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 --- src/mori_debug_menu.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/mori_debug_menu.c') diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index b8fe92b9a..4e6708037 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -8,17 +8,11 @@ extern u8 (*gCallback_03004AE8)(void); -struct DebugMenuAction -{ - u8 *text; - u8 (*func)(void); -}; - extern u8 gUnknown_0839B24D[]; extern u8 gUnknown_0839B255[]; extern u8 gUnknown_0839B257[]; -extern struct DebugMenuAction gMoriDebugMenuActions[]; +extern const struct MenuAction gMoriDebugMenuActions[]; extern u8 gSpeciesNames[][11]; -- 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 --- src/mori_debug_menu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/mori_debug_menu.c') diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index 4e6708037..fd253d0a6 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -16,15 +16,15 @@ extern const struct MenuAction gMoriDebugMenuActions[]; extern u8 gSpeciesNames[][11]; -s8 sub_8083D4C(void) +bool8 sub_8083D4C(void) { - if ( gMain.newKeys & 1 ) + if ( gMain.newKeys & A_BUTTON ) { sub_8071C20(); - return 1; + return TRUE; } else - return 0; + return FALSE; } u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr) @@ -121,7 +121,7 @@ s8 MoriDebugMenu_PokeblockCase(void) return 1; } -s8 MoriDebugMenuProcessInput(void) +bool8 MoriDebugMenuProcessInput(void) { s8 choice = ProcessMenuInput(); @@ -129,12 +129,12 @@ s8 MoriDebugMenuProcessInput(void) { default: gCallback_03004AE8 = gMoriDebugMenuActions[choice].func; - return 0; + return FALSE; case -2: - return 0; + return FALSE; case -1: sub_8071C20(); - return 1; + return TRUE; } } -- cgit v1.2.3