move functions from start_menu.c to menu.c

4 files changed, 19 insertions, 17 deletions

diff --git a/include/menu.h b/include/menu.h
index 9592fc291..66423659c 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -9,6 +9,8 @@ struct MenuAction
    u8 (*func)(void);
 };
 
+void sub_8071C20(void);
+void AppendToList(u8 *list, u8 *pindex, u32 value);
 void InitMenuWindow(const struct WindowConfig *);
 void MultistepInitMenuWindowBegin(const struct WindowConfig *);
 bool32 MultistepInitMenuWindowContinue(void);
diff --git a/include/start_menu.h b/include/start_menu.h
index 77bfe5d0e..ae9e51284 100644
--- a/include/start_menu.h
+++ b/include/start_menu.h
@@ -17,7 +17,5 @@ u8 StartMenu_RetireCallback(void);
 u8 StartMenu_PlayerLinkCallback(void);
 void InitSaveDialog(void);
 void sub_8071B28(void);
-void sub_8071C20(void);
-void AppendToList(u8 *list, u8 *pindex, u32 value);
 
 #endif // GUARD_STARTER_CHOOSE_H
diff --git a/src/menu.c b/src/menu.c
index 0b5eab831..6b35fd5dd 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -6,6 +6,8 @@
 #include "text_window.h"
 #include "sound.h"
 #include "menu_cursor.h"
+#include "map_obj_lock.h"
+#include "script.h"
 
 struct Menu
 {
@@ -41,6 +43,21 @@ EWRAM_DATA u16 gMenuMessageBoxContentTileOffset = 0;
 
 extern const struct MenuAction gUnknown_08376D74[];
 
+void sub_8071C20(void)
+{
+    PlaySE(SE_SELECT);
+    MenuZeroFillScreen();
+    sub_8064E2C();
+    ScriptContext2_Disable();
+    sub_8072DEC();
+}
+
+void AppendToList(u8 *list, u8 *pindex, u32 value)
+{
+    list[*pindex] = value;
+    (*pindex)++;
+}
+
 void InitMenuWindow(const struct WindowConfig *winConfig)
 {
     InitMenuWindowInternal(winConfig, 1);
diff --git a/src/start_menu.c b/src/start_menu.c
index f02665ad1..850f610e3 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -832,18 +832,3 @@ static void Task_8071B64(u8 taskId)
         }
     }
 }
-
-void sub_8071C20(void)
-{
-    PlaySE(SE_SELECT);
-    MenuZeroFillScreen();
-    sub_8064E2C();
-    ScriptContext2_Disable();
-    sub_8072DEC();
-}
-
-void AppendToList(u8 *list, u8 *pindex, u32 value)
-{
-    list[*pindex] = value;
-    (*pindex)++;
-}