fix static var names

common_syms/battle_anim_special.txt

@@ -1,3 +1,3 @@
-gUnknown_3005424
-gUnknown_3005428
-gUnknown_300542C
+sUnknown_3005424
+sUnknown_3005428
+sUnknown_300542C

src/battle_anim.c

@@ -24,7 +24,7 @@
 EWRAM_DATA static const u8 *sBattleAnimScriptPtr = NULL;
 EWRAM_DATA static const u8 *sBattleAnimScriptRetAddr = NULL;
 EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL;
-EWRAM_DATA static s8 gAnimFramesToWait = 0;
+EWRAM_DATA static s8 sAnimFramesToWait = 0;
 EWRAM_DATA bool8 gAnimScriptActive = FALSE;
 EWRAM_DATA u8 gAnimVisualTaskCount = 0;
 EWRAM_DATA u8 gAnimSoundTaskCount = 0;
@@ -1792,7 +1792,7 @@ void ClearBattleAnimationVars(void)
 {
     s32 i;
 
-    gAnimFramesToWait = 0;
+    sAnimFramesToWait = 0;
     gAnimScriptActive = FALSE;
     gAnimVisualTaskCount = 0;
     gAnimSoundTaskCount = 0;
@@ -1852,7 +1852,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
     sMonAnimTaskIdArray[1] = (s8)-1;
     sBattleAnimScriptPtr = animsTable[tableId];
     gAnimScriptActive = TRUE;
-    gAnimFramesToWait = 0;
+    sAnimFramesToWait = 0;
     gAnimScriptCallback = RunAnimScriptCommand;
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
@@ -1925,14 +1925,14 @@ static void ClearSpriteIndex(u16 index)
 
 static void WaitAnimFrameCount(void)
 {
-    if (gAnimFramesToWait <= 0)
+    if (sAnimFramesToWait <= 0)
     {
         gAnimScriptCallback = RunAnimScriptCommand;
-        gAnimFramesToWait = 0;
+        sAnimFramesToWait = 0;
     }
     else
     {
-        gAnimFramesToWait--;
+        sAnimFramesToWait--;
     }
 }
 
@@ -1941,7 +1941,7 @@ static void RunAnimScriptCommand(void)
     do
     {
         sScriptCmdTable[sBattleAnimScriptPtr[0]]();
-    } while (gAnimFramesToWait == 0 && gAnimScriptActive);
+    } while (sAnimFramesToWait == 0 && gAnimScriptActive);
 }
 
 static void ScriptCmd_loadspritegfx(void)
@@ -1954,7 +1954,7 @@ static void ScriptCmd_loadspritegfx(void)
     LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]);
     sBattleAnimScriptPtr += 2;
     AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
-    gAnimFramesToWait = 1;
+    sAnimFramesToWait = 1;
     gAnimScriptCallback = WaitAnimFrameCount;
 }
 
@@ -2057,9 +2057,9 @@ static void ScriptCmd_createvisualtask(void)
 static void ScriptCmd_delay(void)
 {
     sBattleAnimScriptPtr++;
-    gAnimFramesToWait = sBattleAnimScriptPtr[0];
-    if (gAnimFramesToWait == 0)
-        gAnimFramesToWait = -1;
+    sAnimFramesToWait = sBattleAnimScriptPtr[0];
+    if (sAnimFramesToWait == 0)
+        sAnimFramesToWait = -1;
     sBattleAnimScriptPtr++;
     gAnimScriptCallback = WaitAnimFrameCount;
 }
@@ -2069,11 +2069,11 @@ static void ScriptCmd_waitforvisualfinish(void)
     if (gAnimVisualTaskCount == 0)
     {
         sBattleAnimScriptPtr++;
-        gAnimFramesToWait = 0;
+        sAnimFramesToWait = 0;
     }
     else
     {
-        gAnimFramesToWait = 1;
+        sAnimFramesToWait = 1;
     }
 }
 
@@ -2095,7 +2095,7 @@ static void ScriptCmd_end(void)
      || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF)
     {
         sSoundAnimFramesToWait = 0;
-        gAnimFramesToWait = 1;
+        sAnimFramesToWait = 1;
         return;
     }
 
@@ -2104,7 +2104,7 @@ static void ScriptCmd_end(void)
     {
         if (++sSoundAnimFramesToWait <= 90) // Wait 90 frames, then halt the sound effect.
         {
-            gAnimFramesToWait = 1;
+            sAnimFramesToWait = 1;
             return;
         }
         else
@@ -2760,11 +2760,11 @@ static void ScriptCmd_waitbgfadeout(void)
     if (sAnimBackgroundFadeState == 2)
     {
         sBattleAnimScriptPtr++;
-        gAnimFramesToWait = 0;
+        sAnimFramesToWait = 0;
     }
     else
     {
-        gAnimFramesToWait = 1;
+        sAnimFramesToWait = 1;
     }
 }
 
@@ -2773,11 +2773,11 @@ static void ScriptCmd_waitbgfadein(void)
     if (sAnimBackgroundFadeState == 0)
     {
         sBattleAnimScriptPtr++;
-        gAnimFramesToWait = 0;
+        sAnimFramesToWait = 0;
     }
     else
     {
-        gAnimFramesToWait = 1;
+        sAnimFramesToWait = 1;
     }
 }
 
@@ -3159,7 +3159,7 @@ static void ScriptCmd_waitsound(void)
     if (gAnimSoundTaskCount != 0)
     {
         sSoundAnimFramesToWait = 0;
-        gAnimFramesToWait = 1;
+        sAnimFramesToWait = 1;
     }
     else if (IsSEPlaying())
     {
@@ -3171,14 +3171,14 @@ static void ScriptCmd_waitsound(void)
         }
         else
         {
-            gAnimFramesToWait = 1;
+            sAnimFramesToWait = 1;
         }
     }
     else
     {
         sSoundAnimFramesToWait = 0;
         sBattleAnimScriptPtr++;
-        gAnimFramesToWait = 0;
+        sAnimFramesToWait = 0;
     }
 }
 

src/battle_anim_effects_3.c

@@ -79,7 +79,7 @@ static void AnimRecycleStep(struct Sprite *);
 static void AnimTask_SlackOffSquishStep(u8);
 
 // Data
-static const union AnimCmd gScratchAnimCmds[] =
+static const union AnimCmd sScratchAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(16, 4),
@@ -89,9 +89,9 @@ static const union AnimCmd gScratchAnimCmds[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gScratchAnimTable[] =
+static const union AnimCmd *const sScratchAnimTable[] =
 {
-    gScratchAnimCmds,
+    sScratchAnimCmds,
 };
 
 const struct SpriteTemplate gScratchSpriteTemplate =
@@ -99,7 +99,7 @@ const struct SpriteTemplate gScratchSpriteTemplate =
     .tileTag = ANIM_TAG_SCRATCH,
     .paletteTag = ANIM_TAG_SCRATCH,
     .oam = &gOamData_AffineOff_ObjBlend_32x32,
-    .anims = gScratchAnimTable,
+    .anims = sScratchAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimSpriteOnMonPos,
@@ -127,7 +127,7 @@ const struct SpriteTemplate gBlackBallSpriteTemplate =
     .callback = AnimThrowProjectile,
 };
 
-static const union AnimCmd gOpeningEyeAnimCmds[] =    
+static const union AnimCmd sOpeningEyeAnimCmds[] =    
 {
     ANIMCMD_FRAME(0, 40),
     ANIMCMD_FRAME(16, 8),
@@ -135,9 +135,9 @@ static const union AnimCmd gOpeningEyeAnimCmds[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gOpeningEyeAnimTable[] =    
+static const union AnimCmd *const sOpeningEyeAnimTable[] =    
 {
-    gOpeningEyeAnimCmds,
+    sOpeningEyeAnimCmds,
 };
 
 const struct SpriteTemplate gOpeningEyeSpriteTemplate =    
@@ -145,7 +145,7 @@ const struct SpriteTemplate gOpeningEyeSpriteTemplate =
     .tileTag = ANIM_TAG_OPENING_EYE,
     .paletteTag = ANIM_TAG_OPENING_EYE,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gOpeningEyeAnimTable,
+    .anims = sOpeningEyeAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimSpriteOnMonPos,
@@ -173,7 +173,7 @@ const struct SpriteTemplate gTealAlertSpriteTemplate =
     .callback = AnimTealAlert,
 };
 
-static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
+static const union AffineAnimCmd sMeanLookEyeAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x180, 0x180, 0, 0),
     AFFINEANIMCMD_FRAME(-0x20, 0x18, 0, 5),
