Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-09 19:46:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2677 from AlexOn1ine/z_moves_switch_order

Browse Source 
Fix switching Z-Moves when pressing SELECT in battle
This commit is contained in:
ghoulslash
2023-02-13 08:41:58 -05:00
committed by GitHub
parent 5d958e245a ce416be297
commit c399391891
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_controller_player.c
View File

@@ -882,6 +882,7 @@ static void HandleMoveSwitching(void)
if (JOY_NEW(A_BUTTON | SELECT_BUTTON))
{
struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]);
PlaySE(SE_SELECT);
if (gMoveSelectionCursor[gActiveBattler] != gMultiUsePlayerCursor)
@@ -973,6 +974,7 @@ static void HandleMoveSwitching(void)
MoveSelectionDisplayPpString();
MoveSelectionDisplayPpNumber();
MoveSelectionDisplayMoveType();
GetUsableZMoves(gActiveBattler, moveInfo->moves);
}
else if (JOY_NEW(B_BUTTON | SELECT_BUTTON))
{