From 6a03f31b66dd2a4295b6ccdaa0e10d9f8e81e7f4 Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Mon, 3 Jul 2023 23:11:04 +0100
Subject: [PATCH] Now builds debug and non-debug rom files

Also fixes a bug I introduced a while ago where I accidentally added an extra sign into Fuchsia City. Oops.
---
 Makefile                          | 14 +++++++++++---
 data/maps/objects/FuchsiaCity.asm |  5 ++---
 maps/FuchsiaCity.blk              |  2 +-
 scripts/FuchsiaCity.asm           |  4 +---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 1705b6b6..7cb3ceb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 roms := \
-	kep.gbc
+	kep.gbc \
+	kep_debug.gbc
 patches := \
 	kep.patch
 
@@ -15,6 +16,7 @@ rom_obj := \
 	gfx/tilesets.o
 
 kep_obj        := $(rom_obj:.o=_kep.o)
+kep_debug_obj  := $(rom_obj:.o=_kep_debug.o)
 
 ### Build tools
 
@@ -41,6 +43,7 @@ RGBLINK ?= $(RGBDS)rgblink
 
 all: $(roms)
 kep:        kep.gbc
+kep_debug:  kep_debug.gbc
 
 clean: tidy
 	find gfx \
@@ -59,6 +62,7 @@ tidy:
 	      $(patches:.patch=_vc.map) \
 	      $(patches:%.patch=vc/%.constants.sym) \
 	      $(kep_obj) \
+		  $(kep_debug_obj) \
 	      rgbdscheck.o
 	$(MAKE) clean -C tools/
 
@@ -75,7 +79,8 @@ ifeq ($(DEBUG),1)
 RGBASMFLAGS += -E
 endif
 
-$(kep_obj):        RGBASMFLAGS += -D _KEP -D _DEBUG
+$(kep_obj):        RGBASMFLAGS += -D _KEP
+$(kep_debug_obj):  RGBASMFLAGS += -D _KEP -D _DEBUG
 
 %.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
 	tools/make_patch $*_vc.sym $^ $@
@@ -100,6 +105,7 @@ endef
 
 # Dependencies for objects (drop _red and _blue from asm file basenames)
 $(foreach obj, $(kep_obj), $(eval $(call DEP,$(obj),$(obj:_kep.o=.asm))))
+$(foreach obj, $(kep_debug_obj), $(eval $(call DEP,$(obj),$(obj:_kep_debug.o=.asm))))
 
 # Dependencies for VC files that need to run scan_includes
 %.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) $(preinclude_deps) | rgbdscheck.o
@@ -112,8 +118,10 @@ endif
 
 
 kep_pad        = 0x00
+kep_debug_pad  = 0xff
 
-kep_opt        = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "KEP Hack"
+kep_opt        = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "KEP HACK"
+kep_debug_opt  = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "KEP HACK"
 
 %.gbc: $$(%_obj) layout.link
 	$(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^)
diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm
index df59d77d..bba94606 100644
--- a/data/maps/objects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -13,7 +13,6 @@ FuchsiaCity_Object:
 	;warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1
 
 	def_bg_events
-	bg_event 29, 19, 11 ; FuchsiaCityText11
 	bg_event 25, 17, 12 ; FuchsiaCityText12
 	bg_event 17,  5, 13 ; FuchsiaCityText13
 	bg_event  6, 13, 14 ; MartSignText
@@ -30,7 +29,7 @@ FuchsiaCity_Object:
 
 	def_object_events
 	object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
-	object_event 28, 18, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
+	object_event 28, 16, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
 	object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
 	object_event 24,  8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
 	object_event 31,  5, SPRITE_CHANSEY, STAY, ANY_DIR, 5 ; person
@@ -39,6 +38,6 @@ FuchsiaCity_Object:
 	object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person
 	object_event  8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
 	object_event  6,  5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
-	object_event 11,  8, SPRITE_GAMBLER, STAY, UP, 25 ; person
+	object_event 11,  8, SPRITE_GAMBLER, STAY, UP, 11 ; person
 
 	def_warps_to FUCHSIA_CITY
diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.blk
index 13ac0f4b..771890c8 100644
--- a/maps/FuchsiaCity.blk
+++ b/maps/FuchsiaCity.blk
@@ -1,4 +1,4 @@
- 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmmzooooyzzz1U1zzzzzzn

gmzzzVUVooooo11
kkkPRRO1U1wVww11










_1n
ttt
+ 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmmzooooyzzz1U1zzzzzzn

gmzzzVUVooooo11
kkkPRRO1U1wwww11










_1n
ttt
 
 
 
diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm
index a4665a11..c5e3c4d2 100644
--- a/scripts/FuchsiaCity.asm
+++ b/scripts/FuchsiaCity.asm
@@ -12,7 +12,7 @@ FuchsiaCity_TextPointers:
 	dw FuchsiaCityText8
 	dw FuchsiaCityText9
 	dw FuchsiaCityText10
-	dw FuchsiaCityText11
+	dw SubstituteGuy
 	dw FuchsiaCityText12
 	dw FuchsiaCityText13
 	dw MartSignText
@@ -26,7 +26,6 @@ FuchsiaCity_TextPointers:
 	dw FuchsiaCityText22
 	dw FuchsiaCityText23
 	dw FuchsiaCityText24
-	dw SubstituteGuy
 
 FuchsiaCityText1:
 	text_far _FuchsiaCityText1
@@ -54,7 +53,6 @@ FuchsiaCityText10:
 	text_end
 
 FuchsiaCityText12:
-FuchsiaCityText11:
 	text_far _FuchsiaCityText11
 	text_end