Merge pull request #3 from rh-hideout/master

update to newest expansion

.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml

@@ -23,19 +23,16 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.9.2 (Latest release)
+        - 1.10.1 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.10.0
+        - 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

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -23,19 +23,16 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.9.2 (Latest release)
+        - 1.10.1 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.10.0
+        - 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

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -23,19 +23,16 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.9.2 (Latest release)
+        - 1.10.1 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.10.0
+        - 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

.github/pull_request_template.md

@@ -1,5 +1,9 @@
 <!--- Provide a general summary of your changes in the Title above -->
 
+<!--- Before submitting, please make sure your pull request meets the scope guidelines. If unsure, please open a thread in #pr-discussions.-->
+<!--- Scope Guidelines: https://github.com/rh-hideout/pokeemerald-expansion/blob/master/docs/scope.md  -->
+<!--- #pr-discussions:  https://discord.com/channels/419213663107416084/1102784418369785948 -->
+
 ## Description
 <!--- Describe your changes in detail -->
 
@@ -13,13 +17,19 @@
 
 ## **People who collaborated with me in this PR**
 <!-- Please credit everyone else that contributed to this PR, be it code and/or assets. -->
-<!-- Use their GitHub tag if they have one. -->
+<!-- Use their GitHub tag if they have one (or add "@/" at the start if they don't). Be sure to start the line using @ so the automatic changelog can properly detect the collaborators. -->
+<!-- Eg.: "@Lunos for sprites, @/Masuda for support" -->
 <!-- If it doesn't apply, feel free to remove this section. -->
 
 ## Feature(s) this PR does NOT handle:
 <!-- If your PR contains any unfinished features that are not considered merge-blocking, please list them here for clarity so no one can forget. -->
 <!-- If it doesn't apply, feel free to remove this section. -->
 
+## Things to note in the release changelog:
+<!-- We use an automated system to generate our changelogs, so if there's something of note that our end users should know in regards to this change besides the title of this PR, they should be added here. -->
+<!-- *MUST* be structured as bullet points. -->
+<!-- If it doesn't apply, feel free to remove this section. -->
+
 ## **Discord contact info**
-<!--- formatted as name#numbers, e.g. Lunos#4026 -->
+<!--- Formatted as username (e.g. Lunos) or username#numbers (e.g. Lunos#4026) -->
 <!--- Contributors must join https://discord.gg/6CzjAG6GZk -->

.github/workflows/build.yml

@@ -15,49 +15,27 @@ 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
           sudo apt install -y build-essential libpng-dev libelf-dev
-        # build-essential, git, and libpng-dev are already installed
+        # build-essential and git are already installed
         # 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} -O pokeemerald-test.elf
           make -j${nproc} check

.gitignore

@@ -38,5 +38,6 @@ prefabs.json
 *.diff
 *.sym
 *.js
+/pokeemerald-*.png
 src/data/map_group_count.h
 tools/trainerproc/trainerproc

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Pokeemerald-Expansion Changelogs
 
+## 1.10.x
+- **[Version 1.10.1](docs/changelogs/1.10.x/1.10.1.md) - 🧹 Bugfix Release**
+- **[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**
 - **[Version 1.9.2](docs/changelogs/1.9.x/1.9.2.md) - 🧹 Bugfix Release**
 - **[Version 1.9.1](docs/changelogs/1.9.x/1.9.1.md) - 🧹 Bugfix Release**
 - **[Version 1.9.0](docs/changelogs/1.9.x/1.9.0.md) - ✨ Feature Release**