migrate cable_club and mori_debug_menu data to src

6 files changed, 82 insertions, 130 deletions

diff --git a/data/cable_club.s b/data/cable_club.s
deleted file mode 100644
index f0ced6292..000000000
--- a/data/cable_club.s
+++ /dev/null
@@ -1,32 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-.ifdef ENGLISH
-TrainerCardColorName_Bronze:
-	.string "BRONZE$", 7
-TrainerCardColorName_Copper:
-	.string "COPPER$", 7
-TrainerCardColorName_Silver:
-	.string "SILVER$", 7
-TrainerCardColorName_Gold:
-	.string "GOLD$", 7
-.else
-TrainerCardColorName_Bronze:
-	.string "BRONZE$", 7
-TrainerCardColorName_Copper:
-	.string "KUPFER$", 7
-TrainerCardColorName_Silver:
-	.string "SILBER$", 7
-TrainerCardColorName_Gold:
-	.string "GOLD$", 7
-.endif
-
-
-	.align 2
-gTrainerCardColorNames:: @ 839B21C
-	.4byte TrainerCardColorName_Bronze
-	.4byte TrainerCardColorName_Copper
-	.4byte TrainerCardColorName_Silver
-	.4byte TrainerCardColorName_Gold
diff --git a/data/mori_debug_menu.s b/data/mori_debug_menu.s
deleted file mode 100644
index 2545b2b15..000000000
--- a/data/mori_debug_menu.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-@ These seem to be strings for keypad test code.
-gUnknown_0839B22C:: @ 839B22C
-	.string " A$" @ A
-	.string " B$" @ B
-	.string "SL$" @ SELECT
-	.string "ST$" @ START
-	.string "RK$" @ right
-	.string "LK$" @ left
-	.string "UK$" @ up
-	.string "DK$" @ down
-	.string "RT$" @ R
-	.string "LT$" @ L
-
-gUnknown_0839B24A:: @ 839B24A
-	.string "ND$"
-
-gUnknown_0839B24D:: @ 839B24D
-	.string "の　こどもは\n$" @ "'s child <topic-particle>"
-
-gUnknown_0839B255:: @ 839B255
-	.string " $"
-
-gUnknown_0839B257:: @ 839B257
-	.string "ながいなまえぽけもん$" @ "long name pokemon" (used as test name)
-
-Text_39B262: @ 839B262
-	.string "Search a child$"
-
-Text_39B271: @ 839B271
-	.string "Egg$"
-
-Text_39B275: @ 839B275
-	.string "Egg (male)$"
-
-Text_39B280: @ 839B280
-	.string "1000 steps$"
-
-Text_39B28B: @ 839B28B
-	.string "10000 steps$"
-
-Text_39B297: @ 839B297
-	.string "MOVE TUTOR$"
-
-Text_39B2A2: @ 839B2A2
-	.string "Breed an egg$"
-
-Text_39B2AF: @ 839B2AF
-	.string "Long name$"
-
-Text_39B2B9: @ 839B2B9
-.ifdef ENGLISH
-	.string "ポロックけす$" @ "{POKEBLOCK} CASE$"
-.else
-	.string "Delete {POKEBLOCK}$"
-.endif
-
-	.align 2
-gMoriDebugMenuActions:: @ 839B2C0
-	.4byte Text_39B262, MoriDebugMenu_SearchChild
-	.4byte Text_39B271, MoriDebugMenu_Egg
-	.4byte Text_39B275, MoriDebugMenu_MaleEgg
-	.4byte Text_39B280, MoriDebugMenu_1000Steps
-	.4byte Text_39B28B, MoriDebugMenu_10000Steps
-	.4byte Text_39B297, MoriDebugMenu_MoveTutor
-	.4byte Text_39B2A2, MoriDebugMenu_BreedEgg
-	.4byte Text_39B2AF, MoriDebugMenu_LongName
-	.4byte Text_39B2B9, MoriDebugMenu_PokeblockCase
diff --git a/include/mori_debug_menu.h b/include/mori_debug_menu.h
index f1dc0de93..9b0a39fe3 100644
--- a/include/mori_debug_menu.h
+++ b/include/mori_debug_menu.h
@@ -3,14 +3,14 @@
 
 bool8 sub_8083D4C(void);
 u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr);
