Fixes Copycat issues with Z-Moves and 2 turn moves (rh-hideout#4549)

* Fixes Copycat 2-turn moves animation * Fixes Copycat being able to call Z-Moves
Pawkkie · May 29, 2024 · 1a41b3c · 1a41b3c
1 parent 13a3d75
commit 1a41b3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -2248,6 +2248,8 @@ BattleScript_EffectCopycat:
 	trycopycat BattleScript_CopycatFail
 	attackanimation
 	waitanimation
+	setbyte sB_ANIM_TURN, 0
+	setbyte sB_ANIM_TARGETS_HIT, 0
 	jumptocalledmove TRUE
 BattleScript_CopycatFail:
 	ppreduce

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
@@ -16601,7 +16601,7 @@ void BS_TryCopycat(void)
 {
     NATIVE_ARGS(const u8 *failInstr);
 
-    if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gBattleMoves[gLastUsedMove].copycatBanned)
+    if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gBattleMoves[gLastUsedMove].copycatBanned || IsZMove(gLastUsedMove))
     {
         gBattlescriptCurrInstr = cmd->failInstr;
     }