From 9c105309ee65722b3c175196ec94c4bf65e588a3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Fri, 15 Sep 2023 01:41:06 -0400
Subject: [PATCH] Data for debug_menu2/3/4

---
 include/debug_menu2.h  |  4 +-
 src/data/debug_menu1.h |  1 -
 src/data/debug_menu2.h | 31 +++++++++++++++
 src/data/debug_menu3.h | 23 +++++++++++
 src/data/debug_menu4.h | 33 ++++++++++++++++
 src/debug_menu2.c      | 87 +++++++++++++-----------------------------
 src/debug_menu3.c      | 76 ++++++++++++------------------------
 src/debug_menu4.c      | 71 ++++++++++------------------------
 8 files changed, 161 insertions(+), 165 deletions(-)
 create mode 100644 src/data/debug_menu2.h
 create mode 100644 src/data/debug_menu3.h
 create mode 100644 src/data/debug_menu4.h

diff --git a/include/debug_menu2.h b/include/debug_menu2.h
index f630ef2d5..b941db0d8 100644
--- a/include/debug_menu2.h
+++ b/include/debug_menu2.h
@@ -5,7 +5,7 @@
 #include "text.h"
 
 // size: 0x138
-struct unkStruct_203B3F0
+typedef struct unkStruct_203B3F0
 {
     /* 0x0 */ u32 state;
     /* 0x4 */ u8 id;
@@ -15,6 +15,6 @@ struct unkStruct_203B3F0
     unkStructFor8013AA0 unk9C;
     u8 fillCC[0xD8 - 0xCC];
     UnkTextStruct2 unkD8[4];
-};
+} unkStruct_203B3F0;
 
 #endif // GUARD_DEBUG_MENU2_H
\ No newline at end of file
diff --git a/src/data/debug_menu1.h b/src/data/debug_menu1.h
index d02496e65..0a353c684 100644
--- a/src/data/debug_menu1.h
+++ b/src/data/debug_menu1.h
@@ -9,7 +9,6 @@ static const UnkTextStruct2 sUnknown_80E7D40 =
     0, 0,
     NULL
 };