-s8 MoriDebugMenu_Egg(void);
-s8 MoriDebugMenu_MaleEgg(void);
-s8 MoriDebugMenu_1000Steps(void);
-s8 MoriDebugMenu_10000Steps(void);
-s8 MoriDebugMenu_MoveTutor(void);
-s8 MoriDebugMenu_BreedEgg(void);
-s8 MoriDebugMenu_LongName(void);
-s8 MoriDebugMenu_PokeblockCase(void);
+u8 MoriDebugMenu_Egg(void);
+u8 MoriDebugMenu_MaleEgg(void);
+u8 MoriDebugMenu_1000Steps(void);
+u8 MoriDebugMenu_10000Steps(void);
+u8 MoriDebugMenu_MoveTutor(void);
+u8 MoriDebugMenu_BreedEgg(void);
+u8 MoriDebugMenu_LongName(void);
+u8 MoriDebugMenu_PokeblockCase(void);
 bool8 MoriDebugMenuProcessInput(void);
 s8 InitMoriDebugMenu(void);
 
diff --git a/ld_script.txt b/ld_script.txt
index 75ea7c5a2..cd5083604 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -366,8 +366,8 @@ SECTIONS {
         data/field_weather.o(.rodata);
         src/field/field_screen_effect.o(.rodata);
         src/battle/battle_setup.o(.rodata);
-        data/cable_club.o(.rodata);
-        data/mori_debug_menu.o(.rodata);
+        src/engine/cable_club.o(.rodata);
+        src/debug/mori_debug_menu.o(.rodata);
         src/field/trainer_see.o(.rodata);
         data/trainer_see.o(.rodata);
         src/field/wild_encounter.o(.rodata);
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 1595ecd2e..019cfbf25 100644
--- a/src/debug/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
@@ -16,13 +16,50 @@ extern u8 (*gCallback_03004AE8)(void);
 
 u8 gUnknown_03004DA0[0x20];
 
-extern u8 gUnknown_0839B22C[][3];
-extern u8 gUnknown_0839B24A[];
-extern u8 gUnknown_0839B24D[];
-extern u8 gUnknown_0839B255[];
-extern u8 gUnknown_0839B257[];
-
-extern const struct MenuAction gMoriDebugMenuActions[];
+const u8 gUnknown_0839B22C[][3] =
+{
+	_(" A"),
+	_(" B"),
+	_("SL"),
+	_("ST"),
+	_("RK"),
+	_("LK"),
+	_("UK"),
+	_("DK"),
+	_("RT"),
+	_("LT"),
+};
+
+const u8 gUnknown_0839B24A[] = _("ND");
+const u8 gUnknown_0839B24D[] = _("の　こどもは\n"); // "'s child <topic-particle>"=
+const u8 gUnknown_0839B255[] = _(" ");
+const u8 gUnknown_0839B257[] = _("ながいなまえぽけもん"); // "long name pokemon" (used as test name)
+const u8 Text_39B262[] = _("Search a child");
+const u8 Text_39B271[] = _("Egg");
+const u8 Text_39B275[] = _("Egg (male)");
+const u8 Text_39B280[] = _("1000 steps");
+const u8 Text_39B28B[] = _("10000 steps");
+const u8 Text_39B297[] = _("MOVE TUTOR");
+const u8 Text_39B2A2[] = _("Breed an egg");
+const u8 Text_39B2AF[] = _("Long name");
+#ifdef GERMAN
+const u8 Text_39B2B9[] = _("Delete {POKEBLOCK}");
+#else
+const u8 Text_39B2B9[] = _("ポロックけす");
+#endif
+
+const struct MenuAction gMoriDebugMenuActions[] =
+{
+    {Text_39B262, (u8 (*) (void))MoriDebugMenu_SearchChild}, // ugly cast needed to stop complaints of u8 (*func)() not being compatible with this declaration (TODO: Make MenuAction a Callback union to allow a new definition.)
+    {Text_39B271, MoriDebugMenu_Egg},
+    {Text_39B275, MoriDebugMenu_MaleEgg},
+    {Text_39B280, MoriDebugMenu_1000Steps},
+    {Text_39B28B, MoriDebugMenu_10000Steps},
+    {Text_39B297, MoriDebugMenu_MoveTutor},
+    {Text_39B2A2, MoriDebugMenu_BreedEgg},
+    {Text_39B2AF, MoriDebugMenu_LongName},
+    {Text_39B2B9, MoriDebugMenu_PokeblockCase},
+};
 
 void unref_sub_8083CF0(void)
 {
@@ -65,7 +102,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
     return 0;
 }
 
-s8 MoriDebugMenu_Egg(void)
+u8 MoriDebugMenu_Egg(void)
 {
     if ( Daycare_CountPokemon(&gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041940();
@@ -74,7 +111,7 @@ s8 MoriDebugMenu_Egg(void)
     return 1;
 }
 
-s8 MoriDebugMenu_MaleEgg(void)
+u8 MoriDebugMenu_MaleEgg(void)
 {
     if ( Daycare_CountPokemon(&gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041950();
@@ -83,28 +120,28 @@ s8 MoriDebugMenu_MaleEgg(void)
     return 1;
 }
 
-s8 MoriDebugMenu_1000Steps(void)
+u8 MoriDebugMenu_1000Steps(void)
 {
     sub_8041790(1000);
     CloseMenu();
     return 1;
 }
 
-s8 MoriDebugMenu_10000Steps(void)
+u8 MoriDebugMenu_10000Steps(void)
 {
     sub_8041790(10000);
     CloseMenu();
     return 1;
 }
 
-s8 MoriDebugMenu_MoveTutor(void)
+u8 MoriDebugMenu_MoveTutor(void)
 {
     sub_8132670();
     CloseMenu();
     return 1;
 }
 
-s8 MoriDebugMenu_BreedEgg(void)
+u8 MoriDebugMenu_BreedEgg(void)
 {
     u8 loopCounter;
 
@@ -122,14 +159,14 @@ s8 MoriDebugMenu_BreedEgg(void)
     return 1;
 }
 
-s8 MoriDebugMenu_LongName(void)
+u8 MoriDebugMenu_LongName(void)
 {
     SetMonData(gPlayerParty, MON_DATA_NICKNAME, gUnknown_0839B257);
     CloseMenu();
     return 1;
 }
 
-s8 MoriDebugMenu_PokeblockCase(void)
+u8 MoriDebugMenu_PokeblockCase(void)
 {
     s32 loopCounter;
 
diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c
index c61a1d01c..ec8acc65f 100644
--- a/src/engine/cable_club.c
+++ b/src/engine/cable_club.c
@@ -35,7 +35,6 @@ extern const u8 gUnknown_081A4932[];
 extern const u8 gUnknown_081A4975[];
 extern const u8 gUnknown_081A49B6[];
 extern const u8 gUnknown_081A490C[];
-extern const u8* const gTrainerCardColorNames[];
 extern struct
 {
     u8 field0;
@@ -76,6 +75,26 @@ extern void sub_8055574(void);
 extern s32 sub_80554F8(void);
 extern void sub_805465C(void);
 
+#ifdef GERMAN
+const u8 TrainerCardColorName_Bronze[] = _("BRONZE");
+const u8 TrainerCardColorName_Copper[] = _("KUPFER");
+const u8 TrainerCardColorName_Silver[] = _("SILBER");
+const u8 TrainerCardColorName_Gold[] = _("GOLD");
+#else
+const u8 TrainerCardColorName_Bronze[] = _("BRONZE");
+const u8 TrainerCardColorName_Copper[] = _("COPPER");
+const u8 TrainerCardColorName_Silver[] = _("SILVER");
+const u8 TrainerCardColorName_Gold[] = _("GOLD");
+#endif
+
+const u8 *const gTrainerCardColorNames[] =
+{
+    TrainerCardColorName_Bronze,
+    TrainerCardColorName_Copper,
+    TrainerCardColorName_Silver,
+    TrainerCardColorName_Gold,
+};
+
 static void sub_8082CD4(u8 arg0, u8 arg1)
 {
     if (FindTaskIdByFunc(sub_8082F20) == 0xFF)