Fixed an issue related to Pokemon animation bleeding into attack anim… (#7924)
Co-authored-by: LinathanZel <LinathanZel@github.com>
This commit is contained in:
parent
78b11bb35f
commit
65dd96a043
2
data/battle_scripts_2.s
Normal file → Executable file
2
data/battle_scripts_2.s
Normal file → Executable file
@ -212,9 +212,9 @@ BattleScript_WallyBallThrow::
|
||||
|
||||
BattleScript_ShakeBallThrow::
|
||||
animatewildpokemonafterfailedpokeball BS_TARGET
|
||||
waitstate
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
printfromtable gBallEscapeStringIds
|
||||
waitanimation
|
||||
waitmessage B_WAIT_TIME_LONG
|
||||
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
|
||||
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user