1 files changed, 41 insertions, 23 deletions

diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index fbb796ca4..ba79261c0 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -1,26 +1,44 @@
 #include "global.h"
 #include "mori_debug_menu.h"
-#include "asm.h"
-#include "start_menu.h"
-#include "menu.h"
+#include "data2.h"
+#include "daycare.h"
+#include "learn_move.h"
+#include "link.h"
 #include "main.h"
+#include "menu.h"
+#include "pokeblock.h"
+#include "start_menu.h"
 #include "string_util.h"
 
+#define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
+
+extern u8 gUnknown_03004DA0[];
 extern u8 (*gCallback_03004AE8)(void);
 
+extern u8 gUnknown_0839B22C[][3];
+extern u8 gUnknown_0839B24A[];
 extern u8 gUnknown_0839B24D[];
 extern u8 gUnknown_0839B255[];
 extern u8 gUnknown_0839B257[];
 
 extern const struct MenuAction gMoriDebugMenuActions[];
 
-extern u8 gSpeciesNames[][11];
+void unref_sub_8083CF0(void)
+{
+    int i;
+    int id = SIO_MULTI_CNT->id;
+    gUnknown_03004DA0[0] = EOS;
+    StringAppend(gUnknown_03004DA0, gUnknown_0839B24A);
+    for (i = 0; i < 10; i++)
+        if ((word_3002910[id ^ 1] >> i) & 1)
+            StringAppend(gUnknown_03004DA0, gUnknown_0839B22C[i]);
+}
 
 bool8 sub_8083D4C(void)
 {
      if ( gMain.newKeys & A_BUTTON )
     {
-        sub_8071C20();
+        CloseMenu();
         return TRUE;
     }
     else
@@ -32,7 +50,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
     u8 localPtr[52];
     u16 monData;
     u16 var;
-    
+
     monData = GetMonData(gPlayerParty, 11, ptr);
     var = sub_8041870(monData);
     StringCopy(localPtr, gSpeciesNames[monData]);
@@ -48,18 +66,18 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
 
 s8 MoriDebugMenu_Egg(void)
 {
-    if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041940();
-    sub_8071C20();
+    CloseMenu();
 
     return 1;
 }
 
 s8 MoriDebugMenu_MaleEgg(void)
 {
-    if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041950();
-    sub_8071C20();
+    CloseMenu();
 
     return 1;
 }
@@ -67,21 +85,21 @@ s8 MoriDebugMenu_MaleEgg(void)
 s8 MoriDebugMenu_1000Steps(void)
 {
     sub_8041790(1000);
-    sub_8071C20();
-    return 1;    
+    CloseMenu();
+    return 1;
 }
 
 s8 MoriDebugMenu_10000Steps(void)
 {
     sub_8041790(10000);
-    sub_8071C20();
-    return 1;    
+    CloseMenu();
+    return 1;
 }
 
 s8 MoriDebugMenu_MoveTutor(void)
 {
     sub_8132670();
-    sub_8071C20();
+    CloseMenu();
     return 1;
 }
 
@@ -89,7 +107,7 @@ s8 MoriDebugMenu_BreedEgg(void)
 {
     u8 loopCounter;
 
-    for(loopCounter = 0; loopCounter <= 5; loopCounter++)
+    for (loopCounter = 0; loopCounter <= 5; loopCounter++)
     {
         //UB: Too few arguments for function 'GetMonData'
         if ( GetMonData(&gPlayerParty[loopCounter], MON_DATA_IS_EGG) )
@@ -99,25 +117,25 @@ s8 MoriDebugMenu_BreedEgg(void)
         }
     }
     gSaveBlock1.filler_30B6 = -3;
-    sub_8071C20();
+    CloseMenu();
     return 1;
 }
 
 s8 MoriDebugMenu_LongName(void)
 {
     SetMonData(gPlayerParty, MON_DATA_NICKNAME, gUnknown_0839B257);
-    sub_8071C20();
+    CloseMenu();
     return 1;
 }
 
 s8 MoriDebugMenu_PokeblockCase(void)
 {
     s32 loopCounter;
-    
-    for(loopCounter = 0; loopCounter <= 39; loopCounter++)
+
+    for (loopCounter = 0; loopCounter <= 39; loopCounter++)
         sub_810CA6C((u8)loopCounter);
-    
-    sub_8071C20();
+
+    CloseMenu();
     return 1;
 }
 
@@ -133,7 +151,7 @@ bool8 MoriDebugMenuProcessInput(void)
     case -2:
         return FALSE;
     case -1:
-        sub_8071C20();
+        CloseMenu();
         return TRUE;
     }
 }