summaryrefslogtreecommitdiff
path: root/src/battle/anim/aurora.c
diff options
context:
space:
mode:
authorgarakmon <thomastaps194@comcast.net>2018-07-07 21:29:11 -0400
committergarakmon <thomastaps194@comcast.net>2018-07-07 21:29:11 -0400
commit864a69f9bf050eaaa062c8346cd6a5032e617139 (patch)
treebd8b133710c813b11becf602067495526c849b6a /src/battle/anim/aurora.c
parent47bcba3e1b5140cef7f04edcda3759818408726a (diff)
merge conflicts are soooooooooo fun
Diffstat (limited to 'src/battle/anim/aurora.c')
-rw-r--r--src/battle/anim/aurora.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
index 5aff17f48..c17748440 100644
--- a/src/battle/anim/aurora.c
+++ b/src/battle/anim/aurora.c
@@ -68,7 +68,7 @@ void sub_80D33B4(struct Sprite *sprite)
sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + r6;
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
- InitAnimSpriteTranslationDeltas(sprite);
+ InitAnimLinearTranslation(sprite);
sprite->callback = sub_80D344C;
sprite->affineAnimPaused = TRUE;
sprite->callback(sprite);
@@ -81,7 +81,7 @@ static void sub_80D344C(struct Sprite *sprite)
StartSpriteAnim(sprite, 1);
sprite->affineAnimPaused = FALSE;
}
- if (TranslateAnimSpriteByDeltas(sprite) != 0)
+ if (TranslateAnimLinear(sprite) != 0)
DestroyAnimSprite(sprite);
}