@@ -181,17 +181,17 @@ static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(1),
 };
 
-static const union AffineAnimCmd gMeanLookEyeAffineAnimCmds2[] =
+static const union AffineAnimCmd sMeanLookEyeAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x30, 0x30, 0, 0),
     AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 6),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const gMeanLookEyeAffineAnimTable[] =
+static const union AffineAnimCmd *const sMeanLookEyeAffineAnimTable[] =
 {
-    gMeanLookEyeAffineAnimCmds1,
-    gMeanLookEyeAffineAnimCmds2,
+    sMeanLookEyeAffineAnimCmds1,
+    sMeanLookEyeAffineAnimCmds2,
 };
 
 const struct SpriteTemplate gMeanLookEyeSpriteTemplate =
@@ -201,7 +201,7 @@ const struct SpriteTemplate gMeanLookEyeSpriteTemplate =
     .oam = &gOamData_AffineDouble_ObjBlend_64x64,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gMeanLookEyeAffineAnimTable,
+    .affineAnims = sMeanLookEyeAffineAnimTable,
     .callback = AnimMeanLookEye,
 };
 
@@ -216,7 +216,7 @@ const struct SpriteTemplate gSpikesSpriteTemplate =
     .callback = AnimSpikes,
 };
 
-static const union AnimCmd gLeerAnimCmds[] =
+static const union AnimCmd sLeerAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -226,9 +226,9 @@ static const union AnimCmd gLeerAnimCmds[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gLeerAnimTable[] =
+static const union AnimCmd *const sLeerAnimTable[] =
 {
-    gLeerAnimCmds,
+    sLeerAnimCmds,
 };
 
 const struct SpriteTemplate gLeerSpriteTemplate =
@@ -236,33 +236,33 @@ const struct SpriteTemplate gLeerSpriteTemplate =
     .tileTag = ANIM_TAG_LEER,
     .paletteTag = ANIM_TAG_LEER,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gLeerAnimTable,
+    .anims = sLeerAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimLeer,
 };
 
-static const union AnimCmd gLetterZAnimCmds[] =
+static const union AnimCmd sLetterZAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gLetterZAnimTable[] =
+static const union AnimCmd *const sLetterZAnimTable[] =
 {
-    gLetterZAnimCmds,
+    sLetterZAnimCmds,
 };
 
-static const union AffineAnimCmd gLetterZAffineAnimCmds[] =
+static const union AffineAnimCmd sLetterZAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-7, -7, -3, 16),
     AFFINEANIMCMD_FRAME(7, 7, 3, 16),
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd *const gLetterZAffineAnimTable[] =
+static const union AffineAnimCmd *const sLetterZAffineAnimTable[] =
 {
-    gLetterZAffineAnimCmds,
+    sLetterZAffineAnimCmds,
 };
 
 const struct SpriteTemplate gLetterZSpriteTemplate =
@@ -270,13 +270,13 @@ const struct SpriteTemplate gLetterZSpriteTemplate =
     .tileTag = ANIM_TAG_LETTER_Z,
     .paletteTag = ANIM_TAG_LETTER_Z,
     .oam = &gOamData_AffineNormal_ObjNormal_32x32,
-    .anims = gLetterZAnimTable,
+    .anims = sLetterZAnimTable,
     .images = NULL,
-    .affineAnims = gLetterZAffineAnimTable,
+    .affineAnims = sLetterZAffineAnimTable,
     .callback = AnimLetterZ,
 };
 
-static const union AnimCmd gFangAnimCmds[] =
+static const union AnimCmd sFangAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(16, 16),
@@ -285,21 +285,21 @@ static const union AnimCmd gFangAnimCmds[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gFangAnimTable[] =
+static const union AnimCmd *const sFangAnimTable[] =
 {
-    gFangAnimCmds,
+    sFangAnimCmds,
 };
 
-static const union AffineAnimCmd gFangAffineAnimCmds[] =
+static const union AffineAnimCmd sFangAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
     AFFINEANIMCMD_FRAME(-0x20, -0x20, 0, 8),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const gFangAffineAnimTable[] =
+static const union AffineAnimCmd *const sFangAffineAnimTable[] =
 {
-    gFangAffineAnimCmds,
+    sFangAffineAnimCmds,
 };
 
 const struct SpriteTemplate gFangSpriteTemplate =
@@ -307,30 +307,30 @@ const struct SpriteTemplate gFangSpriteTemplate =
     .tileTag = ANIM_TAG_FANG_ATTACK,
     .paletteTag = ANIM_TAG_FANG_ATTACK,
     .oam = &gOamData_AffineDouble_ObjNormal_32x32,
-    .anims = gFangAnimTable,
+    .anims = sFangAnimTable,
     .images = NULL,
-    .affineAnims = gFangAffineAnimTable,
+    .affineAnims = sFangAffineAnimTable,
     .callback = AnimFang,
 };
 
-static const union AffineAnimCmd gSpotlightAffineAnimCmds1[] =
+static const union AffineAnimCmd sSpotlightAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x0, 0x180, 0, 0),
     AFFINEANIMCMD_FRAME(0x10, 0x0, 0, 20),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpotlightAffineAnimCmds2[] =
+static const union AffineAnimCmd sSpotlightAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x140, 0x180, 0, 0),
     AFFINEANIMCMD_FRAME(-0x10, 0x0, 0, 19),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const gSpotlightAffineAnimTable[] =
+static const union AffineAnimCmd *const sSpotlightAffineAnimTable[] =
 {
-    gSpotlightAffineAnimCmds1,
-    gSpotlightAffineAnimCmds2,
+    sSpotlightAffineAnimCmds1,
+    sSpotlightAffineAnimCmds2,
 };
 
 const struct SpriteTemplate gSpotlightSpriteTemplate =
@@ -340,7 +340,7 @@ const struct SpriteTemplate gSpotlightSpriteTemplate =
     .oam = &gOamData_AffineDouble_ObjNormal_64x64,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gSpotlightAffineAnimTable,
+    .affineAnims = sSpotlightAffineAnimTable,
     .callback = AnimSpotlight,
 };
 
@@ -366,7 +366,7 @@ const struct SpriteTemplate gClappingHand2SpriteTemplate =
     .callback = AnimClappingHand2,
 };
 
-static const union AnimCmd gRapidSpinAnimCmds[] =
+static const union AnimCmd sRapidSpinAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(8, 2),
@@ -374,9 +374,9 @@ static const union AnimCmd gRapidSpinAnimCmds[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const gRapidSpinAnimTable[] =
+static const union AnimCmd *const sRapidSpinAnimTable[] =
 {
-    gRapidSpinAnimCmds,
+    sRapidSpinAnimCmds,
 };
 
 const struct SpriteTemplate gRapidSpinSpriteTemplate =
@@ -384,13 +384,13 @@ const struct SpriteTemplate gRapidSpinSpriteTemplate =
     .tileTag = ANIM_TAG_RAPID_SPIN,
     .paletteTag = ANIM_TAG_RAPID_SPIN,
     .oam = &gOamData_AffineOff_ObjNormal_32x16,
-    .anims = gRapidSpinAnimTable,
+    .anims = sRapidSpinAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimRapidSpin,
 };
 
-static const union AffineAnimCmd gUnknown_83FF080[] =
+static const union AffineAnimCmd sUnknown_83FF080[] =
 {
     AFFINEANIMCMD_FRAME(-12, 8, 0, 4),
     AFFINEANIMCMD_FRAME(20, -20, 0, 4),
@@ -398,18 +398,18 @@ static const union AffineAnimCmd gUnknown_83FF080[] =
     AFFINEANIMCMD_END,
 };
 
