diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
commit | 66367c82ef07c10957d45ce7f0f776a178454e18 (patch) | |
tree | 0dd4fcd5cce3ef14dae4fc9ae91e54c6e070eef6 /src/battle/anim/water.c | |
parent | 171dd32df8a56e1f10956be8b944cb216edb8f9d (diff) | |
parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) |
Merge remote-tracking branch 'upstream/master' into btl_attrs
Diffstat (limited to 'src/battle/anim/water.c')
-rw-r--r-- | src/battle/anim/water.c | 4 |
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]; |