through debug_80C43A8

2 files changed, 56 insertions, 4 deletions

diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index a75ee16f1..672b28e71 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -19,6 +19,7 @@
 #include "sound.h"
 #include "pokedex.h"
 #include "load_save.h"
+#include "pokemon_storage_system.h"
 
 EWRAM_DATA u8 gUnknown_Debug_20389EC[0x20] = { 0 };
 EWRAM_DATA u8 gUnknown_Debug_2038A0C[0x10] = { 0 };
@@ -32,10 +33,14 @@ void debug_80C3D2C(u8 taskId);
 void debug_80C4214(u8);
 void debug_80C42B8(u8 taskId);
 void debug_80C4348(u8 taskId);
+void debug_80C43A8(u8 taskId);
 void debug_80C44EC(u8 taskId);
 void debug_80C4694(void);
 void debug_80C4704(void);
+bool8 debug_80C4774(void);
 void debug_80C47BC(u8 taskId);
+void debug_80C4D14(u8 taskId);
+void debug_80C4F48(u8 taskId);
 void debug_80C68CC(u16, u8, u8, u8);
 
 extern const u8 gUnknown_Debug_083F7FD4[2]; // = _("▶");
@@ -939,4 +944,51 @@ void debug_80C42B8(u8 taskId)
         gTasks[taskId].func = debug_80C4348;
 }
 
+void debug_80C4348(u8 taskId)
+{
+    debug_80C38E4(gUnknown_Debug_2038A0C[1] * 2 + 3, 1, 1, 14, 1);
+    REG_WIN1H = 0x0177;
+    REG_WIN1V = 0x017F;
+    gTasks[taskId].func = debug_80C43A8;
+}
+
+void debug_80C43A8(u8 taskId)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        debug_sub_80A433C(gPlayerParty + gUnknown_Debug_2038A0C[1], debug_80C41D4);
+        DestroyTask(taskId);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        gTasks[taskId].func = debug_80C4F48;
+    }
+    else if (gMain.newKeys & START_BUTTON)
+    {
+        if (debug_80C4774())
+        {
+            PlaySE(SE_SELECT);
+            CalculatePlayerPartyCount();
+            CalculateEnemyPartyCount();
+            gTasks[taskId].func = debug_80C4D14;
+        }
+    }
+    else if (gMain.newKeys & (R_BUTTON | DPAD_RIGHT))
+    {
+        debug_80C38E4(0, 1, 1, 14, 0);
+        gTasks[taskId].func = debug_80C44EC;
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_UP && gUnknown_Debug_2038A0C[1] != 0)
+    {
+        gUnknown_Debug_2038A0C[1]--;
+        gTasks[taskId].func = debug_80C4348;
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN && gUnknown_Debug_2038A0C[1] < 5 && GetMonData(gPlayerParty + gUnknown_Debug_2038A0C[1], MON_DATA_SPECIES) != SPECIES_NONE)
+    {
+        gUnknown_Debug_2038A0C[1]++;
+        gTasks[taskId].func = debug_80C4348;
+    }
+}
+
 #endif // DEBUG
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index 0905c185b..762850e06 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -335,11 +335,11 @@ void debug_sub_80A4300(void)
 }
 
 extern void (*unk_2038794)(void);
-extern u32 unk_2038798;
+extern struct Pokemon * unk_2038798;
 
-extern void unref_sub_809CB94();
+extern void debug_sub_809CB94(struct Pokemon *);
 
-void debug_sub_80A433C(u32 a, void (*b)(void))
+void debug_sub_80A433C(struct Pokemon * a, void (*b)(void))
 {
     unk_2038794 = b;
     unk_2038798 = a;
@@ -351,7 +351,7 @@ void debug_sub_80A435C(void)
     switch (gPokemonStorageSystemPtr->unk_0004)
     {
     case 0:
-        unref_sub_809CB94(unk_2038798);
+        debug_sub_809CB94(unk_2038798);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
         gPokemonStorageSystemPtr->unk_0004++;
         break;