-static const union AnimCmd gTriAttackTriangleAnimCmds[] =
+static const union AnimCmd sTriAttackTriangleAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gTriAttackTriangleAnimTable[] =
+static const union AnimCmd *const sTriAttackTriangleAnimTable[] =
 {
-    gTriAttackTriangleAnimCmds,
+    sTriAttackTriangleAnimCmds,
 };
 
-static const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
+static const union AffineAnimCmd sTriAttackTriangleAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 5, 40),
     AFFINEANIMCMD_FRAME(0, 0, 10, 10),
@@ -418,9 +418,9 @@ static const union AffineAnimCmd gTriAttackTriangleAffineAnimCmds[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd *const gTriAttackTriangleAffineAnimTable[] =
+static const union AffineAnimCmd *const sTriAttackTriangleAffineAnimTable[] =
 {
-    gTriAttackTriangleAffineAnimCmds,
+    sTriAttackTriangleAffineAnimCmds,
 };
 
 const struct SpriteTemplate gTriAttackTriangleSpriteTemplate =
@@ -428,13 +428,13 @@ const struct SpriteTemplate gTriAttackTriangleSpriteTemplate =
     .tileTag = ANIM_TAG_TRI_FORCE_TRIANGLE,
     .paletteTag = ANIM_TAG_TRI_FORCE_TRIANGLE,
     .oam = &gOamData_AffineDouble_ObjNormal_64x64,
-    .anims = gTriAttackTriangleAnimTable,
+    .anims = sTriAttackTriangleAnimTable,
     .images = NULL,
-    .affineAnims = gTriAttackTriangleAffineAnimTable,
+    .affineAnims = sTriAttackTriangleAffineAnimTable,
     .callback = AnimTriAttackTriangle,
 };
 
-static const union AnimCmd gEclipsingOrbAnimCmds[] =
+static const union AnimCmd sEclipsingOrbAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -447,9 +447,9 @@ static const union AnimCmd gEclipsingOrbAnimCmds[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gEclipsingOrbAnimTable[] =
+static const union AnimCmd *const sEclipsingOrbAnimTable[] =
 {
-    gEclipsingOrbAnimCmds,
+    sEclipsingOrbAnimCmds,
 };
 
 const struct SpriteTemplate gEclipsingOrbSpriteTemplate =
@@ -457,7 +457,7 @@ const struct SpriteTemplate gEclipsingOrbSpriteTemplate =
     .tileTag = ANIM_TAG_ECLIPSING_ORB,
     .paletteTag = ANIM_TAG_ECLIPSING_ORB,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gEclipsingOrbAnimTable,
+    .anims = sEclipsingOrbAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimSpriteOnMonPos,
@@ -504,7 +504,7 @@ const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate =
     .callback = AnimMiniTwinklingStar,
 };
 
-static const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd sStockpileDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(8, -8, 0, 12),
     AFFINEANIMCMD_FRAME(-16, 16, 0, 12),
@@ -513,7 +513,7 @@ static const union AffineAnimCmd gStockpileDeformMonAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpitUpDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd sSpitUpDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 6, 0, 20),
     AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@@ -535,7 +535,7 @@ const struct SpriteTemplate gSwallowBlueOrbSpriteTemplate =
     .callback = AnimSwallowBlueOrb,
 };
 
-static const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] =
+static const union AffineAnimCmd sSwallowDeformMonAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 6, 0, 20),
     AFFINEANIMCMD_FRAME(0, 0, 0, 20),
@@ -545,7 +545,7 @@ static const union AffineAnimCmd gSwallowDeformMonAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-const s8 gMorningSunLightBeamCoordsTable[] =
+static const s8 sMorningSunLightBeamCoordsTable[] =
 {
     0xE8,
     0x18,
@@ -553,30 +553,30 @@ const s8 gMorningSunLightBeamCoordsTable[] =
     0x00,
 };
 
-static const union AnimCmd gGreenStarAnimCmds1[] =
+static const union AnimCmd sGreenStarAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(4, 6),
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gGreenStarAnimCmds2[] =
+static const union AnimCmd sGreenStarAnimCmds2[] =
 {
     ANIMCMD_FRAME(8, 6),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gGreenStarAnimCmds3[] =    
+static const union AnimCmd sGreenStarAnimCmds3[] =    
 {
     ANIMCMD_FRAME(12, 6),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gGreenStarAnimTable[] =    
+static const union AnimCmd *const sGreenStarAnimTable[] =    
 {
-    gGreenStarAnimCmds1,
-    gGreenStarAnimCmds2,
-    gGreenStarAnimCmds3,
+    sGreenStarAnimCmds1,
+    sGreenStarAnimCmds2,
+    sGreenStarAnimCmds3,
 };
 
 const struct SpriteTemplate gGreenStarSpriteTemplate =    
@@ -584,13 +584,13 @@ const struct SpriteTemplate gGreenStarSpriteTemplate =
     .tileTag = ANIM_TAG_GREEN_STAR,
     .paletteTag = ANIM_TAG_GREEN_STAR,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = gGreenStarAnimTable,
+    .anims = sGreenStarAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimGreenStar,
 };
 
-const s8 gDoomDesireLightBeamCoordTable[] =    
+static const s8 sDoomDesireLightBeamCoordTable[] =    
 {
     0x78,
     0x50,
@@ -598,7 +598,7 @@ const s8 gDoomDesireLightBeamCoordTable[] =
     0x00,
 };
 
-const u8 gDoomDesireLightBeamDelayTable[] =    
+static const u8 sDoomDesireLightBeamDelayTable[] =    
 {
     0,
     0,
@@ -607,7 +607,7 @@ const u8 gDoomDesireLightBeamDelayTable[] =
     50,
 };
 
-static const union AffineAnimCmd gStrongFrustrationAffineAnimCmds[] =    
+static const union AffineAnimCmd sStrongFrustrationAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(0, -15, 0, 7),
     AFFINEANIMCMD_FRAME(0, 15, 0, 7),
@@ -626,7 +626,7 @@ const struct SpriteTemplate gWeakFrustrationAngerMarkSpriteTemplate =
     .callback = AnimWeakFrustrationAngerMark,
 };
 
