From a42bd3f37ded9300cc4c4b9fbec079ea7e22988c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 5 Aug 2020 12:35:51 +0200
Subject: [PATCH] Fix multiple turn moves staying after hitting no target

---
 src/battle_script_commands.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 67f035cab3..69de7f4cfe 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1105,6 +1105,8 @@ static void Cmd_attackcanceler(void)
     if (NoTargetPresent(gCurrentMove))
     {
         gBattlescriptCurrInstr = BattleScript_ButItFailedAtkStringPpReduce;
+        if (!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
+            CancelMultiTurnMoves(gBattlerAttacker);
         return;
     }