summaryrefslogtreecommitdiff
path: root/src/battle/anim/flying_petals.c
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-04-07 14:19:02 -0700
committerhuderlem <huderlem@gmail.com>2019-04-07 16:36:15 -0500
commit0a16dd0df08213b58a804b0711a7fdeb79377ce6 (patch)
treee55162aca184cb88ed0e47e95a35a4b343e2c4ea /src/battle/anim/flying_petals.c
parent963d165e06f4428605fca5c1369c9f417e8e7156 (diff)
Decompile/port rest of battle_anim plus fix 1 NONMATCHING.
Diffstat (limited to 'src/battle/anim/flying_petals.c')
-rw-r--r--src/battle/anim/flying_petals.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index 4d06b994e..7c70cc158 100644
--- a/src/battle/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
@@ -139,20 +139,20 @@ void sub_80CC474(struct Sprite* sprite)
{
case 0:
sprite->pos1.y = gBattleAnimArgs[0];
- sprite->oam.priority = sub_8079ED4(bank);
+ sprite->oam.priority = GetBattlerSpriteBGPriority(bank);
break;
case 1:
sprite->pos1.y = gBattleAnimArgs[0];
- sprite->oam.priority = sub_8079ED4(bank) + 1;
+ sprite->oam.priority = GetBattlerSpriteBGPriority(bank) + 1;
break;
case 2:
sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[0];
- sprite->oam.priority = sub_8079ED4(bank);
+ sprite->oam.priority = GetBattlerSpriteBGPriority(bank);
break;
case 3:
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0];
GetAnimBattlerSpriteId(1);
- sprite->oam.priority = sub_8079ED4(bank) + 1;
+ sprite->oam.priority = GetBattlerSpriteBGPriority(bank) + 1;
break;
}
@@ -177,5 +177,5 @@ static void sub_80CC580(struct Sprite* sprite)
return;
}
- move_anim_8074EE0(sprite);
+ DestroySpriteAndMatrix(sprite);
}