Merge pull request #2 from rh-hideout/master

Merge 1.8.4

.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml

@@ -23,22 +23,26 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.6.2 (Default)
+        - 1.8.4 (Latest release)
+        - master (default, unreleased bugfixes)
         - upcoming (Edge)
-        - 1.6.1
-        - 1.6.0
-        - 1.5.3
-        - 1.5.2
-        - 1.5.1
-        - 1.5.0
-        - pre-1.5.0
+        - 1.8.3
+        - 1.8.2
+        - 1.8.1
+        - 1.8.0
+        - 1.7.4
+        - 1.7.3
+        - 1.7.2
+        - 1.7.1
+        - 1.7.0
+        - pre-1.7.0
     validations:
       required: true
   - type: input
     id: upcomingversion
     attributes:
-      label: Upcoming Version
-      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+      label: Upcoming/master Version
+      description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
     validations:
       required: false
   - type: input

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -23,22 +23,25 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.6.2 (Default)
+        - 1.8.4 (Latest release)
+        - master (default, unreleased bugfixes)
         - upcoming (Edge)
-        - 1.6.1
-        - 1.6.0
-        - 1.5.3
-        - 1.5.2
-        - 1.5.1
-        - 1.5.0
-        - pre-1.5.0
+        - 1.8.3
+        - 1.8.1
+        - 1.8.0
+        - 1.7.4
+        - 1.7.3
+        - 1.7.2
+        - 1.7.1
+        - 1.7.0
+        - pre-1.7.0
     validations:
       required: true
   - type: input
     id: upcomingversion
     attributes:
-      label: Upcoming Version
-      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+      label: Upcoming/master Version
+      description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
     validations:
       required: false
   - type: input

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -23,22 +23,25 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.6.2 (Default)
+        - 1.8.4 (Latest release)
+        - master (default, unreleased bugfixes)
         - upcoming (Edge)
-        - 1.6.1
-        - 1.6.0
-        - 1.5.3
-        - 1.5.2
-        - 1.5.1
-        - 1.5.0
-        - pre-1.5.0
+        - 1.8.3
+        - 1.8.1
+        - 1.8.0
+        - 1.7.4
+        - 1.7.3
+        - 1.7.2
+        - 1.7.1
+        - 1.7.0
+        - pre-1.7.0
     validations:
       required: true
   - type: input
     id: upcomingversion
     attributes:
-      label: Upcoming Version
-      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+      label: Upcoming/master Version
+      description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
     validations:
       required: false
   - type: input

.github/pull_request_template.md

@@ -11,6 +11,15 @@
 <!-- Format: "Fixes #2345, fixes #4523, fixes #2222." -->
 <!-- If it doesn't apply, feel free to remove this section. -->
 
+## **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. -->
+<!-- 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. -->
+
 ## **Discord contact info**
 <!--- formatted as name#numbers, e.g. Lunos#4026 -->
-<!--- Contributors must join https://discord.gg/6CzjAG6GZk -->
+<!--- Contributors must join https://discord.gg/6CzjAG6GZk -->

.github/workflows/build.yml

@@ -10,12 +10,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    container: devkitpro/devkitarm
     env:
       GAME_VERSION: EMERALD
       GAME_REVISION: 0
       GAME_LANGUAGE: ENGLISH
       MODERN: 0
       COMPARE: 0
+      UNUSED_ERROR: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -27,7 +29,9 @@ jobs:
           repository: pret/agbcc
 
       - name: Install binutils
-        run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libelf-dev
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential libpng-dev libelf-dev
         # build-essential, git, and libpng-dev are already installed
         # gcc-arm-none-eabi is only needed for the modern build
         # as an alternative to dkP
@@ -39,6 +43,9 @@ jobs:
         working-directory: agbcc
 
       - name: Agbcc
+        env:
+          MODERN: 0
+          COMPARE: 0
         run: make -j${nproc} -O all
 
       - name: Modern
@@ -49,6 +56,7 @@ jobs:
 
       - name: Test
         env:
+          MODERN: 1
           TEST: 1
         run: |
           make -j${nproc} -O pokeemerald-test.elf

.github/workflows/docs.yml

@@ -0,0 +1,48 @@
+name: Docs
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install latest mdbook
+        run: |
+          tag=$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name')
+          url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz"
+          mkdir mdbook
+          curl -sSL $url | tar -xz --directory=./mdbook
+          echo `pwd`/mdbook >> $GITHUB_PATH
+      - name: Build Book
+        run: |
+          cd docs
+          mdbook build
+      - name: Check if Pages is enabled
+        uses: octokit/[email protected]
+        id: check_pages
+        continue-on-error: true
+        with:
+          route: GET /repos/{repo}/pages
+          repo: ${{ github.repository }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+        if: steps.check_pages.outcome == 'success'
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: 'docs/book'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+        if: steps.check_pages.outcome == 'success'

.gitignore

@@ -21,7 +21,6 @@ sound/**/*.bin
 sound/songs/midi/*.s
 tools/agbcc
 *.map
-*.ld
 *.bat
 *.dump
 *.sa*
@@ -39,3 +38,5 @@ prefabs.json
 *.diff
 *.sym
 *.js
+src/data/map_group_count.h
+tools/trainerproc/trainerproc