dump more baseroms and fix more false offsets

6 files changed, 140 insertions, 102 deletions

diff --git a/data/debug_menu_3.s b/data/debug_menu_3.s
index 36356c18a..f26e257d1 100644
--- a/data/debug_menu_3.s
+++ b/data/debug_menu_3.s
@@ -5,19 +5,41 @@
 
 	.section .rodata
 
-_845DAE1::
+gUnknown_Debug_845DAE1::
 	.incbin "baserom_de_debug.gba", 0x45DAE1, 721
-_845DDB2::
-	.incbin "baserom_de_debug.gba", 0x45DDB2, 1364
-_845E306::
+gUnknown_Debug_845DDB2::
+	.incbin "baserom_de_debug.gba", 0x45DDB2, 36
+gUnknown_Debug_845DDD6::
+	.incbin "baserom_de_debug.gba", 0x45DDD6, 1328
+gUnknown_Debug_845E306::
 	.incbin "baserom_de_debug.gba", 0x45E306, 218
-_845E3E0::
+gUnknown_Debug_845E3E0::
 	.incbin "baserom_de_debug.gba", 0x45E3E0, 34
-_845E402::
+gUnknown_Debug_845E402::
 	.incbin "baserom_de_debug.gba", 0x45E402, 32
-_845E422::
+gUnknown_Debug_845E422::
 	.incbin "baserom_de_debug.gba", 0x45E422, 33
-_845E443::
-	.incbin "baserom_de_debug.gba", 0x45E443, 889
+gUnknown_Debug_845E443::
+	.incbin "baserom_de_debug.gba", 0x45E443, 36
+gUnknown_Debug_845E467::
+	.incbin "baserom_de_debug.gba", 0x45E467, 100
+gUnknown_Debug_845E4CB::
+	.incbin "baserom_de_debug.gba", 0x45E4CB, 36
+gUnknown_Debug_845E4EF::
+	.incbin "baserom_de_debug.gba", 0x45E4EF, 23
+gUnknown_Debug_845E506::
+	.incbin "baserom_de_debug.gba", 0x45E506, 256
+gUnknown_Debug_845E606::
+	.incbin "baserom_de_debug.gba", 0x45E606, 19
+gUnknown_Debug_845E619::
+	.incbin "baserom_de_debug.gba", 0x45E619, 249
+gUnknown_Debug_845E712::
+	.incbin "baserom_de_debug.gba", 0x45E712, 133
+gUnknown_Debug_845E797::
+	.incbin "baserom_de_debug.gba", 0x45E797, 30
+gUnknown_Debug_845E7B5::
+	.incbin "baserom_de_debug.gba", 0x45E7B5, 6
+gUnknown_Debug_845E7BB::
+	.incbin "baserom_de_debug.gba", 0x45E7BB, 1
 
 .endif
diff --git a/data/debug_menu_tomomichi.s b/data/debug_menu_tomomichi.s
index 58e23a572..c54a52bb1 100644
--- a/data/debug_menu_tomomichi.s
+++ b/data/debug_menu_tomomichi.s
@@ -2,7 +2,9 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
+
 	.if DEBUG
+
 gUnknown_Debug_083C0C54:: @ 0x83C0C54
 	.string "Contest graphics$"
 
@@ -346,7 +348,11 @@ gUnknown_Debug_083C1149:: @ 0x83C1149
 	.4byte gUnknown_Debug_083C1148, TomomichiDebugMenu_Config+1
 
 gUnknown_Debug_083C1194:: @ 0x83C1194
-	.incbin "baserom_de_debug.gba", 0x3C1194, 38
+	.byte 9, 7
+
+gUnknown_Debug_083C1196:: @ 0x83C1196
+	.2byte 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019
+	.2byte 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0000, 0x0000
 
 gUnknown_Debug_083C11BA:: @ 0x83C11BA
 	.string "FH-00-08$"
@@ -438,7 +444,11 @@ gUnknown_Debug_083C1288:: @ 0x83C1288
 	.4byte gUnknown_Debug_083C1287, TomomichiDebugMenu_Config+1
 
 gUnknown_Debug_083C12D0:: @ 0x83C12D0
-	.incbin "baserom_de_debug.gba", 0x3C12D0, 38
+	.byte 9, 7
+
+gUnknown_Debug_083C12D2:: @ 0x83C12D2
+	.2byte 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009
+	.2byte 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010, 0x0000, 0x0000
 
 gUnknown_Debug_083C12F6:: @ 0x83C12F6
 	.string "BATCH$"
