mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-26 23:54:13 +01:00
fix wrong z-move ususage
This commit is contained in:
parent
115efe7ea5
commit
30204e9953
@ -215,11 +215,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(move))
|
gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battlerId);
|
||||||
gBattleStruct->zmove.chosenZMove = move;
|
|
||||||
else
|
|
||||||
gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battlerId);
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user