From d40539893b8abe0310ced859d648527bec15b52b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 2 Dec 2016 21:30:18 +0100 Subject: Pass struct array to PrintMenuItems --- include/menu.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'include') 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); -- cgit v1.2.3 From d37a0859eeb871548f64bcbd41fd450f80ea2663 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 2 Dec 2016 21:53:42 +0100 Subject: Fix definition of helper function --- include/asm.inc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/asm.inc.h b/include/asm.inc.h index fc7093437..97164dd31 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -19,8 +19,8 @@ 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); -- cgit v1.2.3 From 3ea6fa99a3b91864ffe78e2b7de6155a88b02c21 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 2 Dec 2016 21:58:23 +0100 Subject: Fix definition of daycare_count_pokemon --- include/asm.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm.inc.h b/include/asm.inc.h index 97164dd31..567c8708e 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -23,7 +23,7 @@ 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); -- cgit v1.2.3 From 1faa19a5422b4238709df52e7de34c0fcd4432f7 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 2 Dec 2016 22:23:53 +0100 Subject: Fix more warnings in mori_debug_menu --- include/mori_debug_menu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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 -- cgit v1.2.3