summaryrefslogtreecommitdiff
path: root/src/battle/anim/water.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/water.c
parent37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff)
parent62388f3bfd5b1abd9fa369628b805e683e64c302 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/battle/anim/water.c')
-rw-r--r--src/battle/anim/water.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index 4068cbe78..e6945f9b2 100644
--- a/src/battle/anim/water.c
+++ b/src/battle/anim/water.c
@@ -18,7 +18,7 @@ void sub_80D37FC(struct Sprite *sprite)
sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4];
- sprite->callback = sub_8078B34;
+ sprite->callback = StartTranslateAnimSpriteByDeltas;
StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}
@@ -30,7 +30,7 @@ void sub_80D3838(struct Sprite *sprite)
}
else
{
- sub_80787B0(sprite, 1);
+ InitAnimSpritePos(sprite, 1);
}
sprite->data[7] = gBattleAnimArgs[2];