Identify characters in _OakSpeechText2B and `Printer_GetMonStats.ID…

.github/checkdiff.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if ! git diff-index --quiet HEAD --; then
+    echo 'Uncommitted changes detected:'
+    git diff-index HEAD --
+    return 1
+fi

.github/workflows/main.yml

@@ -5,25 +5,29 @@ on:
     branches: [ master ]
   pull_request:
 
+env:
+  rgbds_version: v1.0.1
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v6
 
       - name: Checkout rgbds
-        uses: actions/checkout@master
+        uses: actions/checkout@v6
         with:
           path: rgbds
-          ref: v1.0.0
+          ref: ${{ env.rgbds_version }}
           repository: gbdev/rgbds
 
       - name: Install rgbds
         working-directory: rgbds
         run: |
-          sudo apt-get install -yq libpng-dev
-          sudo make install
+          sudo apt-get update
+          sudo apt-get install -yq bison libpng-dev pkg-config
+          sudo make -j$(nproc) install
 
       - name: Remove rgbds
         run: |
@@ -33,21 +37,13 @@ jobs:
         if: ${{ github.repository_owner == 'pret' }}
         run: |
           make DEBUG=1 -j$(nproc) compare
-          if ! git diff-index --quiet HEAD --; then
-            echo 'Uncommitted changes detected:'
-            git diff-index HEAD --
-            return 1
-          fi
+          .github/checkdiff.sh
 
       - name: Make
         if: ${{ github.repository_owner != 'pret' }}
         run: |
           make -j$(nproc)
-          if ! git diff-index --quiet HEAD --; then
-            echo 'Uncommitted changes detected:'
-            git diff-index HEAD --
-            return 1
-          fi
+          .github/checkdiff.sh
 
       - name: Discord webhook
         if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
@@ -57,22 +53,57 @@ jobs:
           .github/webhook.sh
 
       - name: Checkout symbols
-        if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
+        if: ${{ github.repository_owner == 'pret' && github.event_name == 'push' }}
         uses: actions/checkout@master
         with:
           path: symbols
           ref: symbols
 
       - name: Move symbols
-        if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
+        if: ${{ github.repository_owner == 'pret' && github.event_name == 'push' }}
         run: |
-          cp -v *.sym symbols/
-          cp -v *.map symbols/
+          cp -v *.sym *.map symbols/
 
       - name: Update symbols
-        if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
+        if: ${{ github.repository_owner == 'pret' && github.event_name == 'push' }}
         uses: EndBug/add-and-commit@v9
         with:
           cwd: "./symbols"
           add: "*.sym *.map"
           message: ${{ github.event.commits[0].message }}
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Checkout rgbds
+        uses: actions/checkout@v6
+        with:
+          path: rgbds
+          ref: ${{ env.rgbds_version }}
+          repository: gbdev/rgbds
+
+      - name: Install rgbds
+        working-directory: rgbds
+        run: |
+          brew install bison libpng pkg-config
+          export PATH="$(brew --prefix bison)/bin:$PATH"
+          sudo make -j$(sysctl -n hw.ncpu) install
+
+      - name: Remove rgbds
+        run: |
+          rm -rf rgbds
+
+      - name: Compare
+        if: ${{ github.repository_owner == 'pret' }}
+        run: |
+          make DEBUG=1 -j$(sysctl -n hw.ncpu) compare
+          .github/checkdiff.sh
+
+      - name: Make
+        if: ${{ github.repository_owner != 'pret' }}
+        run: |
+          make -j$(sysctl -n hw.ncpu)
+          .github/checkdiff.sh

.rgbds-version

@@ -1 +1 @@
-1.0.0
+1.0.1

INSTALL.md

@@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
 
 Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
 
-Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 1.0.0**.
+Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 1.0.1**.
 
-**Note:** If you already have an installed rgbds older than 1.0.0, you will need to update to 1.0.0. Ignore this if you have never installed rgbds before. If a version newer than 1.0.0 does not work, try downloading 1.0.0.
+**Note:** If you already have an installed rgbds older than 1.0.0, you will need to update to 1.0.1. Ignore this if you have never installed rgbds before. If a version newer than 1.0.1 does not work, try downloading 1.0.1.
 
 Now open the **Cygwin terminal** and enter the following commands.
 
@@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
 
 Open **Terminal** and prepare to enter commands.
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 1.0.0**.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 1.0.1**.
 
 Now you're ready to [build **pokeyellow**](#build-pokeyellow).
 
@@ -84,7 +84,7 @@ To install the software required for **pokeyellow**:
 sudo apt-get install make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.1** from source.
 
 ### OpenSUSE
 
@@ -94,7 +94,7 @@ To install the software required for **pokeyellow**:
 sudo zypper install make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.1** from source.
 
 ### Arch Linux
 
@@ -104,7 +104,7 @@ To install the software required for **pokeyellow**:
 sudo pacman -S make gcc git rgbds
 ```
 
