diff --git a/include/kangaskhan_storage.h b/include/kangaskhan_storage.h
index 2ef0cfc7b..3833e9a82 100644
--- a/include/kangaskhan_storage.h
+++ b/include/kangaskhan_storage.h
@@ -20,8 +20,7 @@ struct unkStruct_203B208
     u32 unk20;
     struct MenuItem unk24[5];
     u16 unk4C[5];
-    u32 unk58;
-    u8 unk5C[0xA8 - 0x5C];
+    struct MenuStruct unk58;
     u32 unkA8;
     u8 unkAC[0xBC - 0xAC];
     u32 unkBC;
@@ -51,8 +50,7 @@ struct unkStruct_203B20C
     u32 unk1C;
     struct MenuItem unk20[8];
     u16 unk60[8];
-    u32 unk70;
-    u8 fill74[0xC0 - 0x74];
+    struct MenuStruct unk70;
     u32 unkC0;
     u32 unkC4;
     u32 unkC8;
diff --git a/include/menu_input.h b/include/menu_input.h
index bed65b0e5..bf14abb22 100644
--- a/include/menu_input.h
+++ b/include/menu_input.h
@@ -1,15 +1,14 @@
 #include "menu.h"
 
 void sub_8012BC4(u32 x, u32 y, s32 n, s32 len, u32 param_5, u32 param_6);
-void sub_8012C60(u32 x,u32 y,u32 param_3,u32 param_4,u32 param_5);
+void sub_8012C60(u32 x, u32 y, u32 param_3, u32 param_4, u32 param_5);
 void sub_8012CAC(struct UnkTextStruct2 *param_1, const struct MenuItem *param_2);
 void sub_8012D08(struct UnkTextStruct2 *param_1, s32 param_2);
 void sub_8012D34(struct UnkTextStruct2 *param_1, s32 param_2);
-void sub_8012D60(struct MenuStruct *param_1,const struct MenuItem *menuItems,u32 *colorArray,u16 *param_4,s32 param_5, s32 index);
-void sub_8012E04(struct MenuStruct *param_1,const struct MenuItem *menuItems,u32 *colorArray,u16 *param_4,s32 param_5, s32 index);
+void sub_8012D60(struct MenuStruct *param_1, const struct MenuItem *menuItems, u32 *colorArray, u16 *param_4, s32 param_5, s32 index);
+void sub_8012E04(struct MenuStruct *param_1, const struct MenuItem *menuItems, u32 *colorArray, u16 *param_4, s32 param_5, s32 index);
 void sub_8012EA4(struct MenuStruct *param_1, bool8 r1);
 void sub_8012EBC(struct MenuStruct *param_1);
-u8 sub_8012FD8(struct MenuStruct *param_1);
-u8 sub_80130A8(struct MenuStruct *param_1);
+bool8 sub_8012FD8(struct MenuStruct *param_1);
+bool8 sub_80130A8(struct MenuStruct *param_1);
 bool8 sub_8013114(struct MenuStruct *param_1, s32 *menuAction);
-
diff --git a/src/code_801D760.c b/src/code_801D760.c
index 33ae1b37f..59063f118 100644
--- a/src/code_801D760.c
+++ b/src/code_801D760.c
@@ -4,12 +4,14 @@
 #include "constants/input.h"
 #include "file_system.h"
 #include "item.h"
+#include "menu.h"
 #include "team_inventory.h"
 #include "memory.h"
 #include "input.h"
 #include "text.h"
 #include "rescue_team_info.h"
 #include "code_800D090.h"
+#include "menu_input.h"
 
 struct unkStruct_203B258
 {
@@ -64,8 +66,6 @@ extern u32 sub_80270A4();
 extern u32 sub_802C898(void);
 extern void sub_802C8F4(void);
 
-extern u8 sub_8012FD8(u32 *);
-extern void sub_8013114(u32 *, s32 *);
 extern const char *sub_8098FB4();
 extern void xxx_format_string(const char *, u8 *, u32 **, u32);
 extern s32 sub_8008ED0(u8 *);
@@ -99,7 +99,7 @@ struct unk_203B250
     u8 unk9;
     u8 fillA[0x14 - 0xA];
     u32 unk14;
-    u32 unk18; // an input struct??
+    struct MenuStruct unk18;
 };
 
 struct unk_203B250 *gUnknown_203B250;
diff --git a/src/code_8023144.c b/src/code_8023144.c
index afb1745c1..278d455b2 100644
--- a/src/code_8023144.c
+++ b/src/code_8023144.c
@@ -2,11 +2,13 @@
 #include "global.h"
 #include "constants/iq_skill.h"
 #include "memory.h"
