Make DEBUG_TRANSLATE a makefile flag

6 files changed, 27 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index f242cd71b..3532f7bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
 GBAFIX    := tools/gbafix/gbafix$(EXE)
 MAPJSON   := tools/mapjson/mapjson$(EXE)
 
-ASFLAGS  := -mcpu=arm7tdmi -I include --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1 --defsym DEBUG=$(DEBUG)
+ASFLAGS  := -mcpu=arm7tdmi -I include --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym DEBUG_TRANSLATE=$(DEBUG_TRANSLATE) --defsym $(GAME_LANGUAGE)=1 --defsym DEBUG=$(DEBUG)
 CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm
-CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(GAME_VERSION) -D REVISION=$(GAME_REVISION) -D $(GAME_LANGUAGE) -D DEBUG=$(DEBUG)
+CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(GAME_VERSION) -D REVISION=$(GAME_REVISION) -D $(GAME_LANGUAGE) -DDEBUG_TRANSLATE=$(DEBUG_TRANSLATE) -D DEBUG=$(DEBUG)
 
 CPPVERSION := $(shell $(CPP) --version 2>/dev/null || true)
 
@@ -80,7 +80,7 @@ $(BUILD_DIR)/data/%.o: data/%.s
 
 #### Main Rules ####
 
-ALL_BUILDS := ruby ruby_rev1 ruby_rev2 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug
+ALL_BUILDS := ruby ruby_rev1 ruby_rev2 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug ruby_en_debug
 
 # Available targets
 .PHONY: all clean tidy tools $(ALL_BUILDS)
@@ -195,6 +195,7 @@ sapphire_rev2: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=2
 ruby_de:       ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN
 sapphire_de:   ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN
 ruby_de_debug: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1
+ruby_en_debug: ; @$(MAKE) GAME_VERSION=RUBY DEBUG=1 DEBUG_TRANSLATE=1
 
 
 #### Graphics Rules ####
diff --git a/config.mk b/config.mk
index 976c02053..171478df1 100644
--- a/config.mk
+++ b/config.mk
@@ -5,6 +5,7 @@ GAME_VERSION  ?= RUBY
 GAME_REVISION ?= 0
 GAME_LANGUAGE ?= ENGLISH
 DEBUG         ?= 0
+DEBUG_TRANSLATE ?= 0
 COMPARE  ?= 1
 
 # For gbafix
@@ -53,8 +54,20 @@ else
 endif
 endif
 
+# Debug translations (always nonmatching)
+ifeq ($(DEBUG_TRANSLATE),1)
+  COMPARE := 0
+  DEBUG = 1
+endif
+
 # Debug
 ifeq ($(DEBUG), 1)
   BUILD_NAME := $(BUILD_NAME)_debug
+ifeq ($(GAME_LANGUAGE), ENGLISH)
+  COMPARE := 0
+  DEBUG_TRANSLATE := 1
 endif
 
+endif
+
+
diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc
index 0111dbf63..bf90fcd1e 100644
--- a/constants/misc_constants.inc
+++ b/constants/misc_constants.inc
@@ -33,11 +33,6 @@
 	.equiv FEMALE, 1
 
 	.ifdef ENGLISH
-
-	.ifdef DEBUG
-	.set DEBUG_TRANSLATE, 1
-	.endif
-
 	.equiv GAME_LANGUAGE, 2
 	.else
 	.ifdef GERMAN
diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 287074137..06ab16430 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -106,7 +106,7 @@ gUnknown_Debug_821F5AC::
 Str_821F624:: @ 0x821F624
 	.string "ーーーーーーーーーーーー$"
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 
 str_821F631:: @ 0x821F631
 	.string "JUNICHI$"
@@ -190,7 +190,7 @@ gUnknown_Debug_821F680::
 gUnknown_Debug_821F798::
 	.byte 0xc0, 0x03, 0x00, 0x00, 0xd6, 0x03, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x56, 0x04, 0x00, 0x00, 0xc0, 0x0b, 0x00, 0x00, 0xd6, 0x0b, 0x00, 0x00, 0x40, 0x0c, 0x00, 0x00, 0x56, 0x0c, 0x00, 0x00
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 Str_821F7B8:: @ 0x821F7B8
 	.string "HEIGHT$"
 
diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s
index 54ddb565d..798c6fdd9 100644
--- a/data/debug_mystery_event_scripts.s
+++ b/data/debug_mystery_event_scripts.s
@@ -26,7 +26,7 @@ _0845DAFF:
 	me_runscript _0845DD0D
 	me_end
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 _0845DB16:
 	.string "Run and visit your DAD in the\n"
 	.string "PETALBURG CITY GYM.$"
@@ -70,7 +70,7 @@ _0845DBB5:
 	release
 	end
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 _0845DBBE:
 	.string "DAD: {PLAYER}! Nice to see you!\n"
 	.string "Here is a Letter for you, {PLAYER}.$"
@@ -132,7 +132,7 @@ _0845DD5B:
 	setmysteryeventstatus 0x3
 	end
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 _0845DD63:
 	.string "This GIFT can only be used\n"
 	.string "once.$"
@@ -183,7 +183,7 @@ _0845E34C:
 	setmysteryeventstatus 0x3
 	end
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 _0845E34F:
 	.string "A POKéMON was added to {PLAYER}'s\n"
 	.string "team.$"
@@ -273,7 +273,7 @@ _0845E637:
 	me_setstatus 0x2
 	me_end
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 
 _0845E64C:
 	.string "Visit your DAD in the PETALBURG\n"
@@ -305,7 +305,7 @@ _0845E683:
 _0845E6BF:
 	gotoram
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 _0845E6C0:
 	.string "DAD: Hi, {PLAYER}!\p"
 	.string "I have just received this rare\n"
@@ -345,7 +345,7 @@ _0845E755:
 	setmysteryeventstatus 0x3
 	end
 
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 _0845E75D:
 	.string "{STR_VAR_1} was handed over.$"
 _0845E771:
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index 5df403631..e4a4cf95c 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -73,7 +73,7 @@ gSpriteTemplate_83BBC88:: @ 83BBC88
 	spr_template 1, 56006, gOamData_83BBC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_809CB74
 
 .if DEBUG
-.ifdef DEBUG_TRANSLATE
+.if DEBUG_TRANSLATE
 gUnknown_Debug_0x83E6268:: @ 0x83E6268
 	.string "SET$"
 .else