-
 static const UnkTextStruct2 sUnknown_80E7D58 =
 {
     0, 0, 0, 0,
diff --git a/src/data/debug_menu2.h b/src/data/debug_menu2.h
new file mode 100644
index 000000000..99eb11fcd
--- /dev/null
+++ b/src/data/debug_menu2.h
@@ -0,0 +1,31 @@
+ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+
+static const UnkTextStruct2 sUnknown_80E7E34 =
+{
+    0, 0, 0, 0,
+    3,
+    0, 0,
+    0, 0,
+    0, 0,
+    NULL
+};
+static const UnkTextStruct2 sUnknown_80E7E4C =
+{
+    0, 0, 0, 0,
+    3,
+    20, 4,
+    6, 3,
+    3, 0,
+    NULL
+};
+static const UnkTextStruct2 sUnknown_80E7E64 =
+{
+    0, 0, 0, 0,
+    3,
+    20, 14,
+    6, 4,
+    4, 0,
+    NULL
+};
+
+ALIGNED(4) static const u8 sNumberPrompt[] = _("Number?");
\ No newline at end of file
diff --git a/src/data/debug_menu3.h b/src/data/debug_menu3.h
new file mode 100644
index 000000000..fbe3b94dc
--- /dev/null
+++ b/src/data/debug_menu3.h
@@ -0,0 +1,23 @@
+ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+
+static const UnkTextStruct2 sUnknown_80E7E8C =
+{
+    0, 0, 0, 0,
+    3,
+    0, 0,
+    0, 0,
+    0, 0,
+    NULL
+};
+static const UnkTextStruct2 sUnknown_80E7EA4 =
+{
+    0, 0, 0, 0,
+    3,
+    21, 4,
+    6, 3,
+    3, 0,
+    NULL
+};
+
+ALIGNED(4) static const u8 sClose[] = _("CLOSE");
+ALIGNED(4) static const u8 sOpen[] = _("OPEN");
\ No newline at end of file
diff --git a/src/data/debug_menu4.h b/src/data/debug_menu4.h
new file mode 100644
index 000000000..f9de94427
--- /dev/null
+++ b/src/data/debug_menu4.h
@@ -0,0 +1,33 @@
+ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+
+static const UnkTextStruct2 sUnknown_80E7ED4 =
+{
+    0, 0, 0, 0,
+    3,
+    0, 0,
+    0, 0,
+    0, 0,
+    NULL
+};
+static const UnkTextStruct2 sUnknown_80E7EEC =
+{
+    0, 0, 0, 0,
+    3,
+    19, 4,
+    9, 3,
+    3, 0,
+    NULL
+};
+static const UnkTextStruct2 sUnknown_80E7F04 =
+{
+    0, 0, 0, 0,
+    3,
+    19, 14,
+    6, 4,
+    4, 0,
+    NULL
+};
+
+ALIGNED(4) static const u8 sNumberPrompt[] = _("Number?");
+ALIGNED(4) static const u8 sLevel[] = _("LEVEL");
+ALIGNED(4) static const u8 sName[] = _("Name");
\ No newline at end of file
diff --git a/src/debug_menu2.c b/src/debug_menu2.c
index f9b4cf0f9..49e1f5ade 100644
--- a/src/debug_menu2.c
+++ b/src/debug_menu2.c
@@ -9,62 +9,30 @@
 #include "text1.h"
 #include "text2.h"
 
-static EWRAM_DATA_2 struct unkStruct_203B3F0 *sUnknown_203B3F0 = {0};
+static EWRAM_DATA_2 unkStruct_203B3F0 *sUnknown_203B3F0 = {0};
 
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+#include "data/debug_menu2.h"
 
-static const UnkTextStruct2 sUnknown_80E7E34 =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x00, 0x00,
-    0x00, 0x00,
-    0x00, 0x00,
-    NULL
-};
-static const UnkTextStruct2 sUnknown_80E7E4C =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x14, 0x04,
-    0x06, 0x03,
-    0x03, 0x00,
-    NULL
-};
-static const UnkTextStruct2 sUnknown_80E7E64 =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x14, 0x0e,
-    0x06, 0x04,
-    0x04, 0x00,
-    NULL
-};
+static void sub_803A504(u32 newState);
+static void sub_803A51C(void);
+static void sub_803A5A0(void);
+static void sub_803A690(void);
+static void sub_803A6F0(void);
+static void sub_803A740(void);
+static void sub_803A7B0(void);
+static void sub_803A810(void);
+static void sub_803A86C(void);
 
-ALIGNED(4) static const u8 sNumberPrompt[] = "Number?";
-
-void sub_803A504(u32);
-void sub_803A51C(void);
-void sub_803A5A0(void);
-void sub_803A690(void);
-void sub_803A6F0(void);
-void sub_803A740(void);
-void sub_803A7B0(void);
-void sub_803A810(void);
-void sub_803A86C(void);
-
-// Unused
-u32 sub_803A45C(void)
+UNUSED static bool8 sub_803A45C(void)
 {
     ResetUnusedInputStruct();
     sub_800641C(NULL, TRUE, TRUE);
-    sUnknown_203B3F0 = MemoryAlloc(sizeof(struct unkStruct_203B3F0), 8);
+    sUnknown_203B3F0 = MemoryAlloc(sizeof(unkStruct_203B3F0), 8);
     sub_803A504(0);
-    return 1;
+    return TRUE;
 }
 
-// Unused
-u32 sub_803A48C(void)
+UNUSED static u32 sub_803A48C(void)
 {
     switch (sUnknown_203B3F0->state) {
         case 0:
@@ -86,8 +54,7 @@ u32 sub_803A48C(void)
     return 0;
 }
 
-// Unused
-void sub_803A4E8(void)
+UNUSED static void sub_803A4E8(void)
 {
     if (sUnknown_203B3F0 != NULL) {
         MemoryFree(sUnknown_203B3F0);
@@ -95,14 +62,14 @@ void sub_803A4E8(void)
     }
 }
 
-void sub_803A504(u32 newState)
+static void sub_803A504(u32 newState)
 {
     sUnknown_203B3F0->state = newState;
     sub_803A51C();
     sub_803A5A0();
 }
 
-void sub_803A51C(void)
+static void sub_803A51C(void)
 {
     s32 i;
 
@@ -125,7 +92,7 @@ void sub_803A51C(void)
     sub_800641C(sUnknown_203B3F0->unkD8, TRUE, TRUE);
 }
 
-void sub_803A5A0(void)
+static void sub_803A5A0(void)
 {
     Item item;
 
@@ -162,7 +129,7 @@ void sub_803A5A0(void)
     }
 }
 
-void sub_803A690(void)
+static void sub_803A690(void)
 {
     sub_8008C54(sUnknown_203B3F0->unk9C.unk14);
     sub_80073B8(sUnknown_203B3F0->unk9C.unk14);
@@ -173,7 +140,7 @@ void sub_803A690(void)
     sub_8012EA4(&sUnknown_203B3F0->unk4C, 0);
 }
 
-void sub_803A6F0(void)
+static void sub_803A6F0(void)
 {
     s32 loopMax = 0;
 
@@ -185,16 +152,16 @@ void sub_803A6F0(void)
         sUnknown_203B3F0->menuAction = 3;
     }
 
-    loopMax += 1;
+    loopMax++;
     sUnknown_203B3F0->menuItems[loopMax].text = *gCommonInfo;
     sUnknown_203B3F0->menuItems[loopMax].menuAction = 3;
 
-    loopMax += 1;
+    loopMax++;
     sUnknown_203B3F0->menuItems[loopMax].text = NULL;
     sUnknown_203B3F0->menuItems[loopMax].menuAction = 1;
 }
 
-void sub_803A740(void)
+static void sub_803A740(void)
 {
     switch (sub_801CA08(TRUE)) {
         case 0:
@@ -215,7 +182,7 @@ void sub_803A740(void)
     }
 }
 
-void sub_803A7B0(void)
+static void sub_803A7B0(void)
 {
     s32 menuAction;
 
@@ -239,7 +206,7 @@ void sub_803A7B0(void)
     }
 }
 
-void sub_803A810(void)
+static void sub_803A810(void)
 {
     sub_801CA08(FALSE);
     sub_8012FD8(&sUnknown_203B3F0->unk4C);
@@ -257,7 +224,7 @@ void sub_803A810(void)
     }
 }
 
-void sub_803A86C(void)
+static void sub_803A86C(void)
 {
     switch (sub_801B410()) {
         case 1:
diff --git a/src/debug_menu3.c b/src/debug_menu3.c
index cf504f19d..dc170d5c9 100644
--- a/src/debug_menu3.c
+++ b/src/debug_menu3.c
@@ -13,51 +13,27 @@
 
 static EWRAM_DATA_2 unkStruct_203B3F4 *sUnknown_203B3F4 = {0};
 
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+#include "data/debug_menu3.h"
 
-static const UnkTextStruct2 sUnknown_80E7E8C =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x00, 0x00,
-    0x00, 0x00,
-    0x00, 0x00,
-    NULL
-};
-static const UnkTextStruct2 sUnknown_80E7EA4 =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x15, 0x04,
-    0x06, 0x03,
-    0x03, 0x00,
-    NULL
-};
+static void sub_803A924(u32 newState);
+static void sub_803A93C(void);
+static void sub_803A9AC(void);
+static void sub_803AA34(void);
+static void sub_803AAC4(void);
+static void sub_803AB34(void);
+static void sub_803ABAC(void);
+static bool8 sub_803ABC8(void);
 