@@ -796,11 +806,18 @@ gDebug_0x83C1974:: @ 0x83C1974
 	.4byte gUnknown_Debug_083C1970, TomomichiDebugMenu_Config+1
 
 gUnknown_Debug_083C19BC:: @ 0x83C19BC
-	.incbin "baserom_de_debug.gba", 0x3C19BC, 10
+	.byte 0x08, 0x07, 0x09, 0x04, 0x09, 0x09, 0x09, 0x07, 0x05, 0x00
 
 gUnknown_Debug_083C19C6:: @ 0x83C19C6
-	.incbin "baserom_de_debug.gba", 0x3C19C6, 162
-
+	.2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e, 0x0000
+	.2byte 0x080f, 0x0810, 0x0811, 0x0812, 0x0813, 0x0814, 0x0815, 0x0000, 0x0000
+	.2byte 0x0816, 0x0817, 0x0818, 0x0819, 0x081a, 0x081b, 0x081c, 0x081d, 0x081e
+	.2byte 0x0800, 0x0801, 0x0802, 0x083b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	.2byte 0x0804, 0x0805, 0x0806, 0x0828, 0x0829, 0x082a, 0x082b, 0x082c, 0x082d
+	.2byte 0x0830, 0x0831, 0x0832, 0x0833, 0x0834, 0x0835, 0x0837, 0x0838, 0x0839
+	.2byte 0x0836, 0x083a, 0x083b, 0x084b, 0x084c, 0x084f, 0x0850, 0x0851, 0x0852
+	.2byte 0x084d, 0x084e, 0x0853, 0x085d, 0x085f, 0x0860, 0x0861, 0x0000, 0x0000
+	.2byte 0x0847, 0x0848, 0x0849, 0x0854, 0x085e, 0x0000, 0x0000, 0x0000, 0x0000
 
 gDebug_0x83C1A68:: @ 0x83C1A68
 	.string "FVーBALL　パート1$"
diff --git a/data/unk_debug_menu_3.s b/data/unk_debug_menu_3.s
index 2fd8381db..100821c9b 100644
--- a/data/unk_debug_menu_3.s
+++ b/data/unk_debug_menu_3.s
@@ -2,77 +2,76 @@
 
 	.align 2
 
-@ Is this actually sJapaneseEggNickname?
-Str_842E238: @ 0x842E238
+Str_842E238:: @ 0x842E238
 	.string "タマゴ$"
 
 .if DEBUG
 
-Str_842E23C: @ 0x842E23C
+Str_842E23C:: @ 0x842E23C
 	.string "ガイブ$"
 
-Str_842E240: @ 0x842E240
+Str_842E240:: @ 0x842E240
 	.string "ENGLISH$"
 
-Str_842E248: @ 0x842E248
+Str_842E248:: @ 0x842E248
 	.string "TOURNAMENT$"
 
-Str_842E253: @ 0x842E253
+Str_842E253:: @ 0x842E253
 	.string "　そら　　カードイー$"
 
-Str_842E25E: @ 0x842E25E
+Str_842E25E:: @ 0x842E25E
 	.string "ポケコッコ$"
 
-Str_842E264: @ 0x842E264
+Str_842E264:: @ 0x842E264
 	.string "ticket$"
 
-Str_842E26B: @ 0x842E26B
+Str_842E26B:: @ 0x842E26B
 	.string "{PKMN}$"
 
-Str_842E26E: @ 0x842E26E
+Str_842E26E:: @ 0x842E26E
 	.string "wrong　{PKMN}$"
 
-Str_842E277: @ 0x842E277
+Str_842E277:: @ 0x842E277
 	.string "ribbon$"
 
-Str_842E27E: @ 0x842E27E
+Str_842E27E:: @ 0x842E27E
 	.string "DEX$"
 
-Str_842E282: @ 0x842E282
+Str_842E282:: @ 0x842E282
 	.string "message$"
 
-Str_842E28A: @ 0x842E28A
+Str_842E28A:: @ 0x842E28A
 	.string "egg$"
 
-Str_842E28E: @ 0x842E28E
+Str_842E28E:: @ 0x842E28E
 	.string "RAM　seed$"
 
-Str_842E297: @ 0x842E297
+Str_842E297:: @ 0x842E297
 	.string "trainer$"
 
