ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 17:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2223 from LOuroboros/patch-3

Browse Source 
Fixed a wrong instance of IS_MOVE_STATUS in IsViableZMove
This commit is contained in:
Eduardo Quezada D'Ottone 2022-08-07 11:21:52 -04:00 committed by GitHub
commit 65d8e9b084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_z_move.c
View File

@ -212,7 +212,7 @@ bool32 IsViableZMove(u8 battlerId, u16 move)
if (move != MOVE_NONE && zMove != MOVE_Z_STATUS && gBattleMoves[move].type == ItemId_GetSecondaryId(item)) if (move != MOVE_NONE && zMove != MOVE_Z_STATUS && gBattleMoves[move].type == ItemId_GetSecondaryId(item))
{ {
if (IS_MOVE_STATUS(gBattleMoves[move].split)) if (IS_MOVE_STATUS(move))
gBattleStruct->zmove.chosenZMove = move; gBattleStruct->zmove.chosenZMove = move;
else else
gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battlerId); gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battlerId);