diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
tree | c8297d41af868eac80642c1f811bc009fa142099 /src/battle/anim/note_rain.c | |
parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/battle/anim/note_rain.c')
-rw-r--r-- | src/battle/anim/note_rain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c index 715462d73..44817b0a0 100644 --- a/src/battle/anim/note_rain.c +++ b/src/battle/anim/note_rain.c @@ -24,14 +24,14 @@ void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b) void sub_80D1C08(struct Sprite* sprite) { - sub_80787B0(sprite, 0); + InitAnimSpritePos(sprite, 0); if (GetBankSide(gAnimBankAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[2]; sprite->data[4] = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[3]; - sprite->callback = sub_8078B34; + sprite->callback = StartTranslateAnimSpriteByDeltas; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); } |