Correct some data misclassification and link relevant objects to mystery_event_menu

3 files changed, 24 insertions, 22 deletions

diff --git a/include/debug.h b/include/debug.h
index 469560b9e..43db92c2b 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -1,6 +1,11 @@
 #ifndef GUARD_DEBUG_H
 #define GUARD_DEBUG_H
 
+struct UnkDebugMenu3Items {
+    const u8 * text;
+    size_t (*func)(u8 * dest);
+};
+
 // start_menu_debug
 void DebugMenu_8077048(void);
 
@@ -17,4 +22,8 @@ void CB2_StartSoundCheckMenu(void);
 // nakamura_debug_menu
 void NakaGenderTest(void);
 
+// unk debug menu 3
+extern const u8 gUnknown_Debug_842E350;
+extern const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[];
+
 #endif // GUARD_DEBUG_H
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index f9ae9b4b5..138b99104 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -323,10 +323,7 @@ const u8 Str_842E2B7[] = _("ball");
 const u8 Str_842E2BC[] = _("cheri　berry");
 const u8 Str_842E2C8[] = _("TM01");
 
-const struct {
-    const u8 * name;
-    size_t (*func)(u8 * dest);
-} gUnknown_Debug_842E2D0[] = {
+const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[] = {
     {Str_842E264, debug_sub_813C404},
     {Str_842E26B, debug_sub_813C810},
     {Str_842E26E, debug_sub_813C888},
@@ -347,22 +344,19 @@ const struct {
 
 extern u8 gUnknown_Debug_845E306[];
 
-const struct {
-    u8 unk0;
-    u8 *scripts[10];
-} gUnknown_Debug_842E350 = {
-    0x10, {
-        gUnknown_Debug_845DAE1,
-        gUnknown_Debug_845DDB2,
-        gUnknown_Debug_845E306,
-        gUnknown_Debug_845E3E0,
-        gUnknown_Debug_845E3E0,
-        gUnknown_Debug_845E402,
-        gUnknown_Debug_845E402,
-        gUnknown_Debug_845E422,
-        gUnknown_Debug_845E422,
-        gUnknown_Debug_845E443
-    }
+const u8 gUnknown_Debug_842E350 = 16;
+
+u8 *const gUnknown_Debug_842E354[] = {
+    gUnknown_Debug_845DAE1,
+    gUnknown_Debug_845DDB2,
+    gUnknown_Debug_845E306,
+    gUnknown_Debug_845E3E0,
+    gUnknown_Debug_845E3E0,
+    gUnknown_Debug_845E402,
+    gUnknown_Debug_845E402,
+    gUnknown_Debug_845E422,
+    gUnknown_Debug_845E422,
+    gUnknown_Debug_845E443
 };
 
 #endif // DEBUG
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 56801ff53..1ea177f2e 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -15,6 +15,7 @@
 #include "text.h"
 #include "title_screen.h"
 #include "ewram.h"
+#include "debug.h"
 
 static EWRAM_DATA u8 gUnknown_02039338 = 0;
 
@@ -347,8 +348,6 @@ static const u8 Str_843DA84[] = _("LR:　select　A:　send。");
 static const u8 Str_843DA98[] = _("sending。。。");
 static const u8 Str_843DAA3[] = _("completed。");
 
-extern const struct {const u8 *text; void (*func)();} gUnknown_Debug_842E2D0[];
-extern const u8 gUnknown_Debug_842E350;
 
 void debug_sub_815D1D8();