summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-06-04 13:58:23 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-06-04 13:58:23 -0400
commite86cbd1cac64659555eacf491f567c6a75a629fb (patch)
tree017370593e176ccf508616cdd858c42bfeff29e1
parent1ed3930722e42ec46d6b15c1a678a80abc6b2d72 (diff)
parent00899db6ab22268bc9ec4ea7c55c183a69731b7f (diff)
Merge branch 'master' into clean_shim
-rw-r--r--Makefile3
-rw-r--r--zero_checksum.inc6
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9fd252a..d9a3d52 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,8 @@ linkerscript: $(ROM:.gb=.link)
%.map: %.gb;
$(CORRECTEDROM): %-correctheader.gb: %.gb
- cp $< $@
+ $(RGBASM) $(RGBASMFLAGS) -o $(BUILD)/zero_checksum.o zero_checksum.inc
+ $(RGBLINK) -O $< -o $@ $(BUILD)/zero_checksum.o
$(RGBFIX) -f hg -m 0x10 $@
$(ROM): poke%-spaceworld.gb: $(OBJS) | $(BASEROM)
diff --git a/zero_checksum.inc b/zero_checksum.inc
new file mode 100644
index 0000000..c35e834
--- /dev/null
+++ b/zero_checksum.inc
@@ -0,0 +1,6 @@
+
+; 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