-static const union AnimCmd gSweetScentPetalAnimCmds1[] =
+static const union AnimCmd sSweetScentPetalAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -639,7 +639,7 @@ static const union AnimCmd gSweetScentPetalAnimCmds1[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gSweetScentPetalAnimCmds2[] =
+static const union AnimCmd sSweetScentPetalAnimCmds2[] =
 {
     ANIMCMD_FRAME(0, 8, .hFlip = TRUE),
     ANIMCMD_FRAME(1, 8, .hFlip = TRUE),
@@ -652,17 +652,17 @@ static const union AnimCmd gSweetScentPetalAnimCmds2[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gSweetScentPetalAnimCmds3[] =
+static const union AnimCmd sSweetScentPetalAnimCmds3[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gSweetScentPetalAnimCmdTable[] =    
+static const union AnimCmd *const sSweetScentPetalAnimCmdTable[] =    
 {
-    gSweetScentPetalAnimCmds1,
-    gSweetScentPetalAnimCmds2,
-    gSweetScentPetalAnimCmds3,
+    sSweetScentPetalAnimCmds1,
+    sSweetScentPetalAnimCmds2,
+    sSweetScentPetalAnimCmds3,
 };
 
 const struct SpriteTemplate gSweetScentPetalSpriteTemplate =
@@ -670,15 +670,15 @@ const struct SpriteTemplate gSweetScentPetalSpriteTemplate =
     .tileTag = ANIM_TAG_PINK_PETAL,
     .paletteTag = ANIM_TAG_PINK_PETAL,
     .oam = &gOamData_AffineOff_ObjNormal_8x8,
-    .anims = gSweetScentPetalAnimCmdTable,
+    .anims = sSweetScentPetalAnimCmdTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimSweetScentPetal,
 };
 
-static const u16 gUnknown_83FF33C[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal");    //Unused
+static const u16 sUnknown_83FF33C[] = INCBIN_U16("graphics/battle_anims/unk_83FF33C.gbapal");    //Unused
 
-static const union AnimCmd gPainSplitAnimCmds[] =
+static const union AnimCmd sPainSplitAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(4, 9),
@@ -686,9 +686,9 @@ static const union AnimCmd gPainSplitAnimCmds[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gPainSplitAnimCmdTable[] =
+static const union AnimCmd *const sPainSplitAnimCmdTable[] =
 {
-    gPainSplitAnimCmds,
+    sPainSplitAnimCmds,
 };
 
 const struct SpriteTemplate gPainSplitProjectileSpriteTemplate =
@@ -696,7 +696,7 @@ const struct SpriteTemplate gPainSplitProjectileSpriteTemplate =
     .tileTag = ANIM_TAG_PAIN_SPLIT,
     .paletteTag = ANIM_TAG_PAIN_SPLIT,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = gPainSplitAnimCmdTable,
+    .anims = sPainSplitAnimCmdTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimPainSplitProjectile,
@@ -720,7 +720,7 @@ const struct SpriteTemplate gFlatterSpotlightSpriteTemplate =
     .oam = &gOamData_AffineDouble_ObjNormal_64x64,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gSpotlightAffineAnimTable,
+    .affineAnims = sSpotlightAffineAnimTable,
     .callback = AnimFlatterSpotlight,
 };
 
@@ -735,7 +735,7 @@ const struct SpriteTemplate gReversalOrbSpriteTemplate =
     .callback = AnimReversalOrb,
 };
 
-static const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =    
+static const union AffineAnimCmd sDeepInhaleAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(16, 0, 0, 4),
     AFFINEANIMCMD_FRAME(0, -3, 0, 16),
@@ -745,7 +745,7 @@ static const union AffineAnimCmd gDeepInhaleAffineAnimCmds[] =
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =    
+static const union AffineAnimCmd sYawnCloudAffineAnimCmds1[] =    
 {
     AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
     AFFINEANIMCMD_FRAME(-8, -8, 0, 8),
@@ -753,7 +753,7 @@ static const union AffineAnimCmd gYawnCloudAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =    
+static const union AffineAnimCmd sYawnCloudAffineAnimCmds2[] =    
 {
     AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
     AFFINEANIMCMD_FRAME(8, 8, 0, 8),
@@ -761,7 +761,7 @@ static const union AffineAnimCmd gYawnCloudAffineAnimCmds2[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =    
+static const union AffineAnimCmd sYawnCloudAffineAnimCmds3[] =    
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(8, 8, 0, 8),
@@ -769,11 +769,11 @@ static const union AffineAnimCmd gYawnCloudAffineAnimCmds3[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd *const gYawnCloudAffineAnimTable[] =    
+static const union AffineAnimCmd *const sYawnCloudAffineAnimTable[] =    
 {
-    gYawnCloudAffineAnimCmds1,
-    gYawnCloudAffineAnimCmds2,
-    gYawnCloudAffineAnimCmds3,
+    sYawnCloudAffineAnimCmds1,
+    sYawnCloudAffineAnimCmds2,
+    sYawnCloudAffineAnimCmds3,
 };
 
 const struct SpriteTemplate gYawnCloudSpriteTemplate =
@@ -783,11 +783,11 @@ const struct SpriteTemplate gYawnCloudSpriteTemplate =
     .oam = &gOamData_AffineNormal_ObjNormal_32x32,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gYawnCloudAffineAnimTable,
+    .affineAnims = sYawnCloudAffineAnimTable,
     .callback = AnimYawnCloud,
 };
 
-static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =    
+static const union AffineAnimCmd sSmokeBallEscapeCloudAffineAnimCmds1[] =    
 {
     AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
     AFFINEANIMCMD_FRAME(-4, -6, 0, 16),
@@ -795,7 +795,7 @@ static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds1[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =    
+static const union AffineAnimCmd sSmokeBallEscapeCloudAffineAnimCmds2[] =    
 {
     AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0),
     AFFINEANIMCMD_FRAME(4, 6, 0, 16),
@@ -803,7 +803,7 @@ static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds2[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =    
+static const union AffineAnimCmd sSmokeBallEscapeCloudAffineAnimCmds3[] =    
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(4, 6, 0, 16),
@@ -811,7 +811,7 @@ static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds3[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =    
+static const union AffineAnimCmd sSmokeBallEscapeCloudAffineAnimCmds4[] =    
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(8, 10, 0, 30),
@@ -819,12 +819,12 @@ static const union AffineAnimCmd gSmokeBallEscapeCloudAffineAnimCmds4[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd *const gSmokeBallEscapeCloudAffineAnimTable[] =    
+static const union AffineAnimCmd *const sSmokeBallEscapeCloudAffineAnimTable[] =    
 {
-    gSmokeBallEscapeCloudAffineAnimCmds1,
-    gSmokeBallEscapeCloudAffineAnimCmds2,
-    gSmokeBallEscapeCloudAffineAnimCmds3,
-    gSmokeBallEscapeCloudAffineAnimCmds4,
+    sSmokeBallEscapeCloudAffineAnimCmds1,
+    sSmokeBallEscapeCloudAffineAnimCmds2,
+    sSmokeBallEscapeCloudAffineAnimCmds3,
+    sSmokeBallEscapeCloudAffineAnimCmds4,
 };
 
 const struct SpriteTemplate gSmokeBallEscapeCloudSpriteTemplate =    
@@ -834,11 +834,11 @@ const struct SpriteTemplate gSmokeBallEscapeCloudSpriteTemplate =
     .oam = &gOamData_AffineDouble_ObjNormal_32x32,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gSmokeBallEscapeCloudAffineAnimTable,
+    .affineAnims = sSmokeBallEscapeCloudAffineAnimTable,
     .callback = AnimSmokeBallEscapeCloud,
 };
 
-static const union AffineAnimCmd gFacadeSquishAffineAnimCmds[] =
+static const union AffineAnimCmd sFacadeSquishAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(-16, 16, 0, 6),
     AFFINEANIMCMD_FRAME(16, -16, 0, 12),
@@ -857,7 +857,7 @@ const struct SpriteTemplate gFacadeSweatDropSpriteTemplate =
     .callback = AnimFacadeSweatDrop,
 };
 
-const u16 gFacadeBlendColors[] = 
+static const u16 sFacadeBlendColors[] = 
 {
     RGB(28, 25,  1),
     RGB(28, 21,  5),
@@ -885,24 +885,24 @@ const u16 gFacadeBlendColors[] =
     RGB(29, 27,  0),
 };
 
-static const union AnimCmd gRoarNoiseLineAnimCmds1[] =
+static const union AnimCmd sRoarNoiseLineAnimCmds1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gRoarNoiseLineAnimCmds2[] =    
+static const union AnimCmd sRoarNoiseLineAnimCmds2[] =    
 {
     ANIMCMD_FRAME(32, 3),
     ANIMCMD_FRAME(48, 3),
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd *const gRoarNoiseLineAnimTable[] =
+static const union AnimCmd *const sRoarNoiseLineAnimTable[] =
 {
-    gRoarNoiseLineAnimCmds1,
-    gRoarNoiseLineAnimCmds2,
+    sRoarNoiseLineAnimCmds1,
+    sRoarNoiseLineAnimCmds2,
 };
 
 const struct SpriteTemplate gRoarNoiseLineSpriteTemplate =
@@ -910,7 +910,7 @@ const struct SpriteTemplate gRoarNoiseLineSpriteTemplate =
     .tileTag = ANIM_TAG_NOISE_LINE,
     .paletteTag = ANIM_TAG_NOISE_LINE,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gRoarNoiseLineAnimTable,
+    .anims = sRoarNoiseLineAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = AnimRoarNoiseLine,
@@ -938,23 +938,23 @@ const struct SpriteTemplate gAssistPawprintSpriteTemplate =
     .callback = AnimAssistPawprint,
 };
 
-static const union AffineAnimCmd gBarrageBallAffineAnimCmds1[] =
+static const union AffineAnimCmd sBarrageBallAffineAnimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -4, 24),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gBarrageBallAffineAnimCmds2[] =
+static const union AffineAnimCmd sBarrageBallAffineAnimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, -64, 0),
     AFFINEANIMCMD_FRAME(0, 0, 4, 24),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const gBarrageBallAffineAnimTable[] =
+static const union AffineAnimCmd *const sBarrageBallAffineAnimTable[] =
 {
-    gBarrageBallAffineAnimCmds1,
-    gBarrageBallAffineAnimCmds2,
+    sBarrageBallAffineAnimCmds1,
+    sBarrageBallAffineAnimCmds2,
 };
 
 const struct SpriteTemplate gBarrageBallSpriteTemplate =
@@ -964,7 +964,7 @@ const struct SpriteTemplate gBarrageBallSpriteTemplate =
     .oam = &gOamData_AffineNormal_ObjNormal_32x32,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gBarrageBallAffineAnimTable,
+    .affineAnims = sBarrageBallAffineAnimTable,
     .callback = SpriteCallbackDummy,
 };
 
@@ -979,7 +979,7 @@ const struct SpriteTemplate gSmellingSaltsHandSpriteTemplate =
     .callback = AnimSmellingSaltsHand,
 };
 
-static const union AffineAnimCmd gSmellingSaltsSquishAffineAnimCmds[] =
+static const union AffineAnimCmd sSmellingSaltsSquishAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, -16, 0, 6),
     AFFINEANIMCMD_FRAME(0, 16, 0, 6),
@@ -1063,36 +1063,36 @@ const struct SpriteTemplate gUnknown_83FF704 =
     .callback = sub_80E3E84,
 };
 
-static const union AnimCmd gKnockOffStrikeAnimCmds[] =    
+static const union AnimCmd sKnockOffStrikeAnimCmds[] =    
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(64, 4),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gKnockOffStrikeAnimTable[] =    
+static const union AnimCmd *const sKnockOffStrikeAnimTable[] =    
 {
-    gKnockOffStrikeAnimCmds,
+    sKnockOffStrikeAnimCmds,
 };
 
-static const union AffineAnimCmd gKnockOffStrikeAffineanimCmds1[] =
+static const union AffineAnimCmd sKnockOffStrikeAffineanimCmds1[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, -4, 8),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gKnockOffStrikeAffineanimCmds2[] =
+static const union AffineAnimCmd sKnockOffStrikeAffineanimCmds2[] =
 {
     AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(0, 0, 4, 8),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const gKnockOffStrikeAffineAnimTable[] =
+static const union AffineAnimCmd *const sKnockOffStrikeAffineAnimTable[] =
 {
-    gKnockOffStrikeAffineanimCmds1,
-    gKnockOffStrikeAffineanimCmds2,
+    sKnockOffStrikeAffineanimCmds1,
+    sKnockOffStrikeAffineanimCmds2,
 };
 
 const struct SpriteTemplate gKnockOffStrikeSpriteTemplate =    
@@ -1100,21 +1100,21 @@ const struct SpriteTemplate gKnockOffStrikeSpriteTemplate =
     .tileTag = ANIM_TAG_SLAM_HIT_2,
     .paletteTag = ANIM_TAG_SLAM_HIT_2,
     .oam = &gOamData_AffineNormal_ObjNormal_64x64,
-    .anims = gKnockOffStrikeAnimTable,
+    .anims = sKnockOffStrikeAnimTable,
     .images = NULL,
-    .affineAnims = gKnockOffStrikeAffineAnimTable,
+    .affineAnims = sKnockOffStrikeAffineAnimTable,
     .callback = AnimKnockOffStrike,
 };
 
-static const union AffineAnimCmd gRecycleSpriteAffineAnimCmds[] =
+static const union AffineAnimCmd sRecycleSpriteAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -4, 64),
     AFFINEANIMCMD_JUMP(0),
 };
 
-static const union AffineAnimCmd *const gRecycleSpriteAffineAnimTable[] =
+static const union AffineAnimCmd *const sRecycleSpriteAffineAnimTable[] =
 {
-    gRecycleSpriteAffineAnimCmds,
+    sRecycleSpriteAffineAnimCmds,
 };
 
 const struct SpriteTemplate gRecycleSpriteTemplate =
@@ -1124,11 +1124,11 @@ const struct SpriteTemplate gRecycleSpriteTemplate =
     .oam = &gOamData_AffineNormal_ObjBlend_64x64,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
-    .affineAnims = gRecycleSpriteAffineAnimTable,
+    .affineAnims = sRecycleSpriteAffineAnimTable,
     .callback = AnimRecycle,
 };
 
