add some debug data

9 files changed, 155 insertions, 89 deletions

diff --git a/data/unk_debug_menu_3.s b/data/unk_debug_menu_3.s
new file mode 100644
index 000000000..cb98f9bbf
--- /dev/null
+++ b/data/unk_debug_menu_3.s
@@ -0,0 +1,103 @@
+    .section .rodata
+
+Str_842E238: @ 0x842E238
+	.string "タマゴ$"
+
+.if DEBUG
+
+Str_842E23C: @ 0x842E23C
+	.string "ガイブ$"
+
+Str_842E240: @ 0x842E240
+	.string "ENGLISH$"
+
+Str_842E248: @ 0x842E248
+	.string "TOURNAMENT$"
+
+Str_842E253: @ 0x842E253
+	.string "　そら　　カードイー$"
+
+Str_842E25E: @ 0x842E25E
+	.string "ポケコッコ$"
+
+Str_842E264: @ 0x842E264
+	.string "ticket$"
+
+Str_842E26B: @ 0x842E26B
+	.string "{PKMN}$"
+
+Str_842E26E: @ 0x842E26E
+	.string "wrong　{PKMN}$"
+
+Str_842E277: @ 0x842E277
+	.string "ribbon$"
+
+Str_842E27E: @ 0x842E27E
+	.string "DEX$"
+
+Str_842E282: @ 0x842E282
+	.string "message$"
+
+Str_842E28A: @ 0x842E28A
+	.string "egg$"
+
+Str_842E28E: @ 0x842E28E
+	.string "RAM　seed$"
+
+Str_842E297: @ 0x842E297
+	.string "trainer$"
+
+Str_842E29F: @ 0x842E29F
+	.string "clock$"
+
+Str_842E2A5: @ 0x842E2A5
+	.string "item$"
+
+Str_842E2AA: @ 0x842E2AA
+	.string "goods$"
+
+Str_842E2B0: @ 0x842E2B0
+	.string "potion$"
+
+Str_842E2B7: @ 0x842E2B7
+	.string "ball$"
+
+Str_842E2BC: @ 0x842E2BC
+	.string "cheri　berry$"
+
+Str_842E2C8: @ 0x842E2C8
+	.string "TM01$"
+
+	.align 2
+_842E2D0::
+	.4byte Str_842E264, debug_sub_813C404+1
+	.4byte Str_842E26B, debug_sub_813C810+1
+	.4byte Str_842E26E, debug_sub_813C888+1
+	.4byte Str_842E277, debug_sub_813C430+1
+	.4byte Str_842E27E, debug_sub_813C488+1
+	.4byte Str_842E282, debug_sub_813C45C+1
+	.4byte Str_842E28A, debug_sub_813C740+1
+	.4byte Str_842E28E, debug_sub_813C5B4+1
+	.4byte Str_842E297, debug_sub_813C93C+1
+	.4byte Str_842E29F, debug_sub_813C4B4+1
+	.4byte Str_842E2A5, debug_sub_813C4D4+1
+	.4byte Str_842E2AA, debug_sub_813C500+1
+	.4byte Str_842E2B0, debug_sub_813C580+1
+	.4byte Str_842E2B7, debug_sub_813C58C+1
+	.4byte Str_842E2BC, debug_sub_813C598+1
+	.4byte Str_842E2C8, debug_sub_813C5A4+1
+
+_842E350::
+	.4byte 0x10
+	.4byte _845DAE1
+	.4byte _845DDB2
+	.4byte _845E306
+	.4byte _845E3E0
+	.4byte _845E3E0
+	.4byte _845E402
+	.4byte _845E402
+	.4byte _845E422
+	.4byte _845E422
+	.4byte _845E443
+
+.endif
diff --git a/ld_script.txt b/ld_script.txt
index 356ece4f4..cbb91e209 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -589,7 +589,6 @@ SECTIONS {
         src/field/fldeff_decoration.o(.rodata);
         src/field/fldeff_recordmixing.o(.rodata);
         src/field/field_special_scene.o(.rodata);
-        src/battle/battle_records.o(.rodata);
         src/field/rotating_gate.o(.rodata);
         src/field/item_use.o(.rodata);
         data/battle_anim_80CA710.o(.rodata);
@@ -617,6 +616,7 @@ SECTIONS {
         src/field/fldeff_flash.o(.rodata);
         src/engine/time_events.o(.rodata);
         src/field/field_specials.o(.rodata);
+        src/battle/battle_records.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
         src/scene/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
@@ -628,6 +628,7 @@ SECTIONS {
         src/field/choose_party.o(.rodata);
         src/scene/cable_car.o(.rodata);
         src/engine/save.o(.rodata);
+        data/unk_debug_menu_3.o(.rodata);
         src/field/field_effect_helpers.o(.rodata);
         src/contest_ai.o(.rodata);
         src/battle/battle_controller_safari.o(.rodata);
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index dfb92feb9..fe2e6317e 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -1,5 +1,10 @@
+#include "global.h"
+#include "menu.h"
+
+#if DEBUG
+
 __attribute__((naked))
-void debug_sub_813C404()
+int debug_sub_813C404()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -27,7 +32,7 @@ void debug_sub_813C404()
 }
 
 __attribute__((naked))
-void debug_sub_813C430()
+int debug_sub_813C430()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -55,7 +60,7 @@ void debug_sub_813C430()
 }
 
 __attribute__((naked))
-void debug_sub_813C45C()
+int debug_sub_813C45C()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -83,7 +88,7 @@ void debug_sub_813C45C()
 }
 
 __attribute__((naked))
