From eb0f0b7ce8d4c0db372fa7acf71610b1b0690fda Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Wed, 1 Sep 2021 21:32:07 +1200 Subject: [PATCH] Fix Sucker Punch vs Protect moves Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects. --- src/battle_script_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 4ba55668e..ae5e30cb0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1452,7 +1452,8 @@ static void Cmd_attackcanceler(void) } else if (IsBattlerProtected(gBattlerTarget, gCurrentMove) && (gCurrentMove != MOVE_CURSE || IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) - && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)))) + && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))) + && gBattleMoves[gCurrentMove].effect != EFFECT_SUCKER_PUNCH) { if (gBattleMoves[gCurrentMove].flags & FLAG_MAKES_CONTACT) gDisableStructs[gBattlerAttacker].touchedProtectLike = 1;