Merge pull request #1404 from GriffinRichards/doc-animeff1

Label more unused battle anims

8 files changed, 246 insertions, 238 deletions

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 03dc75daf..9901aa5dd 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -16,7 +16,12 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
-EWRAM_DATA s16 gUnknown_0203A0F8[4] = {0};
+struct {
+    s16 startX;
+    s16 startY;
+    s16 targetX;
+    s16 targetY;
+} static EWRAM_DATA sFrenzyPlantRootData = {0}; // Debug? Written to but never read.
 
 static void AnimMovePowderParticle(struct Sprite *);
 static void AnimMovePowderParticle_Step(struct Sprite *);
@@ -65,14 +70,14 @@ static void AnimFlyingParticle(struct Sprite *);
 static void AnimFlyingParticle_Step(struct Sprite *);
 static void AnimNeedleArmSpike(struct Sprite *);
 static void AnimNeedleArmSpike_Step(struct Sprite *);
-static void sub_81009F8(struct Sprite *);
+static void AnimSlidingHit(struct Sprite *);
 static void AnimWhipHit(struct Sprite *);
-static void sub_8100A94(struct Sprite *);
+static void AnimFlickeringPunch(struct Sprite *);
 static void AnimCuttingSlice(struct Sprite *);
 static void AnimAirCutterSlice(struct Sprite *);
 static void AnimSlice_Step(struct Sprite *);
-static void sub_8100E1C(struct Sprite *);
-static void sub_8100E80(struct Sprite *);
+static void AnimCirclingMusicNote(struct Sprite *);
+static void AnimCirclingMusicNote_Step(struct Sprite *);
 static void AnimProtect(struct Sprite *);
 static void AnimProtect_Step(struct Sprite *);
 static void AnimMilkBottle(struct Sprite *);
@@ -80,8 +85,8 @@ static void AnimMilkBottle_Step1(struct Sprite *);
 static void AnimMilkBottle_Step2(struct Sprite *, int, int);
 static void AnimGrantingStars(struct Sprite *);
 static void AnimSparkingStars(struct Sprite *);
-static void sub_8101440(struct Sprite *);
-static void sub_81014A0(struct Sprite *);
+static void AnimBubbleBurst(struct Sprite *);
+static void AnimBubbleBurst_Step(struct Sprite *);
 static void AnimSleepLetterZ(struct Sprite *);
 static void AnimSleepLetterZ_Step(struct Sprite *);
 static void AnimLockOnTarget(struct Sprite *);
@@ -99,8 +104,8 @@ static void AnimBowMon_Step2(struct Sprite *);
 static void AnimBowMon_Step3(struct Sprite *);
 static void AnimBowMon_Step4(struct Sprite *);
 static void AnimBowMon_Step3_Callback(struct Sprite *);
-static void sub_8101B90(struct Sprite *);
-static void sub_8101BA0(struct Sprite *);
+static void AnimTipMon(struct Sprite *);
+static void AnimTipMon_Step(struct Sprite *);
 static void AnimSlashSlice(struct Sprite *);
 static void AnimFalseSwipeSlice(struct Sprite *);
 static void AnimFalseSwipeSlice_Step1(struct Sprite *);
@@ -571,7 +576,7 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate =
     .callback = AnimTranslateLinearSingleSineWave,
 };
 
