ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 12:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused parentheses

Browse Source
This commit is contained in:
PokeCodec 2020-09-05 10:01:21 -04:00
parent de274dcb07
commit 3e25d9e5a2
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/easy_chat.c
View File

@ -1614,26 +1614,26 @@ static u16 sub_811ACDC(void)
{ {
return sub_811B150(); return sub_811B150();
} }
else if (JOY_NEW(START_BUTTON)) if (JOY_NEW(START_BUTTON))
{ {
return sub_811B1B4(); return sub_811B1B4();
} }
else if (JOY_NEW(DPAD_UP)) if (JOY_NEW(DPAD_UP))
{ {
sEasyChatScreen->mainCursorRow--; sEasyChatScreen->mainCursorRow--;
break; break;
} }
else if (JOY_NEW(DPAD_LEFT)) if (JOY_NEW(DPAD_LEFT))
{ {
sEasyChatScreen->mainCursorColumn--; sEasyChatScreen->mainCursorColumn--;
break; break;
} }
else if (JOY_NEW(DPAD_DOWN)) if (JOY_NEW(DPAD_DOWN))
{ {
sEasyChatScreen->mainCursorRow = 0; sEasyChatScreen->mainCursorRow = 0;
break; break;
} }
else if (JOY_NEW(DPAD_RIGHT)) if (JOY_NEW(DPAD_RIGHT))
{ {
sEasyChatScreen->mainCursorColumn++; sEasyChatScreen->mainCursorColumn++;
break; break;

6
src/item_menu.c
View File

@ -1229,12 +1229,12 @@ static u8 GetSwitchBagPocketDirection(void)
if (gBagMenu->pocketSwitchDisabled) if (gBagMenu->pocketSwitchDisabled)
return SWITCH_POCKET_NONE; return SWITCH_POCKET_NONE;
LRKeys = GetLRKeysPressed(); LRKeys = GetLRKeysPressed();
if ((JOY_NEW(DPAD_LEFT)) || LRKeys == MENU_L_PRESSED) if (JOY_NEW(DPAD_LEFT) || LRKeys == MENU_L_PRESSED)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return SWITCH_POCKET_LEFT; return SWITCH_POCKET_LEFT;
} }
if ((JOY_NEW(DPAD_RIGHT)) || LRKeys == MENU_R_PRESSED) if (JOY_NEW(DPAD_RIGHT) || LRKeys == MENU_R_PRESSED)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return SWITCH_POCKET_RIGHT; return SWITCH_POCKET_RIGHT;
@ -1669,7 +1669,7 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE); ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE);
} }
} }
else if ((JOY_NEW(DPAD_RIGHT)) || GetLRKeysPressed() == MENU_R_PRESSED) else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED)
{ {
if (!(cursorPos & 1) && sub_81ACDFC(cursorPos + 1)) if (!(cursorPos & 1) && sub_81ACDFC(cursorPos + 1))
{ {

18
src/pokedex.c
View File

@ -2598,7 +2598,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored)
CreateMonListEntry(1, selectedMon, ignored); CreateMonListEntry(1, selectedMon, ignored);
PlaySE(SE_DEX_SCROLL); PlaySE(SE_DEX_SCROLL);
} }
else if ((JOY_HELD(DPAD_DOWN)) && (selectedMon < sPokedexView->pokemonListCount - 1)) else if (JOY_HELD(DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1))
{ {
scrollDir = 2; scrollDir = 2;
selectedMon = GetNextPosition(0, selectedMon, 0, sPokedexView->pokemonListCount - 1); selectedMon = GetNextPosition(0, selectedMon, 0, sPokedexView->pokemonListCount - 1);
@ -2606,7 +2606,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored)
CreateMonListEntry(2, selectedMon, ignored); CreateMonListEntry(2, selectedMon, ignored);
PlaySE(SE_DEX_SCROLL); PlaySE(SE_DEX_SCROLL);
} }
else if ((JOY_NEW(DPAD_LEFT)) && (selectedMon > 0)) else if (JOY_NEW(DPAD_LEFT) && (selectedMon > 0))
{ {
startingPos = selectedMon; startingPos = selectedMon;
@ -3400,8 +3400,8 @@ static void Task_HandleInfoScreenInput(u8 taskId)
} }
return; return;
} }
if (((JOY_NEW(DPAD_LEFT)) if ((JOY_NEW(DPAD_LEFT)
|| ((JOY_NEW(L_BUTTON)) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
&& sPokedexView->selectedScreen > 0) && sPokedexView->selectedScreen > 0)
{ {
sPokedexView->selectedScreen--; sPokedexView->selectedScreen--;
@ -3409,8 +3409,8 @@ static void Task_HandleInfoScreenInput(u8 taskId)
PlaySE(SE_DEX_PAGE); PlaySE(SE_DEX_PAGE);
return; return;
} }
if (((JOY_NEW(DPAD_RIGHT)) if ((JOY_NEW(DPAD_RIGHT)
|| ((JOY_NEW(R_BUTTON)) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
&& sPokedexView->selectedScreen < CANCEL_SCREEN) && sPokedexView->selectedScreen < CANCEL_SCREEN)
{ {
sPokedexView->selectedScreen++; sPokedexView->selectedScreen++;
@ -3657,8 +3657,8 @@ static void Task_HandleCryScreenInput(u8 taskId)
PlaySE(SE_DEX_PAGE); PlaySE(SE_DEX_PAGE);
return; return;
} }
if ((JOY_NEW(DPAD_RIGHT)) if (JOY_NEW(DPAD_RIGHT)
|| ((JOY_NEW(R_BUTTON)) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
{ {
if (!sPokedexListItem->owned) if (!sPokedexListItem->owned)
{ {
@ -5031,7 +5031,7 @@ static void Task_HandleSearchMenuInput(u8 taskId)
CopyWindowToVram(0, 2); CopyWindowToVram(0, 2);
CopyBgTilemapBufferToVram(3); CopyBgTilemapBufferToVram(3);
} }
if ((JOY_NEW(DPAD_RIGHT)) && movementMap[gTasks[taskId].tMenuItem][1] != 0xFF) if (JOY_NEW(DPAD_RIGHT) && movementMap[gTasks[taskId].tMenuItem][1] != 0xFF)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gTasks[taskId].tMenuItem = movementMap[gTasks[taskId].tMenuItem][1]; gTasks[taskId].tMenuItem = movementMap[gTasks[taskId].tMenuItem][1];

4
src/pokemon_summary_screen.c
View File

@ -1505,11 +1505,11 @@ static void Task_HandleInput(u8 taskId)
{ {
ChangeSummaryPokemon(taskId, 1); ChangeSummaryPokemon(taskId, 1);
} }
else if ((JOY_NEW(DPAD_LEFT)) || GetLRKeysPressed() == MENU_L_PRESSED) else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED)
{ {
ChangePage(taskId, -1); ChangePage(taskId, -1);
} }
else if ((JOY_NEW(DPAD_RIGHT)) || GetLRKeysPressed() == MENU_R_PRESSED) else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED)
{ {
ChangePage(taskId, 1); ChangePage(taskId, 1);
} }

13
src/pokenav_conditions_3.c
View File

@ -172,27 +172,26 @@ static u32 sub_81CF030(struct PokenavSub7 *structPtr)
{ {
if (JOY_REPEAT(DPAD_UP)) if (JOY_REPEAT(DPAD_UP))
return 1; return 1;
else if (JOY_REPEAT(DPAD_DOWN)) if (JOY_REPEAT(DPAD_DOWN))
return 2; return 2;
else if (JOY_NEW(DPAD_LEFT)) if (JOY_NEW(DPAD_LEFT))
return 3; return 3;
else if (JOY_NEW(DPAD_RIGHT)) if (JOY_NEW(DPAD_RIGHT))
return 4; return 4;
else if (JOY_NEW(B_BUTTON)) if (JOY_NEW(B_BUTTON))
{ {
structPtr->unk1C = 0; structPtr->unk1C = 0;
structPtr->unk0 = sub_81CF0B0; structPtr->unk0 = sub_81CF0B0;
return 5; return 5;
} }
else if (JOY_NEW(A_BUTTON)) if (JOY_NEW(A_BUTTON))
{ {
structPtr->unkPtr->unk2 = GetSelectedMatchCall(); structPtr->unkPtr->unk2 = GetSelectedMatchCall();
structPtr->unk1C = 1; structPtr->unk1C = 1;
structPtr->unk0 = sub_81CF0B8; structPtr->unk0 = sub_81CF0B8;
return 6; return 6;
} }
else return 0;
return 0;
} }
static u32 sub_81CF0B0(struct PokenavSub7 *structPtr) static u32 sub_81CF0B0(struct PokenavSub7 *structPtr)