diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-31 00:40:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 00:40:45 -0500 |
| commit | ec85c01e7c6d15060eddcc653db33a4b317646d2 (patch) | |
| tree | 4266c43bcdc1c80c52def44e1470182d3f1c665c /data/battle_anim_scripts.s | |
| parent | 093610b46e99b517a416ccd5a572054dff09801b (diff) | |
| parent | 0c74e2097ffbe8395d6f3659c2a49fc829d69b99 (diff) | |
Merge branch 'master' into doc-factscreen
Diffstat (limited to 'data/battle_anim_scripts.s')
| -rw-r--r-- | data/battle_anim_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f7aac71e8..b4bb33993 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -416,7 +416,7 @@ gBattleAnims_Special:: .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON .4byte Special_BallThrow @ B_ANIM_BALL_THROW - .4byte Special_SafariBallThrow @ B_ANIM_SAFARI_BALL_THROW + .4byte Special_BallThrowWithTrainer @ B_ANIM_BALL_THROW_WITH_TRAINER .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE @@ -10738,7 +10738,7 @@ BallThrowTrainerBlock: blendoff goto BallThrowEnd -Special_SafariBallThrow: +Special_BallThrowWithTrainer: createvisualtask AnimTask_LoadBallGfx, 2 delay 0 createvisualtask AnimTask_ThrowBall_StandingTrainer, 2 |