+#include "menu.h"
 #include "pokemon.h"
 #include "team_inventory.h"
 #include "text.h"
 #include "input.h"
 #include "item.h"
+#include "menu_input.h"
 
 struct unkStruct_3001B5C
 {
@@ -40,8 +42,7 @@ extern u16 gUnknown_203B29E;
 extern struct UnkTextStruct2 gUnknown_80DC91C;
 extern struct UnkTextStruct2 gUnknown_80DC904;
 
-extern u8 sub_8023704();
-extern void sub_8012D08(void *, u32);
+extern u8 sub_8023704(u8);
 extern void sub_8013818(void *, u32, u32, u32);
 extern void sub_8013984(u8 *);
 extern void sub_8023420(void);
@@ -67,10 +68,8 @@ struct unkStruct_203B294
     /* 0x48 */ struct PokemonStruct *pokeStruct;
     u32 unk4C;
     struct Item unk50;
-    u32 unk54;
-    u8 fill58[0xA4 - 0x58];
-    u32 unkA4;
-    u8 fillA8[0xF4 - 0xA8];
+    struct MenuStruct unk54;
+    struct MenuStruct unkA4;
     u32 unkF4;
     u32 unkF8;
     u16 unkFC;
@@ -87,8 +86,6 @@ extern void sub_801B048(void);
 extern u32 sub_801B410(void);
 extern void sub_801B450(void);
 
-extern u8 sub_8012FD8(u32 *);
-extern void sub_8013114(u32 *, s32 *);
 extern u32 sub_801A6E8(u32);
 extern void sub_8099690(u32);
 extern void sub_801A928(void);
diff --git a/src/debug_menu.c b/src/debug_menu.c
index c5c8d6d4a..fccfd1e6b 100644
--- a/src/debug_menu.c
+++ b/src/debug_menu.c
@@ -9,6 +9,7 @@
 #include "pokemon.h"
 #include "save.h"
 #include "text_util.h"
+#include "menu_input.h"
 
 extern struct DebugMenu *gUnknown_203B3EC;
 
@@ -54,8 +55,6 @@ ALIGNED(4) static const char debug_menu_fill6[] = "pksdir0";
 
 
 
-extern u8 sub_8012FD8(struct MenuStruct*);
-extern void sub_8013114(struct MenuStruct*, s32 *);
 extern void sub_80976F8(u8);
 extern void sub_803A3BC(void);
 extern void sub_803A3A0(void);
diff --git a/src/friend_rescue_1.c b/src/friend_rescue_1.c
index fa8ee75ea..25fe93abc 100644
--- a/src/friend_rescue_1.c
+++ b/src/friend_rescue_1.c
@@ -12,6 +12,7 @@
 #include "save.h"
 #include "menu.h"
 #include "rescue_password_menu.h"
+#include "menu_input.h"
 
 
 extern struct TeamInventory *gTeamInventory_203B460;
@@ -46,8 +47,6 @@ extern void sub_80155F0();
 extern void sub_80141B4(u8 *r0, u32, u32 *r1, u32);
 extern void sub_8014248(const char *r0, u32, u32, struct MenuItem *r4, u32, u32, u32, u32 *r5, u32);
 
-extern u8 sub_8012FD8(struct MenuStruct *);
-extern void sub_8013114(struct MenuStruct  *, s32 *);
 extern u32 sub_801CA08(u32);
 extern void sub_801CBB8(void);
 extern void sub_801CB5C(u32);
diff --git a/src/kangaskhan_storage_1.c b/src/kangaskhan_storage_1.c
index 539788bdd..685beb005 100644
--- a/src/kangaskhan_storage_1.c
+++ b/src/kangaskhan_storage_1.c
@@ -4,6 +4,7 @@
 #include "input.h"
 #include "item.h"
 #include "kangaskhan_storage.h"
+#include "menu_input.h"
 
 extern struct unkStruct_203B208 *gUnknown_203B208;
 
@@ -12,7 +13,6 @@ extern u8 gUnknown_80DB7A8;
 extern void xxx_call_draw_string(u32 x, u32 y, u8 *, u32, u32);
 extern void sub_801CCD8();
 extern void sub_801AD34(u32);
-extern void sub_8012EA4(u32 *, u32);
 extern void sub_8008C54(u32);
 extern void sub_80073B8(u32);
 extern void sub_8013C68(u32 *);
diff --git a/src/kangaskhan_storage_2.c b/src/kangaskhan_storage_2.c
index 1eea97e9b..ceffe6d45 100644
--- a/src/kangaskhan_storage_2.c
+++ b/src/kangaskhan_storage_2.c
@@ -7,6 +7,7 @@
 #include "team_inventory.h"
 #include "input.h"
 #include "kangaskhan_storage.h"
+#include "menu_input.h"
 
 extern struct unkStruct_203B208 *gUnknown_203B208;
 
@@ -30,8 +31,6 @@ extern s32 sub_80144A4(s32 *);
 extern void sub_801B450();
 extern u32 sub_801B410(void);
 
-extern u8 sub_8012FD8(u32 *r0);
-extern void sub_8013114(u32 *, s32 *);
 extern void sub_801CBB8();
 
 extern bool8 sub_801ADA0(u32);
@@ -47,13 +46,11 @@ extern u32 sub_801A6E8(u32);
 extern u32 sub_801AEA8(void);
 extern u32 sub_801A8AC(void);
 extern void sub_801A928(void);
-extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *);
 extern void sub_80182E4(void);
 extern void sub_8008C54(u32);
 extern void sub_80073B8(u32);
 extern void sub_8013C68(u32 *);
 extern void sub_80073E0(u32);
