Merge pull request #116 from marijnvdwerf/clean/warnings-0

Fix various warnings

1 files changed, 9 insertions, 15 deletions

diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index b8fe92b9a..fd253d0a6 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -8,29 +8,23 @@
 
 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];
 
-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)
@@ -127,7 +121,7 @@ s8 MoriDebugMenu_PokeblockCase(void)
     return 1;
 }
 
-s8 MoriDebugMenuProcessInput(void)
+bool8 MoriDebugMenuProcessInput(void)
 {
     s8 choice = ProcessMenuInput();
 
@@ -135,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;
     }
 }