From 57c460f40a9b99a4a47851b5191a289c641998cc Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 19 Jan 2021 22:10:03 -0700 Subject: [PATCH] fix two turn moves failing on turn 1 w no target --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6c5f37a7d..cd579954f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1319,7 +1319,7 @@ static void Cmd_attackcanceler(void) } gHitMarker |= HITMARKER_OBEYS; - if (NoTargetPresent(gCurrentMove)) + if (NoTargetPresent(gCurrentMove) && (!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))) { gBattlescriptCurrInstr = BattleScript_ButItFailedAtkStringPpReduce; if (!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))