From 3d90bc25d49820e0ae12e9f330a7c8b0949e6d4d Mon Sep 17 00:00:00 2001 From: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:57:24 +0100 Subject: [PATCH 1/2] Removes incorrect activation of Guard Dog --- data/battle_scripts_1.s | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a2184db6a600..c01d721ab2b6 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2680,12 +2680,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: From a99c6d41626d75b6b00c245432e0512435d0b526 Mon Sep 17 00:00:00 2001 From: PhallenTree <168426989+PhallenTree@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:08:22 +0100 Subject: [PATCH 2/2] Adds Guard Dog check on Dragon Tail, Circle Throw --- data/battle_scripts_1.s | 1 + 1 file changed, 1 insertion(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index c01d721ab2b6..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