summaryrefslogtreecommitdiff
path: root/src/battle/anim/guard.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-04 18:27:50 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-04 18:27:50 -0700
commit3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch)
treec8297d41af868eac80642c1f811bc009fa142099 /src/battle/anim/guard.c
parent2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff)
parentce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff)
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/battle/anim/guard.c')
-rw-r--r--src/battle/anim/guard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 254160109..211e0e841 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -15,7 +15,7 @@ void sub_80D3014(struct Sprite *sprite)
{
if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
{
- sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
sprite->pos1.y += 40;
StartSpriteAffineAnim(sprite, 1);
@@ -30,6 +30,6 @@ void sub_80D3014(struct Sprite *sprite)
sprite->data[2] = sprite->pos1.x;
sprite->data[4] = sprite->pos1.y - 72;
- sprite->callback = sub_8078B34;
+ sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}