-ALIGNED(4) static const u8 sClose[] = "CLOSE";
-ALIGNED(4) static const u8 sOpen[] = "OPEN";
-
-void sub_803A924(u32);
-void sub_803A93C(void);
-void sub_803A9AC(void);
-void sub_803AA34(void);
-void sub_803AAC4(void);
-void sub_803AB34(void);
-void sub_803ABAC(void);
-bool8 sub_803ABC8(void);
-
-// Unused
-u32 sub_803A888(void)
+UNUSED static bool8 sub_803A888(void)
 {
     ResetUnusedInputStruct();
     sub_800641C(NULL, TRUE, TRUE);
     sUnknown_203B3F4 = MemoryAlloc(sizeof(unkStruct_203B3F4), 8);
     sub_803A924(0);
-    return 1;
+    return TRUE;
 }
 
-// Unused
-u32 sub_803A8B8(void)
+UNUSED static u32 sub_803A8B8(void)
 {
     switch (sUnknown_203B3F4->state) {
         case 0:
@@ -76,8 +52,7 @@ u32 sub_803A8B8(void)
     return 0;
 }
 
-// Unused
-void sub_803A908(void)
+UNUSED static void sub_803A908(void)
 {
     if (sUnknown_203B3F4 != NULL) {
         MemoryFree(sUnknown_203B3F4);
@@ -85,14 +60,14 @@ void sub_803A908(void)
     }
 }
 
-void sub_803A924(u32 newState)
+static void sub_803A924(u32 newState)
 {
     sUnknown_203B3F4->state = newState;
     sub_803A93C();
     sub_803A9AC();
 }
 
-void sub_803A93C(void)
+static void sub_803A93C(void)
 {
     s32 i;
 
@@ -109,7 +84,7 @@ void sub_803A93C(void)
     sub_800641C(sUnknown_203B3F4->unk9C, TRUE, TRUE);
 }
 
-void sub_803A9AC(void)
+static void sub_803A9AC(void)
 {
     switch (sUnknown_203B3F4->state) {
         case 0:
@@ -131,17 +106,16 @@ void sub_803A9AC(void)
     }
 }
 
-void sub_803AA34(void)
+static void sub_803AA34(void)
 {
     s32 index;
-    u8 *FriendAreas;
+    u8 *friendAreas;
 
     index = 0;
 
-    // So dumb that it matches...
-    FriendAreas = gFriendAreas;
+    friendAreas = gFriendAreas;
 
-    if (FriendAreas[sUnknown_203B3F4->friendArea]) {
+    if (friendAreas[sUnknown_203B3F4->friendArea]) {
         sUnknown_203B3F4->menuItems[0].text = sClose;
 
         if (sub_803ABC8())
@@ -155,7 +129,7 @@ void sub_803AA34(void)
     }
 
     index++;
-    sUnknown_203B3F4->menuItems[index].text = *gCommonInfo;
+    sUnknown_203B3F4->menuItems[index].text = gCommonInfo[0];
     sUnknown_203B3F4->menuItems[index].menuAction = 4;
 
     index++;
@@ -165,7 +139,7 @@ void sub_803AA34(void)
     sUnknown_203B3F4->menuAction = sUnknown_203B3F4->menuItems[0].menuAction;
 }
 
-void sub_803AAC4(void)
+static void sub_803AAC4(void)
 {
     switch (sub_8021274(TRUE)) {
         case 0:
@@ -186,7 +160,7 @@ void sub_803AAC4(void)
    }
 }
 
-void sub_803AB34(void)
+static void sub_803AB34(void)
 {
     s32 menuAction;
 
@@ -215,7 +189,7 @@ void sub_803AB34(void)
     }
 }
 
-void sub_803ABAC(void)
+static void sub_803ABAC(void)
 {
     switch (sub_80217EC()) {
         case 2:
@@ -229,7 +203,7 @@ void sub_803ABAC(void)
     }
 }
 
-bool8 sub_803ABC8(void)
+static bool8 sub_803ABC8(void)
 {
     PokemonStruct1 *mon;
     s32 i;
diff --git a/src/debug_menu4.c b/src/debug_menu4.c
index 0fc2a1f5c..7903afb95 100644
--- a/src/debug_menu4.c
+++ b/src/debug_menu4.c
@@ -10,48 +10,17 @@
 
 static EWRAM_DATA_2 unkStruct_203B3F8 *sUnknown_203B3F8 = {0};
 
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+#include "data/debug_menu4.h"
 
-static const UnkTextStruct2 sUnknown_80E7ED4 =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x00, 0x00,
-    0x00, 0x00,
-    0x00, 0x00,
-    NULL
-};
-static const UnkTextStruct2 sUnknown_80E7EEC =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x13, 0x04,
-    0x09, 0x03,
-    0x03, 0x00,
-    NULL
-};
-static const UnkTextStruct2 sUnknown_80E7F04 =
-{
-    0x00, 0x00, 0x00, 0x00,
-    0x03,
-    0x13, 0x0e,
-    0x06, 0x04,
-    0x04, 0x00,
-    NULL
-};
-ALIGNED(4) static const u8 sNumberPrompt[] = "Number?";
-ALIGNED(4) static const u8 sLevel[] = "LEVEL";
-ALIGNED(4) static const u8 sName[] = "Name";
-
-void sub_803ACD0(u32);
-void sub_803ACE8(void);
-void sub_803AD88(void);
-void sub_803AE58(void);
-void sub_803AEB0(void);
-void sub_803AF38(void);
-void sub_803AF88(void);
-void sub_803AFE8(void);
-void sub_803B034(void);
+static void sub_803ACD0(u32 newState);
+static void sub_803ACE8(void);
+static void sub_803AD88(void);
+static void sub_803AE58(void);
+static void sub_803AEB0(void);
+static void sub_803AF38(void);
+static void sub_803AF88(void);
+static void sub_803AFE8(void);
+static void sub_803B034(void);
 
 UNUSED static bool8 sub_803AC24(void)
 {
@@ -95,14 +64,14 @@ UNUSED static void sub_803ACB4(void)
     }
 }
 