-extern void sub_8012EA4(u32 *, u32);
 extern void xxx_call_draw_string(u32 x, u32 y, u8 *, u32, u32);
 
 extern void sub_801A9E0();
@@ -65,7 +62,6 @@ extern void sub_8013AA0(u32 *);
 extern void sub_801B3C0(struct Item *);
 extern void sub_801A5D8(u32, u32, u32, u32);
 extern void sub_801C8C4(u32, u32, u32, u32);
-extern void sub_8012D60(u32 *, struct MenuItem *, u32, u16 *, u32, u32);
 extern void sub_801CB5C(u32);
 extern void sub_801A8D0(u32);
 extern u32 sub_801CFE0(u8);
diff --git a/src/kangaskhan_storage_3.c b/src/kangaskhan_storage_3.c
index f9a0f27e3..c0a611dd1 100644
--- a/src/kangaskhan_storage_3.c
+++ b/src/kangaskhan_storage_3.c
@@ -2,6 +2,7 @@
 #include "item.h"
 #include "kangaskhan_storage.h"
 #include "team_inventory.h"
+#include "menu_input.h"
 
 extern struct unkStruct_203B20C *gUnknown_203B20C;
 
@@ -11,11 +12,8 @@ extern void sub_8017F10(u32);
 
 extern u8 sub_801CF14(u32);
 
-extern u8 sub_8012FD8(u32 *r0);
-extern void sub_8013114(u32 *, s32 *);
 extern void sub_801CBB8(void);
 extern void sub_8017F10(u32);
-extern void sub_8012EA4(u32 *, u32);
 
 extern u8 sub_801ADA0(s32);
 extern void sub_801A928(void);
diff --git a/src/main_menu.c b/src/main_menu.c
index 1936d64a2..8973d35fe 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -2,6 +2,7 @@
 #include "text.h"
 #include "menu.h"
 #include "input.h"
+#include "menu_input.h"
 
 #include "adventure_log.h"
 #include "debug_menu.h"
@@ -57,12 +58,7 @@ extern void sub_80370D4(void);
 extern void CleanWonderMailMenu(void);
 extern void sub_80383A8(void);
 extern void CleanSaveMenu(void);
-extern u8 sub_8012FD8(struct MenuStruct *);
-extern void sub_8013114(struct MenuStruct *, s32 *);
 extern u8 sub_803D0D8();
-extern void sub_8012D60(struct MenuStruct *, const struct MenuItem *, u32, u32, u32, u32);
-extern void sub_8012E04(struct MenuStruct *, const struct MenuItem *, u32, u32, u32, u32);
-void sub_8012EBC(struct MenuStruct *);
 
 void CleanMainMenu(void);
 void DrawMainMenu(void);
diff --git a/src/menu_input.c b/src/menu_input.c
index 0171b66aa..979aee9f5 100644
--- a/src/menu_input.c
+++ b/src/menu_input.c
@@ -360,7 +360,7 @@ void sub_8012EBC(struct MenuStruct *param_1)
   }
 }
 
-u8 sub_8012FD8(struct MenuStruct *param_1)
+bool8 sub_8012FD8(struct MenuStruct *param_1)
 {
   u32 prevMenuIndex;
   s32 index;
@@ -416,7 +416,7 @@ u8 sub_8012FD8(struct MenuStruct *param_1)
   return param_1->unk4C;
 }
 
