summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-09-04 19:44:33 -0400
committerGitHub <noreply@github.com>2020-09-04 19:44:33 -0400
commit135ed6a1623ecda72ede79a12d2a8483231da95f (patch)
tree66ee20f129d3b729b9ad557745665210f02825c8 /data
parent8324a355176b2edbc3ad4ab8aec03f3fc7eb0a8c (diff)
parentafb3472282c52746aaac52d1e361d0c9bdf31de3 (diff)
Merge pull request #1163 from GriffinRichards/doc-animthrow
Minor battle_anim_throw cleanup
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_scripts.s4
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