summaryrefslogtreecommitdiff
path: root/src/fire.c
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2021-03-19 14:34:58 -0400
committerKurausukun <lord.uber1@gmail.com>2021-03-19 14:34:58 -0400
commitc94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch)
treeb188427bb1942695f32e14ee3fe137855d638c8c /src/fire.c
parent0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff)
parented16a7409ae9c808a110975dec1930f9f949a6d6 (diff)
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/fire.c')
-rw-r--r--src/fire.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fire.c b/src/fire.c
index 7833620d4..3a3e6be9b 100644
--- a/src/fire.c
+++ b/src/fire.c
@@ -1016,7 +1016,7 @@ static void AnimWillOWispOrb(struct Sprite *sprite)
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
- sub_8075678(sprite);
+ BattleAnim_InitLinearTranslationWithDuration(sprite);
sprite->callback = sub_80AD690;
}
break;
@@ -1160,7 +1160,7 @@ void AnimTask_BlendBackground(u8 taskId)
{
struct BattleAnimBgData animBg;
- sub_80752A0(&animBg);
+ GetBattleAnimBg1Data(&animBg);
BlendPalette(animBg.paletteId * 16, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]);
DestroyAnimVisualTask(taskId);
}