summaryrefslogtreecommitdiff
path: root/src/battle/anim/sword.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-05 18:28:16 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-05 18:28:16 -0700
commitd975a85c84616155e226b2d5120aee9adcae16b5 (patch)
tree0668eb03388e9404e134e24b3dcd753f7bc47050 /src/battle/anim/sword.c
parent37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff)
parent62388f3bfd5b1abd9fa369628b805e683e64c302 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/battle/anim/sword.c')
-rw-r--r--src/battle/anim/sword.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c
index b46fe6759..3367cca07 100644
--- a/src/battle/anim/sword.c
+++ b/src/battle/anim/sword.c
@@ -15,7 +15,7 @@ static void sub_80CF6B4(struct Sprite* sprite);
void sub_80CF690(struct Sprite* sprite)
{
- sub_80787B0(sprite, 0);
+ InitAnimSpritePos(sprite, 0);
sprite->callback = sub_80785E4;
StoreSpriteCallbackInData(sprite, sub_80CF6B4);
}
@@ -25,6 +25,6 @@ void sub_80CF6B4(struct Sprite* sprite)
sprite->data[0] = 6;
sprite->data[2] = sprite->pos1.x;
sprite->data[4] = sprite->pos1.y - 32;
- sprite->callback = sub_8078B34;
+ sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}