ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

secondary id for type-z moves, fix signature z move loading

Browse Source
This commit is contained in:
Evan 2020-11-29 10:16:01 -05:00
parent 752aca7698
commit 71857f4c89
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_z_move.c
View File

@ -186,11 +186,11 @@ bool32 IsViableZMove(u8 battlerId, u16 move)
u16 zMove = GetSignatureZMove(move, gBattleMons[battlerId].species, item);
if (zMove != MOVE_NONE)
{
gBattleStruct->zmove.currZMove = MOVE_Z_SIGNATURE; //signature z move exists
gBattleStruct->zmove.currZMove = zMove; //signature z move exists
return TRUE;
}
if (move != MOVE_NONE && zMove != MOVE_Z_SIGNATURE && gBattleMoves[move].type == ItemId_GetHoldEffectParam(item))
if (move != MOVE_NONE && zMove != MOVE_Z_SIGNATURE && gBattleMoves[move].type == ItemId_GetSecondaryId(item))
{
if (gBattleMoves[move].split == SPLIT_STATUS)
gBattleStruct->zmove.currZMove = MOVE_Z_SIGNATURE;