diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-08-08 23:20:40 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-08 23:27:32 +0200 |
| commit | 7b88a2b8e11ff4f81aa2bc82ac11e9d2ed8ac667 (patch) | |
| tree | db72142caeb4192f37f46c3758e8dcf6c44c61fc | |
| parent | 7f84d05e823c07c480d6b1e7f0601dc7ae76eb25 (diff) | |
Fix RGBDS 0.4.1
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | home/toolgear.asm | 3 | ||||
| -rwxr-xr-x | shim.sym | 4 | ||||
| -rw-r--r-- | zero_checksum.asm | 6 |
5 files changed, 7 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 441112c..f402b8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ os: linux install: - |- ( cd - git clone -b v0.3.8 --depth=1 https://github.com/rednex/rgbds + git clone -b v0.4.1 --depth=1 https://github.com/rednex/rgbds sudo make -C rgbds install rm -rf rgbds sudo apt-get install wget p7zip-full @@ -65,10 +65,9 @@ linkerscript: $(ROM:.gb=-gen.link) %.map: %.gb $(CORRECTEDROM): %-correctheader.gb: %.gb - $(RGBASM) $(RGBASMFLAGS) -o $(BUILD)/zero_checksum.o zero_checksum.asm - $(RGBLINK) -O $< -o $@ $(BUILD)/zero_checksum.o - $(RGBFIX) -f hg -m 0x10 $@ + cp $< $@ cp $(<:.gb=.sym) $(@:.gb=.sym) + $(RGBFIX) -f hg -m 0x10 $@ $(ROM): poke%-spaceworld.gb: $(OBJS) | $(BASEROM) $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -l $(@:.gb=.link) -O $(BASEROM) -o $@ $^ diff --git a/home/toolgear.asm b/home/toolgear.asm index dc79b5b..59baf51 100644 --- a/home/toolgear.asm +++ b/home/toolgear.asm @@ -4,6 +4,7 @@ SECTION "home/toolgear.asm", ROM0 ; local charmap, global charmap won't apply ; see https://github.com/rednex/rgbds/issues/265#issuecomment-395229694 +newcharmap local charmap "０", $66 charmap "１", $67 charmap "２", $68 @@ -185,4 +186,4 @@ endc add "０" ld [de], a inc de - ret
\ No newline at end of file + ret @@ -61,7 +61,7 @@ 0B:5663 Function2d663 0E:4B78 LoadTrainerClassName -0E:4BA0 LoadTrainerClassName.got_name +;0E:4BA0 LoadTrainerClassName.got_name 0E:4BA9 LoadTrainerClass 0D:7E3D Function37e3d @@ -179,5 +179,5 @@ 3F:64CE MonsterTest 3F:654E PicTest 3F:6750 PicTestMenu -3F:6755 PicTestMenu.loop +;3F:6755 PicTestMenu.loop 3F:67A1 CallSubGameMenu diff --git a/zero_checksum.asm b/zero_checksum.asm deleted file mode 100644 index c35e834..0000000 --- a/zero_checksum.asm +++ /dev/null @@ -1,6 +0,0 @@ - -; This is part of a workaround to RGBFIX 0.3.7, which does not compute the global checksum correctly -; if it's not 0 in the pre-fix ROM. See https://github.com/rednex/rgbds/issues/280 - -SECTION "RGBFIX 0.3.7 workaround", ROM0[$14E] - dw 0
\ No newline at end of file |