Skip to content

Commit

Permalink
Version 1.10.0 (#5752)
Browse files Browse the repository at this point in the history
  • Loading branch information
AsparagusEduardo authored Dec 1, 2024
2 parents 2e65627 + bd7a46f commit 7f494f8
Show file tree
Hide file tree
Showing 4,534 changed files with 51,422 additions and 22,701 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 3 additions & 9 deletions .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,15 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.9.4 (Latest release)
- 1.10.0 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.9.4
- 1.9.3
- 1.9.2
- 1.9.1
- 1.9.0
- 1.8.6
- 1.8.5
- 1.8.4
- 1.8.3
- 1.8.2
- 1.8.1
- 1.8.0
- pre-1.8.0
- pre-1.9.0
validations:
required: true
- type: input
Expand Down
12 changes: 3 additions & 9 deletions .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,15 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.9.4 (Latest release)
- 1.10.0 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.9.4
- 1.9.3
- 1.9.2
- 1.9.1
- 1.9.0
- 1.8.6
- 1.8.5
- 1.8.4
- 1.8.3
- 1.8.2
- 1.8.1
- 1.8.0
- pre-1.8.0
- pre-1.9.0
validations:
required: true
- type: input
Expand Down
12 changes: 3 additions & 9 deletions .github/ISSUE_TEMPLATE/04_other_errors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,15 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.9.4 (Latest release)
- 1.10.0 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.9.4
- 1.9.3
- 1.9.2
- 1.9.1
- 1.9.0
- 1.8.6
- 1.8.5
- 1.8.4
- 1.8.3
- 1.8.2
- 1.8.1
- 1.8.0
- pre-1.8.0
- pre-1.9.0
validations:
required: true
- type: input
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,12 @@ jobs:
GAME_VERSION: EMERALD
GAME_REVISION: 0
GAME_LANGUAGE: ENGLISH
MODERN: 0
COMPARE: 0
UNUSED_ERROR: 1
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Checkout agbcc
uses: actions/checkout@v2
with:
path: agbcc
repository: pret/agbcc

- name: Install binutils
run: |
sudo apt update
Expand All @@ -36,27 +29,13 @@ jobs:
# gcc-arm-none-eabi is only needed for the modern build
# as an alternative to dkP

- name: Install agbcc
run: |
./build.sh
./install.sh ../
working-directory: agbcc

- name: Agbcc
env:
MODERN: 0
COMPARE: 0
run: make -j${nproc} -O all

- name: Modern
- name: ROM
env:
MODERN: 1
COMPARE: 0
run: make -j${nproc} -O all

- name: Test
env:
MODERN: 1
TEST: 1
run: |
make -j${nproc} check
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@ prefabs.json
*.sym
*.js
/pokeemerald-*.png
/pokeemerald_agbcc-*.png
src/data/map_group_count.h
tools/trainerproc/trainerproc
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Pokeemerald-Expansion Changelogs

## 1.10.x
- **[Version 1.10.0](docs/changelogs/1.10.x/1.10.0.md) - ✨ Feature Release**

## 1.9.x
- **[Version 1.9.4](docs/changelogs/1.9.x/1.9.4.md) - 🧹 Bugfix Release**
- **[Version 1.9.3](docs/changelogs/1.9.x/1.9.3.md) - 🧹 Bugfix Release**
Expand Down
52 changes: 0 additions & 52 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -596,58 +596,6 @@ To build **pokeemerald.elf** with debug symbols under a modern toolchain:
```bash
make DINFO=1
```
Note that this is not necessary for a non-modern (agbcc) build since those are built with debug symbols by default.
### agbcc
<details>
<summary><i>Deprecated; installing agbcc is optional since 1.7.0</i>.</summary>
1. Install agbcc into pokeemerald-expansion. The commands to run depend on certain conditions. **You should only follow one of the listed instructions**:
- If agbcc has **not been built before** in the folder where you chose to store pokeemerald Expansion, run the following commands to build and install it into pokeemerald-expansion:
```bash
git clone https://github.com/pret/agbcc
cd agbcc
./build.sh
./install.sh ../pokeemerald-expansion
```
- **Otherwise**, if agbcc has been built before (e.g. if the git clone above fails), but was **last built on a different terminal** than the one currently used (only relevant to Windows, e.g. switching from msys2 to WSL1), then run the following commands to build and install it into pokeemerald-expansion:
```bash
cd agbcc
git clean -fX
./build.sh
./install.sh ../pokeemerald-expansion
```
- **Otherwise**, if agbcc has been built before on the same terminal, run the following commands to install agbcc into pokeemerald-expansion:
```bash
cd agbcc
./install.sh ../pokeemerald-expansion
```
<details>
<summary><i>Note...</i></summary>
> If building agbcc or pokeemerald results in an error, try deleting the agbcc folder and re-installing agbcc as if it has not been built before.
</details>
2. Once agbcc is installed, change directory back to the base directory where pokeemerald-expansion and agbcc are stored:
```bash
cd ..
```
3. To compile with agbcc:
```bash
make agbcc
```
</details>
# Useful additional tools
Expand Down
Loading

0 comments on commit 7f494f8

Please sign in to comment.