summaryrefslogtreecommitdiff
path: root/src/battle_anim_rock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_anim_rock.c')
-rw-r--r--src/battle_anim_rock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c
index 64a84d580..245fb43a2 100644
--- a/src/battle_anim_rock.c
+++ b/src/battle_anim_rock.c
@@ -24,7 +24,7 @@ static void AnimRockScatter_Step(struct Sprite *sprite);
static void AnimParticleInVortex(struct Sprite *);
static void AnimParticleInVortex_Step(struct Sprite *sprite);
static void AnimTask_LoadSandstormBackground_Step(u8 taskId);
-static void sub_8111214(struct Task *task);
+static void CreateRolloutDirtSprite(struct Task *task);
static u8 GetRolloutCounter(void);
static const union AnimCmd sAnim_FlyingRock_0[] =
@@ -411,7 +411,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId)
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
- GetDefaultBattleAnimBgData(&animBg);
+ GetBattleAnimBg1Data(&animBg);
AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Sandstorm, animBg.tilesOffset);
AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Sandstorm, 0);
LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, animBg.paletteId * 16, 32);
@@ -470,8 +470,8 @@ static void AnimTask_LoadSandstormBackground_Step(u8 taskId)
}
break;
case 3:
- GetDefaultBattleAnimBgData(&animBg);
- sub_80A6C68(animBg.bgId);
+ GetBattleAnimBg1Data(&animBg);
+ ClearBattleAnimBg(animBg.bgId);
gTasks[taskId].data[12]++;
break;
case 4:
@@ -659,7 +659,7 @@ static void AnimTask_Rollout_Step(u8 taskId)
if (++task->data[9] >= task->data[10])
{
task->data[9] = 0;
- sub_8111214(task);
+ CreateRolloutDirtSprite(task);
task->data[13] += task->data[14];
PlaySE12WithPanning(SE_M_DIG, task->data[13]);
}
@@ -676,7 +676,7 @@ static void AnimTask_Rollout_Step(u8 taskId)
}
}
-static void sub_8111214(struct Task *task)
+static void CreateRolloutDirtSprite(struct Task *task)
{
const struct SpriteTemplate *spriteTemplate;
int tileOffset;