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/menu.h') 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