-const union AnimCmd gConstrictBindingAnimCmds1[] =
+static const union AnimCmd sAnim_ConstrictBinding[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(32, 4),
@@ -580,7 +585,7 @@ const union AnimCmd gConstrictBindingAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gConstrictBindingAnimCmds2[] =
+static const union AnimCmd sAnim_ConstrictBinding_Flipped[] =
 {
     ANIMCMD_FRAME(0,  4, .hFlip = TRUE),
     ANIMCMD_FRAME(32, 4, .hFlip = TRUE),
@@ -589,29 +594,29 @@ const union AnimCmd gConstrictBindingAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gConstrictBindingAnimTable[] =
+static const union AnimCmd *const sAnims_ConstrictBinding[] =
 {
-    gConstrictBindingAnimCmds1,
-    gConstrictBindingAnimCmds2,
+    sAnim_ConstrictBinding,
+    sAnim_ConstrictBinding_Flipped,
 };
 
-const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = {
+static const union AffineAnimCmd sAffineAnim_ConstrictBinding[] = {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(-11, 0, 0, 6),
     AFFINEANIMCMD_FRAME(11, 0, 0, 6),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = {
+static const union AffineAnimCmd sAffineAnim_ConstrictBinding_Flipped[] = {
     AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(11, 0, 0, 6),
     AFFINEANIMCMD_FRAME(-11, 0, 0, 6),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gConstrictBindingAffineAnimTable[] = {
-    gConstrictBindingAffineAnimCmds1,
-    gConstrictBindingAffineAnimCmds2,
+static const union AffineAnimCmd *const sAffineAnims_ConstrictBinding[] = {
+    sAffineAnim_ConstrictBinding,
+    sAffineAnim_ConstrictBinding_Flipped,
 };
 
 const struct SpriteTemplate gConstrictBindingSpriteTemplate =
@@ -619,9 +624,9 @@ const struct SpriteTemplate gConstrictBindingSpriteTemplate =
     .tileTag = ANIM_TAG_TENDRILS,
     .paletteTag = ANIM_TAG_TENDRILS,
     .oam = &gOamData_AffineNormal_ObjNormal_64x32,
-    .anims = gConstrictBindingAnimTable,
+    .anims = sAnims_ConstrictBinding,
     .images = NULL,
-    .affineAnims = gConstrictBindingAffineAnimTable,
+    .affineAnims = sAffineAnims_ConstrictBinding,
     .callback = AnimConstrictBinding,
 };
 
@@ -1060,7 +1065,7 @@ const struct SpriteTemplate gNeedleArmSpikeSpriteTemplate =
     .callback = AnimNeedleArmSpike,
 };
 
-const union AnimCmd gWhipAnimCmds1[] =
+static const union AnimCmd sAnim_Whip[] =
 {
     ANIMCMD_FRAME(64, 3),
     ANIMCMD_FRAME(80, 3),
@@ -1069,7 +1074,7 @@ const union AnimCmd gWhipAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gWhipAnimCmds2[] =
+static const union AnimCmd sAnim_Whip_Flipped[] =
 {
     ANIMCMD_FRAME(64, 3, .hFlip = TRUE),
     ANIMCMD_FRAME(80, 3, .hFlip = TRUE),
@@ -1078,10 +1083,10 @@ const union AnimCmd gWhipAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gWhipAnimTable[] =
+static const union AnimCmd *const sAnims_Whip[] =
 {
-    gWhipAnimCmds1,
-    gWhipAnimCmds2,
+    sAnim_Whip,
+    sAnim_Whip_Flipped,
 };
 
 const struct SpriteTemplate gSlamHitSpriteTemplate =
@@ -1089,7 +1094,7 @@ const struct SpriteTemplate gSlamHitSpriteTemplate =
     .tileTag = ANIM_TAG_SLAM_HIT,
     .paletteTag = ANIM_TAG_SLAM_HIT,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gWhipAnimTable,
+    .anims = sAnims_Whip,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimWhipHit,
@@ -1100,13 +1105,13 @@ const struct SpriteTemplate gVineWhipSpriteTemplate =
     .tileTag = ANIM_TAG_WHIP_HIT,
     .paletteTag = ANIM_TAG_WHIP_HIT,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gWhipAnimTable,
+    .anims = sAnims_Whip,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimWhipHit,
 };
 
-const union AnimCmd gUnknown_08592900[] =
+static const union AnimCmd sAnim_SlidingHit[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -1116,96 +1121,96 @@ const union AnimCmd gUnknown_08592900[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_08592918[] =
+static const union AnimCmd *const sAnims_SlidingHit[] =
 {
-    gUnknown_08592900,
+    sAnim_SlidingHit,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_0859291C =
+static const struct SpriteTemplate sSlidingHit1SpriteTemplate =
 {
     .tileTag = ANIM_TAG_HIT,
     .paletteTag = ANIM_TAG_HIT,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gUnknown_08592918,
+    .anims = sAnims_SlidingHit,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_81009F8,
+    .callback = AnimSlidingHit,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_08592934 =
+static const struct SpriteTemplate sSlidingHit2SpriteTemplate =
 {
     .tileTag = ANIM_TAG_HIT_2,
     .paletteTag = ANIM_TAG_HIT_2,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gUnknown_08592918,
+    .anims = sAnims_SlidingHit,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_81009F8,
+    .callback = AnimSlidingHit,
 };
 
-const union AffineAnimCmd gUnknown_0859294C[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_Normal[] = {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_0859295C[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedTopLeft[] = {
     AFFINEANIMCMD_FRAME(256, 256, 32, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_0859296C[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedLeft[] = {
     AFFINEANIMCMD_FRAME(256, 256, 64, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_0859297C[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedBottomLeft[] = {
     AFFINEANIMCMD_FRAME(256, 256, 96, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_0859298C[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_UpsideDown[] = {
     AFFINEANIMCMD_FRAME(256, 256, -128, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_0859299C[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedBottomRight[] = {
     AFFINEANIMCMD_FRAME(256, 256, -96, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_085929AC[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedRight[] = {
     AFFINEANIMCMD_FRAME(256, 256, -64, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_085929BC[] = {
+static const union AffineAnimCmd sAffineAnim_FlickeringPunch_TurnedTopRight[] = {
     AFFINEANIMCMD_FRAME(256, 256, -32, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gUnknown_085929CC[] = {
-    gUnknown_0859294C,
-    gUnknown_0859295C,
-    gUnknown_0859296C,
-    gUnknown_0859297C,
-    gUnknown_0859298C,
-    gUnknown_0859299C,
-    gUnknown_085929AC,
-    gUnknown_085929BC,
+static const union AffineAnimCmd *const sAffineAnims_FlickeringPunch[] = {
+    sAffineAnim_FlickeringPunch_Normal,
+    sAffineAnim_FlickeringPunch_TurnedTopLeft,
+    sAffineAnim_FlickeringPunch_TurnedLeft,
+    sAffineAnim_FlickeringPunch_TurnedBottomLeft,
+    sAffineAnim_FlickeringPunch_UpsideDown,
+    sAffineAnim_FlickeringPunch_TurnedBottomRight,
+    sAffineAnim_FlickeringPunch_TurnedRight,
+    sAffineAnim_FlickeringPunch_TurnedTopRight,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_085929EC =
+static const struct SpriteTemplate sFlickeringPunchSpriteTemplate =
 {
     .tileTag = ANIM_TAG_HANDS_AND_FEET,
     .paletteTag = ANIM_TAG_HANDS_AND_FEET,
     .oam = &gOamData_AffineNormal_ObjNormal_32x32,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gUnknown_085929CC,
-    .callback = sub_8100A94,
+    .affineAnims = sAffineAnims_FlickeringPunch,
+    .callback = AnimFlickeringPunch,
 };
 
 const union AnimCmd gCuttingSliceAnimCmds[] =
@@ -1244,90 +1249,90 @@ const struct SpriteTemplate gAirCutterSliceSpriteTemplate =
     .callback = AnimAirCutterSlice,
 };
 
-const union AnimCmd gUnknown_08592A4C[] =
+static const union AnimCmd sAnim_CirclingMusicNote_Eighth[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A54[] =
+static const union AnimCmd sAnim_CirclingMusicNote_BeamedEighth[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A5C[] =
+static const union AnimCmd sAnim_CirclingMusicNote_SlantedBeamedEighth[] =
 {
     ANIMCMD_FRAME(8, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A64[] =
+static const union AnimCmd sAnim_CirclingMusicNote_Quarter[] =
 {
     ANIMCMD_FRAME(12, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A6C[] =
+static const union AnimCmd sAnim_CirclingMusicNote_QuarterRest[] =
 {
     ANIMCMD_FRAME(16, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A74[] =
+static const union AnimCmd sAnim_CirclingMusicNote_EighthRest[] =
 {
     ANIMCMD_FRAME(20, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A7C[] =
+static const union AnimCmd sAnim_CirclingMusicNote_Eighth_Flipped[] =
 {
     ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A84[] =
+static const union AnimCmd sAnim_CirclingMusicNote_BeamedEighth_Flipped[] =
 {
     ANIMCMD_FRAME(4, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A8C[] =
+static const union AnimCmd sAnim_CirclingMusicNote_SlantedBeamedEighth_Flipped[] =
 {
     ANIMCMD_FRAME(8, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592A94[] =
+static const union AnimCmd sAnim_CirclingMusicNote_Quarter_Flipped[] =
 {
     ANIMCMD_FRAME(12, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_08592A9C[] =
+static const union AnimCmd *const sAnims_CirclingMusicNote[] =
 {
-    gUnknown_08592A4C,
-    gUnknown_08592A54,
-    gUnknown_08592A5C,
-    gUnknown_08592A64,
-    gUnknown_08592A6C,
-    gUnknown_08592A74,
-    gUnknown_08592A7C,
-    gUnknown_08592A84,
-    gUnknown_08592A8C,
-    gUnknown_08592A94,
+    sAnim_CirclingMusicNote_Eighth,
+    sAnim_CirclingMusicNote_BeamedEighth,
+    sAnim_CirclingMusicNote_SlantedBeamedEighth,
+    sAnim_CirclingMusicNote_Quarter,
+    sAnim_CirclingMusicNote_QuarterRest,
+    sAnim_CirclingMusicNote_EighthRest,
+    sAnim_CirclingMusicNote_Eighth_Flipped,
+    sAnim_CirclingMusicNote_BeamedEighth_Flipped,
+    sAnim_CirclingMusicNote_SlantedBeamedEighth_Flipped,
+    sAnim_CirclingMusicNote_Quarter_Flipped,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_08592AC4 =
+static const struct SpriteTemplate sCirclingMusicNoteSpriteTemplate =
 {
     .tileTag = ANIM_TAG_MUSIC_NOTES,
     .paletteTag = ANIM_TAG_MUSIC_NOTES,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = gUnknown_08592A9C,
+    .anims = sAnims_CirclingMusicNote,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8100E1C,
+    .callback = AnimCirclingMusicNote,
 };
 
 const struct SpriteTemplate gProtectSpriteTemplate =
@@ -1414,7 +1419,7 @@ const struct SpriteTemplate gSparklingStarsSpriteTemplate =
     .callback = AnimSparkingStars,
 };
 
-const union AnimCmd gUnknown_08592BAC[] =
+static const union AnimCmd sAnim_BubbleBurst[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(4, 10),
@@ -1427,7 +1432,7 @@ const union AnimCmd gUnknown_08592BAC[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08592BD0[] =
+static const union AnimCmd sAnim_BubbleBurst_Flipped[] =
 {
     ANIMCMD_FRAME(0, 10, .hFlip = TRUE),
     ANIMCMD_FRAME(4, 10, .hFlip = TRUE),
@@ -1440,22 +1445,22 @@ const union AnimCmd gUnknown_08592BD0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_08592BF4[] =
+static const union AnimCmd *const sAnims_BubbleBurst[] =
 {
-    gUnknown_08592BAC,
-    gUnknown_08592BD0,
+    sAnim_BubbleBurst,
+    sAnim_BubbleBurst_Flipped,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_08592BFC =
+static const struct SpriteTemplate sBubbleBurstSpriteTemplate =
 {
     .tileTag = ANIM_TAG_BUBBLE_BURST,
     .paletteTag = ANIM_TAG_BUBBLE_BURST,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = gUnknown_08592BF4,
+    .anims = sAnims_BubbleBurst,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8101440,
+    .callback = AnimBubbleBurst,
 };
 
 const union AnimCmd gSleepLetterZAnimCmds[] =
@@ -1556,7 +1561,8 @@ const struct SpriteTemplate gBowMonSpriteTemplate =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_08592CF0 =
+// Same as BowMon above but without backing up
+static const struct SpriteTemplate sTipMonSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -1564,7 +1570,7 @@ const struct SpriteTemplate gUnknown_08592CF0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8101B90,
+    .callback = AnimTipMon,
 };
 
 const union AnimCmd gSlashSliceAnimCmds1[] =
@@ -2684,9 +2690,9 @@ static void AnimTranslateLinearSingleSineWave_Step(struct Sprite* sprite)
             destroy = TRUE;
     }
 
-    if (sprite->pos1.x + sprite->pos2.x > 256
+    if (sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 16
      || sprite->pos1.x + sprite->pos2.x < -16
-     || sprite->pos1.y + sprite->pos2.y > 160
+     || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
      || sprite->pos1.y + sprite->pos2.y < -16)
         destroy = TRUE;
 
@@ -2940,10 +2946,10 @@ static void AnimFrenzyPlantRoot(struct Sprite *sprite)
     StartSpriteAnim(sprite, gBattleAnimArgs[4]);
     sprite->data[2] = gBattleAnimArgs[5];
     sprite->callback = AnimRootFlickerOut;
-    gUnknown_0203A0F8[0] = sprite->pos1.x;
-    gUnknown_0203A0F8[1] = sprite->pos1.y;
-    gUnknown_0203A0F8[2] = targetX;
-    gUnknown_0203A0F8[3] = targetY;
+    sFrenzyPlantRootData.startX = sprite->pos1.x;
+    sFrenzyPlantRootData.startY = sprite->pos1.y;
+    sFrenzyPlantRootData.targetX = targetX;
+    sFrenzyPlantRootData.targetY = targetY;
 }
 
 static void AnimRootFlickerOut(struct Sprite* sprite)
@@ -2979,7 +2985,7 @@ static void AnimIngrainOrb(struct Sprite* sprite)
         DestroyAnimSprite(sprite);
 }
 
-static void sub_80FF9B8(struct Sprite* sprite, s16 c)
+static void InitItemBagData(struct Sprite* sprite, s16 c)
 {
     int a = (sprite->pos1.x << 8) | sprite->pos1.y;
     int b = (sprite->data[6] << 8) | sprite->data[7];
@@ -3005,7 +3011,7 @@ bool8 moveAlongLinearPath(struct Sprite* sprite)
     if (xEndPos == 0)
         xEndPos = -32;
     else if (xEndPos == 255)
-        xEndPos = 272;
+        xEndPos = DISPLAY_WIDTH + 32;
 
     yEndPos_2 = yEndPos - yStartPos;
     r0 = xEndPos - xStartPos;
@@ -3059,14 +3065,14 @@ static void AnimPresent(struct Sprite* sprite)
     {
         sprite->data[6] = targetX;
         sprite->data[7] = targetY + 10;
-        sub_80FF9B8(sprite, 60);
+        InitItemBagData(sprite, 60);
         sprite->data[3] = 1;
     }
     else
     {
         sprite->data[6] = targetX;
         sprite->data[7] = targetY + 10;
-        sub_80FF9B8(sprite, 60);
+        InitItemBagData(sprite, 60);
         sprite->data[3] = 3;
     }
 
@@ -3101,7 +3107,7 @@ static void AnimKnockOffItem(struct Sprite* sprite)
     {
         sprite->data[6] = 0;
         sprite->data[7] = targetY + 10;
-        sub_80FF9B8(sprite, 40);
+        InitItemBagData(sprite, 40);
         sprite->data[3] = 3;
         sprite->data[4] = 60;
         sprite->callback = AnimItemSteal_Step1;
@@ -3113,7 +3119,7 @@ static void AnimKnockOffItem(struct Sprite* sprite)
         if (IsContest())
             sprite->data[6] = 0;
 
-        sub_80FF9B8(sprite, 40);
+        InitItemBagData(sprite, 40);
         sprite->data[3] = 3;
         sprite->data[4] = 60;
         sprite->callback = AnimKnockOffOpponentsItem;
@@ -3150,14 +3156,14 @@ static void AnimItemSteal(struct Sprite* sprite)
     {
         sprite->data[6] = attackerX;
         sprite->data[7] = attackerY + 10;
-        sub_80FF9B8(sprite, 60);
+        InitItemBagData(sprite, 60);
         sprite->data[3] = 1;
     }
     else
     {
         sprite->data[6] = attackerX;
         sprite->data[7] = attackerY + 10;
-        sub_80FF9B8(sprite, 60);
+        InitItemBagData(sprite, 60);
         sprite->data[3] = 3;
     }
 
@@ -3737,7 +3743,7 @@ static void AnimWhipHit_WaitEnd(struct Sprite* sprite)
         DestroyAnimSprite(sprite);
 }
 
-static void sub_81009F8(struct Sprite* sprite)
+static void AnimSlidingHit(struct Sprite* sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
@@ -3764,7 +3770,7 @@ static void AnimWhipHit(struct Sprite* sprite)
     sprite->pos1.y += gBattleAnimArgs[1];
 }
 
-static void sub_8100A94(struct Sprite* sprite)
+static void AnimFlickeringPunch(struct Sprite* sprite)
 {
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += gBattleAnimArgs[1];
@@ -3879,7 +3885,7 @@ static void AnimSlice_Step(struct Sprite* sprite)
     }
 }
 
-void unref_sub_8100D38(struct Sprite* sprite)
+static void UnusedFlickerAnim(struct Sprite* sprite)
 {
     if (sprite->data[2] > 1)
     {
@@ -3912,7 +3918,7 @@ void unref_sub_8100D38(struct Sprite* sprite)
     }
 }
 
-static void sub_8100E1C(struct Sprite* sprite)
+static void AnimCirclingMusicNote(struct Sprite* sprite)
 {
     sprite->data[0] = gBattleAnimArgs[2];
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -3924,11 +3930,11 @@ static void sub_8100E1C(struct Sprite* sprite)
     sprite->data[1] = -gBattleAnimArgs[3];
     sprite->pos1.y += gBattleAnimArgs[1];
     sprite->data[3] = gBattleAnimArgs[4];
-    sprite->callback = sub_8100E80;
+    sprite->callback = AnimCirclingMusicNote_Step;
     sprite->callback(sprite);
 }
 
-static void sub_8100E80(struct Sprite* sprite)
+static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
 {
     sprite->pos2.x = Cos(sprite->data[0], 100);
     sprite->pos2.y = Sin(sprite->data[0], 20);
@@ -3938,7 +3944,7 @@ static void sub_8100E80(struct Sprite* sprite)
         sprite->subpriority = 14;
 
     sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
-    sprite->data[5] += 0x82;
+    sprite->data[5] += 130;
     sprite->pos2.y += sprite->data[5] >> 8;
     sprite->data[2]++;
     if (sprite->data[2] == sprite->data[3])
@@ -4169,7 +4175,7 @@ static void AnimSparkingStars(struct Sprite* sprite)
     sprite->callback = TranslateSpriteLinearFixedPoint;
 }
 
-static void sub_8101440(struct Sprite* sprite)
+static void AnimBubbleBurst(struct Sprite* sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
@@ -4184,10 +4190,10 @@ static void sub_8101440(struct Sprite* sprite)
         StartSpriteAnim(sprite, 1);
     }
 
-    sprite->callback = sub_81014A0;
+    sprite->callback = AnimBubbleBurst_Step;
 }
 
-static void sub_81014A0(struct Sprite* sprite)
+static void AnimBubbleBurst_Step(struct Sprite* sprite)
 {
     if (++sprite->data[0] > 30)
     {
@@ -4511,13 +4517,13 @@ static void AnimBowMon_Step4(struct Sprite* sprite)
     DestroyAnimSprite(sprite);
 }
 
-static void sub_8101B90(struct Sprite *sprite)
+static void AnimTipMon(struct Sprite *sprite)
 {
     sprite->data[0] = 0;
-    sprite->callback = sub_8101BA0;
+    sprite->callback = AnimTipMon_Step;
 }
 
-static void sub_8101BA0(struct Sprite *sprite)
+static void AnimTipMon_Step(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -4912,22 +4918,24 @@ void AnimTask_Conversion2AlphaBlend(u8 taskId)
     }
 }
 
-void unref_sub_8102434(u8 taskId)
+// Unused
+static void AnimTask_HideBattlersHealthbox(u8 taskId)
 {
     u8 i;
     for (i = 0; i < gBattlersCount; i++)
     {
-        if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == B_SIDE_PLAYER)
+        if (gBattleAnimArgs[0] == TRUE && GetBattlerSide(i) == B_SIDE_PLAYER)
             SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]);
 
-        if (gBattleAnimArgs[1] == 1 && GetBattlerSide(i) == B_SIDE_OPPONENT)
+        if (gBattleAnimArgs[1] == TRUE && GetBattlerSide(i) == B_SIDE_OPPONENT)
             SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]);
     }
 
     DestroyAnimVisualTask(taskId);
 }
 
-void unref_sub_81024A8(u8 taskId)
+// Unused
+static void AnimTask_ShowBattlersHealthbox(u8 taskId)
 {
     u8 i;
     for (i = 0; i < gBattlersCount; i++)
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 8142624a2..3a04c8c46 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -16,13 +16,13 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
-static void sub_8103448(struct Sprite *);
-static void sub_8103498(struct Sprite *);
-static void sub_81034D8(struct Sprite *);
-static void sub_810358C(struct Sprite *);
-static void sub_8103620(struct Sprite *);
-static void sub_8103658(struct Sprite *);
-static void sub_8103680(struct Sprite *);
+static void AnimCirclingFinger(struct Sprite *);
+static void AnimBouncingMusicNote(struct Sprite *);
+static void AnimBouncingMusicNote_Step(struct Sprite *);
+static void AnimVibrateBattlerBack(struct Sprite *);
+static void AnimMovingClamp(struct Sprite *);
+static void AnimMovingClamp_Step(struct Sprite *);
+static void AnimMovingClamp_End(struct Sprite *);
 static void AnimKinesisZapEnergy(struct Sprite *);
 static void AnimSwordsDanceBlade(struct Sprite *);
 static void AnimSwordsDanceBlade_Step(struct Sprite *);
@@ -30,8 +30,8 @@ static void AnimSonicBoomProjectile(struct Sprite *);
 static void AnimAirWaveProjectile(struct Sprite *);
 static void AnimAirWaveProjectile_Step1(struct Sprite *sprite);
 static void AnimAirWaveProjectile_Step2(struct Sprite *sprite);
-static void sub_8103FE8(struct Sprite *);
-static void sub_8104018(struct Sprite *);
+static void AnimVoidLines(struct Sprite *);
+static void AnimVoidLines_Step(struct Sprite *);
 static void AnimCoinThrow(struct Sprite *);
 static void AnimFallingCoin(struct Sprite *);
 static void AnimFallingCoin_Step(struct Sprite *);
@@ -109,7 +109,7 @@ static void AnimTask_ScaryFace_Step(u8);
 static void AnimTask_UproarDistortion_Step(u8);
 
 // Unused
-const struct SpriteTemplate gUnknown_08593264 =
+static const struct SpriteTemplate sCirclingFingerSpriteTemplate =
 {
     .tileTag = ANIM_TAG_FINGER,
     .paletteTag = ANIM_TAG_FINGER,
@@ -117,23 +117,23 @@ const struct SpriteTemplate gUnknown_08593264 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8103448,
+    .callback = AnimCirclingFinger,
 };
 
-const union AnimCmd gUnknown_0859327C[] =
+static const union AnimCmd sAnim_BouncingMusicNote[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-// Unused
-const union AnimCmd *const gUnknown_08593284[] =
+// Unused (association assumed)
+static const union AnimCmd *const sAnims_BouncingMusicNote[] =
 {
-    gUnknown_0859327C,
+    sAnim_BouncingMusicNote,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_08593288 =
+static const struct SpriteTemplate sBouncingMusicNoteSpriteTemplate =
 {
     .tileTag = ANIM_TAG_MUSIC_NOTES,
     .paletteTag = ANIM_TAG_MUSIC_NOTES,
@@ -141,11 +141,11 @@ const struct SpriteTemplate gUnknown_08593288 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8103498,
+    .callback = AnimBouncingMusicNote,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_085932A0 =
+static const struct SpriteTemplate sVibrateBattlerBackSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -153,11 +153,11 @@ const struct SpriteTemplate gUnknown_085932A0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_810358C,
+    .callback = AnimVibrateBattlerBack,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_085932B8 =
+static const struct SpriteTemplate sMovingClampSpriteTemplate =
 {
     .tileTag = ANIM_TAG_CLAMP,
     .paletteTag = ANIM_TAG_CLAMP,
@@ -165,10 +165,10 @@ const struct SpriteTemplate gUnknown_085932B8 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gAffineAnims_Bite,
-    .callback = sub_8103620,
+    .callback = AnimMovingClamp,
 };
 
-const union AnimCmd gUnknown_085932D0[] =
+static const union AnimCmd sAnim_SmallExplosion[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(16, 3),
@@ -177,32 +177,32 @@ const union AnimCmd gUnknown_085932D0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_085932E4[] =
+static const union AnimCmd *const sAnims_SmallExplosion[] =
 {
-    gUnknown_085932D0,
+    sAnim_SmallExplosion,
 };
 
-const union AffineAnimCmd gUnknown_085932E8[] =
+static const union AffineAnimCmd sAffineAnim_SmallExplosion[] =
 {
     AFFINEANIMCMD_FRAME(0x50, 0x50, 0, 0),
     AFFINEANIMCMD_FRAME(0x9, 0x9, 0, 18),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gUnknown_08593300[] =
+static const union AffineAnimCmd *const sAffineAnims_SmallExplosion[] =
 {
-    gUnknown_085932E8,
+    sAffineAnim_SmallExplosion,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_08593304 =
+static const struct SpriteTemplate sSmallExplosionSpriteTemplate =
 {
     .tileTag = ANIM_TAG_EXPLOSION_6,
     .paletteTag = ANIM_TAG_EXPLOSION_6,
     .oam = &gOamData_AffineNormal_ObjNormal_32x32,
-    .anims = gUnknown_085932E4,
+    .anims = sAnims_SmallExplosion,
     .images = NULL,
-    .affineAnims = gUnknown_08593300,
+    .affineAnims = sAffineAnims_SmallExplosion,
     .callback = AnimSpriteOnMonPos,
 };
 
@@ -366,7 +366,7 @@ const struct SpriteTemplate gEggThrowSpriteTemplate =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_085934A0 =
+static const struct SpriteTemplate sVoidLinesSpriteTemplate =
 {
     .tileTag = ANIM_TAG_VOID_LINES,
     .paletteTag = ANIM_TAG_VOID_LINES,
@@ -374,7 +374,7 @@ const struct SpriteTemplate gUnknown_085934A0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8103FE8,
+    .callback = AnimVoidLines,
 };
 
 const union AnimCmd gCoinAnimCmds[] =
@@ -1096,7 +1096,7 @@ const struct SpriteTemplate gDevilSpriteTemplate =
     .callback = AnimDevil,
 };
 
-const union AnimCmd gUnknown_08593B08[] =
+static const union AnimCmd sAnim_FurySwipes[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -1105,7 +1105,7 @@ const union AnimCmd gUnknown_08593B08[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08593B1C[] =
+static const union AnimCmd sAnim_FurySwipes_Flipped[] =
 {
     ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -1114,10 +1114,10 @@ const union AnimCmd gUnknown_08593B1C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFurySwipesAnimTable[] =
+static const union AnimCmd *const sAnims_FurySwipes[] =
 {
-    gUnknown_08593B08,
-    gUnknown_08593B1C,
+    sAnim_FurySwipes,
+    sAnim_FurySwipes_Flipped,
 };
 
 const struct SpriteTemplate gFurySwipesSpriteTemplate =
@@ -1125,7 +1125,7 @@ const struct SpriteTemplate gFurySwipesSpriteTemplate =
     .tileTag = ANIM_TAG_SWIPE,
     .paletteTag = ANIM_TAG_SWIPE,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gFurySwipesAnimTable,
+    .anims = sAnims_FurySwipes,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimFurySwipes,
@@ -1262,7 +1262,7 @@ const struct SpriteTemplate gGuardRingSpriteTemplate =
     .callback = AnimGuardRing,
 };
 
-static void sub_8103448(struct Sprite *sprite)
+static void AnimCirclingFinger(struct Sprite *sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
@@ -1276,7 +1276,7 @@ static void sub_8103448(struct Sprite *sprite)
     sprite->callback(sprite);
 }
 
-static void sub_8103498(struct Sprite *sprite)
+static void AnimBouncingMusicNote(struct Sprite *sprite)
 {
     u8 battler;
     if (gBattleAnimArgs[0] == 0)
@@ -1287,10 +1287,10 @@ static void sub_8103498(struct Sprite *sprite)
     SetSpriteNextToMonHead(battler, sprite);
     sprite->data[0] = 0;
     sprite->data[1] = 0;
-    sprite->callback = sub_81034D8;
+    sprite->callback = AnimBouncingMusicNote_Step;
 }
 
-static void sub_81034D8(struct Sprite *sprite)
+static void AnimBouncingMusicNote_Step(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -1311,7 +1311,7 @@ static void sub_81034D8(struct Sprite *sprite)
     }
 }
 
-static void sub_810353C(struct Sprite *sprite)
+static void AnimVibrateBattlerBack_Step(struct Sprite *sprite)
 {
     s16 temp;
     gSprites[sprite->data[2]].pos2.x += sprite->data[1];
@@ -1326,7 +1326,7 @@ static void sub_810353C(struct Sprite *sprite)
     sprite->data[0]--;
 }
 
-static void sub_810358C(struct Sprite *sprite)
+static void AnimVibrateBattlerBack(struct Sprite *sprite)
 {
     u8 spriteId;
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
@@ -1341,30 +1341,30 @@ static void sub_810358C(struct Sprite *sprite)
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = spriteId;
-    sprite->callback = sub_810353C;
+    sprite->callback = AnimVibrateBattlerBack_Step;
     sprite->invisible = TRUE;
 }
 
-static void sub_8103620(struct Sprite *sprite)
+static void AnimMovingClamp(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[4];
     sprite->callback = WaitAnimForDuration;
-    StoreSpriteCallbackInData6(sprite, sub_8103658);
+    StoreSpriteCallbackInData6(sprite, AnimMovingClamp_Step);
 }
 
-static void sub_8103658(struct Sprite *sprite)
+static void AnimMovingClamp_Step(struct Sprite *sprite)
 {
     sprite->data[0] = sprite->data[1];
     sprite->data[2] = sprite->pos1.x;
     sprite->data[4] = sprite->pos1.y + 15;
     sprite->callback = StartAnimLinearTranslation;
-    StoreSpriteCallbackInData6(sprite, sub_8103680);
+    StoreSpriteCallbackInData6(sprite, AnimMovingClamp_End);
 }
 
-static void sub_8103680(struct Sprite *sprite)
+static void AnimMovingClamp_End(struct Sprite *sprite)
 {
     if (sprite->data[5] == 0)
         DestroyAnimSprite(sprite);
@@ -1738,14 +1738,14 @@ void AnimTask_AirCutterProjectile(u8 taskId)
     gTasks[taskId].func = AirCutterProjectileStep1;
 }
 
-static void sub_8103FE8(struct Sprite *sprite)
+static void AnimVoidLines(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, FALSE);
-    sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(gUnknown_085934A0.paletteTag) << 4);
-    sprite->callback = sub_8104018;
+    sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(sVoidLinesSpriteTemplate.paletteTag) << 4);
+    sprite->callback = AnimVoidLines_Step;
 }
 
-static void sub_8104018(struct Sprite *sprite)
+static void AnimVoidLines_Step(struct Sprite *sprite)
 {
     u16 id, val;
     int i;
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 0c56c6bca..67452fe90 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -91,7 +91,7 @@ static void AnimMeteorMashStar(struct Sprite *);
 static void AnimMeteorMashStar_Step(struct Sprite *sprite);
 static void AnimBlockX(struct Sprite *);
 static void AnimBlockX_Step(struct Sprite *);
-static void sub_815FE80(struct Sprite *);
+static void AnimUnusedItemBagSteal(struct Sprite *);
 static void AnimKnockOffStrike(struct Sprite *);
 static void AnimKnockOffStrike_Step(struct Sprite *sprite);
 static void AnimRecycle(struct Sprite *);
@@ -432,7 +432,7 @@ const struct SpriteTemplate gRapidSpinSpriteTemplate =
     .callback = AnimRapidSpin,
 };
 
-const union AffineAnimCmd gUnknown_085CE2A0[] =
+static const union AffineAnimCmd sAffineAnims_Torment[] =
 {
     AFFINEANIMCMD_FRAME(-12, 8, 0, 4),
     AFFINEANIMCMD_FRAME(20, -20, 0, 4),
@@ -718,7 +718,7 @@ const struct SpriteTemplate gSweetScentPetalSpriteTemplate =
     .callback = AnimSweetScentPetal,
 };
 
-const u16 gUnknown_085CE55C[] = INCBIN_U16("graphics/unknown/unknown_85CE55C.gbapal");
+static const u16 sUnusedPalette[] = INCBIN_U16("graphics/battle_anims/unused.gbapal");
 
 const union AnimCmd gPainSplitAnimCmds[] =
 {
@@ -1071,7 +1071,7 @@ const struct SpriteTemplate gMeteorMashStarSpriteTemplate =
     .callback = AnimMeteorMashStar,
 };
 
-const struct SpriteTemplate gUnknown_085CE8F4 =
+static const struct SpriteTemplate sUnusedStarBurstSpriteTemplate =
 {
     .tileTag = ANIM_TAG_GOLD_STARS,
     .paletteTag = ANIM_TAG_GOLD_STARS,
@@ -1093,7 +1093,7 @@ const struct SpriteTemplate gBlockXSpriteTemplate =
     .callback = AnimBlockX,
 };
 
-const struct SpriteTemplate gUnknown_085CE924 =
+static const struct SpriteTemplate sUnusedItemBagStealSpriteTemplate =
 {
     .tileTag = ANIM_TAG_ITEM_BAG,
     .paletteTag = ANIM_TAG_ITEM_BAG,
@@ -1101,7 +1101,7 @@ const struct SpriteTemplate gUnknown_085CE924 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_815FE80,
+    .callback = AnimUnusedItemBagSteal,
 };
 
 const union AnimCmd gKnockOffStrikeAnimCmds[] =
@@ -1944,7 +1944,7 @@ static void TormentAttacker_Step(u8 taskId)
             task->data[5] -= 6;
         }
 
-        PrepareAffineAnimInTaskData(task, task->data[15], gUnknown_085CE2A0);
+        PrepareAffineAnimInTaskData(task, task->data[15], sAffineAnims_Torment);
         task->data[1]++;
         task->data[0] = 1;
         break;
@@ -3580,7 +3580,7 @@ static void AnimSmokeBallEscapeCloud(struct Sprite *sprite)
     sprite->callback = DestroyAnimSpriteAfterTimer;
 }
 
-static void sub_815D8D8(u8 taskId)
+static void AnimTask_SlideMonForFocusBand_Step2(u8 taskId)
 {
     u16 var0 = 0;
     u16 var1 = 0;
@@ -3630,7 +3630,7 @@ static void sub_815D8D8(u8 taskId)
     }
 }
 
-static void sub_815DA20(u8 taskId)
+static void AnimTask_SlideMonForFocusBand_Step1(u8 taskId)
 {
     u16 var0 = 0;
     u16 var1 = 0;
@@ -3679,7 +3679,7 @@ static void sub_815DA20(u8 taskId)
     {
         gTasks[taskId].data[0] = 30;
         gTasks[taskId].data[13] = 0;
-        gTasks[taskId].func = sub_815D8D8;
+        gTasks[taskId].func = AnimTask_SlideMonForFocusBand_Step2;
     }
 }
 
@@ -3714,7 +3714,7 @@ void AnimTask_SlideMonForFocusBand(u8 taskId)
     gTasks[taskId].data[7] = 0;
     gTasks[taskId].data[4] = gBattleAnimArgs[4];
     gTasks[taskId].data[5] = gBattleAnimArgs[5];
-    gTasks[taskId].func = sub_815DA20;
+    gTasks[taskId].func = AnimTask_SlideMonForFocusBand_Step1;
 }
 
 // Squishes the mon vertically and emits sweat droplets a few times.
@@ -4737,7 +4737,7 @@ void AnimTask_MonToSubstitute(u8 taskId)
             StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], 0);
         }
 
-        for (i = 0; i < 16; i++)
+        for (i = 0; i < NUM_TASK_DATA; i++)
             gTasks[taskId].data[i] = 0;
 
         gTasks[taskId].func = AnimTask_MonToSubstituteDoll;
@@ -5143,7 +5143,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
     }
 }
 
-static void sub_815FE80(struct Sprite *sprite)
+static void AnimUnusedItemBagSteal(struct Sprite *sprite)
 {
     switch (sprite->data[7])
     {
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c
index bd6a494c8..5955d203e 100644
--- a/src/battle_anim_flying.c
+++ b/src/battle_anim_flying.c
@@ -290,7 +290,7 @@ const struct SpriteTemplate gDiveBallSpriteTemplate =
     .callback = AnimDiveBall,
 };
 
-static const union AffineAnimCmd sAnim_Unused_085964A8[] =
+static const union AffineAnimCmd sAnim_Unused[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x0, 0, 0),
     AFFINEANIMCMD_FRAME(0x0, 0x20, 0, 12),
@@ -299,9 +299,9 @@ static const union AffineAnimCmd sAnim_Unused_085964A8[] =
 };
 
 // Unused
-static const union AffineAnimCmd *const sAnims_Unused_085964C8[] =
+static const union AffineAnimCmd *const sAnims_Unused[] =
 {
-    sAnim_Unused_085964A8,
+    sAnim_Unused,
 };
 
 const struct SpriteTemplate gDiveWaterSplashSpriteTemplate =
diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c
index 2e4a2318d..4b253a7ec 100644
--- a/src/battle_anim_ghost.c
+++ b/src/battle_anim_ghost.c
@@ -39,8 +39,8 @@ static void AnimGhostStatusSprite(struct Sprite *);
 static void AnimGhostStatusSprite_Step(struct Sprite *);
 static void AnimTask_GrudgeFlames_Step(u8 taskId);
 static void AnimGrudgeFlame(struct Sprite *);
-static void AnimUnused_8112F60(struct Sprite *);
-static void AnimUnused_8112F60_Step(struct Sprite *);
+static void AnimMonMoveCircular(struct Sprite *);
+static void AnimMonMoveCircular_Step(struct Sprite *);
 
 static const union AffineAnimCmd sAffineAnim_ConfuseRayBallBounce[] =
 {
@@ -124,16 +124,16 @@ const struct SpriteTemplate gLickSpriteTemplate =
     .callback = AnimLick,
 };
 
-static const union AffineAnimCmd sAnim_Unused_08596DA4[] =
+static const union AffineAnimCmd sAffineAnim_Unused[] =
 {
     AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
     AFFINEANIMCMD_END,
 };
 
 // Unused
-static const union AffineAnimCmd *const gAnims_Unused_08596DB4[] =
+static const union AffineAnimCmd *const sAffineAnims_Unused[] =
 {
-    sAnim_Unused_08596DA4,
+    sAffineAnim_Unused,
 };
 
 const struct SpriteTemplate gDestinyBondWhiteShadowSpriteTemplate =
@@ -206,7 +206,7 @@ const struct SpriteTemplate gGrudgeFlameSpriteTemplate =
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_08596E48 =
+static const struct SpriteTemplate sMonMoveCircularSpriteTemplate =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -214,7 +214,7 @@ const struct SpriteTemplate gUnusedSpriteTemplate_08596E48 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_8112F60,
+    .callback = AnimMonMoveCircular,
 };
 
 static void AnimConfuseRayBallBounce(struct Sprite *sprite)
@@ -1302,7 +1302,7 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
     }
 }
 
-static void AnimUnused_8112F60(struct Sprite *sprite)
+static void AnimMonMoveCircular(struct Sprite *sprite)
 {
     sprite->invisible = TRUE;
     sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker];
@@ -1310,12 +1310,12 @@ static void AnimUnused_8112F60(struct Sprite *sprite)
     sprite->data[1] = 10;
     sprite->data[2] = gBattleAnimArgs[0];
     sprite->data[3] = gBattleAnimArgs[1];
-    sprite->callback = AnimUnused_8112F60_Step;
+    sprite->callback = AnimMonMoveCircular_Step;
 
     gSprites[sprite->data[5]].pos1.y += 8;
 }
 
-static void AnimUnused_8112F60_Step(struct Sprite *sprite)
+static void AnimMonMoveCircular_Step(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c
index 659cd0cb8..b97ccf9cd 100644
--- a/src/battle_anim_ice.c
+++ b/src/battle_anim_ice.c
@@ -49,16 +49,16 @@ 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 sAnim_Unused_08595A48[] =
+static const union AnimCmd sAnim_Unused[] =
 {
     ANIMCMD_FRAME(0, 5, .hFlip = TRUE),
     ANIMCMD_FRAME(1, 5, .hFlip = TRUE),
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const sAnims_Unused_08595A54[] =
+static const union AnimCmd *const sAnims_Unused[] =
 {
-    sAnim_Unused_08595A48,
+    sAnim_Unused,
 };
 
 // Unused
diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c
index 60ec5b083..9be56880a 100644
--- a/src/battle_anim_normal.c
+++ b/src/battle_anim_normal.c
@@ -12,7 +12,7 @@ static void AnimSimplePaletteBlend_Step(struct Sprite *);
 static void AnimComplexPaletteBlend(struct Sprite *);
 static void AnimComplexPaletteBlend_Step1(struct Sprite *);
 static void AnimComplexPaletteBlend_Step2(struct Sprite *);
-static void AnimUnused_81159B4(struct Sprite *);
+static void AnimCirclingSparkle(struct Sprite *);
 static void AnimShakeMonOrBattleTerrain(struct Sprite *);
 static void AnimShakeMonOrBattleTerrain_Step(struct Sprite *);
 static void AnimShakeMonOrBattleTerrain_UpdateCoordOffsetEnabled(void);
@@ -92,7 +92,7 @@ const struct SpriteTemplate gComplexPaletteBlendSpriteTemplate =
     .callback = AnimComplexPaletteBlend,
 };
 
-static const union AnimCmd sAnim_Unused_085972A4[] =
+static const union AnimCmd sAnim_CirclingSparkle[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -102,21 +102,21 @@ static const union AnimCmd sAnim_Unused_085972A4[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const sAnims_Unused_085972BC[] =
+static const union AnimCmd *const sAnims_CirclingSparkle[] =
 {
-    sAnim_Unused_085972A4,
+    sAnim_CirclingSparkle,
 };
 
 // Unused
-const struct SpriteTemplate gUnusedSpriteTemplate_085972C0 =
+static const struct SpriteTemplate sCirclingSparkleSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SPARKLE_4,
     .paletteTag = ANIM_TAG_SPARKLE_4,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = sAnims_Unused_085972BC,
+    .anims = sAnims_CirclingSparkle,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_81159B4,
+    .callback = AnimCirclingSparkle,
 };
 
 const struct SpriteTemplate gShakeMonOrTerrainSpriteTemplate =
@@ -398,7 +398,7 @@ static void AnimComplexPaletteBlend_Step2(struct Sprite *sprite)
     }
 }
 
-static void AnimUnused_81159B4(struct Sprite *sprite)
+static void AnimCirclingSparkle(struct Sprite *sprite)
 {
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += gBattleAnimArgs[1];
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index 9221116ba..e7ef05673 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -17,14 +17,14 @@ extern const u8 *const gBattleAnims_StatusConditions[];
 extern const struct OamData gOamData_AffineOff_ObjNormal_8x8;
 extern const struct OamData gOamData_AffineOff_ObjBlend_64x64;
 
-static void UnusedTask_80A9DB4(u8 taskId);
+static void Task_UpdateFlashingCircleImpacts(u8 taskId);
 static void AnimTask_FrozenIceCube_Step1(u8 taskId);
 static void AnimTask_FrozenIceCube_Step2(u8 taskId);
 static void AnimTask_FrozenIceCube_Step3(u8 taskId);
 static void AnimTask_FrozenIceCube_Step4(u8 taskId);
 static void Task_DoStatusAnimation(u8 taskId);
-static void AnimUnused_80A9E44(struct Sprite *sprite);
-static void AnimUnused_80A9E44_Step(struct Sprite *sprite);
+static void AnimFlashingCircleImpact(struct Sprite *sprite);
+static void AnimFlashingCircleImpact_Step(struct Sprite *sprite);
 
 static const union AnimCmd sAnim_Unused_853EDE4[] =
 {
@@ -259,7 +259,7 @@ static const struct SpriteTemplate gFrozenIceCubeSpriteTemplate =
     .callback = SpriteCallbackDummy,
 };
 
-static const struct SpriteTemplate gUnusedSpriteTemplate_0853EF60 =
+static const struct SpriteTemplate sFlashingCircleImpactSpriteTemplate =
 {
     .tileTag = ANIM_TAG_CIRCLE_IMPACT,
     .paletteTag = ANIM_TAG_CIRCLE_IMPACT,
@@ -267,31 +267,31 @@ static const struct SpriteTemplate gUnusedSpriteTemplate_0853EF60 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = AnimUnused_80A9E44,
+    .callback = AnimFlashingCircleImpact,
 };
 
 // Unused
-u8 Unused_80A9C70(u8 battlerId, bool8 b)
+static u8 Task_FlashingCircleImpacts(u8 battlerId, bool8 red)
 {
     u8 battlerSpriteId = gBattlerSpriteIds[battlerId];
-    u8 taskId = CreateTask(UnusedTask_80A9DB4, 10);
-    u8 spriteId2;
+    u8 taskId = CreateTask(Task_UpdateFlashingCircleImpacts, 10);
+    u8 spriteId;
     u8 i;
 
     LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]);
     LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]);
     gTasks[taskId].data[0] = battlerId;
-    if (b)
+    if (red)
     {
         gTasks[taskId].data[1] = RGB_RED;
         for (i = 0; i < 10; i++)
         {
-            spriteId2 = CreateSprite(&gUnusedSpriteTemplate_0853EF60, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0);
-            gSprites[spriteId2].data[0] = i * 51;
-            gSprites[spriteId2].data[1] = -256;
-            gSprites[spriteId2].invisible = TRUE;
+            spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0);
+            gSprites[spriteId].data[0] = i * 51;
+            gSprites[spriteId].data[1] = -256;
+            gSprites[spriteId].invisible = TRUE;
             if (i > 4)
-                gSprites[spriteId2].data[6] = 21;
+                gSprites[spriteId].data[6] = 21;
         }
     }
     else
@@ -299,19 +299,19 @@ u8 Unused_80A9C70(u8 battlerId, bool8 b)
         gTasks[taskId].data[1] = RGB_BLUE;
         for (i = 0; i < 10; i++)
         {
-            spriteId2 = CreateSprite(&gUnusedSpriteTemplate_0853EF60, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0);
-            gSprites[spriteId2].data[0] = i * 51;
-            gSprites[spriteId2].data[1] = 256;
-            gSprites[spriteId2].invisible = TRUE;
+            spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0);
+            gSprites[spriteId].data[0] = i * 51;
+            gSprites[spriteId].data[1] = 256;
+            gSprites[spriteId].invisible = TRUE;
             if (i > 4)
-                gSprites[spriteId2].data[6] = 21;
+                gSprites[spriteId].data[6] = 21;
         }
     }
-    gSprites[spriteId2].data[7] = 1;
+    gSprites[spriteId].data[7] = 1;
     return taskId;
 }
 
-static void UnusedTask_80A9DB4(u8 taskId)
+static void Task_UpdateFlashingCircleImpacts(u8 taskId)
 {
     if (gTasks[taskId].data[2] == 2)
     {
@@ -344,13 +344,13 @@ static void UnusedTask_80A9DB4(u8 taskId)
     }
 }
 
-static void AnimUnused_80A9E44(struct Sprite *sprite)
+static void AnimFlashingCircleImpact(struct Sprite *sprite)
 {
     if (sprite->data[6] == 0)
     {
         sprite->invisible = FALSE;
-        sprite->callback = AnimUnused_80A9E44_Step;
-        AnimUnused_80A9E44_Step(sprite);
+        sprite->callback = AnimFlashingCircleImpact_Step;
+        AnimFlashingCircleImpact_Step(sprite);
     }
     else
     {
@@ -358,7 +358,7 @@ static void AnimUnused_80A9E44(struct Sprite *sprite)
     }
 }
 
-static void AnimUnused_80A9E44_Step(struct Sprite *sprite)
+static void AnimFlashingCircleImpact_Step(struct Sprite *sprite)
 {
     sprite->pos2.x = Cos(sprite->data[0], 32);
     sprite->pos2.y = Sin(sprite->data[0], 8);