Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Incompatible Z-Move Activation (#7399)

Browse Source 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
ghoulslash 2025-07-25 04:49:15 -04:00 committed by GitHub
parent c6f539c8be
commit 219823f9a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_controller_player.c
View File

@ -897,7 +897,10 @@ void HandleInputChooseMove(u32 battler)
}
else if (JOY_NEW(START_BUTTON))
{
if (gBattleStruct->gimmick.usableGimmick[battler] != GIMMICK_NONE && !HasTrainerUsedGimmick(battler, gBattleStruct->gimmick.usableGimmick[battler]))
if (gBattleStruct->gimmick.usableGimmick[battler] != GIMMICK_NONE
&& !HasTrainerUsedGimmick(battler, gBattleStruct->gimmick.usableGimmick[battler])
&& !(gBattleStruct->gimmick.usableGimmick[battler] == GIMMICK_Z_MOVE
&& GetUsableZMove(battler, moveInfo->moves[gMoveSelectionCursor[battler]]) == MOVE_NONE))
{
gBattleStruct->gimmick.playerSelect ^= 1;
ReloadMoveNames(battler);