Parting Shot v2

With DizzyEgg's amendment
This commit is contained in:
Papa Cancer 2019-02-09 16:05:59 +00:00 committed by GitHub
parent 62fd90caa0
commit a1be618c47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -367,14 +367,14 @@ BattleScript_EffectPartingShotTrySpAtk:
statbuffchange 0x1, BattleScript_MoveEnd statbuffchange 0x1, BattleScript_MoveEnd
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage 0x40 waitmessage 0x40
jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_MoveEnd setbyte sMOVEEND_STATE, 0x0
openpartyscreen BS_ATTACKER, BattleScript_ButItFailed moveend 0x0, 0x0
printstring STRINGID_PKMNWENTBACK jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_PartingShotEnd
openpartyscreen 0x1, BattleScript_PartingShotEnd
switchoutabilities BS_ATTACKER switchoutabilities BS_ATTACKER
waitstate waitstate
switchhandleorder BS_ATTACKER, 0x2 switchhandleorder BS_ATTACKER, 0x2
returnatktoball returntoball BS_ATTACKER
waitstate
getswitchedmondata BS_ATTACKER getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER hpthresholds BS_ATTACKER
@ -382,7 +382,8 @@ BattleScript_EffectPartingShotTrySpAtk:
switchinanim BS_ATTACKER, TRUE switchinanim BS_ATTACKER, TRUE
waitstate waitstate
switchineffects BS_ATTACKER switchineffects BS_ATTACKER
goto BattleScript_MoveEnd BattleScript_PartingShotEnd:
end
BattleScript_EffectSpAtkUpHit: BattleScript_EffectSpAtkUpHit:
setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER