Merge remote-tracking branch 'origin/master' into battle-stuff

# Conflicts:
#	shim.sym

.github/workflows/main.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Checkout rgbds
+        uses: actions/checkout@master
+        with:
+          path: rgbds
+          ref: v0.5.1
+          repository: gbdev/rgbds
+
+      - name: Install rgbds
+        working-directory: rgbds
+        run: |
+          sudo make install
+
+      - name: Remove rgbds
+        run: |
+          rm -rf rgbds
+
+      - name: Cache baserom
+        id: cache-baserom
+        uses: actions/cache@master
+        with:
+          path: baserom.gb
+          key: ${{ runner.os }}-baserom
+
+      - name: Download baserom
+        if: steps.cache-baserom.outputs.cache-hit != 'true'
+        run: |
+          sudo apt-get install wget p7zip-full
+          wget -O roms.7z 'https://tcrf.net/images/3/33/Pok%C3%A9mon_Gold_-_Spaceworld_1997_Demo_%28Debug%29.7z'
+          7z e roms.7z
+          mv P*\(Debug\).sgb baserom.gb
+          rm -f roms.7z P*\(Header\ Fixed\).sgb
+
+      - name: Compare
+        run: |
+          make -j$(nproc) compare
+          if ! git diff-index --quiet HEAD --; then
+            echo 'Uncommitted changes detected:'
+            git diff-index HEAD --
+            return 1
+          fi

Makefile

@@ -124,6 +124,10 @@ $(BUILD)/%.1bpp: %.1bpp.png tools/gfx | $$(dir $$@)
 $(BUILD)/%.tilemap: %.png | $$(dir $$@)
 	$(RGBGFX) -t $@ $<
 
+.PRECIOUS: $(BUILD)/%.sgb.tilemap
+$(BUILD)/%.sgb.tilemap: %.bin | $$(dir $$@)
+	tr < $< -d '\000' > $@
+
 .PRECIOUS: %/
 %/:
 	mkdir -p $@

README.md

@@ -1,4 +1,4 @@
-# Pokémon Gold and Silver: Space World 1997 Demo [![Build Status][travis-badge]][travis]
+# Pokémon Gold and Silver: Space World 1997 Demo [![Build Status][ci-badge]][ci]
 
 This is a work-in-progress disassembly of the Pokémon Gold and Pokémon Silver prototypes demoed at Space World 1997.
 
@@ -38,5 +38,5 @@ Other disassembly projects:
 [pokeemerald]: https://github.com/pret/pokeemerald
 [discord]: https://discord.gg/d5dubZ3
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
-[travis]: https://travis-ci.org/pret/pokegold-spaceworld
-[travis-badge]: https://travis-ci.org/pret/pokegold-spaceworld.svg?branch=master
+[ci]: https://github.com/pret/pokegold-spaceworld/actions
+[ci-badge]: https://github.com/pret/pokegold-spaceworld/actions/workflows/main.yml/badge.svg