From 1a41b3c98140049e13c4b384d1ba239d46bb3dd8 Mon Sep 17 00:00:00 2001
From: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Sat, 11 May 2024 13:16:35 +0100
Subject: [PATCH] Fixes Copycat issues with Z-Moves and 2 turn moves (#4549)

* Fixes Copycat 2-turn moves animation

* Fixes Copycat being able to call Z-Moves
---
 data/battle_scripts_1.s      | 2 ++
 src/battle_script_commands.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 1b02d835f252..178b21bb27ce 100644
--- 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
index 8178f89816b9..72b67a67f5e9 100644
--- 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;
     }