UTurn Battle Arena no switchin

This commit is contained in:
DizzyEggg 2020-07-08 17:38:28 +02:00
parent fc510a6b44
commit c93ab64e46

View file

@ -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