Merge pull request #1401 from GriffinRichards/doc-moveanims

Label unused move anims

6 files changed, 89 insertions, 88 deletions

diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c
index 19e8c9523..c2bfe269b 100644
--- a/src/battle_anim_dark.c
+++ b/src/battle_anim_dark.c
@@ -9,24 +9,24 @@
 #include "util.h"
 #include "constants/rgb.h"
 
-static void sub_81138D4(struct Sprite *);
+static void AnimUnusedBagSteal(struct Sprite *);
+static void AnimUnusedBagSteal_Step(struct Sprite *);
 static void AnimBite(struct Sprite *);
 static void AnimTearDrop(struct Sprite *);
 static void AnimClawSlash(struct Sprite *);
 static void AnimTask_AttackerFadeToInvisible_Step(u8);
 static void AnimTask_AttackerFadeFromInvisible_Step(u8);
-static void sub_8113950(struct Sprite *);
 static void AnimBite_Step1(struct Sprite *);
 static void AnimBite_Step2(struct Sprite *);
 static void AnimTearDrop_Step(struct Sprite *);
 static void AnimTask_MoveAttackerMementoShadow_Step(u8);
 static void AnimTask_MoveTargetMementoShadow_Step(u8);
-static void sub_8114244(struct Task *);
-static void sub_8114374(u8);
+static void DoMementoShadowEffect(struct Task *);
+static void SetAllBattlersSpritePriority(u8);
 static void AnimTask_MetallicShine_Step(u8);
 
 // Unused
-const struct SpriteTemplate gUnknown_08596FC8 =
+static const struct SpriteTemplate sUnusedBagStealSpriteTemplate =
 {
     .tileTag = ANIM_TAG_TIED_BAG,
     .paletteTag = ANIM_TAG_TIED_BAG,
@@ -34,7 +34,7 @@ const struct SpriteTemplate gUnknown_08596FC8 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_81138D4,
+    .callback = AnimUnusedBagSteal,
 };
 
 static const union AffineAnimCmd sAffineAnim_Bite_0[] =
@@ -268,7 +268,7 @@ void AnimTask_InitAttackerFadeFromInvisible(u8 taskId)
     DestroyAnimVisualTask(taskId);
 }
 
-static void sub_81138D4(struct Sprite *sprite)
+static void AnimUnusedBagSteal(struct Sprite *sprite)
 {
     sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
@@ -279,11 +279,11 @@ static void sub_81138D4(struct Sprite *sprite)
     sprite->data[3] = -sprite->data[1];
     sprite->data[4] = -sprite->data[2];
     sprite->data[6] = 0xFFD8;
-    sprite->callback = sub_8113950;
+    sprite->callback = AnimUnusedBagSteal_Step;
     sprite->callback(sprite);
 }
 
-static void sub_8113950(struct Sprite *sprite)
+static void AnimUnusedBagSteal_Step(struct Sprite *sprite)
 {
     sprite->data[3] += sprite->data[1];
     sprite->data[4] += sprite->data[2];
@@ -430,7 +430,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
         scanlineParams.dmaDest = &REG_BG1VOFS;
         var0 = WINOUT_WIN01_BG1;
         if (!IsContest())
-            gBattle_BG2_X += 240;
+            gBattle_BG2_X += DISPLAY_WIDTH;
     }
     else
     {
@@ -440,7 +440,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
         scanlineParams.dmaDest = &REG_BG2VOFS;
         var0 = WINOUT_WIN01_BG2;
         if (!IsContest())
-            gBattle_BG1_X += 240;
+            gBattle_BG1_X += DISPLAY_WIDTH;
     }
 
     scanlineParams.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT;
@@ -451,7 +451,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
     task->data[0] = 0;
     task->data[1] = 0;
     task->data[2] = 0;
-    sub_8114374(3);
+    SetAllBattlersSpritePriority(3);
     for (i = 0; i < 112; i++)
     {
         gScanlineEffectRegBuffers[0][i] = task->data[10];
@@ -462,7 +462,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
     SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | (var0 ^ (WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR)));
     SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
     gBattle_WIN0H = (task->data[14] << 8) | task->data[15];