-static const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] =    
+static const union AffineAnimCmd sSlackOffSquishAffineAnimCmds[] =    
 {
     AFFINEANIMCMD_FRAME(0, 16, 0, 4),
     AFFINEANIMCMD_FRAME(-2, 0, 0, 8),
@@ -1246,7 +1246,7 @@ static void AnimMeanLookEye_Step1(struct Sprite *sprite)
         StartSpriteAffineAnim(sprite, 1);
         sprite->data[2] = 0;
         sprite->invisible = TRUE;
-        sprite->affineAnimPaused = 1;
+        sprite->affineAnimPaused = TRUE;
         sprite->callback = AnimMeanLookEye_Step2;
     }
 }
@@ -1256,7 +1256,7 @@ static void AnimMeanLookEye_Step2(struct Sprite *sprite)
     if (sprite->data[2]++ > 9)
     {
         sprite->invisible = FALSE;
-        sprite->affineAnimPaused = 0;
+        sprite->affineAnimPaused = FALSE;
         if (sprite->affineAnimEnded)
             sprite->callback = AnimMeanLookEye_Step3;
     }
@@ -1885,7 +1885,7 @@ static void TormentAttacker_Step(u8 taskId)
             task->data[5] -= 6;
         }
 
-        PrepareAffineAnimInTaskData(task, task->data[15], gUnknown_83FF080);
+        PrepareAffineAnimInTaskData(task, task->data[15], sUnknown_83FF080);
         task->data[1]++;
         task->data[0] = 1;
         break;
@@ -2131,7 +2131,7 @@ void AnimTask_StockpileDeformMon(u8 taskId)
 {
     if (!gTasks[taskId].data[0])
     {
-        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gStockpileDeformMonAffineAnimCmds);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), sStockpileDeformMonAffineAnimCmds);
         gTasks[taskId].data[0]++;
     }
     else
@@ -2145,7 +2145,7 @@ void AnimTask_SpitUpDeformMon(u8 taskId)
 {
     if (!gTasks[taskId].data[0])
     {
-        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gSpitUpDeformMonAffineAnimCmds);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), sSpitUpDeformMonAffineAnimCmds);
         gTasks[taskId].data[0]++;
     }
     else
@@ -2178,7 +2178,7 @@ void AnimTask_SwallowDeformMon(u8 taskId)
 {
     if (!gTasks[taskId].data[0])
     {
-        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gSwallowDeformMonAffineAnimCmds);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), sSwallowDeformMonAffineAnimCmds);
         gTasks[taskId].data[0]++;
     }
     else
@@ -2339,7 +2339,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
         SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1]));
         if (!gTasks[taskId].data[1])
         {
-            gBattle_BG1_X = gMorningSunLightBeamCoordsTable[gTasks[taskId].data[2]] + gTasks[taskId].data[10];
+            gBattle_BG1_X = sMorningSunLightBeamCoordsTable[gTasks[taskId].data[2]] + gTasks[taskId].data[10];
             if (++gTasks[taskId].data[2] == 4)
                 gTasks[taskId].data[0] = 4;
             else
@@ -2517,9 +2517,9 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
     case 1:
         gTasks[taskId].data[3] = 0;
         if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
-            gBattle_BG1_X = gTasks[taskId].data[10] + gDoomDesireLightBeamCoordTable[gTasks[taskId].data[2]];
+            gBattle_BG1_X = gTasks[taskId].data[10] + sDoomDesireLightBeamCoordTable[gTasks[taskId].data[2]];
         else
-            gBattle_BG1_X = gTasks[taskId].data[10] - gDoomDesireLightBeamCoordTable[gTasks[taskId].data[2]];
+            gBattle_BG1_X = gTasks[taskId].data[10] - sDoomDesireLightBeamCoordTable[gTasks[taskId].data[2]];
 
         if (++gTasks[taskId].data[2] == 5)
             gTasks[taskId].data[0] = 5;
@@ -2535,7 +2535,7 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
             gTasks[taskId].data[0]++;
         break;
     case 3:
-        if (++gTasks[taskId].data[3] > gDoomDesireLightBeamDelayTable[gTasks[taskId].data[2]])
+        if (++gTasks[taskId].data[3] > sDoomDesireLightBeamDelayTable[gTasks[taskId].data[2]])
             gTasks[taskId].data[0]++;
         break;
     case 4:
@@ -2568,7 +2568,7 @@ void AnimTask_StrongFrustrationGrowAndShrink(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
-        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gStrongFrustrationAffineAnimCmds);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), sStrongFrustrationAffineAnimCmds);
         gTasks[taskId].data[0]++;
     }
     else
