atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit c399391891
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats 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))
{