diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a2184db6a600..a103fc34a1cb 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1734,6 +1734,7 @@ BattleScript_EffectHitSwitchTarget:: tryfaintmon BS_TARGET jumpiffainted BS_TARGET, TRUE, BattleScript_MoveEnd jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut + jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_MoveEnd jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted jumpiftargetdynamaxed BattleScript_HitSwitchTargetDynamaxed tryhitswitchtarget BattleScript_MoveEnd @@ -2680,12 +2681,11 @@ BattleScript_EffectHealBlock:: BattleScript_EffectHitEscape:: call BattleScript_EffectHit_Ret jumpifmovehadnoeffect BattleScript_MoveEnd - jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_MoveEnd tryfaintmon BS_TARGET moveendto MOVEEND_ATTACKER_VISIBLE moveendfrom MOVEEND_TARGET_VISIBLE jumpifbattleend BattleScript_HitEscapeEnd - jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd + jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_HitEscapeEnd jumpifemergencyexited BS_TARGET, BattleScript_HitEscapeEnd goto BattleScript_MoveSwitch BattleScript_HitEscapeEnd: