3 files changed, 13 insertions, 7 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index fc7093437..567c8708e 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -19,11 +19,11 @@ void sub_80408BC();
 void current_map_music_set__default_for_battle(u16);
 
 // asm/rom_8040EB4.o
-void StoreWordInTwoHalfwords(u32, u8 *);
-void LoadWordFromTwoHalfwords(u32, u8 *);
+void StoreWordInTwoHalfwords(u16 *, u32);
+void LoadWordFromTwoHalfwords(u16 *, u32);
 
 // asm/daycare.o
-u8 daycare_count_pokemon(u32);
+u8 daycare_count_pokemon(u8 *);
 void sub_8041324(struct BoxPokemon *, void *);
 void sub_8041790(int i);
 u16 sub_8041870(u16);
diff --git a/include/menu.h b/include/menu.h
index 7dfe418a9..6805591df 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -3,6 +3,12 @@
 
 #include "text.h"
 
+struct MenuAction
+{
+   u8 *text;
+   u8 (*func)(void);
+};
+
 void InitMenuWindow(const struct WindowConfig *);
 void MultistepInitMenuWindowBegin(struct WindowConfig *);
 bool32 MultistepInitMenuWindowContinue(void);
@@ -36,8 +42,8 @@ u8 MoveMenuCursor4(s8);
 void sub_807274C(u8, u8, u8, u8, u8 * const [][2], u8, u32);
 s8 sub_80727CC(void);
 u8 sub_807288C(u8);
-void PrintMenuItems(u8, u8, u8, u8 * const [][2]);
-void PrintMenuItemsReordered(u8, u8, u8, u8 * const [][2], u8*);
+void PrintMenuItems(u8, u8, u8, const struct MenuAction[]);
+void PrintMenuItemsReordered(u8, u8, u8, const struct MenuAction[], u8*);
 void InitYesNoMenu(u8, u8, u8);
 void DisplayYesNoMenu(u8, u8, u32);
 s8 ProcessMenuInputNoWrap_(void);
diff --git a/include/mori_debug_menu.h b/include/mori_debug_menu.h
index 0d1f49d3b..f1dc0de93 100644
--- a/include/mori_debug_menu.h
+++ b/include/mori_debug_menu.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_MORI_DEBUG_MENU_H
 #define GUARD_MORI_DEBUG_MENU_H
 
-s8 sub_8083D4C(void);
+bool8 sub_8083D4C(void);
 u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr);
 s8 MoriDebugMenu_Egg(void);
 s8 MoriDebugMenu_MaleEgg(void);
@@ -11,7 +11,7 @@ s8 MoriDebugMenu_MoveTutor(void);
 s8 MoriDebugMenu_BreedEgg(void);
 s8 MoriDebugMenu_LongName(void);
 s8 MoriDebugMenu_PokeblockCase(void);
-s8 MoriDebugMenuProcessInput(void);
+bool8 MoriDebugMenuProcessInput(void);
 s8 InitMoriDebugMenu(void);
 
 #endif // GUARD_MORI_DEBUG_MENU_H