-    gBattle_WIN0V = 160;
+    gBattle_WIN0V = DISPLAY_HEIGHT;
 
     task->func = AnimTask_MoveAttackerMementoShadow_Step;
 }
@@ -496,14 +496,14 @@ static void AnimTask_MoveAttackerMementoShadow_Step(u8 taskId)
         break;
     case 1:
         task->data[4] -= 8;
-        sub_8114244(task);
+        DoMementoShadowEffect(task);
 
         if (task->data[4] < task->data[8])
             task->data[0]++;
         break;
     case 2:
         task->data[4] -= 8;
-        sub_8114244(task);
+        DoMementoShadowEffect(task);
         task->data[14] += 4;
         task->data[15] -= 4;
 
@@ -550,12 +550,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
             if (task->data[3] == 1)
             {
                 SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
-                gBattle_BG2_X += 240;
+                gBattle_BG2_X += DISPLAY_WIDTH;
             }
             else
             {
                 SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
-                gBattle_BG1_X += 240;
+                gBattle_BG1_X += DISPLAY_WIDTH;
             }
 
             task->data[0]++;
@@ -574,7 +574,7 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
             FillPalette(0, 9 * 16, 32);
         }
 
-        sub_8114374(3);
+        SetAllBattlersSpritePriority(3);
         task->data[0]++;
         break;
     case 2:
@@ -622,7 +622,7 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
 
         SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
         gBattle_WIN0H = (task->data[14] << 8) | task->data[15];
-        gBattle_WIN0V = 160;
+        gBattle_WIN0V = DISPLAY_HEIGHT;
 
         task->data[0] = 0;
         task->data[1] = 0;
@@ -644,7 +644,7 @@ static void AnimTask_MoveTargetMementoShadow_Step(u8 taskId)
         if (task->data[5] >=  task->data[7])
             task->data[5] = task->data[7];
 
-        sub_8114244(task);
+        DoMementoShadowEffect(task);
         if (task->data[5] == task->data[7])
             task->data[0]++;
         break;
@@ -664,7 +664,7 @@ static void AnimTask_MoveTargetMementoShadow_Step(u8 taskId)
         if (task->data[4] >= task->data[6])
             task->data[4] = task->data[6];
 
-        sub_8114244(task);
+        DoMementoShadowEffect(task);
         if (task->data[4] == task->data[6] && task->data[1])
         {
             task->data[1] = 0;
@@ -706,7 +706,7 @@ static void AnimTask_MoveTargetMementoShadow_Step(u8 taskId)
     }
 }
 
-static void sub_8114244(struct Task *task)
+static void DoMementoShadowEffect(struct Task *task)
 {
     int var0, var1;
     s16 var2;
@@ -757,7 +757,7 @@ static void sub_8114244(struct Task *task)
     }
 }
 
-static void sub_8114374(u8 priority)
+static void SetAllBattlersSpritePriority(u8 priority)
 {
     u16 i;
 
diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c
index 1e24f8a16..2c5c7e0f1 100644
--- a/src/battle_anim_electric.c
+++ b/src/battle_anim_electric.c
@@ -7,9 +7,9 @@
 
 static void AnimLightning(struct Sprite *);
 static void AnimLightning_Step(struct Sprite *);
-static void AnimUnused_0810A214(struct Sprite *);
-static void AnimUnused_0810A214_Step(struct Sprite *);
-static void AnimUnused_0810A274(struct Sprite *);
+static void AnimUnusedSpinningFist(struct Sprite *);
+static void AnimUnusedSpinningFist_Step(struct Sprite *);
+static void AnimUnusedCirclingShock(struct Sprite *);
 static void AnimSparkElectricity(struct Sprite *);
 static void AnimZapCannonSpark(struct Sprite *);
 static void AnimZapCannonSpark_Step(struct Sprite *);
@@ -63,7 +63,7 @@ const struct SpriteTemplate gLightningSpriteTemplate =
     .callback = AnimLightning,
 };
 
