Disassemble the final English debug ROMs

1 files changed, 29 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index faff2d33..c6774a88 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-roms := pokegold.gbc pokesilver.gbc
+roms := pokegold.gbc pokesilver.gbc pokegold_debug.gbc pokesilver_debug.gbc
 
 rom_obj := \
 audio.o \
@@ -21,9 +21,13 @@ gfx/pics
 
 gold_excl_obj := $(addsuffix _gold.o,$(gs_excl_asm))
 silver_excl_obj := $(addsuffix _silver.o,$(gs_excl_asm))
+gold_debug_excl_obj := $(addsuffix _gold_debug.o,$(gs_excl_asm))
+silver_debug_excl_obj := $(addsuffix _silver_debug.o,$(gs_excl_asm))
 
 pokegold_obj := $(rom_obj:.o=_gold.o) $(gold_excl_obj)
 pokesilver_obj := $(rom_obj:.o=_silver.o) $(silver_excl_obj)
+pokegold_debug_obj := $(rom_obj:.o=_gold_debug.o) $(gold_debug_excl_obj)
+pokesilver_debug_obj := $(rom_obj:.o=_silver_debug.o) $(silver_debug_excl_obj)
 
 
 ### Build tools
@@ -50,16 +54,18 @@ RGBLINK ?= $(RGBDS)rgblink
 .SECONDARY:
 
 all: $(roms)
-gold:   pokegold.gbc
-silver: pokesilver.gbc
+gold:         pokegold.gbc
+silver:       pokesilver.gbc
+gold_debug:   pokegold_debug.gbc
+silver_debug: pokesilver_debug.gbc
 
 clean:
-	rm -f $(roms) $(pokegold_obj) $(pokesilver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
+	rm -f $(roms) $(pokegold_obj) $(pokesilver_obj) $(pokegold_debug_obj) $(pokesilver_debug_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
 	find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" -o -name "*.dimensions" -o -name "*.sgb.tilemap" \) -delete
 	$(MAKE) clean -C tools/
 
 tidy:
-	rm -f $(roms) $(pokegold_obj) $(pokesilver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
+	rm -f $(roms) $(pokegold_obj) $(pokesilver_obj) $(pokegold_debug_obj) $(pokesilver_debug_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
 	$(MAKE) clean -C tools/
 
 compare: $(roms)
@@ -75,8 +81,10 @@ ifeq ($(DEBUG),1)
 RGBASMFLAGS += -E
 endif
 
-$(pokegold_obj):   RGBASMFLAGS += -D _GOLD
-$(pokesilver_obj): RGBASMFLAGS += -D _SILVER
+$(pokegold_obj):         RGBASMFLAGS += -D _GOLD
+$(pokesilver_obj):       RGBASMFLAGS += -D _SILVER
+$(pokegold_debug_obj):   RGBASMFLAGS += -D _GOLD -D _DEBUG
+$(pokesilver_debug_obj): RGBASMFLAGS += -D _SILVER -D _DEBUG
 
 rgbdscheck.o: rgbdscheck.asm
 	$(RGBASM) -o $@ $<
@@ -100,15 +108,26 @@ $(foreach obj, $(filter-out $(gold_excl_obj), $(pokegold_obj)), \
 	$(eval $(call DEP,$(obj),$(obj:_gold.o=.asm))))
 $(foreach obj, $(filter-out $(silver_excl_obj), $(pokesilver_obj)), \
 	$(eval $(call DEP,$(obj),$(obj:_silver.o=.asm))))
+$(foreach obj, $(filter-out $(gold_debug_excl_obj), $(pokegold_debug_obj)), \
+	$(eval $(call DEP,$(obj),$(obj:_gold_debug.o=.asm))))
+$(foreach obj, $(filter-out $(silver_debug_excl_obj), $(pokesilver_debug_obj)), \
+	$(eval $(call DEP,$(obj),$(obj:_silver_debug.o=.asm))))
 
 # Dependencies for game-exclusive objects (keep _gold and _silver in asm file basenames)
-$(foreach obj, $(gold_excl_obj) $(silver_excl_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
+$(foreach obj, $(gold_excl_obj) $(silver_excl_obj), \
+	$(eval $(call DEP,$(obj),$(obj:.o=.asm))))
+$(foreach obj, $(gold_debug_excl_obj), \
+	$(eval $(call DEP,$(obj),$(obj:_gold_debug.o=_gold.asm))))
+$(foreach obj, $(silver_debug_excl_obj), \
+	$(eval $(call DEP,$(obj),$(obj:_silver_debug.o=_silver.asm))))
 
 endif
 
 
-pokegold_opt   = -cjsv -t POKEMON_GLD -i AAUE -k 01 -l 0x33 -m 0x10 -r 3 -p 0
-pokesilver_opt = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m 0x10 -r 3 -p 0
+pokegold_opt         = -cjsv -t POKEMON_GLD -i AAUE -k 01 -l 0x33 -m 0x10 -r 3 -p 0
+pokesilver_opt       = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m 0x10 -r 3 -p 0
+pokegold_debug_opt   = -cjsv -t POKEMON_GLD -i AAUE -k 01 -l 0x33 -m 0x10 -r 3 -p 0
+pokesilver_debug_opt = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m 0x10 -r 3 -p 0
 
 %.gbc: $$(%_obj) layout.link
 	$(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^)