Preliminary support for English rev0 debug. Matching but still needs

cleaning up.
Rename DEBUG_TRANSLATE to DEBUG_FIX now that we have actual English
Debug ROMs.
Add Sapphire German "first edition" debug support, now that we have a
hash for it.
Fix an obvious nonmatching.

5 files changed, 16 insertions, 18 deletions

diff --git a/include/config.h b/include/config.h
index 0046c3878..57154e8e2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -5,11 +5,11 @@
 // Ruby/Sapphire and Emerald do not have these asserts while Fire Red
 // still has them in the ROM. This is because the developers forgot
 // to define NDEBUG before release, however this has been changed as
-// Ruby's actual debug build does not use the AGBPrint features.
+// Ruby's actual debug builds do not use the AGBPrint features.
 
 // To note, Ruby/Sapphire likely did not use AGBPrint. This is because
-// the german debug ROM of Ruby did not have any uses of AGBPrint and
-// the assert commands but instead a "crash" screen. This config exists
+// the debug ROMs of Ruby did not have any uses of AGBPrint and the
+// assert commands but instead a "crash" screen. This config exists
 // for convenience for the user of pokeruby and NOT because it is
 // authoritative. These additions are for user convenience based on
 // officially recommended SDK practices for debugging and is therefore
@@ -55,15 +55,8 @@
 #define UNITS_METRIC
 #endif
 
-// An option to use translations/encoding fixes for the Debug menus.
-// Selected by default for custom English debug roms.
-#ifndef DEBUG_TRANSLATE
-#if ENGLISH && DEBUG
-#define DEBUG_TRANSLATE 1
-#else
-#define DEBUG_TRANSLATE 0
-#endif
-#endif
+// An option to use fuller translations for debug ROMs.
+// #define DEBUG_FIX 1 // Unsupported languages default to English text.
 
 // Fixed in Emerald.
 // #define BUGFIX_SETMONIVS
diff --git a/include/global.h b/include/global.h
index 0ddc2d7bb..4ca22ff32 100644
--- a/include/global.h
+++ b/include/global.h
@@ -21,12 +21,13 @@
 #endif
 
 // For debug menu translations.
-// DTR("こんにちは", "Hello") will expand to "Hello" with DEBUG_TRANSLATE,
+// DTR("こんにちは", "Hello") will expand to "Hello" with DEBUG_FIX,
 // or "こんにちは" if not.
 // The KANA macro will wrap Japanese text with encoding markers to
 // prevent mojibake while they are being translated.
 
-#if DEBUG_TRANSLATE
+// TODO: Support multiple languages.
+#if DEBUG_FIX
 #define DTR(japanese, english) _(english)
 #define KANA(txt) _("{JPN}" txt "{ENG}")
 #else
diff --git a/include/main.h b/include/main.h
index 8a7c4d67c..20ed1ec74 100644
--- a/include/main.h
+++ b/include/main.h
@@ -64,7 +64,7 @@ void InitFlashTimer(void);
 void DoSoftReset(void);
 void ClearPokemonCrySongs(void);
 
-extern const char BuildDateTime[];
+extern const u8 BuildDateTime[];
 extern s8 gPcmDmaCounter;
 
 #endif // GUARD_MAIN_H
diff --git a/include/pokemon.h b/include/pokemon.h
index df2d42522..cb02268a8 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -509,8 +509,8 @@ void BoxMonRestorePP(struct BoxPokemon *);
 bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId);
 u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
 
-#if DEBUG
+#if DEBUG && !(ENGLISH && REVISION == 0)
 void Nakamura_NakaGenderTest_RecalcStats(struct Pokemon *);
-#endif // DEBUG
+#endif
 
 #endif // GUARD_POKEMON_H
diff --git a/include/start_menu.h b/include/start_menu.h
index 327df8c16..b035eb211 100644
--- a/include/start_menu.h
+++ b/include/start_menu.h
@@ -13,7 +13,11 @@ void debug_sub_8075DB4(struct BattleTowerEReaderTrainer *ereaderTrainer, const u
 bool8 debug_sub_8075C30(void);
 
 #if DEBUG
-extern u32 gUnknown_Debug_03004BD0;
+extern u8 gUnknown_Debug_03004BD0;
+// TODO: see if this is in rev1+
+#if (ENGLISH && REVISION == 0)
+extern u8 gUnknown_Debug_Murakawa2;
+#endif
 #endif // DEBUG
 
 #endif // GUARD_START_MENU_H