From 2b90c0b94557d88a575f096752715d122fa33c74 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Fri, 19 Feb 2021 13:57:29 +1300 Subject: [PATCH] Fix Spiky Shield/Jump Kick bug Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield. --- data/battle_scripts_1.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b7be704299..e683265834 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -7293,6 +7293,7 @@ BattleScript_RockyHelmetActivatesDmg: return BattleScript_SpikyShieldEffect:: + jumpifabsent BS_ATTACKER, BattleScript_SpikyShieldRet orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT healthbarupdate BS_ATTACKER @@ -7300,6 +7301,7 @@ BattleScript_SpikyShieldEffect:: printstring STRINGID_PKMNHURTSWITH waitmessage 0x40 tryfaintmon BS_ATTACKER, FALSE, NULL +BattleScript_SpikyShieldRet:: return BattleScript_KingsShieldEffect::