summaryrefslogtreecommitdiff
path: root/src/menu.c
diff options
context:
space:
mode:
authorPokeCodec <doremylover456@gmail.com>2020-08-14 22:02:49 -0400
committerPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-09-01 11:42:28 -0400
commit26ac9c5faf74fe9ea3a14f5c87ede78d077db118 (patch)
tree1af34f57c2a11723c5a99a5638a7c6ae0376721a /src/menu.c
parent4ac1b3fec52d4f09dd3b4d36c2d6d941b4e89343 (diff)
Match Most of Remaining Functions
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/menu.c b/src/menu.c
index 9b7abe642..a245f0743 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -347,17 +347,17 @@ s8 Menu_ProcessInput(void)
PlaySE(SE_SELECT);
return sMenu.cursorPos;
}
- else if (JOY_NEW(B_BUTTON))
+ if (JOY_NEW(B_BUTTON))
{
return MENU_B_PRESSED;
}
- else if (JOY_NEW(DPAD_UP))
+ if (JOY_NEW(DPAD_UP))
{
PlaySE(SE_SELECT);
Menu_MoveCursor(-1);
return MENU_NOTHING_CHOSEN;
}
- else if (JOY_NEW(DPAD_DOWN))
+ if (JOY_NEW(DPAD_DOWN))
{
PlaySE(SE_SELECT);
Menu_MoveCursor(1);
@@ -376,17 +376,17 @@ s8 Menu_ProcessInputNoWrapAround(void)
PlaySE(SE_SELECT);
return sMenu.cursorPos;
}
- else if (JOY_NEW(B_BUTTON))
+ if (JOY_NEW(B_BUTTON))
{
return MENU_B_PRESSED;
}
- else if (JOY_NEW(DPAD_UP))
+ if (JOY_NEW(DPAD_UP))
{
if (oldPos != Menu_MoveCursorNoWrapAround(-1))
PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN;
}
- else if (JOY_NEW(DPAD_DOWN))
+ if (JOY_NEW(DPAD_DOWN))
{
if (oldPos != Menu_MoveCursorNoWrapAround(1))
PlaySE(SE_SELECT);
@@ -403,17 +403,17 @@ s8 Menu_ProcessInput_other(void)
PlaySE(SE_SELECT);
return sMenu.cursorPos;
}
- else if (JOY_NEW(B_BUTTON))
+ if (JOY_NEW(B_BUTTON))
{
return MENU_B_PRESSED;
}
- else if (JOY_REPT(DPAD_ANY) == DPAD_UP)
+ if (JOY_REPT(DPAD_ANY) == DPAD_UP)
{
PlaySE(SE_SELECT);
Menu_MoveCursor(-1);
return MENU_NOTHING_CHOSEN;
}
- else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
+ if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
{
PlaySE(SE_SELECT);
Menu_MoveCursor(1);
@@ -432,17 +432,17 @@ s8 Menu_ProcessInputNoWrapAround_other(void)
PlaySE(SE_SELECT);
return sMenu.cursorPos;
}
- else if (JOY_NEW(B_BUTTON))
+ if (JOY_NEW(B_BUTTON))
{
return MENU_B_PRESSED;
}
- else if (JOY_REPT(DPAD_ANY) == DPAD_UP)
+ if (JOY_REPT(DPAD_ANY) == DPAD_UP)
{
if (oldPos != Menu_MoveCursorNoWrapAround(-1))
PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN;
}
- else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
+ if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
{
if (oldPos != Menu_MoveCursorNoWrapAround(1))
PlaySE(SE_SELECT);