@@ -3371,7 +3371,7 @@ void AnimTask_DeepInhale(u8 taskId)
     
     task->data[0] = 0;
     task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-    PrepareAffineAnimInTaskData(&gTasks[taskId], task->data[15], gDeepInhaleAffineAnimCmds);
+    PrepareAffineAnimInTaskData(&gTasks[taskId], task->data[15], sDeepInhaleAffineAnimCmds);
     task->func = AnimTask_DeepInhaleStep;
 }
 
@@ -3635,7 +3635,7 @@ void AnimTask_SquishAndSweatDroplets(u8 taskId)
     task->data[5] = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y);
     task->data[6] = GetBattlerSpriteSubpriority(battler);
     task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-    PrepareAffineAnimInTaskData(task, task->data[15], gFacadeSquishAffineAnimCmds);
+    PrepareAffineAnimInTaskData(task, task->data[15], sFacadeSquishAffineAnimCmds);
     task->func = AnimTask_SquishAndSweatDropletsStep;
 }
 
@@ -3662,7 +3662,7 @@ static void AnimTask_SquishAndSweatDropletsStep(u8 taskId)
             else
             {
                 task->data[1] = 0;
-                PrepareAffineAnimInTaskData(task, task->data[15], gFacadeSquishAffineAnimCmds);
+                PrepareAffineAnimInTaskData(task, task->data[15], sFacadeSquishAffineAnimCmds);
             }
         }
         break;
@@ -3744,7 +3744,7 @@ static void AnimTask_FacadeColorBlendStep(u8 taskId)
 {
     if (gTasks[taskId].data[1])
     {
-        BlendPalette(gTasks[taskId].data[2], 16, 8, gFacadeBlendColors[gTasks[taskId].data[0]]);
+        BlendPalette(gTasks[taskId].data[2], 16, 8, sFacadeBlendColors[gTasks[taskId].data[0]]);
         if (++gTasks[taskId].data[0] > 23)
             gTasks[taskId].data[0] = 0;
 
@@ -4111,7 +4111,7 @@ void AnimTask_SmellingSaltsSquish(u8 taskId)
     {
         gTasks[taskId].data[0] = gBattleAnimArgs[1];
         gTasks[taskId].data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-        PrepareAffineAnimInTaskData(&gTasks[taskId], gTasks[taskId].data[15], gSmellingSaltsSquishAffineAnimCmds);
+        PrepareAffineAnimInTaskData(&gTasks[taskId], gTasks[taskId].data[15], sSmellingSaltsSquishAffineAnimCmds);
         gTasks[taskId].func = AnimTask_SmellingSaltsSquishStep;
     }
 }
@@ -4134,7 +4134,7 @@ static void AnimTask_SmellingSaltsSquishStep(u8 taskId)
         gSprites[task->data[15]].pos2.x = 0;
         if (--task->data[0])
         {
-            PrepareAffineAnimInTaskData(&gTasks[taskId], gTasks[taskId].data[15], gSmellingSaltsSquishAffineAnimCmds);
+            PrepareAffineAnimInTaskData(&gTasks[taskId], gTasks[taskId].data[15], sSmellingSaltsSquishAffineAnimCmds);
             task->data[1] = 0;
             task->data[2] = 0;
         }
@@ -5289,7 +5289,7 @@ void AnimTask_SlackOffSquish(u8 taskId)
     
     task->data[0] = 0;
     task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-    PrepareAffineAnimInTaskData(task, task->data[15], gSlackOffSquishAffineAnimCmds);
+    PrepareAffineAnimInTaskData(task, task->data[15], sSlackOffSquishAffineAnimCmds);
     task->func = AnimTask_SlackOffSquishStep;
 }
 

src/battle_anim_special.c

@@ -40,9 +40,9 @@
 #define LOHALF(n) ((n) & 0xFFFF)
 
 // RAM
-int gUnknown_3005424;
-u16 gUnknown_3005428;
-u16 gUnknown_300542C;
+int sUnknown_3005424;
+u16 sUnknown_3005428;
+u16 sUnknown_300542C;
 
 // Function Declarations
 static void sub_80EEDF4(u8);
@@ -158,7 +158,7 @@ const struct CompressedSpritePalette gBallParticlePalettes[] =
     {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL},
 };
 
