summaryrefslogtreecommitdiff
path: root/src/battle_anim_fire.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-13 23:32:10 -0500
committerGitHub <noreply@github.com>2021-11-13 23:32:10 -0500
commit70577e844ddcb8092ab9e55dd0dd7993f68f4122 (patch)
tree7a09999f6ac2fc2d1b36ece5ec484ec6527a201f /src/battle_anim_fire.c
parent8d18d03c791c40bad532c62f217b0f82aadec6d2 (diff)
parentf42eafc85b007cd27e90bc9a1350d589e31bda43 (diff)
Merge pull request #1548 from GriffinRichards/doc-banim
Document battle_anim_mons
Diffstat (limited to 'src/battle_anim_fire.c')
-rw-r--r--src/battle_anim_fire.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index 912391280..8ecb60713 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -472,7 +472,7 @@ static void AnimFireSpiralInward(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
- sprite->callback = TranslateSpriteInGrowingCircleOverDuration;
+ sprite->callback = TranslateSpriteInGrowingCircle;
sprite->callback(sprite);
}
@@ -665,9 +665,9 @@ static void AnimFireRing_Step1(struct Sprite *sprite)
{
sprite->data[0] = 0x19;
sprite->data[1] = sprite->x;
- sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
sprite->data[3] = sprite->y;
- sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
InitAnimLinearTranslation(sprite);
@@ -681,8 +681,8 @@ static void AnimFireRing_Step2(struct Sprite *sprite)
{
sprite->data[0] = 0;
- sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
sprite->y2 = 0;
sprite->x2 = 0;
@@ -1101,9 +1101,9 @@ static void AnimWillOWispOrb(struct Sprite *sprite)
sprite->data[0] = 256;
sprite->data[1] = sprite->x;
- sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
sprite->data[3] = sprite->y;
- sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
InitAnimLinearTranslationWithSpeed(sprite);
sprite->callback = AnimWillOWispOrb_Step;