-If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.1** from source.
 
 ### Termux
 
@@ -120,7 +120,7 @@ To install **rgbds**:
 pkg install rgbds
 ```
 
-If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.1** from source.
 
 ### Other distros
 
@@ -131,7 +131,7 @@ If your distro is not listed here, try to find the required software in its repo
 - `git`
 - `rgbds`
 
-If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
+If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.1** from source.
 
 Now you're ready to [build **pokeyellow**](#build-pokeyellow).
 
@@ -153,8 +153,8 @@ make
 
 ### Build with a local rgbds version
 
-If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 1.0.0 globally. Instead, you can put its files in a directory within pokeyellow, such as `pokeyellow/rgbds-1.0.0/`. Then specify it when you run `make`:
+If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 1.0.1 globally. Instead, you can put its files in a directory within pokeyellow, such as `pokeyellow/rgbds-1.0.1/`. Then specify it when you run `make`:
 
 ```bash
-make RGBDS=rgbds-1.0.0/
+make RGBDS=rgbds-1.0.1/
 ```

Makefile

@@ -48,7 +48,15 @@ RGBGFXFLAGS  ?= -Weverything
 .SECONDEXPANSION:
 .PRECIOUS:
 .SECONDARY:
-.PHONY: all yellow yellow_debug clean tidy compare tools
+.PHONY: \
+	all \
+	yellow \
+	yellow_debug \
+	yellow_vc \
+	clean \
+	tidy \
+	compare \
+	tools
 
 all: $(roms)
 yellow:       pokeyellow.gbc

constants/event_constants.asm

@@ -610,7 +610,7 @@
 	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
 	const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	const_skip
-	const EVENT_677 ; ???
+	const EVENT_ENTERED_ROCKET_HIDEOUT
 	const_skip 7
 	const EVENT_67F ; ???
 	const_skip

constants/gfx_constants.asm

@@ -7,7 +7,11 @@ DEF SCREEN_BLOCK_HEIGHT EQU 5 ; blocks
 DEF SURROUNDING_WIDTH  EQU SCREEN_BLOCK_WIDTH * BLOCK_WIDTH ; tiles
 DEF SURROUNDING_HEIGHT EQU SCREEN_BLOCK_HEIGHT * BLOCK_HEIGHT ; tiles
 
-DEF SPRITEBUFFERSIZE EQU 7 * 7 * TILE_1BPP_SIZE
+DEF PIC_WIDTH  EQU 7 ; tiles
+DEF PIC_HEIGHT EQU PIC_WIDTH ; tiles
+DEF PIC_SIZE   EQU PIC_WIDTH * PIC_HEIGHT ; tiles
+
+DEF SPRITEBUFFERSIZE EQU PIC_WIDTH * PIC_HEIGHT * TILE_1BPP_SIZE
 
 ; DMGPalToCGBPal
 DEF CONVERT_BGP  EQU 0