update static declarations

7 files changed, 378 insertions, 380 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index ce20a4f01..dbaffa31b 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -59,7 +59,6 @@ static void LoadDefaultBg(void);
 static void Task_LoopAndPlaySE(u8 taskId);
 static void Task_WaitAndPlaySE(u8 taskId);
 static void sub_807331C(u8 taskId);
-static bool8 sub_807378C(u16 a);
 
 static void ScriptCmd_loadspritegfx(void);
 static void ScriptCmd_unloadspritegfx(void);
@@ -125,7 +124,6 @@ const struct OamData gOamData_AffineOff_ObjNormal_8x8 =
     .paletteNum = 0,
 };
 
-
 const struct OamData gOamData_AffineOff_ObjNormal_16x16 =
 {
     .y = 0,
@@ -2082,6 +2080,7 @@ static void ScriptCmd_waitforvisualfinish(void)
 static void ScriptCmd_hang1(void)
 {
 }
+
 static void ScriptCmd_hang2(void)
 {
 }
@@ -3281,7 +3280,7 @@ static void ScriptCmd_visible(void)
 static void ScriptCmd_doublebattle_2D(void)
 {
     u8 wantedBattler;
-    u8 r4;
+    u8 priority;
     u8 spriteId;
 
     wantedBattler = sBattleAnimScriptPtr[1];
@@ -3291,21 +3290,21 @@ static void ScriptCmd_doublebattle_2D(void)
     {
         if (wantedBattler == ANIM_ATTACKER)
         {
-            r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
+            priority = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
             spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
-            r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
+            priority = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
             spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
         if (spriteId != 0xFF)
         {
             gSprites[spriteId].invisible = FALSE;
-            if (r4 == 2)
+            if (priority == 2)
                 gSprites[spriteId].oam.priority = 3;
 
-            if (r4 == 1)
+            if (priority == 1)
                 sub_8073128(FALSE);
             else
                 sub_8073128(TRUE);
@@ -3316,7 +3315,7 @@ static void ScriptCmd_doublebattle_2D(void)
 static void ScriptCmd_doublebattle_2E(void)
 {
     u8 wantedBattler;
-    u8 r4;
+    u8 priority;
     u8 spriteId;
 
     wantedBattler = sBattleAnimScriptPtr[1];
@@ -3326,16 +3325,16 @@ static void ScriptCmd_doublebattle_2E(void)
     {
         if (wantedBattler == ANIM_ATTACKER)
         {
-            r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
+            priority = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
             spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
-            r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
+            priority = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
             spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
 
-        if (spriteId != 0xFF && r4 == 2)
+        if (spriteId != 0xFF && priority == 2)
             gSprites[spriteId].oam.priority = 2;
     }
 }
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 6c09f3a5b..da9998c2f 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -16,7 +16,7 @@
 #include "constants/songs.h"
 
 // RAM
-EWRAM_DATA s16 gUnknown_203999C[4] = {0};
+static EWRAM_DATA s16 gUnknown_203999C[4] = {0};
 
 // Function Declarations
 static void AnimMovePowderParticleStep(struct Sprite *);
@@ -93,7 +93,7 @@ static void AnimTauntFingerStep2(struct Sprite *);
 
 static const u8 gUnknown_83E2964[] = {0x02, 0x04, 0x01, 0x03};
 
-const union AnimCmd gPowderParticlesAnimCmds[] =
+static const union AnimCmd gPowderParticlesAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(2, 5),
@@ -106,7 +106,7 @@ const union AnimCmd gPowderParticlesAnimCmds[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gPowderParticlesAnimTable[] =
+static const union AnimCmd *const gPowderParticlesAnimTable[] =
 {
     gPowderParticlesAnimCmds,
 };
@@ -144,61 +144,61 @@ const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate =
     .callback = AnimMovePowderParticle,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds1[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds2[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds3[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds3[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds4[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds4[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds5[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds5[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds6[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds6[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamBigOrbAnimCmds7[] =
+static const union AnimCmd gSolarbeamBigOrbAnimCmds7[] =
 {
     ANIMCMD_FRAME(6, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSolarbeamSmallOrbAnimCms[] =
+static const union AnimCmd gSolarbeamSmallOrbAnimCms[] =
 {
     ANIMCMD_FRAME(7, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gPowerAbsorptionOrbAnimCmds[] =
+static const union AnimCmd gPowerAbsorptionOrbAnimCmds[] =
 {
     ANIMCMD_FRAME(8, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSolarbeamBigOrbAnimTable[] =
+static const union AnimCmd *const gSolarbeamBigOrbAnimTable[] =
 {
     gSolarbeamBigOrbAnimCmds1,
     gSolarbeamBigOrbAnimCmds2,
@@ -209,23 +209,23 @@ const union AnimCmd *const gSolarbeamBigOrbAnimTable[] =
     gSolarbeamBigOrbAnimCmds7,
 };
 
-const union AnimCmd *const gSolarbeamSmallOrbAnimTable[] =
+static const union AnimCmd *const gSolarbeamSmallOrbAnimTable[] =
 {
     gSolarbeamSmallOrbAnimCms,
 };
 
-const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] =
+static const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] =
 {
     gPowerAbsorptionOrbAnimCmds,
 };
 
-const union AffineAnimCmd gPowerAbsorptionOrbAffineAnimCmds[] =
+static const union AffineAnimCmd gPowerAbsorptionOrbAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-5, -5, 0, 1),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gPowerAbsorptionOrbAffineAnimTable[] =
+static const union AffineAnimCmd *const gPowerAbsorptionOrbAffineAnimTable[] =
 {
     gPowerAbsorptionOrbAffineAnimCmds,
 };
@@ -263,14 +263,14 @@ const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate =
     .callback = AnimSolarbeamSmallOrb,
 };
 
-const union AffineAnimCmd gStockpileAbsorptionOrbAffineCmds[] =
+static const union AffineAnimCmd gStockpileAbsorptionOrbAffineCmds[] =
 {
     AFFINEANIMCMD_FRAME(320, 320, 0, 0),
     AFFINEANIMCMD_FRAME(-14, -14, 0, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gStockpileAbsorptionOrbAffineAnimTable[] =
+static const union AffineAnimCmd *const gStockpileAbsorptionOrbAffineAnimTable[] =
 {
     gStockpileAbsorptionOrbAffineCmds,
 };
@@ -286,13 +286,13 @@ const struct SpriteTemplate gStockpileAbsorptionOrbSpriteTemplate =
     .callback = AnimPowerAbsorptionOrb,
 };
 
-const union AffineAnimCmd gAbsorptionOrbAffineAnimCmds[] =
+static const union AffineAnimCmd gAbsorptionOrbAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-5, -5, 0, 1),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gAbsorptionOrbAffineAnimTable[] =
+static const union AffineAnimCmd *const gAbsorptionOrbAffineAnimTable[] =
 {
     gAbsorptionOrbAffineAnimCmds,
 };
@@ -319,20 +319,20 @@ const struct SpriteTemplate gHyperBeamOrbSpriteTemplate =
     .callback = AnimHyperBeamOrb,
 };
 
-const union AnimCmd gLeechSeedAnimCmds1[] =
+static const union AnimCmd gLeechSeedAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeechSeedAnimCmds2[] =
+static const union AnimCmd gLeechSeedAnimCmds2[] =
 {
     ANIMCMD_FRAME(4, 7),
     ANIMCMD_FRAME(8, 7),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gLeechSeedAnimTable[] =
+static const union AnimCmd *const gLeechSeedAnimTable[] =
 {
     gLeechSeedAnimCmds1,
     gLeechSeedAnimCmds2,
@@ -349,19 +349,19 @@ const struct SpriteTemplate gLeechSeedSpriteTemplate =
     .callback = AnimLeechSeed,
 };
 
-const union AnimCmd gSporeParticleAnimCmds1[] =
+static const union AnimCmd gSporeParticleAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSporeParticleAnimCmds2[] =
+static const union AnimCmd gSporeParticleAnimCmds2[] =
 {
     ANIMCMD_FRAME(4, 7),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSporeParticleAnimTable[] =
+static const union AnimCmd *const gSporeParticleAnimTable[] =
 {
     gSporeParticleAnimCmds1,
     gSporeParticleAnimCmds2,
@@ -378,24 +378,24 @@ const struct SpriteTemplate gSporeParticleSpriteTemplate =
     .callback = AnimSporeParticle,
 };
 
-const union AnimCmd gPetalDanceBigFlowerAnimCmds[] =
+static const union AnimCmd gPetalDanceBigFlowerAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gPetalDanceSmallFlowerAnimCmds[] =
+static const union AnimCmd gPetalDanceSmallFlowerAnimCmds[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gPetalDanceBigFlowerAnimTable[] =
+static const union AnimCmd *const gPetalDanceBigFlowerAnimTable[] =
 {
     gPetalDanceBigFlowerAnimCmds,
 };
 
-const union AnimCmd *const gPetalDanceSmallFlowerAnimTable[] =
+static const union AnimCmd *const gPetalDanceSmallFlowerAnimTable[] =
 {
     gPetalDanceSmallFlowerAnimCmds,
 };
@@ -422,7 +422,7 @@ const struct SpriteTemplate gPetalDanceSmallFlowerSpriteTemplate =
     .callback = AnimPetalDanceSmallFlower,
 };
 
-const union AnimCmd gRazorLeafParticleAnimCmds1[] =
+static const union AnimCmd gRazorLeafParticleAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(4, 5),
@@ -437,7 +437,7 @@ const union AnimCmd gRazorLeafParticleAnimCmds1[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gRazorLeafParticleAnimCmds2[] =
+static const union AnimCmd gRazorLeafParticleAnimCmds2[] =
 {
     ANIMCMD_FRAME(24, 5),
     ANIMCMD_FRAME(28, 5),
@@ -445,7 +445,7 @@ const union AnimCmd gRazorLeafParticleAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gRazorLeafParticleAnimTable[] =
+static const union AnimCmd *const gRazorLeafParticleAnimTable[] =
 {
     gRazorLeafParticleAnimCmds1,
     gRazorLeafParticleAnimCmds2,
@@ -473,7 +473,7 @@ const struct SpriteTemplate gTwisterLeafParticleSpriteTemplate =
     .callback = AnimMoveTwisterParticle,
 };
 
-const union AnimCmd gRazorLeafCutterAnimCmds[] =
+static const union AnimCmd gRazorLeafCutterAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(0, 3, .hFlip = TRUE),
@@ -482,7 +482,7 @@ const union AnimCmd gRazorLeafCutterAnimCmds[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gRazorLeafCutterAnimTable[] =
+static const union AnimCmd *const gRazorLeafCutterAnimTable[] =
 {
     gRazorLeafCutterAnimCmds,
 };
@@ -498,13 +498,13 @@ const struct SpriteTemplate gRazorLeafCutterSpriteTemplate =
     .callback = AnimTranslateLinearSingleSineWave,
 };
 
-const union AffineAnimCmd gSwiftStarAffineAnimCmds[] = 
+static const union AffineAnimCmd gSwiftStarAffineAnimCmds[] = 
 {
     AFFINEANIMCMD_FRAME(0, 0, 0, 1),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gSwiftStarAffineAnimTable[] = 
+static const union AffineAnimCmd *const gSwiftStarAffineAnimTable[] = 
 {
     gSwiftStarAffineAnimCmds,
 };
@@ -520,7 +520,7 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate =
     .callback = AnimTranslateLinearSingleSineWave,
 };
 
-const union AnimCmd gConstrictBindingAnimCmds1[] =
+static const union AnimCmd gConstrictBindingAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(32, 4),
@@ -529,7 +529,7 @@ const union AnimCmd gConstrictBindingAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gConstrictBindingAnimCmds2[] =
+static const union AnimCmd gConstrictBindingAnimCmds2[] =
 {
     ANIMCMD_FRAME(0,  4, .hFlip = TRUE),
     ANIMCMD_FRAME(32, 4, .hFlip = TRUE),
@@ -538,13 +538,13 @@ const union AnimCmd gConstrictBindingAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gConstrictBindingAnimTable[] =
+static const union AnimCmd *const gConstrictBindingAnimTable[] =
 {
     gConstrictBindingAnimCmds1,
     gConstrictBindingAnimCmds2,
 };
 
-const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = 
+static const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = 
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(-11, 0, 0, 6),
@@ -552,7 +552,7 @@ const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = 
+static const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = 
 {
     AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(11, 0, 0, 6),
@@ -560,7 +560,7 @@ const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gConstrictBindingAffineAnimTable[] = 
+static const union AffineAnimCmd *const gConstrictBindingAffineAnimTable[] = 
 {
     gConstrictBindingAffineAnimCmds1,
     gConstrictBindingAffineAnimCmds2,
@@ -577,20 +577,20 @@ const struct SpriteTemplate gConstrictBindingSpriteTemplate =
     .callback = AnimConstrictBinding,
 };
 
-const union AffineAnimCmd gMimicOrbAffineAnimCmds1[] = 
+static const union AffineAnimCmd gMimicOrbAffineAnimCmds1[] = 
 {
     AFFINEANIMCMD_FRAME(0, 0, 0, 0),
     AFFINEANIMCMD_FRAME(48, 48, 0, 14),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gMimicOrbAffineAnimCmds2[] = 
+static const union AffineAnimCmd gMimicOrbAffineAnimCmds2[] = 
 {
     AFFINEANIMCMD_FRAME(-16, -16, 0, 1),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gMimicOrbAffineAnimTable[] = 
+static const union AffineAnimCmd *const gMimicOrbAffineAnimTable[] = 
 {
     gMimicOrbAffineAnimCmds1,
     gMimicOrbAffineAnimCmds2,
@@ -607,7 +607,7 @@ const struct SpriteTemplate gMimicOrbSpriteTemplate =
     .callback = AnimMimicOrb,
 };
 
-const union AnimCmd gIngrainRootAnimCmds1[] =
+static const union AnimCmd gIngrainRootAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(16, 7),
@@ -616,7 +616,7 @@ const union AnimCmd gIngrainRootAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gIngrainRootAnimCmds2[] =
+static const union AnimCmd gIngrainRootAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 7, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 7, .hFlip = TRUE),
@@ -625,7 +625,7 @@ const union AnimCmd gIngrainRootAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gIngrainRootAnimCmds3[] =
+static const union AnimCmd gIngrainRootAnimCmds3[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(16, 7),
@@ -633,7 +633,7 @@ const union AnimCmd gIngrainRootAnimCmds3[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gIngrainRootAnimCmds4[] =
+static const union AnimCmd gIngrainRootAnimCmds4[] =
 {
     ANIMCMD_FRAME(0, 7, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 7, .hFlip = TRUE),
@@ -641,7 +641,7 @@ const union AnimCmd gIngrainRootAnimCmds4[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gIngrainRootAnimTable[] =
+static const union AnimCmd *const gIngrainRootAnimTable[] =
 {
     gIngrainRootAnimCmds1,
     gIngrainRootAnimCmds2,
@@ -671,14 +671,14 @@ const struct SpriteTemplate gFrenzyPlantRootSpriteTemplate =
     .callback = AnimFrenzyPlantRoot,
 };
 
-const union AnimCmd gIngrainOrbAnimCmds[] =
+static const union AnimCmd gIngrainOrbAnimCmds[] =
 {
     ANIMCMD_FRAME(3, 3),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gIngrainOrbAnimTable[] =
+static const union AnimCmd *const gIngrainOrbAnimTable[] =
 {
     gIngrainOrbAnimCmds,
 };
@@ -694,18 +694,18 @@ const struct SpriteTemplate gIngrainOrbSpriteTemplate =
     .callback = AnimIngrainOrb,
 };
 
-const union AnimCmd gFallingBagAnimCmds[] =
+static const union AnimCmd gFallingBagAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFallingBagAnimTable[] =
+static const union AnimCmd *const gFallingBagAnimTable[] =
 {
     gFallingBagAnimCmds,
 };
 
-const union AffineAnimCmd gFallingBagAffineAnimCmds1[] = 
+static const union AffineAnimCmd gFallingBagAffineAnimCmds1[] = 
 {
     AFFINEANIMCMD_FRAME(0, 0, -4, 10),
     AFFINEANIMCMD_FRAME(0, 0, 4, 20),
@@ -713,7 +713,7 @@ const union AffineAnimCmd gFallingBagAffineAnimCmds1[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gFallingBagAffineAnimCmds2[] = 
+static const union AffineAnimCmd gFallingBagAffineAnimCmds2[] = 
 {
     AFFINEANIMCMD_FRAME(0, 0, -1, 2),
     AFFINEANIMCMD_FRAME(0, 0, 1, 4),
@@ -724,7 +724,7 @@ const union AffineAnimCmd gFallingBagAffineAnimCmds2[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gFallingBagAffineAnimTable[] = 
+static const union AffineAnimCmd *const gFallingBagAffineAnimTable[] = 
 {
     gFallingBagAffineAnimCmds1,
     gFallingBagAffineAnimCmds2,
@@ -752,7 +752,7 @@ const struct SpriteTemplate gKnockOffItemSpriteTemplate =
     .callback = AnimKnockOffItem,
 };
 
-const union AnimCmd gPresentHealParticleAnimCmds[] =
+static const union AnimCmd gPresentHealParticleAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(4, 4),
@@ -761,7 +761,7 @@ const union AnimCmd gPresentHealParticleAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gPresentHealParticleAnimTable[] =
+static const union AnimCmd *const gPresentHealParticleAnimTable[] =
 {
     gPresentHealParticleAnimCmds,
 };
@@ -788,13 +788,13 @@ const struct SpriteTemplate gItemStealSpriteTemplate =
     .callback = AnimItemSteal,
 };
 
-const union AffineAnimCmd gTrickBagAffineAnimCmds1[] = 
+static const union AffineAnimCmd gTrickBagAffineAnimCmds1[] = 
 {
     AFFINEANIMCMD_FRAME(0, 0, 0, 3),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gTrickBagAffineAnimCmds2[] = 
+static const union AffineAnimCmd gTrickBagAffineAnimCmds2[] = 
 {
     AFFINEANIMCMD_FRAME(0, -10, 0, 3),
     AFFINEANIMCMD_FRAME(0, -6, 0, 3),
@@ -806,7 +806,7 @@ const union AffineAnimCmd gTrickBagAffineAnimCmds2[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gTrickBagAffineAnimTable[] = 
+static const union AffineAnimCmd *const gTrickBagAffineAnimTable[] = 
 {
     gTrickBagAffineAnimCmds1,
     gTrickBagAffineAnimCmds2,
@@ -825,7 +825,7 @@ const struct SpriteTemplate gTrickBagSpriteTemplate =
     .callback = AnimTrickBag,
 };
 
-const s8 gTrickBagCoordinates[][3] =
+static const s8 gTrickBagCoordinates[][3] =
 {
     {5, 24,   1},
     {0,  4,   0},
@@ -840,49 +840,49 @@ const s8 gTrickBagCoordinates[][3] =
     {0,  0, 127},
 };
 
-const union AnimCmd gLeafBladeAnimCmds1[] =
+static const union AnimCmd gLeafBladeAnimCmds1[] =
 {
     ANIMCMD_FRAME(28, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeafBladeAnimCmds2[] =
+static const union AnimCmd gLeafBladeAnimCmds2[] =
 {
     ANIMCMD_FRAME(32, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeafBladeAnimCmds3[] =
+static const union AnimCmd gLeafBladeAnimCmds3[] =
 {
     ANIMCMD_FRAME(20, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeafBladeAnimCmds4[] =
+static const union AnimCmd gLeafBladeAnimCmds4[] =
 {
     ANIMCMD_FRAME(28, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeafBladeAnimCmds5[] =    
+static const union AnimCmd gLeafBladeAnimCmds5[] =    
 {
     ANIMCMD_FRAME(16, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeafBladeAnimCmds6[] =    
+static const union AnimCmd gLeafBladeAnimCmds6[] =    
 {
     ANIMCMD_FRAME(16, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gLeafBladeAnimCmds7[] =    
+static const union AnimCmd gLeafBladeAnimCmds7[] =    
 {
     ANIMCMD_FRAME(28, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gLeafBladeAnimTable[] =
+static const union AnimCmd *const gLeafBladeAnimTable[] =
 {
     gLeafBladeAnimCmds1,
     gLeafBladeAnimCmds2,
@@ -904,14 +904,14 @@ const struct SpriteTemplate gLeafBladeSpriteTemplate =
     .callback = SpriteCallbackDummy,
 };
 
-const union AffineAnimCmd gAromatherapyBigFlowerAffineAnimCmds[] = 
+static const union AffineAnimCmd gAromatherapyBigFlowerAffineAnimCmds[] = 
 {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, 4, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gAromatherapyBigFlowerAffineAnimTable[] = 
+static const union AffineAnimCmd *const gAromatherapyBigFlowerAffineAnimTable[] = 
 {
     gAromatherapyBigFlowerAffineAnimCmds,
 };
@@ -938,38 +938,38 @@ const struct SpriteTemplate gAromatherapyBigFlowerSpriteTemplate =
     .callback = AnimFlyingParticle,
 };
 
-const union AffineAnimCmd gSilverWindBigSparkAffineAnimCmds[] = 
+static const union AffineAnimCmd gSilverWindBigSparkAffineAnimCmds[] = 
 {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, -10, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd gSilverWindMediumSparkAffineAnimCmds[] = 
+static const union AffineAnimCmd gSilverWindMediumSparkAffineAnimCmds[] = 
 {
     AFFINEANIMCMD_FRAME(192, 192, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, -12, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd gSilverWindSmallSparkAffineAnimCmds[] = 
+static const union AffineAnimCmd gSilverWindSmallSparkAffineAnimCmds[] = 
 {
     AFFINEANIMCMD_FRAME(143, 143, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, -15, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gSilverWindBigSparkAffineAnimTable[] = 
+static const union AffineAnimCmd *const gSilverWindBigSparkAffineAnimTable[] = 
 {
     gSilverWindBigSparkAffineAnimCmds,
 };
 
-const union AffineAnimCmd *const gSilverWindMediumSparkAffineAnimTable[] = 
+static const union AffineAnimCmd *const gSilverWindMediumSparkAffineAnimTable[] = 
 {
     gSilverWindMediumSparkAffineAnimCmds,
 };
 
-const union AffineAnimCmd *const gSilverWindSmallSparkAffineAnimTable[] = 
+static const union AffineAnimCmd *const gSilverWindSmallSparkAffineAnimTable[] = 
 {
     gSilverWindSmallSparkAffineAnimCmds,
 };
@@ -1007,7 +1007,7 @@ const struct SpriteTemplate gSilverWindSmallSparkSpriteTemplate =
     .callback = AnimFlyingParticle,
 };
 
-const u16 gMagicalLeafBlendColors[] =
+static const u16 gMagicalLeafBlendColors[] =
 {
     RGB(31, 0, 0),
     RGB(31, 19, 0),
@@ -1029,7 +1029,7 @@ const struct SpriteTemplate gNeedleArmSpikeSpriteTemplate =
     .callback = AnimNeedleArmSpike,
 };
 
-const union AnimCmd gWhipAnimCmds1[] =    
+static const union AnimCmd gWhipAnimCmds1[] =    
 {
     ANIMCMD_FRAME(64, 3),
     ANIMCMD_FRAME(80, 3),
@@ -1038,7 +1038,7 @@ const union AnimCmd gWhipAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gWhipAnimCmds2[] =    
+static const union AnimCmd gWhipAnimCmds2[] =    
 {
     ANIMCMD_FRAME(64, 3, .hFlip = TRUE),
     ANIMCMD_FRAME(80, 3, .hFlip = TRUE),
@@ -1047,7 +1047,7 @@ const union AnimCmd gWhipAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gWhipAnimTable[] =    
+static const union AnimCmd *const gWhipAnimTable[] =    
 {
     gWhipAnimCmds1,
     gWhipAnimCmds2,
@@ -1075,7 +1075,7 @@ const struct SpriteTemplate gVineWhipSpriteTemplate =
     .callback = AnimWhipHit,
 };
 
-const union AnimCmd gUnknown_83E3178[] =
+static const union AnimCmd gUnknown_83E3178[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -1085,13 +1085,13 @@ const union AnimCmd gUnknown_83E3178[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_83E3190[] =
+static const union AnimCmd *const gUnknown_83E3190[] =
 {
     gUnknown_83E3178,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3194 =
+static const struct SpriteTemplate gUnknown_83E3194 =
 {
     .tileTag = ANIM_TAG_HIT,
     .paletteTag = ANIM_TAG_HIT,
@@ -1103,7 +1103,7 @@ const struct SpriteTemplate gUnknown_83E3194 =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E31AC =
+static const struct SpriteTemplate gUnknown_83E31AC =
 {
     .tileTag = ANIM_TAG_HIT_2,
     .paletteTag = ANIM_TAG_HIT_2,
@@ -1114,55 +1114,55 @@ const struct SpriteTemplate gUnknown_83E31AC =
     .callback = sub_80A43F8,
 };
 
-const union AffineAnimCmd gUnknown_83E31C4[] =
+static const union AffineAnimCmd gUnknown_83E31C4[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E31D4[] =
+static const union AffineAnimCmd gUnknown_83E31D4[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 32, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E31E4[] =
+static const union AffineAnimCmd gUnknown_83E31E4[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 64, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E31F4[] =
+static const union AffineAnimCmd gUnknown_83E31F4[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 96, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E3204[] =
+static const union AffineAnimCmd gUnknown_83E3204[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, -128, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E3214[] =
+static const union AffineAnimCmd gUnknown_83E3214[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, -96, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E3224[] =
+static const union AffineAnimCmd gUnknown_83E3224[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, -64, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_83E3234[] =
+static const union AffineAnimCmd gUnknown_83E3234[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, -32, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gUnknown_83E3244[] = 
+static const union AffineAnimCmd *const gUnknown_83E3244[] = 
 {
     gUnknown_83E31C4,
     gUnknown_83E31D4,
@@ -1175,7 +1175,7 @@ const union AffineAnimCmd *const gUnknown_83E3244[] =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3264 =
+static const struct SpriteTemplate gUnknown_83E3264 =
 {
     .tileTag = ANIM_TAG_HANDS_AND_FEET,
     .paletteTag = ANIM_TAG_HANDS_AND_FEET,
@@ -1186,7 +1186,7 @@ const struct SpriteTemplate gUnknown_83E3264 =
     .callback = sub_80A4494,
 };
 
-const union AnimCmd gCuttingSliceAnimCmds[] =
+static const union AnimCmd gCuttingSliceAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(16, 5),
@@ -1195,7 +1195,7 @@ const union AnimCmd gCuttingSliceAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gCuttingSliceAnimTable[] =
+static const union AnimCmd *const gCuttingSliceAnimTable[] =
 {
     gCuttingSliceAnimCmds,
 };
@@ -1222,67 +1222,67 @@ const struct SpriteTemplate gAirCutterSliceSpriteTemplate =
     .callback = AnimAirCutterSlice,
 };
 
-const union AnimCmd gUnknown_83E32C4[] =
+static const union AnimCmd gUnknown_83E32C4[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32CC[] =
+static const union AnimCmd gUnknown_83E32CC[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32D4[] =
+static const union AnimCmd gUnknown_83E32D4[] =
 {
     ANIMCMD_FRAME(8, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32DC[] =
+static const union AnimCmd gUnknown_83E32DC[] =
 {
     ANIMCMD_FRAME(12, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32E4[] =
+static const union AnimCmd gUnknown_83E32E4[] =
 {
     ANIMCMD_FRAME(16, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32EC[] =
+static const union AnimCmd gUnknown_83E32EC[] =
 {
     ANIMCMD_FRAME(20, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32F4[] =
+static const union AnimCmd gUnknown_83E32F4[] =
 {
     ANIMCMD_FRAME(0, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E32FC[] =
+static const union AnimCmd gUnknown_83E32FC[] =
 {
     ANIMCMD_FRAME(4, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E3304[] =
+static const union AnimCmd gUnknown_83E3304[] =
 {
     ANIMCMD_FRAME(8, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E330C[] =
+static const union AnimCmd gUnknown_83E330C[] =
 {
     ANIMCMD_FRAME(12, 1, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_83E3314[] =
+static const union AnimCmd *const gUnknown_83E3314[] =
 {
     gUnknown_83E32C4,
     gUnknown_83E32CC,
@@ -1297,7 +1297,7 @@ const union AnimCmd *const gUnknown_83E3314[] =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E333C =
+static const struct SpriteTemplate gUnknown_83E333C =
 {
     .tileTag = ANIM_TAG_MUSIC_NOTES,
     .paletteTag = ANIM_TAG_MUSIC_NOTES,
@@ -1319,13 +1319,13 @@ const struct SpriteTemplate gProtectWallSpriteTemplate =
     .callback = AnimProtect,
 };
 
-const union AffineAnimCmd gMilkBottleAffineAnimCmds1[] =
+static const union AffineAnimCmd gMilkBottleAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gMilkBottleAffineAnimCmds2[] =
+static const union AffineAnimCmd gMilkBottleAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12),
     AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6),
@@ -1335,7 +1335,7 @@ const union AffineAnimCmd gMilkBottleAffineAnimCmds2[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gMilkBottleAffineAnimTable[] =
+static const union AffineAnimCmd *const gMilkBottleAffineAnimTable[] =
 {
     gMilkBottleAffineAnimCmds1,
     gMilkBottleAffineAnimCmds2,
@@ -1352,7 +1352,7 @@ const struct SpriteTemplate gMilkBottleSpriteTemplate =
     .callback = AnimMilkBottle,
 };
 
-const union AnimCmd gGrantingStarsAnimCmds[] =
+static const union AnimCmd gGrantingStarsAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(16, 7),
@@ -1365,7 +1365,7 @@ const union AnimCmd gGrantingStarsAnimCmds[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gGrantingStarsAnimTable[] =
+static const union AnimCmd *const gGrantingStarsAnimTable[] =
 {
     gGrantingStarsAnimCmds,
 };
@@ -1392,7 +1392,7 @@ const struct SpriteTemplate gSparklingStarsSpriteTemplate =
     .callback = AnimSparkingStars,
 };
 
-const union AnimCmd gUnknown_83E3424[] =
+static const union AnimCmd gUnknown_83E3424[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(4, 10),
@@ -1405,7 +1405,7 @@ const union AnimCmd gUnknown_83E3424[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_83E3448[] =
+static const union AnimCmd gUnknown_83E3448[] =
 {
     ANIMCMD_FRAME(0, 10, .hFlip = TRUE),
     ANIMCMD_FRAME(4, 10, .hFlip = TRUE),
@@ -1418,14 +1418,14 @@ const union AnimCmd gUnknown_83E3448[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_83E346C[] =
+static const union AnimCmd *const gUnknown_83E346C[] =
 {
     gUnknown_83E3424,
     gUnknown_83E3448,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3474 =
+static const struct SpriteTemplate gUnknown_83E3474 =
 {
     .tileTag = ANIM_TAG_BUBBLE_BURST,
     .paletteTag = ANIM_TAG_BUBBLE_BURST,
@@ -1436,46 +1436,46 @@ const struct SpriteTemplate gUnknown_83E3474 =
     .callback = sub_80A4E40,
 };
 
-const union AnimCmd gSleepLetterZAnimCmds[] =
+static const union AnimCmd gSleepLetterZAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 40),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSleepLetterZAnimTable[] =
+static const union AnimCmd *const gSleepLetterZAnimTable[] =
 {
     gSleepLetterZAnimCmds,
 };
 
-const union AffineAnimCmd gSleepLetterZAffineAnimCmds1[] =
+static const union AffineAnimCmd gSleepLetterZAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x14, 0x14, -30, 0),
     AFFINEANIMCMD_FRAME(0x8, 0x8, 1, 24),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gSleepLetterZAffineAnimCmds1_2[] =
+static const union AffineAnimCmd gSleepLetterZAffineAnimCmds1_2[] =
 {
     AFFINEANIMCMD_LOOP(0),
     AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24),
     AFFINEANIMCMD_LOOP(10),
 };
 
-const union AffineAnimCmd gSleepLetterZAffineAnimCmds2[] =
+static const union AffineAnimCmd gSleepLetterZAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x14, 0x14, 30, 0),
     AFFINEANIMCMD_FRAME(0x8, 0x8, -1, 24),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gSleepLetterZAffineAnimCmds2_2[] =
+static const union AffineAnimCmd gSleepLetterZAffineAnimCmds2_2[] =
 {
     AFFINEANIMCMD_LOOP(0),
     AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 24),
     AFFINEANIMCMD_LOOP(10),
 };
 
-const union AffineAnimCmd *const gSleepLetterZAffineAnimTable[] =
+static const union AffineAnimCmd *const gSleepLetterZAffineAnimTable[] =
 {
     gSleepLetterZAffineAnimCmds1,
     gSleepLetterZAffineAnimCmds2,
@@ -1514,7 +1514,7 @@ const struct SpriteTemplate gLockOnMoveTargetSpriteTemplate =
     .callback = AnimLockOnMoveTarget,
 };
 
-const s8 gInclineMonCoordTable[][2] =
+static const s8 gInclineMonCoordTable[][2] =
 {
     { 64,  64},
     {  0, -64},
@@ -1534,7 +1534,7 @@ const struct SpriteTemplate gBowMonSpriteTemplate =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3568 =
+static const struct SpriteTemplate gUnknown_83E3568 =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -1545,7 +1545,7 @@ const struct SpriteTemplate gUnknown_83E3568 =
     .callback = sub_80A5590,
 };
 
-const union AnimCmd gSlashSliceAnimCmds1[] =
+static const union AnimCmd gSlashSliceAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -1554,13 +1554,13 @@ const union AnimCmd gSlashSliceAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gSlashSliceAnimCmds2[] =
+static const union AnimCmd gSlashSliceAnimCmds2[] =
 {
     ANIMCMD_FRAME(48, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSlashSliceAnimTable[] =
+static const union AnimCmd *const gSlashSliceAnimTable[] =
 {
     gSlashSliceAnimCmds1,
     gSlashSliceAnimCmds2,
@@ -1599,7 +1599,7 @@ const struct SpriteTemplate gFalseSwipePositionedSliceSpriteTemplate =
     .callback = AnimFalseSwipePositionedSlice,
 };
 
-const union AnimCmd gEndureEnergyAnimCmds[] =
+static const union AnimCmd gEndureEnergyAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(8, 12),
@@ -1608,7 +1608,7 @@ const union AnimCmd gEndureEnergyAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gEndureEnergyAnimTable[] =
+static const union AnimCmd *const gEndureEnergyAnimTable[] =
 {
     gEndureEnergyAnimCmds,
 };
@@ -1624,7 +1624,7 @@ const struct SpriteTemplate gEndureEnergySpriteTemplate =
     .callback = AnimEndureEnergy,
 };
 
-const union AnimCmd gSharpenSphereAnimCmds[] =
+static const union AnimCmd gSharpenSphereAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 18),
     ANIMCMD_FRAME(0, 6),
@@ -1643,7 +1643,7 @@ const union AnimCmd gSharpenSphereAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSharpenSphereAnimTable[] =
+static const union AnimCmd *const gSharpenSphereAnimTable[] =
 {
     gSharpenSphereAnimCmds,
 };
@@ -1670,7 +1670,7 @@ const struct SpriteTemplate gOctazookaBallSpriteTemplate =
     .callback = TranslateAnimSpriteToTargetMonLocation,
 };
 
-const union AnimCmd gOctazookaAnimCmds[] =
+static const union AnimCmd gOctazookaAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -1680,7 +1680,7 @@ const union AnimCmd gOctazookaAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gOctazookaAnimTable[] =
+static const union AnimCmd *const gOctazookaAnimTable[] =
 {
     gOctazookaAnimCmds,
 };
@@ -1696,7 +1696,7 @@ const struct SpriteTemplate gOctazookaSmokeSpriteTemplate =
     .callback = AnimSpriteOnMonPos,
 };
 
-const union AnimCmd gConversionAnimCmds[] =
+static const union AnimCmd gConversionAnimCmds[] =
 {
     ANIMCMD_FRAME(3, 5),
     ANIMCMD_FRAME(2, 5),
@@ -1705,18 +1705,18 @@ const union AnimCmd gConversionAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gConversionAnimTable[] =
+static const union AnimCmd *const gConversionAnimTable[] =
 {
     gConversionAnimCmds,
 };
 
-const union AffineAnimCmd gConversionAffineAnimCmds[] =
+static const union AffineAnimCmd gConversionAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gConversionAffineAnimTable[] =
+static const union AffineAnimCmd *const gConversionAffineAnimTable[] =
 {
     gConversionAffineAnimCmds,
 };
@@ -1732,7 +1732,7 @@ const struct SpriteTemplate gConversionSpriteTemplate =
     .callback = AnimConversion,
 };
 
-const union AnimCmd gConversion2AnimCmds[] =
+static const union AnimCmd gConversion2AnimCmds[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -1741,7 +1741,7 @@ const union AnimCmd gConversion2AnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gConversion2AnimTable[] =
+static const union AnimCmd *const gConversion2AnimTable[] =
 {
     gConversion2AnimCmds,
 };
@@ -1768,7 +1768,7 @@ const struct SpriteTemplate gMoonSpriteTemplate =
     .callback = AnimMoon,
 };
 
-const union AnimCmd gMoonlightSparkleAnimCmds[] =
+static const union AnimCmd gMoonlightSparkleAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(4, 8),
@@ -1777,7 +1777,7 @@ const union AnimCmd gMoonlightSparkleAnimCmds[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gMoonlightSparkleAnimTable[] =
+static const union AnimCmd *const gMoonlightSparkleAnimTable[] =
 {
     gMoonlightSparkleAnimCmds,
 };
@@ -1793,7 +1793,7 @@ const struct SpriteTemplate gMoonlightSparkleSpriteTemplate =
     .callback = AnimMoonlightSparkle,
 };
 
-const union AnimCmd gHealingBlueStarAnimCmds[] =
+static const union AnimCmd gHealingBlueStarAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(16, 2),
@@ -1806,7 +1806,7 @@ const union AnimCmd gHealingBlueStarAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gHealingBlueStarAnimTable[] =
+static const union AnimCmd *const gHealingBlueStarAnimTable[] =
 {
     gHealingBlueStarAnimCmds,
 };
@@ -1833,7 +1833,7 @@ const struct SpriteTemplate gHornHitSpriteTemplate =
     .callback = AnimHornHit,
 };
 
-const union AnimCmd gSuperFangAnimCmds[] =
+static const union AnimCmd gSuperFangAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(16, 2),
@@ -1842,7 +1842,7 @@ const union AnimCmd gSuperFangAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSuperFangAnimTable[] =
+static const union AnimCmd *const gSuperFangAnimTable[] =
 {
     gSuperFangAnimCmds,
 };
@@ -1858,49 +1858,49 @@ const struct SpriteTemplate gSuperFangSpriteTemplate =
     .callback = AnimSuperFang,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds1[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds2[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds2[] =
 {
     ANIMCMD_FRAME(4, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds3[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds3[] =
 {
     ANIMCMD_FRAME(8, 41),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds4[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds4[] =
 {
     ANIMCMD_FRAME(12, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds5[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds5[] =
 {
     ANIMCMD_FRAME(16, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds6[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds6[] =
 {
     ANIMCMD_FRAME(20, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds7[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds7[] =
 {
     ANIMCMD_FRAME(0, 10, .vFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gWavyMusicNotesAnimCmds8[] =
+static const union AnimCmd gWavyMusicNotesAnimCmds8[] =
 {
     ANIMCMD_FRAME(4, 10, .vFlip = TRUE),
     ANIMCMD_END,
@@ -1918,14 +1918,14 @@ const union AnimCmd *const gMusicNotesAnimTable[] =
     gWavyMusicNotesAnimCmds8,
 };
 
-const union AffineAnimCmd gWavyMusicNotesAffineAnimCmds[] =    
+static const union AffineAnimCmd gWavyMusicNotesAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(0xC, 0xC, 0, 16),
     AFFINEANIMCMD_FRAME(0xFFF4, 0xFFF4, 0, 16),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gMusicNotesAffineAnimTable[] =    
+static const union AffineAnimCmd *const gMusicNotesAffineAnimTable[] =    
 {
     gWavyMusicNotesAffineAnimCmds,
 };
@@ -1941,7 +1941,7 @@ const struct SpriteTemplate gWavyMusicNotesSpriteTemplate =
     .callback = AnimWavyMusicNotes,
 };
 
-const u16 gParticlesColorBlendTable[][6] =    
+static const u16 gParticlesColorBlendTable[][6] =    
 {
     {ANIM_TAG_MUSIC_NOTES,     RGB_WHITE, RGB(31, 26, 28), RGB(31, 22, 26), RGB(31, 17, 24), RGB(31, 13, 22)},
     {ANIM_TAG_BENT_SPOON,      RGB_WHITE, RGB(25, 31, 26), RGB(20, 31, 21), RGB(15, 31, 16), RGB(10, 31, 12)},
@@ -1971,14 +1971,14 @@ const struct SpriteTemplate gBellyDrumHandSpriteTemplate =
     .callback = AnimBellyDrumHand,
 };
 
-const union AffineAnimCmd gSlowFlyingMusicNotesAffineAnimCmds[] =
+static const union AffineAnimCmd gSlowFlyingMusicNotesAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0),
     AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gSlowFlyingMusicNotesAffineAnimTable[] =
+static const union AffineAnimCmd *const gSlowFlyingMusicNotesAffineAnimTable[] =
 {
     gSlowFlyingMusicNotesAffineAnimCmds,
 };
@@ -1994,7 +1994,7 @@ const struct SpriteTemplate gSlowFlyingMusicNotesSpriteTemplate =
     .callback = AnimSlowFlyingMusicNotes,
 };
 
-const union AnimCmd gMetronomeThroughtBubbleAnimCmds1[] =
+static const union AnimCmd gMetronomeThroughtBubbleAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 2, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 2, .hFlip = TRUE),
@@ -2003,7 +2003,7 @@ const union AnimCmd gMetronomeThroughtBubbleAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gMetronomeThroughtBubbleAnimCmds3[] =
+static const union AnimCmd gMetronomeThroughtBubbleAnimCmds3[] =
 {
     ANIMCMD_FRAME(48, 2, .hFlip = TRUE),
     ANIMCMD_FRAME(32, 2, .hFlip = TRUE),
@@ -2012,7 +2012,7 @@ const union AnimCmd gMetronomeThroughtBubbleAnimCmds3[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gMetronomeThroughtBubbleAnimCmds2[] =
+static const union AnimCmd gMetronomeThroughtBubbleAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(16, 2),
@@ -2021,7 +2021,7 @@ const union AnimCmd gMetronomeThroughtBubbleAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gMetronomeThroughtBubbleAnimCmds4[] =
+static const union AnimCmd gMetronomeThroughtBubbleAnimCmds4[] =
 {
     ANIMCMD_FRAME(48, 2),
     ANIMCMD_FRAME(32, 2),
@@ -2030,7 +2030,7 @@ const union AnimCmd gMetronomeThroughtBubbleAnimCmds4[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gMetronomeThroughtBubbleAnimTable[] =
+static const union AnimCmd *const gMetronomeThroughtBubbleAnimTable[] =
 {
     gMetronomeThroughtBubbleAnimCmds1,
     gMetronomeThroughtBubbleAnimCmds2,
@@ -2049,14 +2049,14 @@ const struct SpriteTemplate gThoughtBubbleSpriteTemplate =
     .callback = AnimThoughtBubble,
 };
 
-const union AffineAnimCmd gMetronomeFingerAffineAnimCmds1[] =
+static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0),
     AFFINEANIMCMD_FRAME(0x1E, 0x1E, 0, 8),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2[] =
+static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 11),
     AFFINEANIMCMD_FRAME(0x0, 0x0, -4, 11),
@@ -2065,7 +2065,7 @@ const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2_2[] =
+static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2_2[] =
 {
     AFFINEANIMCMD_FRAME(16, 16, 0, 0),
     AFFINEANIMCMD_FRAME(30, 30, 0, 8),
@@ -2078,7 +2078,7 @@ const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2_2[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gMetronomeFingerAffineAnimTable[] =
+static const union AffineAnimCmd *const gMetronomeFingerAffineAnimTable[] =
 {
     gMetronomeFingerAffineAnimCmds1,
     gMetronomeFingerAffineAnimCmds2,
@@ -2106,19 +2106,19 @@ const struct SpriteTemplate gFollowMeFingerSpriteTemplate =
     .callback = AnimFollowMeFinger,
 };
 
-const union AnimCmd gTauntFingerAnimCmds1[] =
+static const union AnimCmd gTauntFingerAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gTauntFingerAnimCmds2[] =
+static const union AnimCmd gTauntFingerAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 1, .hFlip = TRUE),
     ANIMCMD_END,
 };
 
-const union AnimCmd gTauntFingerAnimCmds3[] =
+static const union AnimCmd gTauntFingerAnimCmds3[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -2130,7 +2130,7 @@ const union AnimCmd gTauntFingerAnimCmds3[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gTauntFingerAnimCmds4[] =
+static const union AnimCmd gTauntFingerAnimCmds4[] =
 {
     ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -2142,7 +2142,7 @@ const union AnimCmd gTauntFingerAnimCmds4[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gTauntFingerAnimTable[] =
+static const union AnimCmd *const gTauntFingerAnimTable[] =
 {
     gTauntFingerAnimCmds1,
     gTauntFingerAnimCmds2,
@@ -2655,7 +2655,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite)
     if (b > 200 && r0 < 56 && sprite->oam.affineParam == 0)
         sprite->oam.affineParam++;
 
-    if (sprite->oam.affineParam && sprite->data[0])
+    if (sprite->oam.affineParam != 0 && sprite->data[0] != 0)
     {
         sprite->invisible ^= 1;
         sprite->oam.affineParam++;
@@ -2773,7 +2773,6 @@ static void AnimConstrictBindingStep2(struct Sprite* sprite)
     }
 }
 
-// Unused
 void sub_80A2F0C(u8 taskId)
 {
     u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
@@ -3157,14 +3156,14 @@ static void AnimItemStealStep3(struct Sprite* sprite)
 
     sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
     if (sprite->pos2.y == 0)
-        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
 
     if (MoveAlongLinearPath(sprite))
     {
         sprite->pos2.y = 0;
         sprite->data[0] = 0;
         sprite->callback = AnimItemStealStep2;
-        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
     }
 }
 
@@ -4246,7 +4245,7 @@ static void AnimLockOnTargetStep1(struct Sprite* sprite)
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep2);
         sprite->data[5] += 0x100;
-        PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
         break;
     }
 
@@ -4333,7 +4332,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite)
         sprite->data[2]++;
         pal = sprite->oam.paletteNum;
         LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
-        PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
     }
     else if (sprite->data[1] == 0)
     {
@@ -4420,7 +4419,7 @@ void AnimBowMon(struct Sprite* sprite)
 static void AnimBowMonStep1(struct Sprite* sprite)
 {
     sprite->data[0] = 6;
-    sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2;
+    sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) ? 2 : -2;
     sprite->data[2] = 0;
     sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
     StoreSpriteCallbackInData6(sprite, AnimBowMonStep1_Callback);
@@ -4450,7 +4449,7 @@ static void AnimBowMonStep1_Callback(struct Sprite* sprite)
 static void AnimBowMonStep2(struct Sprite* sprite)
 {
     sprite->data[0] = 4;
-    sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3;
+    sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) ? -3 : 3;
     sprite->data[2] = 0;
     sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
     StoreSpriteCallbackInData6(sprite, AnimBowMonStep4);
@@ -4544,11 +4543,11 @@ static void sub_80A55A0(struct Sprite *sprite)
 
 void AnimTask_SkullBashPosition(u8 taskId)
 {
-    u8 a;
+    u8 side;
 
     gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker];
-    a = GetBattlerSide(gBattleAnimAttacker);
-    gTasks[taskId].data[1] = a;
+    side = GetBattlerSide(gBattleAnimAttacker);
+    gTasks[taskId].data[1] = side;
     gTasks[taskId].data[2] = 0;
     switch (gBattleAnimArgs[0])
     {
@@ -4560,7 +4559,7 @@ void AnimTask_SkullBashPosition(u8 taskId)
         gTasks[taskId].data[3] = 8;
         gTasks[taskId].data[4] = 0;
         gTasks[taskId].data[5] = 3;
-        if (a == 0)
+        if (side == B_SIDE_PLAYER)
             gTasks[taskId].data[5] *= -1;
 
         gTasks[taskId].func = AnimTask_SkullBashPositionSet;
@@ -4569,7 +4568,7 @@ void AnimTask_SkullBashPosition(u8 taskId)
         gTasks[taskId].data[3] = 8;
         gTasks[taskId].data[4] = 0x600;
         gTasks[taskId].data[5] = 0xC0;
-        if (a == 0)
+        if (side == B_SIDE_PLAYER)
         {
             gTasks[taskId].data[4] = -gTasks[taskId].data[4];
             gTasks[taskId].data[5] = -gTasks[taskId].data[5];
@@ -4797,7 +4796,7 @@ void AnimSharpenSphere(struct Sprite* sprite)
     sprite->data[2] = 0;
     sprite->data[3] = 0;
     sprite->data[4] = 0;
-    sprite->data[5] = BattleAnimAdjustPanning(-64);
+    sprite->data[5] = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
     sprite->callback = AnimSharpenSphereStep;
 }
 
@@ -4868,7 +4867,7 @@ void AnimTask_ConversionAlphaBlend(u8 taskId)
 void AnimConversion2(struct Sprite* sprite)
 {
     InitSpritePosToAnimTarget(sprite, FALSE);
-    sprite->animPaused = 1;
+    sprite->animPaused = TRUE;
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->callback = AnimConversion2Step;
 }
@@ -4881,7 +4880,7 @@ static void AnimConversion2Step(struct Sprite* sprite)
     }
     else
     {
-        sprite->animPaused = 0;
+        sprite->animPaused = FALSE;
         sprite->data[0] = 30;
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
@@ -4941,8 +4940,8 @@ void AnimMoon(struct Sprite* sprite)
         sprite->pos1.y = gBattleAnimArgs[1];
     }
 
-    sprite->oam.shape = 0;
-    sprite->oam.size = 3;
+    sprite->oam.shape = SPRITE_SHAPE(8x8);
+    sprite->oam.size = SPRITE_SIZE(64x32);
     sprite->data[0] = 0;
     sprite->callback = AnimMoonStep;
 }
@@ -5434,7 +5433,7 @@ void AnimSlowFlyingMusicNotes(struct Sprite* sprite)
 
 static void AnimSlowFlyingMusicNotesStep(struct Sprite* sprite)
 {
-    if (AnimTranslateLinear(sprite) == 0)
+    if (!AnimTranslateLinear(sprite))
     {
         s16 xDiff;
         
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index ad2da7d2e..3a33276a1 100644
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -65,7 +65,7 @@ static void AnimPerishSongMusicNote_Step2(struct Sprite *);
 
 // Data
 // Unused
-const struct SpriteTemplate gUnknown_83E3ADC =
+static const struct SpriteTemplate gUnknown_83E3ADC =
 {
     .tileTag = ANIM_TAG_FINGER,
     .paletteTag = ANIM_TAG_FINGER,
@@ -76,19 +76,19 @@ const struct SpriteTemplate gUnknown_83E3ADC =
     .callback = sub_80A6E48,
 };
 
-const union AnimCmd gUnknown_83E3AF4[] =
+static const union AnimCmd gUnknown_83E3AF4[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_83E3AFC[] =
+static const union AnimCmd *const gUnknown_83E3AFC[] =
 {
     gUnknown_83E3AF4,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3B00 =
+static const struct SpriteTemplate gUnknown_83E3B00 =
 {
     .tileTag = ANIM_TAG_MUSIC_NOTES,
     .paletteTag = ANIM_TAG_MUSIC_NOTES,
@@ -100,7 +100,7 @@ const struct SpriteTemplate gUnknown_83E3B00 =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3B18 =
+static const struct SpriteTemplate gUnknown_83E3B18 =
 {
     .tileTag = 0,
     .paletteTag = 0,
@@ -112,7 +112,7 @@ const struct SpriteTemplate gUnknown_83E3B18 =
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3B30 =
+static const struct SpriteTemplate gUnknown_83E3B30 =
 {
     .tileTag = ANIM_TAG_CLAMP,
     .paletteTag = ANIM_TAG_CLAMP,
@@ -123,7 +123,7 @@ const struct SpriteTemplate gUnknown_83E3B30 =
     .callback = sub_80A7020,
 };
 
-const union AnimCmd gUnknown_83E3B48[] =
+static const union AnimCmd gUnknown_83E3B48[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(16, 3),
@@ -132,25 +132,25 @@ const union AnimCmd gUnknown_83E3B48[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_83E3B5C[] =
+static const union AnimCmd *const gUnknown_83E3B5C[] =
 {
     gUnknown_83E3B48,
 };
 
-const union AffineAnimCmd gUnknown_83E3B60[] =
+static const union AffineAnimCmd gUnknown_83E3B60[] =
 {
     AFFINEANIMCMD_FRAME(80, 80, 0, 0),
     AFFINEANIMCMD_FRAME(9, 9, 0, 18),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gUnknown_83E3B78[] =
+static const union AffineAnimCmd *const gUnknown_83E3B78[] =
 {
     gUnknown_83E3B60,
 };
 
 // Unused
-const struct SpriteTemplate gUnknown_83E3B7C =
+static const struct SpriteTemplate gUnknown_83E3B7C =
 {
     .tileTag = ANIM_TAG_EXPLOSION_6,
     .paletteTag = ANIM_TAG_EXPLOSION_6,
@@ -161,7 +161,7 @@ const struct SpriteTemplate gUnknown_83E3B7C =
     .callback = AnimSpriteOnMonPos,
 };
 
-const union AnimCmd gKinesisZapEnergyAnimCmds[] =
+static const union AnimCmd gKinesisZapEnergyAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3, .hFlip = TRUE),
     ANIMCMD_FRAME(8, 3, .hFlip = TRUE),
@@ -174,7 +174,7 @@ const union AnimCmd gKinesisZapEnergyAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gKinesisZapEnergyAnimTable[] =
+static const union AnimCmd *const gKinesisZapEnergyAnimTable[] =
 {
     gKinesisZapEnergyAnimCmds,
 };
@@ -190,7 +190,7 @@ const struct SpriteTemplate gKinesisZapEnergySpriteTemplate =
     .callback = Anim_KinesisZapEnergy,
 };
 
-const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] =
+static const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(16, 256, 0, 0),
     AFFINEANIMCMD_FRAME(20, 0, 0, 12),
@@ -198,7 +198,7 @@ const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gSwordsDanceBladeAffineAnimTable[] =
+static const union AffineAnimCmd *const gSwordsDanceBladeAffineAnimTable[] =
 {
     gSwordsDanceBladeAffineAnimCmds,
 };
@@ -236,14 +236,14 @@ const struct SpriteTemplate gAirWaveProjectileSpriteTemplate =
     .callback = AnimAirWaveProjectile,
 };
 
-const union AffineAnimCmd gGrowingRingAffineAnimCmds[] =
+static const union AffineAnimCmd gGrowingRingAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(32, 32, 0, 0),
     AFFINEANIMCMD_FRAME(7, 7, 0, -56),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] =
+static const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(5, 5, 0, 10),
     AFFINEANIMCMD_FRAME(-10, -10, 0, 10),
@@ -260,7 +260,7 @@ const union AffineAnimCmd *const gGrowingRingAffineAnimTable[] =
     gGrowingRingAffineAnimCmds,
 };
 
-const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] =    
+static const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] =    
 {
     gWaterPulseRingAffineAnimCmds,
 };
@@ -331,24 +331,24 @@ const struct SpriteTemplate gUnknown_83E3D18 =
     .callback = sub_80A79E8,
 };
 
-const union AnimCmd gCoinAnimCmds[] =
+static const union AnimCmd gCoinAnimCmds[] =
 {
     ANIMCMD_FRAME(8, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gCoinAnimTable[] =
+static const union AnimCmd *const gCoinAnimTable[] =
 {
     gCoinAnimCmds,
 };
 
-const union AffineAnimCmd gFallingCoinAffineAnimCmds[] =
+static const union AffineAnimCmd gFallingCoinAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 10, 1),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gFallingCoinAffineAnimTable[] =
+static const union AffineAnimCmd *const gFallingCoinAffineAnimTable[] =
 {
     gFallingCoinAffineAnimCmds,
 };
@@ -375,13 +375,13 @@ const struct SpriteTemplate gFallingCoinSpriteTemplate =
     .callback = AnimFallingCoin,
 };
 
-const union AffineAnimCmd gBulletSeedAffineAnimCmds[] =
+static const union AffineAnimCmd gBulletSeedAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 20, 1),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gBulletSeedAffineAnimTable[] =
+static const union AffineAnimCmd *const gBulletSeedAffineAnimTable[] =
 {
     gBulletSeedAffineAnimCmds,
 };
@@ -397,14 +397,14 @@ const struct SpriteTemplate gBulletSeedSpriteTemplate =
     .callback = AnimBulletSeed,
 };
 
-const union AffineAnimCmd gRazorWindTornadoAffineAnimCmds[] =
+static const union AffineAnimCmd gRazorWindTornadoAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(16, 256, 0, 0),
     AFFINEANIMCMD_FRAME(4, 0, 0, 40),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gRazorWindTornadoAffineAnimTable[] =
+static const union AffineAnimCmd *const gRazorWindTornadoAffineAnimTable[] =
 {
     gRazorWindTornadoAffineAnimCmds,
 };
@@ -420,7 +420,7 @@ const struct SpriteTemplate gRazorWindTornadoSpriteTemplate =
     .callback = AnimRazorWindTornado,
 };
 
-const union AnimCmd gViceGripAnimCmds1[] =
+static const union AnimCmd gViceGripAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -428,7 +428,7 @@ const union AnimCmd gViceGripAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gViceGripAnimCmds2[] =
+static const union AnimCmd gViceGripAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE),
@@ -436,7 +436,7 @@ const union AnimCmd gViceGripAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gViceGripAnimTable[] =
+static const union AnimCmd *const gViceGripAnimTable[] =
 {
     gViceGripAnimCmds1,
     gViceGripAnimCmds2,
@@ -453,7 +453,7 @@ const struct SpriteTemplate gViceGripSpriteTemplate =
     .callback = AnimViceGripPincer,
 };
 
-const union AnimCmd gGuillotineAnimCmds1[] =
+static const union AnimCmd gGuillotineAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(16, 2),
@@ -461,7 +461,7 @@ const union AnimCmd gGuillotineAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gGuillotineAnimCmds2[] =
+static const union AnimCmd gGuillotineAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE),
@@ -469,7 +469,7 @@ const union AnimCmd gGuillotineAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gGuillotineAnimTable[] =
+static const union AnimCmd *const gGuillotineAnimTable[] =
 {
     gGuillotineAnimCmds1,
     gGuillotineAnimCmds2,
@@ -486,7 +486,7 @@ const struct SpriteTemplate gGuillotineSpriteTemplate =
     .callback = AnimGuillotinePincer,
 };
 
-const union AffineAnimCmd gSplashEffectAffineAnimCmds[] =
+static const union AffineAnimCmd gSplashEffectAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-6, 4, 0, 8),
     AFFINEANIMCMD_FRAME(10, -10, 0, 8),
@@ -494,7 +494,7 @@ const union AffineAnimCmd gSplashEffectAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] =
+static const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-4, -5, 0, 12),
     AFFINEANIMCMD_FRAME(0, 0, 0, 24),
@@ -502,7 +502,7 @@ const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-const union AnimCmd gBreathPuffAnimCmds1[] =
+static const union AnimCmd gBreathPuffAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(4, 40, .hFlip = TRUE),
@@ -511,7 +511,7 @@ const union AnimCmd gBreathPuffAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gBreathPuffAnimCmds2[] =
+static const union AnimCmd gBreathPuffAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(4, 40),
@@ -520,7 +520,7 @@ const union AnimCmd gBreathPuffAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gBreathPuffAnimTable[] =
+static const union AnimCmd *const gBreathPuffAnimTable[] =
 {
     gBreathPuffAnimCmds1,
     gBreathPuffAnimCmds2,
@@ -537,14 +537,14 @@ const struct SpriteTemplate gBreathPuffSpriteTemplate =
     .callback = AnimBreathPuff,
 };
 
-const union AffineAnimCmd gAngerMarkAffineAnimCmds[] =
+static const union AffineAnimCmd gAngerMarkAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(11, 11, 0, 8),
     AFFINEANIMCMD_FRAME(-11, -11, 0, 8),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] =
+static const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] =
 {
     gAngerMarkAffineAnimCmds,
 };
@@ -560,7 +560,7 @@ const struct SpriteTemplate gAngerMarkSpriteTemplate =
     .callback = AnimAngerMark,
 };
 
-const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] =
+static const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-10, 9, 0, 7),
     AFFINEANIMCMD_FRAME(20, -20, 0, 7),
@@ -592,7 +592,7 @@ const struct SpriteTemplate gSnoreZSpriteTemplate =
     .callback = AnimSnoreZ,
 };
 
-const union AnimCmd gExplosionAnimCmds[] =
+static const union AnimCmd gExplosionAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(16, 5),
@@ -601,7 +601,7 @@ const union AnimCmd gExplosionAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gExplosionAnimTable[] =
+static const union AnimCmd *const gExplosionAnimTable[] =
 {
     gExplosionAnimCmds,
 };
@@ -617,7 +617,7 @@ const struct SpriteTemplate gExplosionSpriteTemplate =
     .callback = AnimSpriteOnMonPos,
 };
 
-const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] =
+static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -8, 2),
     AFFINEANIMCMD_FRAME(0, 0, 8, 4),
@@ -625,13 +625,13 @@ const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] =
+static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] =
+static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] =
 {
     AFFINEANIMCMD_FRAME(-8, 4, 0, 8),
     AFFINEANIMCMD_LOOP(0),
@@ -643,7 +643,7 @@ const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gSoftBoiledEggAffineAnimTable[] =
+static const union AffineAnimCmd *const gSoftBoiledEggAffineAnimTable[] =
 {
     gSoftBoiledEggAffineAnimCmds1,
     gSoftBoiledEggAffineAnimCmds2,
@@ -661,34 +661,34 @@ const struct SpriteTemplate gSoftBoiledEggSpriteTemplate =
     .callback = AnimSoftBoiledEgg,
 };
 
-const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] =
+static const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(16, 16, 0, 0),
     AFFINEANIMCMD_FRAME(16, 16, 0, 30),
     AFFINEANIMCMD_END_ALT(1),
 };
 
-const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] =
+static const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(16, 16, 0, 0),
     AFFINEANIMCMD_FRAME(32, 32, 0, 15),
     AFFINEANIMCMD_END_ALT(1),
 };
 
-const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] =
+static const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(16, 16, 0, 0),
     AFFINEANIMCMD_FRAME(11, 11, 0, 45),
     AFFINEANIMCMD_END_ALT(1),
 };
 
-const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] =
+static const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] =
 {
     gThinRingExpandingAffineAnimCmds1,
     gThinRingExpandingAffineAnimCmds2,
 };
 
-const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] =
+static const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] =
 {
     gHyperVoiceRingAffineAnimCmds,
 };
@@ -704,14 +704,14 @@ const struct SpriteTemplate gThinRingExpandingSpriteTemplate =
     .callback = AnimSpriteOnMonPos,
 };
 
-const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] =
+static const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(512, 512, 0, 0),
     AFFINEANIMCMD_FRAME(-16, -16, 0, 30),
     AFFINEANIMCMD_END_ALT(1),
 };
 
-const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] =
+static const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] =
 {
     gThinRingShrinkingAffineAnimCmds,
 };
@@ -760,13 +760,13 @@ const struct SpriteTemplate gUproarRingSpriteTemplate =
     .callback = AnimUproarRing,
 };
 
-const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] =
+static const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(96, -13, 0, 8),
     AFFINEANIMCMD_END,
 };
 
-const union AnimCmd gSpeedDustAnimCmds[] =
+static const union AnimCmd gSpeedDustAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(4, 3),
@@ -776,7 +776,7 @@ const union AnimCmd gSpeedDustAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpeedDustAnimTable[] =
+static const union AnimCmd *const gSpeedDustAnimTable[] =
 {
     gSpeedDustAnimCmds,
 };
@@ -800,7 +800,7 @@ const s8 gSpeedDustPosTable[][2] =
     {-10, 28},
 };
 
-const union AnimCmd gBellAnimCmds[] =
+static const union AnimCmd gBellAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(16, 6),
@@ -818,7 +818,7 @@ const union AnimCmd gBellAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gBellAnimTable[] =
+static const union AnimCmd *const gBellAnimTable[] =
 {
     gBellAnimCmds,
 };
@@ -863,7 +863,7 @@ const struct SpriteTemplate gMagentaHeartSpriteTemplate =
     .callback = AnimMagentaHeart,
 };
 
-const union AffineAnimCmd gUnknown_83E4200[] =
+static const union AffineAnimCmd gUnknown_83E4200[] =
 {
     AFFINEANIMCMD_FRAME(10, -13, 0, 10),
     AFFINEANIMCMD_FRAME(-10, 13, 0, 10),
@@ -903,14 +903,14 @@ const struct SpriteTemplate gRedHeartRisingSpriteTemplate =
     .callback = AnimRedHeartRising,
 };
 
-const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] =
+static const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(128, 128, 0, 0),
     AFFINEANIMCMD_FRAME(8, 8, 0, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] =
+static const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] =
 {
     gHiddenPowerOrbAffineAnimCmds,
 };
@@ -937,14 +937,14 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate =
     .callback = AnimOrbitScatter,
 };
 
-const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] =
+static const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(128, 128, 0, 0),
     AFFINEANIMCMD_FRAME(8, 8, 0, 1),
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] =
+static const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] =
 {
     gSpitUpOrbAffineAnimCmds,
 };
@@ -960,7 +960,7 @@ const struct SpriteTemplate gSpitUpOrbSpriteTemplate =
     .callback = AnimSpitUpOrb,
 };
 
-const union AnimCmd gEyeSparkleAnimCmds[] =
+static const union AnimCmd gEyeSparkleAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(4, 4),
@@ -970,7 +970,7 @@ const union AnimCmd gEyeSparkleAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gEyeSparkleAnimTable[] =
+static const union AnimCmd *const gEyeSparkleAnimTable[] =
 {
     gEyeSparkleAnimCmds,
 };
@@ -986,13 +986,13 @@ const struct SpriteTemplate gEyeSparkleSpriteTemplate =
     .callback = AnimEyeSparkle,
 };
 
-const union AnimCmd gAngelSpriteAnimCmds[] =
+static const union AnimCmd gAngelSpriteAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gAngelSpriteAnimTable[] =
+static const union AnimCmd *const gAngelSpriteAnimTable[] =
 {
     gAngelSpriteAnimCmds,
 };
@@ -1019,19 +1019,19 @@ const struct SpriteTemplate gPinkHeartSpriteTemplate =
     .callback = AnimPinkHeart,
 };
 
-const union AnimCmd gDevilAnimCmds1[] =
+static const union AnimCmd gDevilAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gDevilAnimCmds2[] =
+static const union AnimCmd gDevilAnimCmds2[] =
 {
     ANIMCMD_FRAME(16, 3),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gDevilAnimTable[] =
+static const union AnimCmd *const gDevilAnimTable[] =
 {
     gDevilAnimCmds1,
     gDevilAnimCmds2,
@@ -1048,7 +1048,7 @@ const struct SpriteTemplate gDevilSpriteTemplate =
     .callback = AnimDevil,
 };
 
-const union AnimCmd gUnknown_08593B08[] =
+static const union AnimCmd gUnknown_08593B08[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -1057,7 +1057,7 @@ const union AnimCmd gUnknown_08593B08[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_08593B1C[] =
+static const union AnimCmd gUnknown_08593B1C[] =
 {
     ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
     ANIMCMD_FRAME(16, 4, .hFlip = TRUE),
@@ -1066,7 +1066,7 @@ const union AnimCmd gUnknown_08593B1C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFurySwipesAnimTable[] =
+static const union AnimCmd *const gFurySwipesAnimTable[] =
 {
     gUnknown_08593B08,
     gUnknown_08593B1C,
@@ -1083,7 +1083,7 @@ const struct SpriteTemplate gFurySwipesSpriteTemplate =
     .callback = AnimFurySwipes,
 };
 
-const union AnimCmd gMovementWavesAnimCmds1[] =
+static const union AnimCmd gMovementWavesAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(16, 8),
@@ -1092,7 +1092,7 @@ const union AnimCmd gMovementWavesAnimCmds1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gMovementWavesAnimCmds2[] =
+static const union AnimCmd gMovementWavesAnimCmds2[] =
 {
     ANIMCMD_FRAME(16, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(32, 8, .hFlip = TRUE),
@@ -1101,7 +1101,7 @@ const union AnimCmd gMovementWavesAnimCmds2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gMovementWavesAnimTable[] =
+static const union AnimCmd *const gMovementWavesAnimTable[] =
 {
     gMovementWavesAnimCmds1,
     gMovementWavesAnimCmds2,
@@ -1118,7 +1118,7 @@ const struct SpriteTemplate gMovementWavesSpriteTemplate =
     .callback = AnimMovementWaves,
 };
 
-const union AffineAnimCmd gUnknown_08593B98[] =
+static const union AffineAnimCmd gUnknown_08593B98[] =
 {
     AFFINEANIMCMD_FRAME(-12, 8, 0, 4),
     AFFINEANIMCMD_FRAME(20, -20, 0, 4),
@@ -1137,25 +1137,25 @@ const struct SpriteTemplate gJaggedMusicNoteSpriteTemplate =
     .callback = AnimJaggedMusicNote,
 };
 
-const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] =
+static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 0, 5),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] =
+static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -8, 16),
     AFFINEANIMCMD_END_ALT(1),
 };
 
-const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] =
+static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 8, 16),
     AFFINEANIMCMD_END_ALT(1),
 };
 
-const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] =
+static const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] =
 {
     gPerishSongMusicNoteAffineAnimCmds1,
     gPerishSongMusicNoteAffineAnimCmds2,
@@ -1184,19 +1184,19 @@ const struct SpriteTemplate gPerishSongMusicNote2SpriteTemplate =
     .callback = AnimPerishSongMusicNote2,
 };
 
-const union AffineAnimCmd gGuardRingAffineAnimCmds1[] =
+static const union AffineAnimCmd gGuardRingAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gGuardRingAffineAnimCmds2[] =
+static const union AffineAnimCmd gGuardRingAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(512, 256, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gGuardRingAffineAnimTable[] =
+static const union AffineAnimCmd *const gGuardRingAffineAnimTable[] =
 {
     gGuardRingAffineAnimCmds1,
     gGuardRingAffineAnimCmds2,
@@ -1788,7 +1788,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
     u16 rand;
     s16* ptr;
     
-    PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(63));
+    PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
     sprite->pos1.x += sprite->pos2.x;
     sprite->pos1.y += sprite->pos2.y;
     sprite->pos2.y = 0;
@@ -2621,7 +2621,7 @@ void AnimHyperVoiceRing(struct Sprite *sprite)
         sp1 = GetBattlerSpriteCoord(battler2, sp4);
     }
 
-    if (GetBattlerSide(battler2))
+    if (GetBattlerSide(battler2) != B_SIDE_PLAYER)
         sp0 += gBattleAnimArgs[3];
     else
         sp0 -= gBattleAnimArgs[3];
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index f9efc04cd..cb2f8b78e 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -79,7 +79,7 @@ static void AnimRecycleStep(struct Sprite *);
 static void AnimTask_SlackOffSquishStep(u8);
 
 // Data
-const union AnimCmd gScratchAnimCmds[] =
+static const union AnimCmd gScratchAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -89,7 +89,7 @@ const union AnimCmd gScratchAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gScratchAnimTable[] =
+static const union AnimCmd *const gScratchAnimTable[] =
 {
     gScratchAnimCmds,
 };
@@ -127,7 +127,7 @@ const struct SpriteTemplate gBlackBallSpriteTemplate =
     .callback = AnimThrowProjectile,
 };
 
-const union AnimCmd gOpeningEyeAnimCmds[] =    
+static const union AnimCmd gOpeningEyeAnimCmds[] =    
 {
     ANIMCMD_FRAME(0, 40),
     ANIMCMD_FRAME(16, 8),
@@ -135,7 +135,7 @@ const union AnimCmd gOpeningEyeAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gOpeningEyeAnimTable[] =    
+static const union AnimCmd *const gOpeningEyeAnimTable[] =    
 {
     gOpeningEyeAnimCmds,
 };
@@ -173,7 +173,7 @@ const struct SpriteTemplate gTealAlertSpriteTemplate =
     .callback = AnimTealAlert,
 };
 
-const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
+static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x180, 0x180, 0, 0),
     AFFINEANIMCMD_FRAME(-0x20, 0x18, 0, 5),
@@ -181,14 +181,14 @@ const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd gMeanLookEyeAffineAnimCmds2[] =
+static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x30, 0x30, 0, 0),
     AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 6),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gMeanLookEyeAffineAnimTable[] =
+static const union AffineAnimCmd *const gMeanLookEyeAffineAnimTable[] =
 {
     gMeanLookEyeAffineAnimCmds1,
     gMeanLookEyeAffineAnimCmds2,
@@ -216,7 +216,7 @@ const struct SpriteTemplate gSpikesSpriteTemplate =
     .callback = AnimSpikes,
 };
 
-const union AnimCmd gLeerAnimCmds[] =
+static const union AnimCmd gLeerAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -226,7 +226,7 @@ const union AnimCmd gLeerAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gLeerAnimTable[] =
+static const union AnimCmd *const gLeerAnimTable[] =
 {
     gLeerAnimCmds,
 };
@@ -242,25 +242,25 @@ const struct SpriteTemplate gLeerSpriteTemplate =
     .callback = AnimLeer,
 };
 
-const union AnimCmd gLetterZAnimCmds[] =
+static const union AnimCmd gLetterZAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gLetterZAnimTable[] =
+static const union AnimCmd *const gLetterZAnimTable[] =
 {
     gLetterZAnimCmds,
 };
 
-const union AffineAnimCmd gLetterZAffineAnimCmds[] =
+static const union AffineAnimCmd gLetterZAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-7, -7, -3, 16),
     AFFINEANIMCMD_FRAME(7, 7, 3, 16),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gLetterZAffineAnimTable[] =
+static const union AffineAnimCmd *const gLetterZAffineAnimTable[] =
 {
     gLetterZAffineAnimCmds,
 };
@@ -276,7 +276,7 @@ const struct SpriteTemplate gLetterZSpriteTemplate =
     .callback = AnimLetterZ,
 };
 
-const union AnimCmd gFangAnimCmds[] =
+static const union AnimCmd gFangAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(16, 16),
@@ -285,19 +285,19 @@ const union AnimCmd gFangAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFangAnimTable[] =
+static const union AnimCmd *const gFangAnimTable[] =
 {
     gFangAnimCmds,
 };
 
-const union AffineAnimCmd gFangAffineAnimCmds[] =
+static const union AffineAnimCmd gFangAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
     AFFINEANIMCMD_FRAME(-0x20, -0x20, 0, 8),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gFangAffineAnimTable[] =
+static const union AffineAnimCmd *const gFangAffineAnimTable[] =
 {
     gFangAffineAnimCmds,
 };
@@ -313,21 +313,21 @@ const struct SpriteTemplate gFangSpriteTemplate =
     .callback = AnimFang,
 };
 
-const union AffineAnimCmd gSpotlightAffineAnimCmds1[] =
+static const union AffineAnimCmd gSpotlightAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x180, 0, 0),
     AFFINEANIMCMD_FRAME(0x10, 0x0, 0, 20),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gSpotlightAffineAnimCmds2[] =
+static const union AffineAnimCmd gSpotlightAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x140, 0x180, 0, 0),
     AFFINEANIMCMD_FRAME(-0x10, 0x0, 0, 19),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gSpotlightAffineAnimTable[] =
+static const union AffineAnimCmd *const gSpotlightAffineAnimTable[] =
 {
     gSpotlightAffineAnimCmds1,
     gSpotlightAffineAnimCmds2,
@@ -366,7 +366,7 @@ const struct SpriteTemplate gClappingHand2SpriteTemplate =
     .callback = AnimClappingHand2,
 };
 
-const union AnimCmd gRapidSpinAnimCmds[] =
+static const union AnimCmd gRapidSpinAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(8, 2),
@@ -374,7 +374,7 @@ const union AnimCmd gRapidSpinAnimCmds[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gRapidSpinAnimTable[] =
+static const union AnimCmd *const gRapidSpinAnimTable[] =
 {
     gRapidSpinAnimCmds,
 };
@@ -390,7 +390,7 @@ const struct SpriteTemplate gRapidSpinSpriteTemplate =
     .callback = AnimRapidSpin,
 };
 
-const union AffineAnimCmd gUnknown_83FF080[] =
+static const union AffineAnimCmd gUnknown_83FF080[] =
 {
     AFFINEANIMCMD_FRAME(-12, 8, 0, 4),
     AFFINEANIMCMD_FRAME(20, -20, 0, 4),
@@ -398,18 +398,18 @@ const union AffineAnimCmd gUnknown_83FF080[] =
     AFFINEANIMCMD_END,
 };
 
-const union AnimCmd gTriAttackTriangleAnimCmds[] =
+static const union AnimCmd gTriAttackTriangleAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gTriAttackTriangleAnimTable[] =
+static const union AnimCmd *const gTriAttackTriangleAnimTable[] =
 {
     gTriAttackTriangleAnimCmds,
 };
 
-const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
+static const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 5, 40),
     AFFINEANIMCMD_FRAME(0, 0, 10, 10),
@@ -418,7 +418,7 @@ const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gTriAttackTriangleAffineAnimTable[] =
+static const union AffineAnimCmd *const gTriAttackTriangleAffineAnimTable[] =
 {
     gTriAttackTriangleAffineAnimCmds,
 };
@@ -434,7 +434,7 @@ const struct SpriteTemplate gTriAttackTriangleSpriteTemplate =
     .callback = AnimTriAttackTriangle,
 };
 
-const union AnimCmd gEclipsingOrbAnimCmds[] =
+static const union AnimCmd gEclipsingOrbAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -447,7 +447,7 @@ const union AnimCmd gEclipsingOrbAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gEclipsingOrbAnimTable[] =
+static const union AnimCmd *const gEclipsingOrbAnimTable[] =
 {
     gEclipsingOrbAnimCmds,
 };
@@ -463,7 +463,7 @@ const struct SpriteTemplate gEclipsingOrbSpriteTemplate =
     .callback = AnimSpriteOnMonPos,
 };
 
-const union AffineAnimCmd DefenseCurlDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd DefenseCurlDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-12, 20, 0, 8),
     AFFINEANIMCMD_FRAME(12, -20, 0, 8),
@@ -504,7 +504,7 @@ const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate =
     .callback = AnimMiniTwinklingStar,
 };
 
-const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(8, -8, 0, 12),
     AFFINEANIMCMD_FRAME(-16, 16, 0, 12),
@@ -513,7 +513,7 @@ const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gSpitUpDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd gSpitUpDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 6, 0, 20),
     AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@@ -535,7 +535,7 @@ const struct SpriteTemplate gSwallowBlueOrbSpriteTemplate =
     .callback = AnimSwallowBlueOrb,
 };
 
-const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 6, 0, 20),
     AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@@ -553,26 +553,26 @@ const s8 gMorningSunLightBeamCoordsTable[] =
     0x00,
 };
 
-const union AnimCmd gGreenStarAnimCmds1[] =
+static const union AnimCmd gGreenStarAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(4, 6),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gGreenStarAnimCmds2[] =
+static const union AnimCmd gGreenStarAnimCmds2[] =
 {
     ANIMCMD_FRAME(8, 6),
     ANIMCMD_END,
 };
 
-const union AnimCmd gGreenStarAnimCmds3[] =    
+static const union AnimCmd gGreenStarAnimCmds3[] =    
 {
     ANIMCMD_FRAME(12, 6),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gGreenStarAnimTable[] =    
+static const union AnimCmd *const gGreenStarAnimTable[] =    
 {
     gGreenStarAnimCmds1,
     gGreenStarAnimCmds2,
@@ -607,7 +607,7 @@ const u8 gDoomDesireLightBeamDelayTable[] =
     50,
 };
 
-const union AffineAnimCmd gStrongFrustrationAffineAnimCmds[] =    
+static const union AffineAnimCmd gStrongFrustrationAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(0, -15, 0, 7),
     AFFINEANIMCMD_FRAME(0, 15, 0, 7),
@@ -626,7 +626,7 @@ const struct SpriteTemplate gWeakFrustrationAngerMarkSpriteTemplate =
     .callback = AnimWeakFrustrationAngerMark,
 };
 
-const union AnimCmd gSweetScentPetalAnimCmds1[] =
+static const union AnimCmd gSweetScentPetalAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -639,7 +639,7 @@ const union AnimCmd gSweetScentPetalAnimCmds1[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gSweetScentPetalAnimCmds2[] =
+static const union AnimCmd gSweetScentPetalAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(1, 8, .hFlip = TRUE),
@@ -652,13 +652,13 @@ const union AnimCmd gSweetScentPetalAnimCmds2[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gSweetScentPetalAnimCmds3[] =
+static const union AnimCmd gSweetScentPetalAnimCmds3[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSweetScentPetalAnimCmdTable[] =    
+static const union AnimCmd *const gSweetScentPetalAnimCmdTable[] =    
 {
     gSweetScentPetalAnimCmds1,
     gSweetScentPetalAnimCmds2,
@@ -676,9 +676,9 @@ const struct SpriteTemplate gSweetScentPetalSpriteTemplate =
     .callback = AnimSweetScentPetal,
 };
 
-const u16 gUnknown_83FF33C[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal");    //Unused
+static const u16 gUnknown_83FF33C[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal");    //Unused
 
-const union AnimCmd gPainSplitAnimCmds[] =
+static const union AnimCmd gPainSplitAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(4, 9),
@@ -686,7 +686,7 @@ const union AnimCmd gPainSplitAnimCmds[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gPainSplitAnimCmdTable[] =
+static const union AnimCmd *const gPainSplitAnimCmdTable[] =
 {
     gPainSplitAnimCmds,
 };
@@ -735,7 +735,7 @@ const struct SpriteTemplate gReversalOrbSpriteTemplate =
     .callback = AnimReversalOrb,
 };
 
-const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =    
+static const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(16, 0, 0, 4),
     AFFINEANIMCMD_FRAME(0, -3, 0, 16),
@@ -745,7 +745,7 @@ const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =    
+static const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =    
 {
     AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
     AFFINEANIMCMD_FRAME(-8, -8, 0, 8),
@@ -753,7 +753,7 @@ const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =    
+static const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =    
 {
     AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
     AFFINEANIMCMD_FRAME(8, 8, 0, 8),
@@ -761,7 +761,7 @@ const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =    
+static const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =    
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(8, 8, 0, 8),
@@ -769,7 +769,7 @@ const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gYawnCloudAffineAnimTable[] =    
+static const union AffineAnimCmd *const gYawnCloudAffineAnimTable[] =    
 {
     gYawnCloudAffineAnimCmds1,
     gYawnCloudAffineAnimCmds2,
@@ -787,7 +787,7 @@ const struct SpriteTemplate gYawnCloudSpriteTemplate =
     .callback = AnimYawnCloud,
 };
 
-const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =    
+static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =    
 {
     AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
     AFFINEANIMCMD_FRAME(-4, -6, 0, 16),
@@ -795,7 +795,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =    
+static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =    
 {
     AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
     AFFINEANIMCMD_FRAME(4, 6, 0, 16),
@@ -803,7 +803,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =    
+static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =    
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(4, 6, 0, 16),
@@ -811,7 +811,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =    
+static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =    
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(8, 10, 0, 30),
@@ -819,7 +819,7 @@ const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gSmokeBallEscapeCloudAffineAnimTable[] =    
+static const union AffineAnimCmd *const gSmokeBallEscapeCloudAffineAnimTable[] =    
 {
     gSmokeBallEscapeCloudAffineAnimCmds1,
     gSmokeBallEscapeCloudAffineAnimCmds2,
@@ -838,7 +838,7 @@ const struct SpriteTemplate gSmokeBallEscapeCloudSpriteTemplate =
     .callback = AnimSmokeBallEscapeCloud,
 };
 
-const union AffineAnimCmd gFacadeSquishAffineAnimCmds[] =
+static const union AffineAnimCmd gFacadeSquishAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-16, 16, 0, 6),
     AFFINEANIMCMD_FRAME(16, -16, 0, 12),
@@ -885,21 +885,21 @@ const u16 gFacadeBlendColors[] =
     RGB(29, 27,  0),
 };
 
-const union AnimCmd gRoarNoiseLineAnimCmds1[] =
+static const union AnimCmd gRoarNoiseLineAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gRoarNoiseLineAnimCmds2[] =    
+static const union AnimCmd gRoarNoiseLineAnimCmds2[] =    
 {
     ANIMCMD_FRAME(32, 3),
     ANIMCMD_FRAME(48, 3),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gRoarNoiseLineAnimTable[] =
+static const union AnimCmd *const gRoarNoiseLineAnimTable[] =
 {
     gRoarNoiseLineAnimCmds1,
     gRoarNoiseLineAnimCmds2,
@@ -938,20 +938,20 @@ const struct SpriteTemplate gAssistPawprintSpriteTemplate =
     .callback = AnimAssistPawprint,
 };
 
-const union AffineAnimCmd gBarrageBallAffineAnimCmds1[] =
+static const union AffineAnimCmd gBarrageBallAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -4, 24),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gBarrageBallAffineAnimCmds2[] =
+static const union AffineAnimCmd gBarrageBallAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, -64, 0),
     AFFINEANIMCMD_FRAME(0, 0, 4, 24),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gBarrageBallAffineAnimTable[] =
+static const union AffineAnimCmd *const gBarrageBallAffineAnimTable[] =
 {
     gBarrageBallAffineAnimCmds1,
     gBarrageBallAffineAnimCmds2,
@@ -979,7 +979,7 @@ const struct SpriteTemplate gSmellingSaltsHandSpriteTemplate =
     .callback = AnimSmellingSaltsHand,
 };
 
-const union AffineAnimCmd gSmellingSaltsSquishAffineAnimCmds[] =
+static const union AffineAnimCmd gSmellingSaltsSquishAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, -16, 0, 6),
     AFFINEANIMCMD_FRAME(0, 16, 0, 6),
@@ -1063,33 +1063,33 @@ const struct SpriteTemplate gUnknown_83FF704 =
     .callback = sub_80E3E84,
 };
 
-const union AnimCmd gKnockOffStrikeAnimCmds[] =    
+static const union AnimCmd gKnockOffStrikeAnimCmds[] =    
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(64, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gKnockOffStrikeAnimTable[] =    
+static const union AnimCmd *const gKnockOffStrikeAnimTable[] =    
 {
     gKnockOffStrikeAnimCmds,
 };
 
-const union AffineAnimCmd gKnockOffStrikeAffineanimCmds1[] =
+static const union AffineAnimCmd gKnockOffStrikeAffineanimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, -4, 8),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gKnockOffStrikeAffineanimCmds2[] =
+static const union AffineAnimCmd gKnockOffStrikeAffineanimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, 4, 8),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gKnockOffStrikeAffineAnimTable[] =
+static const union AffineAnimCmd *const gKnockOffStrikeAffineAnimTable[] =
 {
     gKnockOffStrikeAffineanimCmds1,
     gKnockOffStrikeAffineanimCmds2,
@@ -1106,13 +1106,13 @@ const struct SpriteTemplate gKnockOffStrikeSpriteTemplate =
     .callback = AnimKnockOffStrike,
 };
 
-const union AffineAnimCmd gRecycleSpriteAffineAnimCmds[] =
+static const union AffineAnimCmd gRecycleSpriteAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -4, 64),
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gRecycleSpriteAffineAnimTable[] =
+static const union AffineAnimCmd *const gRecycleSpriteAffineAnimTable[] =
 {
     gRecycleSpriteAffineAnimCmds,
 };
@@ -1128,7 +1128,7 @@ const struct SpriteTemplate gRecycleSpriteTemplate =
     .callback = AnimRecycle,
 };
 
-const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] =    
+static const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(0, 16, 0, 4),
     AFFINEANIMCMD_FRAME(-2, 0, 0, 8),
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index 1c9d6fe9b..44a7928d8 100644
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -158,7 +158,7 @@ const struct CompressedSpritePalette gBallParticlePalettes[] =
     {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL},
 };
 
-const union AnimCmd gAnim_RegularBall[] =
+static const union AnimCmd gAnim_RegularBall[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -169,38 +169,38 @@ const union AnimCmd gAnim_RegularBall[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gAnim_MasterBall[] =
+static const union AnimCmd gAnim_MasterBall[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnim_NetDiveBall[] =
+static const union AnimCmd gAnim_NetDiveBall[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnim_NestBall[] =
+static const union AnimCmd gAnim_NestBall[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnim_LuxuryPremierBall[] =
+static const union AnimCmd gAnim_LuxuryPremierBall[] =
 {
     ANIMCMD_FRAME(6, 4),
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gAnim_UltraRepeatTimerBall[] =    
+static const union AnimCmd gAnim_UltraRepeatTimerBall[] =    
 {
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gAnims_BallParticles[] =    
+static const union AnimCmd *const gAnims_BallParticles[] =    
 {
     gAnim_RegularBall,
     gAnim_MasterBall,
@@ -391,13 +391,13 @@ const struct SpriteTemplate gPokeblockSpriteTemplate =
     .callback = sub_80F1B3C,
 };
 
-const union AnimCmd gUnknown_840C204[] =
+static const union AnimCmd gUnknown_840C204[] =
 {
     ANIMCMD_FRAME(64, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_840C20C[] =
+static const union AnimCmd *const gSpriteAnimTable_840C20C[] =
 {
     gUnknown_840C204,
 };
@@ -2216,7 +2216,7 @@ void AnimTask_LoadPokeblockGfx(u8 taskId)
 
     LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
     LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
-    paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK); // unused
+    paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK);
     DestroyAnimVisualTask(taskId);
 }
 
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index d9a6754c7..df4a8243b 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -496,9 +496,9 @@ static void sub_80BB2A0(u8 taskId)
     gTasks[taskId].data[7] = gBattlerSpriteIds[sAnimStatsChangeData->battler2];
     gTasks[taskId].func = sub_80BB4B8;
     if (sAnimStatsChangeData->data[0] == 0)
-        PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(PAN_SIDE_PLAYER));
+        PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
     else
-        PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(PAN_SIDE_PLAYER));
+        PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
 }
 
 static void sub_80BB4B8(u8 taskId)
diff --git a/src/rock.c b/src/rock.c
index b0809fade..082f3b655 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -583,8 +583,8 @@ void sub_80B4BD0(u8 taskId)
     task->data[5] = ((var3 - var1) * 8) / task->data[8];
     task->data[6] = 0;
     task->data[7] = 0;
-    pan1 = BattleAnimAdjustPanning(PAN_SIDE_PLAYER);
-    pan2 = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT);
+    pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
+    pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
     task->data[13] = pan1;
     task->data[14] = (pan2 - pan1) / task->data[8];
     task->data[1] = var4;