-static const union AffineAnimCmd sAnim_Unused_085956D8[] =
+static const union AffineAnimCmd sAffineAnim_UnusedSpinningFist[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 20),
@@ -71,24 +71,24 @@ static const union AffineAnimCmd sAnim_Unused_085956D8[] =
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const sAnims_Unused_085956F8[] =
+static const union AffineAnimCmd *const sAffineAnims_UnusedSpinningFist[] =
 {
-    sAnim_Unused_085956D8,
+    sAffineAnim_UnusedSpinningFist,
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_085956FC =
+static const struct SpriteTemplate sUnusedSpinningFistSpriteTemplate =
 {
     .tileTag = ANIM_TAG_HANDS_AND_FEET,
     .paletteTag = ANIM_TAG_HANDS_AND_FEET,
     .oam = &gOamData_AffineNormal_ObjNormal_32x32,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = sAnims_Unused_085956F8,
-    .callback = AnimUnused_0810A214,
+    .affineAnims = sAffineAnims_UnusedSpinningFist,
+    .callback = AnimUnusedSpinningFist,
 };
 
-static const union AnimCmd sAnim_Unused_08595714[] =
+static const union AnimCmd sAnim_UnusedCirclingShock[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(16, 5),
@@ -99,21 +99,21 @@ static const union AnimCmd sAnim_Unused_08595714[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const sAnims_Unused_08595730[] =
+static const union AnimCmd *const sAnims_UnusedCirclingShock[] =
 {
-    sAnim_Unused_08595714,
+    sAnim_UnusedCirclingShock,
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_08595734 =
+static const struct SpriteTemplate sUnusedCirclingShockSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SHOCK,
     .paletteTag = ANIM_TAG_SHOCK,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = sAnims_Unused_08595730,
+    .anims = sAnims_UnusedCirclingShock,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_0810A274,
+    .callback = AnimUnusedCirclingShock,
 };
 
 const struct SpriteTemplate gSparkElectricitySpriteTemplate =
@@ -473,23 +473,23 @@ static void AnimLightning_Step(struct Sprite *sprite)
         DestroyAnimSprite(sprite);
 }
 
-static void AnimUnused_0810A214(struct Sprite *sprite)
+static void AnimUnusedSpinningFist(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->pos1.x -= gBattleAnimArgs[0];
     else
         sprite->pos1.x += gBattleAnimArgs[0];
 
-    sprite->callback = AnimUnused_0810A214_Step;
+    sprite->callback = AnimUnusedSpinningFist_Step;
 }
 
-static void AnimUnused_0810A214_Step(struct Sprite *sprite)
+static void AnimUnusedSpinningFist_Step(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
         DestroySpriteAndMatrix(sprite);
 }
 
-static void AnimUnused_0810A274(struct Sprite *sprite)
+static void AnimUnusedCirclingShock(struct Sprite *sprite)
 {
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c
index 328f178ae..b3399901e 100644
--- a/src/battle_anim_fight.c
+++ b/src/battle_anim_fight.c
@@ -6,7 +6,7 @@
 #include "trig.h"
 #include "constants/rgb.h"
 
-static void AnimUnused_080B08A0(struct Sprite *);
+static void AnimUnusedHumanoidFoot(struct Sprite *);
 static void AnimSlideHandOrFootToTarget(struct Sprite *);
 static void AnimJumpKick(struct Sprite *);
 static void AnimBasicFistOrFoot(struct Sprite *);
@@ -40,7 +40,7 @@ static void AnimSpinningKickOrPunchFinish(struct Sprite *);
 extern struct SpriteTemplate gBasicHitSplatSpriteTemplate;
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_08595E14 =
+static const struct SpriteTemplate sUnusedHumanoidFootSpriteTemplate =
 {
     .tileTag = ANIM_TAG_HUMANOID_FOOT,
     .paletteTag = ANIM_TAG_HUMANOID_FOOT,
@@ -48,7 +48,7 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08595E14 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_080B08A0,
+    .callback = AnimUnusedHumanoidFoot,
 };
 
 static const union AnimCmd sAnim_Fist[] =
@@ -409,7 +409,7 @@ const struct SpriteTemplate gFocusPunchFistSpriteTemplate =
     .callback = AnimFocusPunchFist,
 };
 
-static void AnimUnused_080B08A0(struct Sprite *sprite)
+static void AnimUnusedHumanoidFoot(struct Sprite *sprite)
 {
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
     sprite->pos1.y += gBattleAnimArgs[1];
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index 5b43f4276..e18d72c31 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -12,8 +12,8 @@ static void AnimFireSpread(struct Sprite *);
 static void AnimFirePlume(struct Sprite *);
 static void AnimLargeFlame(struct Sprite *);
 static void AnimLargeFlame_Step(struct Sprite *);
-static void AnimUnused_8109064(struct Sprite *);
-static void AnimUnused_8109064_Step(struct Sprite *);
+static void AnimUnusedSmallEmber(struct Sprite *);
+static void AnimUnusedSmallEmber_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 gUnusedSpriteTemplate_08595440 =
+static const struct SpriteTemplate sUnusedEmberFirePlumeSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SMALL_EMBER,
     .paletteTag = ANIM_TAG_SMALL_EMBER,
@@ -173,7 +173,7 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08595440 =
     .callback = AnimFirePlume,
 };
 
-static const union AnimCmd sAnim_Unused_08595458[] =
+static const union AnimCmd sAnim_UnusedSmallEmber[] =
 {
     ANIMCMD_FRAME(16, 6),
     ANIMCMD_FRAME(32, 6),
@@ -181,21 +181,21 @@ static const union AnimCmd sAnim_Unused_08595458[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const sAnims_Unused_08595468[] =
+static const union AnimCmd *const sAnims_UnusedSmallEmber[] =
 {
-    sAnim_Unused_08595458,
+    sAnim_UnusedSmallEmber,
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_0859546C =
+static const struct SpriteTemplate sUnusedSmallEmberSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SMALL_EMBER,
     .paletteTag = ANIM_TAG_SMALL_EMBER,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = sAnims_Unused_08595468,
+    .anims = sAnims_UnusedSmallEmber,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_8109064,
+    .callback = AnimUnusedSmallEmber,
 };
 
 static const union AffineAnimCmd sAffineAnim_SunlightRay[] =
@@ -292,23 +292,23 @@ static const union AnimCmd *const sAnims_FireBlastCross[] =
     sAnim_FireBlastCross,
 };
 
-static const union AffineAnimCmd sAnim_Unused_08595544[] =
+static const union AffineAnimCmd sAffineAnim_Unused_0[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd sAnim_Unused_08595554[] =
+static const union AffineAnimCmd sAffineAnim_Unused_1[] =
 {
     AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0),
     AFFINEANIMCMD_END,
 };
 
 // Unused
-static const union AffineAnimCmd *const sAnims_Unused_08595564[] =
+static const union AffineAnimCmd *const sAffineAnims_Unused[] =
 {
-    sAnim_Unused_08595544,
-    sAnim_Unused_08595554,
+    sAffineAnim_Unused_0,
+    sAffineAnim_Unused_1,
 };
 
 const struct SpriteTemplate gFireBlastCrossSpriteTemplate =
@@ -548,7 +548,7 @@ static void AnimLargeFlame_Step(struct Sprite *sprite)
         DestroySpriteAndMatrix(sprite);
 }
 
-static void AnimUnused_8109064(struct Sprite *sprite)
+static void AnimUnusedSmallEmber(struct Sprite *sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
 
@@ -570,10 +570,10 @@ static void AnimUnused_8109064(struct Sprite *sprite)
     sprite->data[4] = gBattleAnimArgs[6];
     sprite->data[5] = 0;
 
-    sprite->callback = AnimUnused_8109064_Step;
+    sprite->callback = AnimUnusedSmallEmber_Step;
 }
 
-static void AnimUnused_8109064_Step(struct Sprite *sprite)
+static void AnimUnusedSmallEmber_Step(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c
index 060149a9e..bd6a494c8 100644
--- a/src/battle_anim_flying.c
+++ b/src/battle_anim_flying.c
@@ -20,7 +20,7 @@ static void AnimFlyBallAttack_Step(struct Sprite *);
 static void AnimFallingFeather(struct Sprite *);
 static void AnimFallingFeather_Step(struct Sprite *);
 static void AnimWhirlwindLine_Step(struct Sprite *);
-static void AnimUnused_810EA4C(struct Sprite *);
+static void AnimUnusedBubbleThrow(struct Sprite *);
 static void AnimWhirlwindLine(struct Sprite *);
 static void AnimBounceBallShrink(struct Sprite *);
 static void AnimBounceBallLand(struct Sprite *);
@@ -30,8 +30,8 @@ static void AnimDiveBall_Step2(struct Sprite *);
 static void AnimDiveWaterSplash(struct Sprite *);
 static void AnimSprayWaterDroplet(struct Sprite *);
 static void AnimSprayWaterDroplet_Step(struct Sprite *);
-static void AnimUnused_810F004(struct Sprite *);
-static void AnimUnused_810F004_Step(struct Sprite *);
+static void AnimUnusedFlashingLight(struct Sprite *);
+static void AnimUnusedFlashingLight_Step(struct Sprite *);
 static void AnimSkyAttackBird(struct Sprite *);
 static void AnimSkyAttackBird_Step(struct Sprite *);
 static void AnimTask_AnimateGustTornadoPalette_Step(u8);
@@ -180,7 +180,7 @@ const struct SpriteTemplate gFallingFeatherSpriteTemplate =
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_085963A0 =
+static const struct SpriteTemplate sUnusedBubbleThrowSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SMALL_BUBBLES,
     .paletteTag = ANIM_TAG_SMALL_BUBBLES,
@@ -188,7 +188,7 @@ const struct SpriteTemplate gUnusedSpriteTemplate_085963A0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_810EA4C,
+    .callback = AnimUnusedBubbleThrow,
 };
 
 static const union AnimCmd sAnim_WhirlwindLines[] =
@@ -327,7 +327,7 @@ const struct SpriteTemplate gSprayWaterDropletSpriteTemplate =
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_085964FC =
+static const struct SpriteTemplate sUnusedFlashingLightSpriteTemplate =
 {
     .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
     .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
@@ -335,7 +335,7 @@ const struct SpriteTemplate gUnusedSpriteTemplate_085964FC =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_810F004,
+    .callback = AnimUnusedFlashingLight,
 };
 
 const struct SpriteTemplate gSkyAttackBirdSpriteTemplate =
@@ -892,7 +892,7 @@ static void AnimFallingFeather_Step(struct Sprite *sprite)
     }
 }
 
