summaryrefslogtreecommitdiff
path: root/src/battle_anim_fire.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_anim_fire.c')
-rw-r--r--src/battle_anim_fire.c90
1 files changed, 40 insertions, 50 deletions
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index 1073f10fa..c90d7f4f1 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -11,9 +11,9 @@ static void AnimFireSpiralInward(struct Sprite *);
static void AnimFireSpread(struct Sprite *);
static void AnimFirePlume(struct Sprite *);
static void AnimLargeFlame(struct Sprite *);
-static void sub_8109028(struct Sprite *);
-static void sub_8109064(struct Sprite *);
-static void sub_81090D8(struct Sprite *);
+static void AnimLargeFlame_Step(struct Sprite *);
+static void AnimUnused_8109064(struct Sprite *);
+static void AnimUnused_8109064_Step(struct Sprite *);
static void AnimSunlight(struct Sprite *);
static void AnimEmberFlare(struct Sprite *);
static void AnimBurnFlame(struct Sprite *);
@@ -162,7 +162,7 @@ const struct SpriteTemplate gFirePlumeSpriteTemplate =
};
// Unused
-const struct SpriteTemplate gUnknown_08595440 =
+const struct SpriteTemplate gUnusedSpriteTemplate_08595440 =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
@@ -173,7 +173,7 @@ const struct SpriteTemplate gUnknown_08595440 =
.callback = AnimFirePlume,
};
-static const union AnimCmd gUnknown_08595458[] =
+static const union AnimCmd sAnim_Unused_08595458[] =
{
ANIMCMD_FRAME(16, 6),
ANIMCMD_FRAME(32, 6),
@@ -181,21 +181,21 @@ static const union AnimCmd gUnknown_08595458[] =
ANIMCMD_JUMP(0),
};
-static const union AnimCmd *const gUnknown_08595468[] =
+static const union AnimCmd *const sAnims_Unused_08595468[] =
{
- gUnknown_08595458,
+ sAnim_Unused_08595458,
};
// Unused
-const struct SpriteTemplate gUnknown_0859546C =
+const struct SpriteTemplate gUnusedSpriteTemplate_0859546C =
{
.tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER,
.oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = gUnknown_08595468,
+ .anims = sAnims_Unused_08595468,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = sub_8109064,
+ .callback = AnimUnused_8109064,
};
static const union AffineAnimCmd sAffineAnim_SunlightRay[] =
@@ -292,23 +292,23 @@ static const union AnimCmd *const sAnims_FireBlastCross[] =
sAnim_FireBlastCross,
};
-static const union AffineAnimCmd gUnknown_08595544[] =
+static const union AffineAnimCmd sAnim_Unused_08595544[] =
{
AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
AFFINEANIMCMD_END,
};
-static const union AffineAnimCmd gUnknown_08595554[] =
+static const union AffineAnimCmd sAnim_Unused_08595554[] =
{
AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0),
AFFINEANIMCMD_END,
};
// Unused
-static const union AffineAnimCmd *const gUnknown_08595564[] =
+static const union AffineAnimCmd *const sAnims_Unused_08595564[] =
{
- gUnknown_08595544,
- gUnknown_08595554,
+ sAnim_Unused_08595544,
+ sAnim_Unused_08595554,
};
const struct SpriteTemplate gFireBlastCrossSpriteTemplate =
@@ -511,7 +511,7 @@ static void AnimFirePlume(struct Sprite *sprite)
sprite->data[4] = gBattleAnimArgs[3];
sprite->data[3] = gBattleAnimArgs[5];
- sprite->callback = sub_8109028;
+ sprite->callback = AnimLargeFlame_Step;
}
static void AnimLargeFlame(struct Sprite *sprite)
@@ -533,10 +533,10 @@ static void AnimLargeFlame(struct Sprite *sprite)
sprite->data[4] = gBattleAnimArgs[3];
sprite->data[3] = gBattleAnimArgs[5];
- sprite->callback = sub_8109028;
+ sprite->callback = AnimLargeFlame_Step;
}
-static void sub_8109028(struct Sprite *sprite)
+static void AnimLargeFlame_Step(struct Sprite *sprite)
{
if (++sprite->data[0] < sprite->data[4])
{
@@ -548,7 +548,7 @@ static void sub_8109028(struct Sprite *sprite)
DestroySpriteAndMatrix(sprite);
}
-static void sub_8109064(struct Sprite *sprite)
+static void AnimUnused_8109064(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
@@ -570,10 +570,10 @@ static void sub_8109064(struct Sprite *sprite)
sprite->data[4] = gBattleAnimArgs[6];
sprite->data[5] = 0;
- sprite->callback = sub_81090D8;
+ sprite->callback = AnimUnused_8109064_Step;
}
-static void sub_81090D8(struct Sprite *sprite)
+static void AnimUnused_8109064_Step(struct Sprite *sprite)
{
if (sprite->data[3])
{
@@ -611,8 +611,6 @@ static void AnimSunlight(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
-//fire 2
-
// Animates the secondary effect of MOVE_EMBER, where the flames grow and slide
// horizontally a bit.
// arg 0: initial x pixel offset
@@ -792,15 +790,14 @@ void AnimTask_EruptionLaunchRocks(u8 taskId)
task->func = AnimTask_EruptionLaunchRocks_Step;
}
-static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTION?
+static void AnimTask_EruptionLaunchRocks_Step(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
{
case 0:
- sub_80A805C(task, task->data[15], 0x100, 0x100, 0xE0, 0x200, 0x20);
-
+ PrepareEruptAnimTaskData(task, task->data[15], 0x100, 0x100, 0xE0, 0x200, 32);
task->data[0]++;
case 1:
if (++task->data[1] > 1)
@@ -813,7 +810,7 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTIO
gSprites[task->data[15]].pos2.x = -3;
}
- if (task->data[5])
+ if (task->data[5] != B_SIDE_PLAYER)
{
if (++task->data[3] > 4)
{
@@ -822,7 +819,7 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTIO
}
}
- if(!sub_80A80C8(task))
+ if(!UpdateEruptAnimTask(task))
{
SetBattlerSpriteYOffsetFromYScale(task->data[15]);
gSprites[task->data[15]].pos2.x = 0;
@@ -836,20 +833,19 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTIO
case 2:
if (++task->data[1] > 4)
{
- if (task->data[5])
- sub_80A805C(task, task->data[15], 0xE0, 0x200, 0x180, 0xF0, 0x6);
+ if (task->data[5] != B_SIDE_PLAYER)
+ PrepareEruptAnimTaskData(task, task->data[15], 0xE0, 0x200, 0x180, 0xF0, 6);
else
- sub_80A805C(task, task->data[15], 0xE0, 0x200, 0x180, 0xC0, 0x6);
+ PrepareEruptAnimTaskData(task, task->data[15], 0xE0, 0x200, 0x180, 0xC0, 6);
task->data[1] = 0;
task->data[0]++;
}
break;
case 3:
- if (!sub_80A80C8(task))
+ if (!UpdateEruptAnimTask(task))
{
CreateEruptionLaunchRocks(task->data[15], taskId, 6);
-
task->data[0]++;
}
break;
@@ -866,10 +862,10 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTIO
if (++task->data[3] > 0x18)
{
- if (task->data[5])
- sub_80A805C(task, task->data[15], 0x180, 0xF0, 0x100, 0x100, 0x8);
+ if (task->data[5] != B_SIDE_PLAYER)
+ PrepareEruptAnimTaskData(task, task->data[15], 0x180, 0xF0, 0x100, 0x100, 8);
else
- sub_80A805C(task, task->data[15], 0x180, 0xC0, 0x100, 0x100, 0x8);
+ PrepareEruptAnimTaskData(task, task->data[15], 0x180, 0xC0, 0x100, 0x100, 8);
if (task->data[2] & 1)
gSprites[task->data[15]].pos2.y -= 3;
@@ -881,14 +877,13 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTIO
}
break;
case 5:
- if (task->data[5])
+ if (task->data[5] != B_SIDE_PLAYER)
gSprites[task->data[15]].pos1.y--;
- if (!sub_80A80C8(task))
+ if (!UpdateEruptAnimTask(task))
{
gSprites[task->data[15]].pos1.y = task->data[4];
ResetSpriteRotScale(task->data[15]);
-
task->data[2] = 0;
task->data[0]++;
}
@@ -896,7 +891,6 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId) // animate Move_ERUPTIO
case 6:
if (!task->data[6])
DestroyAnimVisualTask(taskId);
-
break;
default:
break;
@@ -955,16 +949,12 @@ static void AnimEruptionLaunchRock(struct Sprite *sprite)
static u16 GetEruptionLaunchRockInitialYPos(u8 spriteId)
{
- u16 y = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
+ s16 y = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
- {
- y = ((y << 16) + 0x4A0000) >> 16;
- }
+ y += 74;
else
- {
- y = ((y << 16) + 0x2C0000) >> 16;
- }
+ y += 44;
return y;
}
@@ -1282,14 +1272,14 @@ static void AnimTask_MoveHeatWaveTargets_Step(u8 taskId)
}
}
-// Used to add a color mask to the battle interface / HUD in Heat Wave.
+// Used to add a color mask to the battle background.
// arg 0: opacity
// arg 1: color code
void AnimTask_BlendBackground(u8 taskId)
{
struct BattleAnimBgData animBg;
- sub_80A6B30(&animBg);
- BlendPalette(animBg.paletteId * 16, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor
+ GetDefaultBattleAnimBgData(&animBg);
+ BlendPalette(animBg.paletteId * 16, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]);
DestroyAnimVisualTask(taskId);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 04:57:49 +0000