From c93ab64e463b5676dfe438c78292cf25ab742e02 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 8 Jul 2020 17:38:28 +0200 Subject: [PATCH] UTurn Battle Arena no switchin --- 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 d6ea879a2..87f2f4bd8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -593,6 +593,7 @@ BattleScript_EffectPartingShotTrySpAtk: waitmessage 0x40 BattleScript_EffectPartingShotSwitch: moveendall + jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_PartingShotEnd jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_PartingShotEnd openpartyscreen 0x1, BattleScript_PartingShotEnd switchoutabilities BS_ATTACKER @@ -1981,6 +1982,7 @@ BattleScript_EffectHitEscape: moveendfrom MOVEEND_TARGET_VISIBLE jumpifbattleend BattleScript_HitEscapeEnd jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd + jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_HitEscapeEnd jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_HitEscapeEnd openpartyscreen BS_ATTACKER, BattleScript_HitEscapeEnd switchoutabilities BS_ATTACKER