-static void AnimUnused_810EA4C(struct Sprite *sprite)
+static void AnimUnusedBubbleThrow(struct Sprite *sprite)
 {
     sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
@@ -1158,14 +1158,14 @@ static void AnimSprayWaterDroplet_Step(struct Sprite *sprite)
         DestroyAnimSprite(sprite);
 }
 
-static void AnimUnused_810F004(struct Sprite *sprite)
+static void AnimUnusedFlashingLight(struct Sprite *sprite)
 {
     sprite->data[6] = 0;
     sprite->data[7] = 64;
-    sprite->callback = AnimUnused_810F004_Step;
+    sprite->callback = AnimUnusedFlashingLight_Step;
 }
 
-static void AnimUnused_810F004_Step(struct Sprite *sprite)
+static void AnimUnusedFlashingLight_Step(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -1220,7 +1220,8 @@ void AnimSkyAttackBird_Step(struct Sprite *sprite)
         DestroySpriteAndMatrix(sprite);
 }
 
-void AnimTask_Unused_810F184(u8 taskId)
+// Unused
+static void AnimTask_SetAttackerVisibility(u8 taskId)
 {
     if (gBattleAnimArgs[0] == 0)
     {
diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c
index 53aa14cff..659cd0cb8 100644
--- a/src/battle_anim_ice.c
+++ b/src/battle_anim_ice.c
@@ -20,8 +20,8 @@ struct HailStruct {
     s32 unk3:4;
 };
 
-static void AnimUnused_810B6C4(struct Sprite *);
-static void AnimUnused_810B6C4_Step(struct Sprite *);
+static void AnimUnusedIceCrystalThrow(struct Sprite *);
+static void AnimUnusedIceCrystalThrow_Step(struct Sprite *);
 static void AnimIcePunchSwirlingParticle(struct Sprite *);
 static void AnimIceBeamParticle(struct Sprite *);
 static void AnimIceEffectParticle(struct Sprite *);
@@ -62,7 +62,7 @@ static const union AnimCmd *const sAnims_Unused_08595A54[] =
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_08595A58 =
+static const struct SpriteTemplate sUnusedIceCrystalThrowSpriteTemplate =
 {
     .tileTag = ANIM_TAG_ICE_CRYSTALS,
     .paletteTag = ANIM_TAG_ICE_CRYSTALS,
@@ -70,10 +70,10 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08595A58 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_810B6C4,
+    .callback = AnimUnusedIceCrystalThrow,
 };
 
-static const union AnimCmd sAnim_Unused_08595A70[] =
+static const union AnimCmd sAnim_IceCrystalLargeChunk[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
@@ -110,10 +110,10 @@ static const union AnimCmd sAnim_SmallBubblePair[] =
     ANIMCMD_JUMP(0),
 };
 
-// Unused
-static const union AnimCmd *const sAnims_Unused_08595AA4[] =
+// Unused, contains just the top left corner of the large ice crystal
+static const union AnimCmd *const sAnims_IceCrystalLargeChunk[] =
 {
-    sAnim_Unused_08595A70,
+    sAnim_IceCrystalLargeChunk,
 };
 
 static const union AnimCmd *const sAnims_IceCrystalLarge[] =
@@ -524,7 +524,7 @@ const struct SpriteTemplate gIceBallImpactShardSpriteTemplate =
 };
 
 // Unused
-static void AnimUnused_810B6C4(struct Sprite *sprite)
+static void AnimUnusedIceCrystalThrow(struct Sprite *sprite)
 {
     s16 targetX, targetY, attackerX, attackerY;
 
@@ -540,13 +540,13 @@ static void AnimUnused_810B6C4(struct Sprite *sprite)
     sprite->data[4] = gBattleAnimArgs[3] + targetY;
     sub_80A64EC(sprite);
 
-    for (;(targetX >= -32 && targetX <= 272) && (targetY >= -32 && targetY <= 192);
+    for (;(targetX >= -32 && targetX <= DISPLAY_WIDTH + 32) && (targetY >= -32 && targetY <= DISPLAY_HEIGHT + 32);
            targetX += sprite->data[1], targetY += sprite->data[2])
         ;
 
     sprite->data[1] = -sprite->data[1];
     sprite->data[2] = -sprite->data[2];
-    for (;(attackerX >= -32 && attackerX <= 272) && (attackerY >= -32 && attackerY <= 192);
+    for (;(attackerX >= -32 && attackerX <= DISPLAY_WIDTH + 32) && (attackerY >= -32 && attackerY <= DISPLAY_HEIGHT + 32);
            attackerX += sprite->data[1], attackerY += sprite->data[2])
         ;
 
@@ -560,10 +560,10 @@ static void AnimUnused_810B6C4(struct Sprite *sprite)
     sub_80A64EC(sprite);
     sprite->data[3] = gBattleAnimArgs[5];
     sprite->data[4] = gBattleAnimArgs[6];
-    sprite->callback = AnimUnused_810B6C4_Step;
+    sprite->callback = AnimUnusedIceCrystalThrow_Step;
 }
 
-static void AnimUnused_810B6C4_Step(struct Sprite *sprite)
+static void AnimUnusedIceCrystalThrow_Step(struct Sprite *sprite)
 {
     if (sprite->data[0] != 0)
     {