-void sub_803ACD0(u32 newState)
+static void sub_803ACD0(u32 newState)
 {
     sUnknown_203B3F8->state = newState;
     sub_803ACE8();
     sub_803AD88();
 }
 
-void sub_803ACE8(void)
+static void sub_803ACE8(void)
 {
     s32 i;
 
@@ -127,7 +96,7 @@ void sub_803ACE8(void)
     sub_800641C(sUnknown_203B3F8->unkE0, TRUE, TRUE);
 }
 
-void sub_803AD88(void)
+static void sub_803AD88(void)
 {
     switch (sUnknown_203B3F8->state) {
         case 1:
@@ -163,7 +132,7 @@ void sub_803AD88(void)
     }
 }
 
-void sub_803AE58(void)
+static void sub_803AE58(void)
 {
     sub_8008C54(sUnknown_203B3F8->unk60.unk14);
     sub_80073B8(sUnknown_203B3F8->unk60.unk14);
@@ -174,7 +143,7 @@ void sub_803AE58(void)
     sub_8012EA4(&sUnknown_203B3F8->unk10, 0);
 }
 
-void sub_803AEB0(void)
+static void sub_803AEB0(void)
 {
     s32 i;
     s32 loopMax;
@@ -201,7 +170,7 @@ void sub_803AEB0(void)
     }
 }
 
-void sub_803AF38(void)
+static void sub_803AF38(void)
 {
     switch (sub_8023A94(TRUE)) {
         case 3:
@@ -219,7 +188,7 @@ void sub_803AF38(void)
     }
 }
 
-void sub_803AF88(void)
+static void sub_803AF88(void)
 {
     s32 menuAction;
 
@@ -245,7 +214,7 @@ void sub_803AF88(void)
     }
 }
 
-void sub_803AFE8(void)
+static void sub_803AFE8(void)
 {
     sub_8023A94(FALSE);
     sub_8012FD8(&sUnknown_203B3F8->unk10);
@@ -265,7 +234,7 @@ void sub_803AFE8(void)
     }
 }
 
-void sub_803B034(void)
+static void sub_803B034(void)
 {
     switch (sub_8016080()) {
         case 2:
@@ -274,4 +243,4 @@ void sub_803B034(void)
             sub_803ACD0(2);
             break;
     }
-}
+}
\ No newline at end of file