-static const union AnimCmd gAnim_RegularBall[] =
+static const union AnimCmd sAnim_RegularBall[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -169,48 +169,48 @@ static const union AnimCmd gAnim_RegularBall[] =
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gAnim_MasterBall[] =
+static const union AnimCmd sAnim_MasterBall[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gAnim_NetDiveBall[] =
+static const union AnimCmd sAnim_NetDiveBall[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gAnim_NestBall[] =
+static const union AnimCmd sAnim_NestBall[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gAnim_LuxuryPremierBall[] =
+static const union AnimCmd sAnim_LuxuryPremierBall[] =
 {
     ANIMCMD_FRAME(6, 4),
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_JUMP(0),
 };
 
-static const union AnimCmd gAnim_UltraRepeatTimerBall[] =    
+static const union AnimCmd sAnim_UltraRepeatTimerBall[] =    
 {
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gAnims_BallParticles[] =    
+static const union AnimCmd *const sAnims_BallParticles[] =    
 {
-    gAnim_RegularBall,
-    gAnim_MasterBall,
-    gAnim_NetDiveBall,
-    gAnim_NestBall,
-    gAnim_LuxuryPremierBall,
-    gAnim_UltraRepeatTimerBall,
+    sAnim_RegularBall,
+    sAnim_MasterBall,
+    sAnim_NetDiveBall,
+    sAnim_NestBall,
+    sAnim_LuxuryPremierBall,
+    sAnim_UltraRepeatTimerBall,
 };
 
-const u8 gBallParticleAnimNums[] =
+static const u8 sBallParticleAnimNums[] =
 {
     [BALL_POKE] = 0,
     [BALL_GREAT] = 0,
@@ -226,7 +226,7 @@ const u8 gBallParticleAnimNums[] =
     [BALL_PREMIER] = 4,
 };
 
-const TaskFunc gBallParticleAnimationFuncs[] =
+static const TaskFunc sBallParticleAnimationFuncs[] =
 {
     PokeBallOpenParticleAnimation,
     GreatBallOpenParticleAnimation,
@@ -242,13 +242,13 @@ const TaskFunc gBallParticleAnimationFuncs[] =
     PremierBallOpenParticleAnimation,
 };
 
-const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
+static const struct SpriteTemplate sBallParticlesSpriteTemplates[] =
 {
     {
         .tileTag = TAG_PARTICLES_POKEBALL,
         .paletteTag = TAG_PARTICLES_POKEBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -257,7 +257,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_GREATBALL,
         .paletteTag = TAG_PARTICLES_GREATBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -266,7 +266,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_SAFARIBALL,
         .paletteTag = TAG_PARTICLES_SAFARIBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -275,7 +275,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_ULTRABALL,
         .paletteTag = TAG_PARTICLES_ULTRABALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -284,7 +284,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_MASTERBALL,
         .paletteTag = TAG_PARTICLES_MASTERBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -293,7 +293,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_NETBALL,
         .paletteTag = TAG_PARTICLES_NETBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -302,7 +302,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_DIVEBALL,
         .paletteTag = TAG_PARTICLES_DIVEBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -311,7 +311,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_NESTBALL,
         .paletteTag = TAG_PARTICLES_NESTBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -320,7 +320,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_REPEATBALL,
         .paletteTag = TAG_PARTICLES_REPEATBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -329,7 +329,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_TIMERBALL,
         .paletteTag = TAG_PARTICLES_TIMERBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -338,7 +338,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_LUXURYBALL,
         .paletteTag = TAG_PARTICLES_LUXURYBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -347,14 +347,14 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
         .tileTag = TAG_PARTICLES_PREMIERBALL,
         .paletteTag = TAG_PARTICLES_PREMIERBALL,
         .oam = &gOamData_AffineOff_ObjNormal_8x8,
-        .anims = gAnims_BallParticles,
+        .anims = sAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
 };
 
-const u16 gBallOpenFadeColors[] =
+static const u16 sBallOpenFadeColors[] =
 {
     [BALL_POKE] = RGB(31, 22, 30),
     [BALL_GREAT] = RGB(16, 23, 30),
@@ -391,15 +391,15 @@ const struct SpriteTemplate gPokeblockSpriteTemplate =
     .callback = sub_80F1B3C,
 };
 
-static const union AnimCmd gUnknown_840C204[] =
+static const union AnimCmd sUnknown_840C204[] =
 {
     ANIMCMD_FRAME(64, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gSpriteAnimTable_840C20C[] =
+static const union AnimCmd *const sSpriteAnimTable_840C20C[] =
 {
-    gUnknown_840C204,
+    sUnknown_840C204,
 };
 
 const struct SpriteTemplate gUnknown_840C210 =
@@ -407,7 +407,7 @@ const struct SpriteTemplate gUnknown_840C210 =
     .tileTag = ANIM_TAG_ROCKS,
     .paletteTag = ANIM_TAG_ROCKS,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gSpriteAnimTable_840C20C,
+    .anims = sSpriteAnimTable_840C20C,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_80F1B3C,
@@ -899,10 +899,10 @@ static void sub_80EFA0C(struct Sprite *sprite)
     case 0:
         PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL);
         gTasks[taskId].data[10] = 256;
-        gUnknown_3005424 = 28;
-        gUnknown_300542C = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y);
-        gUnknown_3005428 = (u32)(gUnknown_300542C * 256) / 28;
-        gTasks[taskId].data[2] = gUnknown_3005428;
+        sUnknown_3005424 = 28;
+        sUnknown_300542C = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y);
+        sUnknown_3005428 = (u32)(sUnknown_300542C * 256) / 28;
+        gTasks[taskId].data[2] = sUnknown_3005428;
         gTasks[taskId].data[0]++;
         break;
     case 1:
@@ -1293,7 +1293,7 @@ static void sub_80F01B8(struct Sprite *sprite)
     sub_80F05B4(4);
     for (i = 0; i < 3; i++)
     {
-        u8 spriteId = CreateSprite(&gBallParticlesSpriteTemplates[4], sprite->pos1.x, sprite->pos1.y, subpriority);
+        u8 spriteId = CreateSprite(&sBallParticlesSpriteTemplates[4], sprite->pos1.x, sprite->pos1.y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].data[0] = 24;
@@ -1302,7 +1302,7 @@ static void sub_80F01B8(struct Sprite *sprite)
             gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2;
             InitAnimArcTranslation(&gSprites[spriteId]);
             gSprites[spriteId].callback = sub_80F0278;
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[4]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[4]);
         }
     }
 }
@@ -1443,7 +1443,7 @@ u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId)
     u8 taskId;
 
     sub_80F05B4(ballId);
-    taskId = CreateTask(gBallParticleAnimationFuncs[ballId], 5);
+    taskId = CreateTask(sBallParticleAnimationFuncs[ballId], 5);
     gTasks[taskId].data[1] = x;
     gTasks[taskId].data[2] = y;
     gTasks[taskId].data[3] = priority;
@@ -1475,11 +1475,11 @@ static void PokeBallOpenParticleAnimation(u8 taskId)
         priority = gTasks[taskId].data[3];
         subpriority = gTasks[taskId].data[4];
 
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1;
             gSprites[spriteId].oam.priority = priority;
 
@@ -1534,11 +1534,11 @@ static void TimerBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1568,11 +1568,11 @@ static void DiveBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1603,11 +1603,11 @@ static void SafariBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1638,11 +1638,11 @@ static void UltraBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 10; i++)
     {
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 25;
@@ -1679,11 +1679,11 @@ static void GreatBallOpenParticleAnimation(u8 taskId)
 
         for (i = 0; i < 8; i++)
         {
-            spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+            spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
             if (spriteId != MAX_SPRITES)
             {
                 sub_80F0674();
-                StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+                StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
                 gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
                 gSprites[spriteId].oam.priority = priority;
                 gSprites[spriteId].data[0] = i * 32;
@@ -1729,11 +1729,11 @@ static void RepeatBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < POKEBALL_COUNT; i++)
     {
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 21;
@@ -1773,11 +1773,11 @@ static void MasterBallOpenParticleAnimation(u8 taskId)
     {
         for (i = 0; i < 8; i++)
         {
-            spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+            spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
             if (spriteId != MAX_SPRITES)
             {
                 sub_80F0674();
-                StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+                StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
                 gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
                 gSprites[spriteId].oam.priority = priority;
                 gSprites[spriteId].data[0] = i * 32;
@@ -1817,11 +1817,11 @@ static void PremierBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&sBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_80F0674();
-            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], sBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1888,12 +1888,12 @@ u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 battler, u32 selectedPalettes, u8
 
     if (!unfadeLater)
     {
-        BlendPalette(battler * 16 + 0x100, 16, 0, gBallOpenFadeColors[ballId]);
+        BlendPalette(battler * 16 + 0x100, 16, 0, sBallOpenFadeColors[ballId]);
         gTasks[taskId].data[1] = 1;
     }
     else
     {
-        BlendPalette(battler * 16 + 0x100, 16, 16, gBallOpenFadeColors[ballId]);
+        BlendPalette(battler * 16 + 0x100, 16, 16, sBallOpenFadeColors[ballId]);
         gTasks[taskId].data[0] = 16;
         gTasks[taskId].data[1] = -1;
         gTasks[taskId].func = sub_80F1370;
@@ -1909,7 +1909,7 @@ static void sub_80F12E0(u8 taskId)
 
     if (gTasks[taskId].data[2] <= 16)
     {
-        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]);
+        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], sBallOpenFadeColors[ballId]);
         gTasks[taskId].data[0] += gTasks[taskId].data[1];
         gTasks[taskId].data[2]++;
     }
@@ -1937,7 +1937,7 @@ static void sub_80F13C0(u8 taskId)
 
     if (gTasks[taskId].data[2] <= 16)
     {
-        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]);
+        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], sBallOpenFadeColors[ballId]);
         gTasks[taskId].data[0] += gTasks[taskId].data[1];
         gTasks[taskId].data[2]++;
     }

src/battle_anim_status_effects.c

@@ -23,7 +23,7 @@ static void sub_807834C(struct Sprite *sprite);
 static void sub_8078380(struct Sprite *sprite);
 
 // Data
-static const union AnimCmd gUnknown_83BF3E0[] =
+static const union AnimCmd sUnknown_83BF3E0[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(4, 3),
@@ -32,9 +32,9 @@ static const union AnimCmd gUnknown_83BF3E0[] =
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAnimTable_83BF3F4[] =
+static const union AnimCmd *const sSpriteAnimTable_83BF3F4[] =
 {
-    gUnknown_83BF3E0
+    sUnknown_83BF3E0
 };
 
 const struct SpriteTemplate gSpriteTemplate_83BF3F8 =
@@ -42,7 +42,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF3F8 =
     .tileTag = ANIM_TAG_ORB,
     .paletteTag = ANIM_TAG_ORB,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = gSpriteAnimTable_83BF3F4,
+    .anims = sSpriteAnimTable_83BF3F4,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_8076F58,
@@ -53,21 +53,21 @@ const struct SpriteTemplate gSpriteTemplate_83BF410 =
     .tileTag = ANIM_TAG_ORB,
     .paletteTag = ANIM_TAG_ORB,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = gSpriteAnimTable_83BF3F4,
+    .anims = sSpriteAnimTable_83BF3F4,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_8076ED8,
 };
 
