From 71857f4c89aba190205af5b657238ba84a86cb77 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 29 Nov 2020 10:16:01 -0500 Subject: [PATCH] secondary id for type-z moves, fix signature z move loading --- src/battle_z_move.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index cdaf38849b..fb8025d2f5 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -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;