-void debug_sub_813C488()
+int debug_sub_813C488()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -111,7 +116,7 @@ void debug_sub_813C488()
 }
 
 __attribute__((naked))
-void debug_sub_813C4B4()
+int debug_sub_813C4B4()
 {
     asm(
         "	push	{r4, lr}\n"
@@ -134,7 +139,7 @@ void debug_sub_813C4B4()
 }
 
 __attribute__((naked))
-void debug_sub_813C4D4()
+int debug_sub_813C4D4()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -162,7 +167,7 @@ void debug_sub_813C4D4()
 }
 
 __attribute__((naked))
-void debug_sub_813C500()
+int debug_sub_813C500()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -237,7 +242,7 @@ void debug_sub_813C52C()
 }
 
 __attribute__((naked))
-void debug_sub_813C580()
+int debug_sub_813C580()
 {
     asm(
         "	push	{lr}\n"
@@ -250,7 +255,7 @@ void debug_sub_813C580()
 }
 
 __attribute__((naked))
-void debug_sub_813C58C()
+int debug_sub_813C58C()
 {
     asm(
         "	push	{lr}\n"
@@ -263,7 +268,7 @@ void debug_sub_813C58C()
 }
 
 __attribute__((naked))
-void debug_sub_813C598()
+int debug_sub_813C598()
 {
     asm(
         "	push	{lr}\n"
@@ -276,7 +281,7 @@ void debug_sub_813C598()
 }
 
 __attribute__((naked))
-void debug_sub_813C5A4()
+int debug_sub_813C5A4()
 {
     asm(
         "	push	{lr}\n"
@@ -293,7 +298,7 @@ void debug_sub_813C5A4()
 }
 
 __attribute__((naked))
-void debug_sub_813C5B4()
+int debug_sub_813C5B4()
 {
     asm(
         "	push	{r4, r5, r6, r7, lr}\n"
@@ -498,7 +503,7 @@ void debug_sub_813C6AC()
 }
 
 __attribute__((naked))
-void debug_sub_813C740()
+int debug_sub_813C740()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -596,7 +601,7 @@ void debug_sub_813C740()
 }
 
 __attribute__((naked))
-void debug_sub_813C810()
+int debug_sub_813C810()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -656,7 +661,7 @@ void debug_sub_813C810()
 }
 
 __attribute__((naked))
-void debug_sub_813C888()
+int debug_sub_813C888()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -752,7 +757,7 @@ void debug_sub_813C904()
 }
 
 __attribute__((naked))
-void debug_sub_813C93C()
+int debug_sub_813C93C()
 {
     asm(
         "	push	{r4, r5, r6, lr}\n"
@@ -795,3 +800,5 @@ void debug_sub_813C93C()
     );
 }
 
+#endif
+
diff --git a/src/engine/menu_cursor.c b/src/engine/menu_cursor.c
index 35116d40b..ae4d5b14a 100644
--- a/src/engine/menu_cursor.c
+++ b/src/engine/menu_cursor.c
@@ -11,6 +11,15 @@ EWRAM_DATA static u8 gUnknown_0203A3D2 = 0;
 EWRAM_DATA static u8 gUnknown_0203A3D3 = 0;
 EWRAM_DATA static u8 gUnknown_0203A3D4 = 0;
 
+#if DEBUG
+//const u8 gEmptySpace_08459A8C[0x1C0] = {0};
+//const u8 gEmptySpace_08459A8C[0xE300-0xC700] = {0};
+asm(".section .rodata\n\
+    .global gEmptySpace_08459A8C\n\
+gEmptySpace_08459A8C:\n\
+    .incbin \"pokeruby_de_debug.gba\", 0x459A8C, 0x1C00");
+#endif
+
 #if ENGLISH
 #include "../src/data/menu_cursor_en.h"
 #elif GERMAN
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index 0cfa1e71a..cda73f96b 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -147,6 +147,13 @@ const struct SpriteTemplate gSpriteTemplate_83764E8 =
 
 const u8 gUnknown_08376500[] = _(" : ");
 
+#if DEBUG
+const u8 gUnknown_Debug_0839AE94[] = _("にっすう");
+const u8 gUnknown_Debug_0839AE99[] = _("じかん");
+const u8 gUnknown_Debug_0839AE9D[] = _("ゲームない　じかん");
+const u8 gUnknown_Debug_0839AEA7[] = _("RTC　じかん");
+#endif
+
 void SpriteCB_ResetRtcCusor0(struct Sprite *sprite)
 {
     int state = gTasks[sprite->data[0]].data[2];
diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c
index 165829a55..e2514df90 100644
--- a/src/field/field_effect_helpers.c
+++ b/src/field/field_effect_helpers.c
@@ -29,8 +29,6 @@ static void sub_81280A0(struct MapObject *, struct Sprite *, struct Sprite *);
 static void sub_8128174(struct Sprite *);
 static u32 ShowDisguiseFieldEffect(u8, u8, u8);
 
-const u8 UnusedEggString_8401E28[] = _("タマゴ");
-
 void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 flag)
 {
     struct Sprite *newSprite;
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index b76710a2d..e26b801bc 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -107,69 +107,6 @@ EWRAM_DATA u8 gUnknown_0202E8F6 = 0;
 EWRAM_DATA u16 gUnknown_0202E8F8 = 0;
 EWRAM_DATA u8 gPartyMenuType = 0;
 
-#if 0
-const u16 TMHMMoves[] =
-{
-    0x5016,
-    0x030D,
-    0x3DFF,
-    MOVE_CALM_MIND,
-    MOVE_ROAR,
-    MOVE_TOXIC,
-    MOVE_HAIL,
-    MOVE_BULK_UP,
-    MOVE_BULLET_SEED,
-    MOVE_HIDDEN_POWER,
-    MOVE_SUNNY_DAY,
-    MOVE_TAUNT,
-    MOVE_ICE_BEAM,
-    MOVE_BLIZZARD,
-    MOVE_HYPER_BEAM,
-    MOVE_LIGHT_SCREEN,
-    MOVE_PROTECT,
-    MOVE_RAIN_DANCE,
-    MOVE_GIGA_DRAIN,
-    MOVE_SAFEGUARD,
-    MOVE_FRUSTRATION,
-    MOVE_SOLAR_BEAM,
-    MOVE_IRON_TAIL,
-    MOVE_THUNDERBOLT,
-    MOVE_THUNDER,
-    MOVE_EARTHQUAKE,
-    MOVE_RETURN,
-    MOVE_DIG,
-    MOVE_PSYCHIC,
-    MOVE_SHADOW_BALL,
-    MOVE_BRICK_BREAK,
-    MOVE_DOUBLE_TEAM,
-    MOVE_REFLECT,
-    MOVE_SHOCK_WAVE,
-    MOVE_FLAMETHROWER,
-    MOVE_SLUDGE_BOMB,
-    MOVE_SANDSTORM,
-    MOVE_FIRE_BLAST,
-    MOVE_ROCK_TOMB,
-    MOVE_AERIAL_ACE,
-    MOVE_TORMENT,
-    MOVE_FACADE,
-    MOVE_SECRET_POWER,
-    MOVE_REST,
-    MOVE_ATTRACT,
-    MOVE_THIEF,
-    MOVE_STEEL_WING,
-    MOVE_SKILL_SWAP,
-    MOVE_SNATCH,
-    MOVE_OVERHEAT,
-    MOVE_CUT,
-    MOVE_FLY,
-    MOVE_SURF,
-    MOVE_STRENGTH,
-    MOVE_FLASH,
-    MOVE_ROCK_SMASH,
-    MOVE_WATERFALL,
-    MOVE_DIVE,
-};
-#else
 const u16 TMHMMoves[] =
 {
     MOVE_FOCUS_PUNCH,
@@ -231,7 +168,6 @@ const u16 TMHMMoves[] =
     MOVE_WATERFALL,
     MOVE_DIVE,
 };
-#endif
 
 //FIXME
 //const u8 *unrefTileBuffer = gTileBuffer;
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 73fa53d97..b69d8ac06 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -233,6 +233,11 @@ const struct Pokeblock gUnknown_083F7F9C[] =
     { PBLOCK_CLR_YELLOW,  0,  0,  0,  0, 20, 20}
 };
 
+#if DEBUG
+// possibly continuation of gUnknown_083F7F9C?
+asm(".incbin \"baserom_de_debug.gba\", 0x424128, 0x50");
+#endif
+
 // text
 
 static void sub_810B674(void)
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index 1ad8d8376..160bce913 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -298,13 +298,13 @@ const u8 Str_841160F[] = _("{STR_VAR_1}　{STR_VAR_2}");
 const u8 Str_841161A[] = _("メール{STR_VAR_1}　{STR_VAR_2}");
 const u8 Str_8411623[] = _("メール{STR_VAR_1}を　だれに　もたせる？");
 const u8 Str_8411634[] = _("000　{STR_VAR_1}");
-const u8 Str_841163B[] = _("せいきの　データが　とうろくずみ　です\n");
-const u8 Str_841163B_after[] = _("しんき　とうろく　できません");
-const u8 Str_841165E[] = _("せいきに　とうろくされたメールデータは\n");
-const u8 Str_841165E_after[] = _("へんこう　できません");
+const u8 Str_841163B[] = _("せいきの　データが　とうろくずみ　です\n"
+                           "しんき　とうろく　できません");
+const u8 Str_841165E[] = _("せいきに　とうろくされたメールデータは\n"
+                           "へんこう　できません");
 const u8 Str_841167D[] = _("メール{STR_VAR_1}　とうろく　かいじょ");
-const u8 Str_841168D[] = _("デバッグメニューから　とうろくした\n");
-const u8 Str_841168D_after[] = _("メール　いがいは　けせません");
+const u8 Str_841168D[] = _("デバッグメニューから　とうろくした\n"
+                           "メール　いがいは　けせません");
 const u8 Str_84116AE[] = _("メール{STR_VAR_1}　{STR_VAR_2}　{STR_VAR_3}");
 
 const struct MenuAction _84116BC[] =