summaryrefslogtreecommitdiff
path: root/src/battle_anim_ice.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_anim_ice.c')
-rw-r--r--src/battle_anim_ice.c68
1 files changed, 33 insertions, 35 deletions
diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c
index 4babe577a..53aa14cff 100644
--- a/src/battle_anim_ice.c
+++ b/src/battle_anim_ice.c
@@ -20,8 +20,8 @@ struct HailStruct {
s32 unk3:4;
};
-static void sub_810B6C4(struct Sprite *);
-static void sub_810B848(struct Sprite *);
+static void AnimUnused_810B6C4(struct Sprite *);
+static void AnimUnused_810B6C4_Step(struct Sprite *);
static void AnimIcePunchSwirlingParticle(struct Sprite *);
static void AnimIceBeamParticle(struct Sprite *);
static void AnimIceEffectParticle(struct Sprite *);
@@ -44,25 +44,25 @@ static void InitIceBallAnim(struct Sprite *);
static void AnimThrowIceBall(struct Sprite *);
static void InitIceBallParticle(struct Sprite *);
static void AnimIceBallParticle(struct Sprite *);
-static void AnimTask_Haze2(u8);
-static void AnimTask_OverlayFogTiles(u8);
+static void AnimTask_HazeScrollingFog_Step(u8);
+static void AnimTask_LoadMistTiles_Step(u8);
static void AnimTask_Hail2(u8);
static bool8 GenerateHailParticle(u8 hailStructId, u8 affineAnimNum, u8 taskId, u8 c);
-static const union AnimCmd gUnknown_08595A48[] =
+static const union AnimCmd sAnim_Unused_08595A48[] =
{
ANIMCMD_FRAME(0, 5, .hFlip = TRUE),
ANIMCMD_FRAME(1, 5, .hFlip = TRUE),
ANIMCMD_JUMP(0),
};
-static const union AnimCmd *const gUnknown_08595A54[] =
+static const union AnimCmd *const sAnims_Unused_08595A54[] =
{
- gUnknown_08595A48,
+ sAnim_Unused_08595A48,
};
// Unused
-const struct SpriteTemplate gUnknown_08595A58 =
+const struct SpriteTemplate gUnusedSpriteTemplate_08595A58 =
{
.tileTag = ANIM_TAG_ICE_CRYSTALS,
.paletteTag = ANIM_TAG_ICE_CRYSTALS,
@@ -70,10 +70,10 @@ const struct SpriteTemplate gUnknown_08595A58 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = sub_810B6C4,
+ .callback = AnimUnused_810B6C4,
};
-static const union AnimCmd gUnknown_08595A70[] =
+static const union AnimCmd sAnim_Unused_08595A70[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
@@ -111,9 +111,9 @@ static const union AnimCmd sAnim_SmallBubblePair[] =
};
// Unused
-static const union AnimCmd *const gUnknown_08595AA4[] =
+static const union AnimCmd *const sAnims_Unused_08595AA4[] =
{
- gUnknown_08595A70,
+ sAnim_Unused_08595A70,
};
static const union AnimCmd *const sAnims_IceCrystalLarge[] =
@@ -337,7 +337,7 @@ const struct SpriteTemplate gSmogCloudSpriteTemplate =
.callback = InitSwirlingFogAnim,
};
-static const u8 sUnknown_08595C5C[] =
+static const u8 sHazeBlendAmounts[] =
{
0, 1, 2, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 6, 7, 8, 8, 8, 9,
};
@@ -353,7 +353,7 @@ const struct SpriteTemplate gMistBallSpriteTemplate =
.callback = AnimThrowMistBall,
};
-static const u8 sUnknown_08595C88[] =
+static const u8 wMistBlendAmounts[] =
{
0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5,
};
@@ -524,7 +524,7 @@ const struct SpriteTemplate gIceBallImpactShardSpriteTemplate =
};
// Unused
-static void sub_810B6C4(struct Sprite *sprite)
+static void AnimUnused_810B6C4(struct Sprite *sprite)
{
s16 targetX, targetY, attackerX, attackerY;
@@ -560,10 +560,10 @@ static void sub_810B6C4(struct Sprite *sprite)
sub_80A64EC(sprite);
sprite->data[3] = gBattleAnimArgs[5];
sprite->data[4] = gBattleAnimArgs[6];
- sprite->callback = sub_810B848;
+ sprite->callback = AnimUnused_810B6C4_Step;
}
-static void sub_810B848(struct Sprite *sprite)
+static void AnimUnused_810B6C4_Step(struct Sprite *sprite)
{
if (sprite->data[0] != 0)
{
@@ -998,15 +998,15 @@ void AnimTask_HazeScrollingFog(u8 taskId)
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
- GetDefaultBattleAnimBgData(&animBg);
+ GetBattleAnimBg1Data(&animBg);
LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset);
AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimFogTilemap, 0);
- LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32);
+ LoadPalette(&gFogPalette, animBg.paletteId * 16, 32);
- gTasks[taskId].func = AnimTask_Haze2;
+ gTasks[taskId].func = AnimTask_HazeScrollingFog_Step;
}
-static void AnimTask_Haze2(u8 taskId)
+static void AnimTask_HazeScrollingFog_Step(u8 taskId)
{
struct BattleAnimBgData animBg;
@@ -1020,7 +1020,7 @@ static void AnimTask_Haze2(u8 taskId)
{
gTasks[taskId].data[10] = 0;
gTasks[taskId].data[9]++;
- gTasks[taskId].data[11] = sUnknown_08595C5C[gTasks[taskId].data[9]];
+ gTasks[taskId].data[11] = sHazeBlendAmounts[gTasks[taskId].data[9]];
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
if (gTasks[taskId].data[11] == 9)
@@ -1052,12 +1052,10 @@ static void AnimTask_Haze2(u8 taskId)
}
break;
case 3:
- GetDefaultBattleAnimBgData(&animBg);
- sub_80A6C68(1);
- sub_80A6C68(2);
-
+ GetBattleAnimBg1Data(&animBg);
+ ClearBattleAnimBg(1);
+ ClearBattleAnimBg(2);
gTasks[taskId].data[12]++;
-
// fall through
case 4:
if (!IsContest())
@@ -1105,16 +1103,16 @@ void AnimTask_LoadMistTiles(u8 taskId)
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
- GetDefaultBattleAnimBgData(&animBg);
+ GetBattleAnimBg1Data(&animBg);
LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset);
AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimFogTilemap, 0);
- LoadPalette(&gUnknown_083970E8, animBg.paletteId * 16, 32);
+ LoadPalette(&gFogPalette, animBg.paletteId * 16, 32);
gTasks[taskId].data[15] = -1;
- gTasks[taskId].func = AnimTask_OverlayFogTiles;
+ gTasks[taskId].func = AnimTask_LoadMistTiles_Step;
}
-static void AnimTask_OverlayFogTiles(u8 taskId)
+static void AnimTask_LoadMistTiles_Step(u8 taskId)
{
struct BattleAnimBgData animBg;
@@ -1125,7 +1123,7 @@ static void AnimTask_OverlayFogTiles(u8 taskId)
{
case 0:
gTasks[taskId].data[9] += 1;
- gTasks[taskId].data[11] = sUnknown_08595C88[gTasks[taskId].data[9]];
+ gTasks[taskId].data[11] = wMistBlendAmounts[gTasks[taskId].data[9]];
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11]));
if (gTasks[taskId].data[11] == 5)
{
@@ -1154,9 +1152,9 @@ static void AnimTask_OverlayFogTiles(u8 taskId)
}
break;
case 3:
- GetDefaultBattleAnimBgData(&animBg);
- sub_80A6C68(1);
- sub_80A6C68(2);
+ GetBattleAnimBg1Data(&animBg);
+ ClearBattleAnimBg(1);
+ ClearBattleAnimBg(2);
gTasks[taskId].data[12]++;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:42:54 +0000