-Str_842E29F: @ 0x842E29F
+Str_842E29F:: @ 0x842E29F
 	.string "clock$"
 
-Str_842E2A5: @ 0x842E2A5
+Str_842E2A5:: @ 0x842E2A5
 	.string "item$"
 
-Str_842E2AA: @ 0x842E2AA
+Str_842E2AA:: @ 0x842E2AA
 	.string "goods$"
 
-Str_842E2B0: @ 0x842E2B0
+Str_842E2B0:: @ 0x842E2B0
 	.string "potion$"
 
-Str_842E2B7: @ 0x842E2B7
+Str_842E2B7:: @ 0x842E2B7
 	.string "ball$"
 
-Str_842E2BC: @ 0x842E2BC
+Str_842E2BC:: @ 0x842E2BC
 	.string "cheri　berry$"
 
-Str_842E2C8: @ 0x842E2C8
+Str_842E2C8:: @ 0x842E2C8
 	.string "TM01$"
 
 	.align 2
-_842E2D0::
+gUnknown_Debug_842E2D0::
 	.4byte Str_842E264, debug_sub_813C404+1
 	.4byte Str_842E26B, debug_sub_813C810+1
 	.4byte Str_842E26E, debug_sub_813C888+1
@@ -90,17 +89,17 @@ _842E2D0::
 	.4byte Str_842E2BC, debug_sub_813C598+1
 	.4byte Str_842E2C8, debug_sub_813C5A4+1
 
-_842E350::
+gUnknown_Debug_842E350::
 	.4byte 0x10
-	.4byte _845DAE1
-	.4byte _845DDB2
-	.4byte _845E306
-	.4byte _845E3E0
-	.4byte _845E3E0
-	.4byte _845E402
-	.4byte _845E402
-	.4byte _845E422
-	.4byte _845E422
-	.4byte _845E443
+	.4byte gUnknown_Debug_845DAE1
+	.4byte gUnknown_Debug_845DDB2
+	.4byte gUnknown_Debug_845E306
+	.4byte gUnknown_Debug_845E3E0
+	.4byte gUnknown_Debug_845E3E0
+	.4byte gUnknown_Debug_845E402
+	.4byte gUnknown_Debug_845E402
+	.4byte gUnknown_Debug_845E422
+	.4byte gUnknown_Debug_845E422
+	.4byte gUnknown_Debug_845E443
 
 .endif
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 0549cb5c0..68c05270f 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -4223,7 +4223,7 @@ void debug_sub_808D54C()
         "	.align	2, 0\n"
         "._325:\n"
         "	.word	gMain\n"
-        "	.word	gUnknown_Debug_083C1194+0x2\n"
+        "	.word	gUnknown_Debug_083C1196\n"
         "._323:\n"
         "	add	r0, r4, #0\n"
         "	bl	FlagClear\n"
@@ -4288,7 +4288,7 @@ void debug_sub_808D59C()
         "	.align	2, 0\n"
         "._329:\n"
         "	.word	gUnknown_Debug_083C1194\n"
-        "	.word	gUnknown_Debug_083C1194+0x2\n"
+        "	.word	gUnknown_Debug_083C1196\n"
         "\n"
     );
 }
@@ -4554,7 +4554,7 @@ void debug_sub_808D790()
         "	.align	2, 0\n"
         "._351:\n"
         "	.word	gMain\n"
-        "	.word	gUnknown_Debug_083C12D0+0x2\n"
+        "	.word	gUnknown_Debug_083C12D2\n"
         "._349:\n"
         "	add	r0, r4, #0\n"
         "	bl	FlagClear\n"
@@ -4619,7 +4619,7 @@ void debug_sub_808D7E0()
         "	.align	2, 0\n"
         "._355:\n"
         "	.word	gUnknown_Debug_083C12D0\n"
-        "	.word	gUnknown_Debug_083C12D0+0x2\n"
+        "	.word	gUnknown_Debug_083C12D2\n"
         "\n"
     );
 }
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index 411b32fe3..fa944b25f 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -25,8 +25,8 @@ int debug_sub_813C404()
         "._2:\n"
         "	.align	2, 0\n"
         "._1:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x30d\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x3c\n"
+        "	.word	gUnknown_Debug_845DDB2\n"
+        "	.word	gUnknown_Debug_845DAE1\n"
         "\n"
     );
 }
@@ -53,8 +53,8 @@ int debug_sub_813C430()
         "._4:\n"
         "	.align	2, 0\n"
         "._3:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x95d\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x93b\n"
