dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Removed excess parenthesis

Browse Source
This commit is contained in:
PokeCodec
2020-09-04 21:16:55 -04:00
parent 28ef2fb774
commit 7efdcaf120
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu.c
+12 -12
View File
@@ -1049,13 +1049,13 @@ s8 ProcessMenuInput_other(void)
{ {
return MENU_B_PRESSED; return MENU_B_PRESSED;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_UP) else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
Menu_MoveCursor(-1); Menu_MoveCursor(-1);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_DOWN) else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
Menu_MoveCursor(1); Menu_MoveCursor(1);
@@ -1079,13 +1079,13 @@ s8 Menu_ProcessInputNoWrapAround_other(void)
{ {
return MENU_B_PRESSED; return MENU_B_PRESSED;
} }
if ((JOY_REPEAT(DPAD_ANY)) == DPAD_UP) if (JOY_REPEAT(DPAD_ANY) == DPAD_UP)
{ {
if (oldPos != Menu_MoveCursorNoWrapAround(-1)) if (oldPos != Menu_MoveCursorNoWrapAround(-1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
if ((JOY_REPEAT(DPAD_ANY)) == DPAD_DOWN) if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN)
{ {
if (oldPos != Menu_MoveCursorNoWrapAround(1)) if (oldPos != Menu_MoveCursorNoWrapAround(1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@@ -1496,25 +1496,25 @@ s8 sub_81993D8(void)
{ {
return MENU_B_PRESSED; return MENU_B_PRESSED;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_UP) else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP); ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_DOWN) else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN); ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED) else if (JOY_REPEAT(DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE); ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED) else if (JOY_REPEAT(DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE); ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE);
@@ -1538,25 +1538,25 @@ s8 sub_8199484(void)
{ {
return MENU_B_PRESSED; return MENU_B_PRESSED;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_UP) else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP)
{ {
if (oldPos != ChangeGridMenuCursorPosition(0, -1)) if (oldPos != ChangeGridMenuCursorPosition(0, -1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_DOWN) else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN)
{ {
if (oldPos != ChangeGridMenuCursorPosition(0, 1)) if (oldPos != ChangeGridMenuCursorPosition(0, 1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED) else if (JOY_REPEAT(DPAD_ANY) == DPAD_LEFT || GetLRKeysPressedAndHeld() == MENU_L_PRESSED)
{ {
if (oldPos != ChangeGridMenuCursorPosition(-1, 0)) if (oldPos != ChangeGridMenuCursorPosition(-1, 0))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED) else if (JOY_REPEAT(DPAD_ANY) == DPAD_RIGHT || GetLRKeysPressedAndHeld() == MENU_R_PRESSED)
{ {
if (oldPos != ChangeGridMenuCursorPosition(1, 0)) if (oldPos != ChangeGridMenuCursorPosition(1, 0))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
src/menu_helpers.c
+4 -4
View File
@@ -183,7 +183,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
{ {
s16 valBefore = (*arg0); s16 valBefore = (*arg0);
if ((JOY_REPEAT(DPAD_ANY)) == DPAD_UP) if (JOY_REPEAT(DPAD_ANY) == DPAD_UP)
{ {
(*arg0)++; (*arg0)++;
if ((*arg0) > arg1) if ((*arg0) > arg1)
@@ -199,7 +199,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
return TRUE; return TRUE;
} }
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_DOWN) else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN)
{ {
(*arg0)--; (*arg0)--;
if ((*arg0) <= 0) if ((*arg0) <= 0)
@@ -215,7 +215,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
return TRUE; return TRUE;
} }
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_RIGHT) else if (JOY_REPEAT(DPAD_ANY) == DPAD_RIGHT)
{ {
(*arg0) += 10; (*arg0) += 10;
if ((*arg0) > arg1) if ((*arg0) > arg1)
@@ -231,7 +231,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
return TRUE; return TRUE;
} }
} }
else if ((JOY_REPEAT(DPAD_ANY)) == DPAD_LEFT) else if (JOY_REPEAT(DPAD_ANY) == DPAD_LEFT)
{ {
(*arg0) -= 10; (*arg0) -= 10;
if ((*arg0) <= 0) if ((*arg0) <= 0)