-u8 sub_80130A8(struct MenuStruct *param_1)
+bool8 sub_80130A8(struct MenuStruct *param_1)
 {
   s32 index;
   s32 menuAction;
diff --git a/src/other_menus.c b/src/other_menus.c
index 182f67302..851a4a4d6 100644
--- a/src/other_menus.c
+++ b/src/other_menus.c
@@ -7,6 +7,7 @@
 #include "menu.h"
 #include "memory.h"
 #include "text.h"
+#include "menu_input.h"
 
 struct unkStruct_203B35C
 {
@@ -59,8 +60,6 @@ extern void sub_8035CF4(struct MenuStruct *,u32, u32);
 extern void sub_80376CC();
 extern void sub_8035CC0(struct UnkTextStruct2 *, u32);
 
-extern u8 sub_80130A8(struct MenuStruct *);
-extern void sub_8013114(struct MenuStruct *, u32 *);
 extern u32 sub_8037C10(u32);
 extern void sub_8037748(void);
 extern void sub_80371B8(void);
diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c
index 4ff865ea6..bdee3a07b 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -13,6 +13,7 @@
 #include "text.h"
 #include "team_inventory.h"
 #include "code_800D090.h"
+#include "menu_input.h"
 
 extern struct WonderMailStruct_203B2C4 *gUnknown_203B2C4;
 
@@ -155,7 +156,6 @@ const struct MenuItem gUnknown_80DEEE4[4] =
 
 extern void sub_80141B4(const char *r0, u32, struct OpenedFile **r1, u32);
 extern void sub_8014248(const char *r0, u32, u32, const struct MenuItem *r4, u32, u32, u32, struct OpenedFile **r5, u32);
-extern u8 sub_8012FD8(struct MenuStruct *r0);
 extern void sub_8035CC0(struct UnkTextStruct2 *r0, u32);
 extern void sub_8030810(u32);
 extern u32 sub_8031DCC(void);
@@ -167,7 +167,6 @@ extern u32 sub_8030768(u32);
 extern s8 sub_80307EC(void);
 extern void sub_8030D40(u8, u32);
 extern u32 sub_8030DA0();
-extern void sub_8013114(struct MenuStruct *r0, s32 *r1);
 extern void HandleThankYouMailPelipperMainMenu();
 extern void sub_802AAC8();
 extern void ReturnToThankYouMailMainMenu();
diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c
index 35e4b2fde..e17d25d75 100644
--- a/src/trade_items_menu.c
+++ b/src/trade_items_menu.c
@@ -8,6 +8,7 @@
 #include "memory.h"
 #include "save.h"
 #include "menu.h"
+#include "menu_input.h"
 
 extern struct TradeItemsMenu *gTradeItemsMenu;
 
@@ -87,8 +88,6 @@ extern u32 sub_801CA08(u32);
 extern void sub_801CBB8();
 extern u8 sub_801CB24();
 extern void sub_801B3C0(struct Item *);
-extern u8 sub_8012FD8(struct MenuStruct *);
-extern void sub_8013114(struct MenuStruct *, s32 *);
 extern void sub_8035CC0(struct UnkTextStruct2 *, u32);
 extern void sub_801CCD8();
 extern u32 sub_801B410();
diff --git a/src/wonder_mail.c b/src/wonder_mail.c
index 7f9ecbb8f..2cc3c97f4 100644
--- a/src/wonder_mail.c
+++ b/src/wonder_mail.c
@@ -11,6 +11,7 @@
 #include "text.h"
 #include "team_inventory.h"
 #include "rescue_password_menu.h"
+#include "menu_input.h"
 
 extern struct WonderMailStruct_203B2C0 *gUnknown_203B2C0;
 
@@ -36,7 +37,6 @@ extern void sub_803084C();
 extern u32 sub_8030768(u32);
 extern s8 sub_80307EC();
 extern void sub_8030D40(u8, u32);
-extern u8 sub_8012FD8(struct MenuStruct *r0);
 extern void sub_8030810(u32);
 extern void sub_8035CC0(struct UnkTextStruct2 *r0, u32);
 extern void sub_8035CF4(struct MenuStruct *r0, u32, u32);
@@ -50,7 +50,6 @@ extern void sub_8014248(const char *r0, u32, u32, const struct MenuItem *r4, u32
 extern void sub_8095274(u32);
 extern void sub_80155F0();
 extern void sub_80951BC(struct unkStruct_203B480 *r0);
-extern void sub_8013114(struct MenuStruct *r0, s32 *r1);
 extern void sub_8023C60();
 extern u32 sub_8023A94(u32);
 extern void sub_8024458(s16, u32);