-static const union AnimCmd gUnknown_83BF428[] =
+static const union AnimCmd sUnknown_83BF428[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAnimTable_83BF430[] =
+static const union AnimCmd *const sSpriteAnimTable_83BF430[] =
 {
-    gUnknown_83BF428
+    sUnknown_83BF428
 };
 
 const struct SpriteTemplate gSpriteTemplate_83BF434 =
@@ -75,7 +75,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF434 =
     .tileTag = ANIM_TAG_WEATHER_BALL,
     .paletteTag = ANIM_TAG_WEATHER_BALL,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gSpriteAnimTable_83BF430,
+    .anims = sSpriteAnimTable_83BF430,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_807729C,
@@ -86,13 +86,13 @@ const struct SpriteTemplate gSpriteTemplate_83BF44C =
     .tileTag = ANIM_TAG_WEATHER_BALL,
     .paletteTag = ANIM_TAG_WEATHER_BALL,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gSpriteAnimTable_83BF430,
+    .anims = sSpriteAnimTable_83BF430,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_8077350,
 };
 
-static const union AnimCmd gUnknown_83BF464[] =
+static const union AnimCmd sUnknown_83BF464[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(16, 3),
@@ -102,9 +102,9 @@ static const union AnimCmd gUnknown_83BF464[] =
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_83BF47C[] =
+static const union AnimCmd *const sSpriteAnimTable_83BF47C[] =
 {
-    gUnknown_83BF464
+    sUnknown_83BF464
 };
 
 const struct SpriteTemplate gSpriteTemplate_83BF480 =
@@ -112,7 +112,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF480 =
     .tileTag = ANIM_TAG_SPARKLE_4,
     .paletteTag = ANIM_TAG_SPARKLE_4,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gSpriteAnimTable_83BF47C,
+    .anims = sSpriteAnimTable_83BF47C,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_8076FD0,
@@ -129,29 +129,29 @@ const struct SpriteTemplate gSpriteTemplate_83BF498 =
     .callback = sub_8076F58,
 };
 
-static const union AnimCmd gUnknown_83BF4B0[] =
+static const union AnimCmd sUnknown_83BF4B0[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_83BF4B8[] =
+static const union AnimCmd sUnknown_83BF4B8[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gUnknown_83BF4C0[] =
+static const union AnimCmd sUnknown_83BF4C0[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAniimTable_83BF4C8[] =
+static const union AnimCmd *const sSpriteAniimTable_83BF4C8[] =
 {
-    gUnknown_83BF4B0,
-    gUnknown_83BF4B8,
-    gUnknown_83BF4C0
+    sUnknown_83BF4B0,
+    sUnknown_83BF4B8,
+    sUnknown_83BF4C0
 };
 
 const struct SpriteTemplate gSpriteTemplate_83BF4D4 =
@@ -159,33 +159,33 @@ const struct SpriteTemplate gSpriteTemplate_83BF4D4 =
     .tileTag = ANIM_TAG_IMPACT,
     .paletteTag = ANIM_TAG_IMPACT,
     .oam = &gOamData_AffineOff_ObjNormal_32x32,
-    .anims = gSpriteAniimTable_83BF4C8,
+    .anims = sSpriteAniimTable_83BF4C8,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_8076F58,
 };
 
-static const union AnimCmd gUnknown_83BF4EC[] =
+static const union AnimCmd sUnknown_83BF4EC[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAnimTable_83BF4F4[] =
+static const union AnimCmd *const sSpriteAnimTable_83BF4F4[] =
 {
-    gUnknown_83BF4EC
+    sUnknown_83BF4EC
 };
 
-static const union AffineAnimCmd gUnknown_83BF4F8[] =
+static const union AffineAnimCmd sUnknown_83BF4F8[] =
 {
     AFFINEANIMCMD_FRAME(96, 96, 0, 0),
     AFFINEANIMCMD_FRAME(2, 2, 0, 1),
     AFFINEANIMCMD_JUMP(1)
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_83BF510[] =
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_83BF510[] =
 {
-    gUnknown_83BF4F8
+    sUnknown_83BF4F8
 };
 
 const struct SpriteTemplate gSpriteTemplate_83BF514 =
@@ -193,15 +193,15 @@ const struct SpriteTemplate gSpriteTemplate_83BF514 =
     .tileTag = ANIM_TAG_ORB,
     .paletteTag = ANIM_TAG_ORB,
     .oam = &gOamData_AffineDouble_ObjNormal_16x16,
-    .anims = gSpriteAnimTable_83BF4F4,
+    .anims = sSpriteAnimTable_83BF4F4,
     .images = NULL,
-    .affineAnims = gSpriteAffineAnimTable_83BF510,
+    .affineAnims = sSpriteAffineAnimTable_83BF510,
     .callback = sub_8076ED8,
 };
 
-const u8 gUnknown_83BF52C[] = _("TASK OVER\nタスクがオ-バ-しました");
+static const u8 sUnknown_83BF52C[] = _("TASK OVER\nタスクがオ-バ-しました");
 
-static const struct Subsprite gSubsprites_83BF544[] =
+static const struct Subsprite sSubsprites_83BF544[] =
 {
     {.x = -16, .y = -16, .shape = SPRITE_SHAPE(8x8),  .size = 3, .tileOffset =   0, .priority = 2},
     {.x = -16, .y =  48, .shape = SPRITE_SHAPE(16x8), .size = 3, .tileOffset =  64, .priority = 2},
@@ -209,12 +209,12 @@ static const struct Subsprite gSubsprites_83BF544[] =
     {.x =  48, .y =  48, .shape = SPRITE_SHAPE(8x8),  .size = 2, .tileOffset = 128, .priority = 2},
 };
 
-static const struct SubspriteTable gUnknown_83BF554[] =
+static const struct SubspriteTable sUnknown_83BF554[] =
 {
-    {NELEMS(gSubsprites_83BF544), gSubsprites_83BF544},
+    {NELEMS(sSubsprites_83BF544), sSubsprites_83BF544},
 };
 
-static const struct SpriteTemplate gUnknown_83BF55C =
+static const struct SpriteTemplate sUnknown_83BF55C =
 {
     .tileTag = ANIM_TAG_ICE_CUBE,
     .paletteTag = ANIM_TAG_ICE_CUBE,
@@ -225,7 +225,7 @@ static const struct SpriteTemplate gUnknown_83BF55C =
     .callback = SpriteCallbackDummy,
 };
 
-static const struct SpriteTemplate gUnknown_83BF574 =
+static const struct SpriteTemplate sUnknown_83BF574 =
 {
     .tileTag = ANIM_TAG_CIRCLE_IMPACT,
     .paletteTag = ANIM_TAG_CIRCLE_IMPACT,
@@ -252,7 +252,7 @@ static u8 sub_8078178(u8 battlerId, bool8 b)
         gTasks[taskId].data[1] = RGB_RED;
         for (i = 0; i < 10; i++)
         {
-            spriteId2 = CreateSprite(&gUnknown_83BF574, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0);
+            spriteId2 = CreateSprite(&sUnknown_83BF574, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0);
             gSprites[spriteId2].data[0] = i * 51;
             gSprites[spriteId2].data[1] = -256;
             gSprites[spriteId2].invisible = TRUE;
@@ -265,7 +265,7 @@ static u8 sub_8078178(u8 battlerId, bool8 b)
         gTasks[taskId].data[1] = RGB_BLUE;
         for (i = 0; i < 10; i++)
         {
-            spriteId2 = CreateSprite(&gUnknown_83BF574, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0);
+            spriteId2 = CreateSprite(&sUnknown_83BF574, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0);
             gSprites[spriteId2].data[0] = i * 51;
             gSprites[spriteId2].data[1] = 256;
             gSprites[spriteId2].invisible = TRUE;
@@ -356,11 +356,11 @@ void sub_80783FC(u8 taskId)
     
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
-    spriteId = CreateSprite(&gUnknown_83BF55C, x, y, 4);
+    spriteId = CreateSprite(&sUnknown_83BF55C, x, y, 4);
     if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == SPRITE_INVALID_TAG)
         gSprites[spriteId].invisible = TRUE;
     
-    SetSubspriteTables(&gSprites[spriteId], gUnknown_83BF554);
+    SetSubspriteTables(&gSprites[spriteId], sUnknown_83BF554);
     gTasks[taskId].data[15] = spriteId;
     gTasks[taskId].func = sub_80784D8;
 }