+        "	.word	gUnknown_Debug_845E402\n"
+        "	.word	gUnknown_Debug_845E3E0\n"
         "\n"
     );
 }
@@ -81,8 +81,8 @@ int debug_sub_813C45C()
         "._6:\n"
         "	.align	2, 0\n"
         "._5:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x99e\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x97d\n"
+        "	.word	gUnknown_Debug_845E443\n"
+        "	.word	gUnknown_Debug_845E422\n"
         "\n"
     );
 }
@@ -109,8 +109,8 @@ int debug_sub_813C488()
         "._8:\n"
         "	.align	2, 0\n"
         "._7:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x97d\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x95d\n"
+        "	.word	gUnknown_Debug_845E422\n"
+        "	.word	gUnknown_Debug_845E402\n"
         "\n"
     );
 }
@@ -132,8 +132,8 @@ int debug_sub_813C4B4()
         "._10:\n"
         "	.align	2, 0\n"
         "._9:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xb74\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xb61\n"
+        "	.word	gUnknown_Debug_845E619\n"
+        "	.word	gUnknown_Debug_845E606\n"
         "\n"
     );
 }
@@ -160,8 +160,8 @@ int debug_sub_813C4D4()
         "._12:\n"
         "	.align	2, 0\n"
         "._11:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xc6d\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xb74\n"
+        "	.word	gUnknown_Debug_845E712\n"
+        "	.word	gUnknown_Debug_845E619\n"
         "\n"
     );
 }
@@ -188,8 +188,8 @@ int debug_sub_813C500()
         "._14:\n"
         "	.align	2, 0\n"
         "._13:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xcf2\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xc6d\n"
+        "	.word	gUnknown_Debug_845E797\n"
+        "	.word	gUnknown_Debug_845E712\n"
         "\n"
     );
 }
@@ -234,9 +234,9 @@ void debug_sub_813C52C()
         "._16:\n"
         "	.align	2, 0\n"
         "._15:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xd16\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xcf2\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xd10\n"
+        "	.word	gUnknown_Debug_845E7BB\n"
+        "	.word	gUnknown_Debug_845E797\n"
+        "	.word	gUnknown_Debug_845E7B5\n"
         "\n"
     );
 }
@@ -358,10 +358,10 @@ int debug_sub_813C5B4()
         "	.align	2, 0\n"
         "._23:\n"
         "	.word	gSaveBlock1+0x3160\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x331\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x30d\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x861\n"
-        "	.word	sUnusedFlashSectors+0x8\n"
+        "	.word	gUnknown_Debug_845DDD6\n"
+        "	.word	gUnknown_Debug_845DDB2\n"
+        "	.word	gUnknown_Debug_845E306\n"
+        "	.word	Str_842E23C\n"
         "	.word	0xfff\n"
         "	.word	0x52f\n"
         "\n"
@@ -422,8 +422,8 @@ void debug_sub_813C638()
         "	.align	2, 0\n"
         "._25:\n"
         "	.word	0x270f\n"
-        "	.word	sUnusedFlashSectors+0xc\n"
-        "	.word	sUnusedFlashSectors+0x14\n"
+        "	.word	Str_842E240\n"
+        "	.word	Str_842E248\n"
         "\n"
     );
 }
@@ -590,12 +590,12 @@ int debug_sub_813C740()
         "._30:\n"
         "	.align	2, 0\n"
         "._29:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x99e\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa4a\n"
+        "	.word	gUnknown_Debug_845E443\n"
+        "	.word	gUnknown_Debug_845E4EF\n"
         "	.word	gEnemyParty\n"
-        "	.word	sUnusedFlashSectors+0x4\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x9c2\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa26\n"
+        "	.word	Str_842E238\n"
+        "	.word	gUnknown_Debug_845E467\n"
+        "	.word	gUnknown_Debug_845E4CB\n"
         "\n"
     );
 }
@@ -651,11 +651,11 @@ int debug_sub_813C810()
         "._32:\n"
         "	.align	2, 0\n"
         "._31:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x99e\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa4a\n"
+        "	.word	gUnknown_Debug_845E443\n"
+        "	.word	gUnknown_Debug_845E4EF\n"
         "	.word	gEnemyParty\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x9c2\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa26\n"
+        "	.word	gUnknown_Debug_845E467\n"
+        "	.word	gUnknown_Debug_845E4CB\n"
         "\n"
     );
 }
