summaryrefslogtreecommitdiff
path: root/src/battle/anim/note_scatter_2.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/note_scatter_2.c
parent2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff)
parentce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff)
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/battle/anim/note_scatter_2.c')
-rw-r--r--src/battle/anim/note_scatter_2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c
index 524c51c08..262afb8bf 100644
--- a/src/battle/anim/note_scatter_2.c
+++ b/src/battle/anim/note_scatter_2.c
@@ -32,14 +32,14 @@ void sub_80CEE60(struct Sprite* sprite)
sprite->data[2] = a + sprite->data[1];
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = sprite->data[3] - 40;
- obj_translate_based_on_private_1_2_3_4(sprite);
+ InitAnimSpriteTranslationDeltas(sprite);
sprite->data[5] = gBattleAnimArgs[3];
sprite->callback = sub_80CEEE8;
}
void sub_80CEEE8(struct Sprite* sprite)
{
- if (sub_8078B5C(sprite) == 0)
+ if (TranslateAnimSpriteByDeltas(sprite) == 0)
{
s16 a;
a = Sin(sprite->data[5], 8);