summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2016-12-02 22:23:53 +0100
committerMarijn van der Werf <marijn.vanderwerf@gmail.com>2016-12-02 22:33:57 +0100
commit1faa19a5422b4238709df52e7de34c0fcd4432f7 (patch)
tree25360631d4b77423ea52a458daa3c1b30be743bf
parent3ea6fa99a3b91864ffe78e2b7de6155a88b02c21 (diff)
Fix more warnings in mori_debug_menu
-rw-r--r--include/mori_debug_menu.h4
-rw-r--r--src/mori_debug_menu.c16
2 files changed, 10 insertions, 10 deletions
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
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;
}
}