@@ -713,11 +713,11 @@ int debug_sub_813C888()
         "._34:\n"
         "	.align	2, 0\n"
         "._33:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x99e\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa4a\n"
+        "	.word	gUnknown_Debug_845E443\n"
+        "	.word	gUnknown_Debug_845E4EF\n"
         "	.word	gEnemyParty\n"
-        "	.word	gOtherText_DataCannotUseVersion+0x9c2\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa26\n"
+        "	.word	gUnknown_Debug_845E467\n"
+        "	.word	gUnknown_Debug_845E4CB\n"
         "\n"
     );
 }
@@ -791,11 +791,11 @@ int debug_sub_813C93C()
         "._38:\n"
         "	.align	2, 0\n"
         "._37:\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa4a\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xb61\n"
-        "	.word	sUnusedFlashSectors+0x24\n"
+        "	.word	gUnknown_Debug_845E4EF\n"
+        "	.word	gUnknown_Debug_845E606\n"
+        "	.word	Str_842E253+5  @ weird...\n"
         "	.word	0x270f\n"
-        "	.word	gOtherText_DataCannotUseVersion+0xa61\n"
+        "	.word	gUnknown_Debug_845E506\n"
         "\n"
     );
 }
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index da2973945..c80a8f3e9 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -397,9 +397,9 @@ void debug_sub_815D04C()
         "	.align	2, 0\n"
         "._125:\n"
         "	.word	gTasks\n"
-        "	.word	sUnusedFlashSectors+0x9c\n"
+        "	.word	gUnknown_Debug_842E2D0\n"
         "	.word	gMain\n"
-        "	.word	sUnusedFlashSectors+0x11c\n"
+        "	.word	gUnknown_Debug_842E350\n"
         "._123:\n"
         "	sub	r0, r1, #1\n"
         "._124:\n"
@@ -435,7 +435,7 @@ void debug_sub_815D04C()
         "	.align	2, 0\n"
         "._130:\n"
         "	.word	gTasks\n"
-        "	.word	sUnusedFlashSectors+0x11c\n"
+        "	.word	gUnknown_Debug_842E350\n"
         "._128:\n"
         "	ldrh	r0, [r4, #0xa]\n"
         "	add	r0, r0, #0x1\n"
@@ -481,7 +481,7 @@ void debug_sub_815D04C()
         "	.align	2, 0\n"
         "._133:\n"
         "	.word	gTasks\n"
-        "	.word	sUnusedFlashSectors+0x9c\n"
+        "	.word	gUnknown_Debug_842E2D0\n"
         "	.word	+0x2004000\n"
         "	.word	0x43c\n"
         "\n"
@@ -603,7 +603,7 @@ void debug_sub_815D1D8()
         "._161:\n"
         "	.word	gPaletteFade\n"
         "	.word	gLinkTestBlockChecksums+0x8\n"
-        "	.word	gUnknown_0841192C+0x14\n"
+        "	.word	Str_843DA70\n"
         "	.word	0x43c\n"
         "._144:\n"
         "	bl	Menu_UpdateWindowText\n"
@@ -653,7 +653,7 @@ void debug_sub_815D1D8()
         "._171:\n"
         "	.word	gReceivedRemoteLinkPlayers\n"
         "	.word	0x43c\n"
-        "	.word	gUnknown_0841192C+0x28\n"
+        "	.word	Str_843DA84\n"
         "._146:\n"
         "	bl	Menu_UpdateWindowText\n"
         "	lsl	r0, r0, #0x18\n"
@@ -690,8 +690,8 @@ void debug_sub_815D1D8()
         "._180:\n"
         "	.align	2, 0\n"
         "._179:\n"
-        "	.word	gUnknown_0841192C+0x3c\n"
-        "	.word	+0x2004000\n"
+        "	.word	Str_843DA98\n"
+        "	.word	0x2004000\n"
         "	.word	0x2004\n"
         "	.word	gMain\n"
         "	.word	0x43c\n"
@@ -743,7 +743,7 @@ void debug_sub_815D1D8()
         "	.align	2, 0\n"
         "._190:\n"
         "	.word	gReceivedRemoteLinkPlayers\n"
-        "	.word	gUnknown_0841192C+0x47\n"
+        "	.word	Str_843DAA3\n"
         "	.word	gMain\n"
         "	.word	0x43c\n"
         "._152:\n"