diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_anim.c | 44 | ||||
| -rw-r--r-- | src/battle_anim_effects_1.c | 772 | ||||
| -rw-r--r-- | src/battle_anim_effects_2.c | 348 | ||||
| -rw-r--r-- | src/battle_anim_effects_3.c | 306 | ||||
| -rw-r--r-- | src/battle_anim_special.c | 130 | ||||
| -rw-r--r-- | src/battle_anim_status_effects.c | 80 |
6 files changed, 841 insertions, 839 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index dbaffa31b..0cb88219a 100644 --- a/src/battle_anim.c +++ b/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; } } diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index da9998c2f..647d2f367 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -16,7 +16,7 @@ #include "constants/songs.h" // RAM -static EWRAM_DATA s16 gUnknown_203999C[4] = {0}; +EWRAM_DATA static s16 gUnknown_203999C[4] = {0}; // Function Declarations static void AnimMovePowderParticleStep(struct Sprite *); @@ -91,9 +91,10 @@ static void AnimFollowMeFingerStep2(struct Sprite *); static void AnimTauntFingerStep1(struct Sprite *); static void AnimTauntFingerStep2(struct Sprite *); -static const u8 gUnknown_83E2964[] = {0x02, 0x04, 0x01, 0x03}; +// Unused +static const u8 sUnknown_83E2964[] = {0x02, 0x04, 0x01, 0x03}; -static const union AnimCmd gPowderParticlesAnimCmds[] = +static const union AnimCmd sPowderParticlesAnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(2, 5), @@ -106,9 +107,9 @@ static const union AnimCmd gPowderParticlesAnimCmds[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gPowderParticlesAnimTable[] = +static const union AnimCmd *const sPowderParticlesAnimTable[] = { - gPowderParticlesAnimCmds, + sPowderParticlesAnimCmds, }; const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = @@ -116,7 +117,7 @@ const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = .tileTag = ANIM_TAG_SLEEP_POWDER, .paletteTag = ANIM_TAG_SLEEP_POWDER, .oam = &gOamData_AffineOff_ObjNormal_8x16, - .anims = gPowderParticlesAnimTable, + .anims = sPowderParticlesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovePowderParticle, @@ -127,7 +128,7 @@ const struct SpriteTemplate gStunSporeParticleSpriteTemplate = .tileTag = ANIM_TAG_STUN_SPORE, .paletteTag = ANIM_TAG_STUN_SPORE, .oam = &gOamData_AffineOff_ObjNormal_8x16, - .anims = gPowderParticlesAnimTable, + .anims = sPowderParticlesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovePowderParticle, @@ -138,96 +139,96 @@ const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = .tileTag = ANIM_TAG_POISON_POWDER, .paletteTag = ANIM_TAG_POISON_POWDER, .oam = &gOamData_AffineOff_ObjNormal_8x16, - .anims = gPowderParticlesAnimTable, + .anims = sPowderParticlesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovePowderParticle, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds1[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds2[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds2[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds3[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds3[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds4[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds4[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds5[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds5[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds6[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds6[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamBigOrbAnimCmds7[] = +static const union AnimCmd sSolarbeamBigOrbAnimCmds7[] = { ANIMCMD_FRAME(6, 1), ANIMCMD_END, }; -static const union AnimCmd gSolarbeamSmallOrbAnimCms[] = +static const union AnimCmd sSolarbeamSmallOrbAnimCms[] = { ANIMCMD_FRAME(7, 1), ANIMCMD_END, }; -static const union AnimCmd gPowerAbsorptionOrbAnimCmds[] = +static const union AnimCmd sPowerAbsorptionOrbAnimCmds[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END, }; -static const union AnimCmd *const gSolarbeamBigOrbAnimTable[] = +static const union AnimCmd *const sSolarbeamBigOrbAnimTable[] = { - gSolarbeamBigOrbAnimCmds1, - gSolarbeamBigOrbAnimCmds2, - gSolarbeamBigOrbAnimCmds3, - gSolarbeamBigOrbAnimCmds4, - gSolarbeamBigOrbAnimCmds5, - gSolarbeamBigOrbAnimCmds6, - gSolarbeamBigOrbAnimCmds7, + sSolarbeamBigOrbAnimCmds1, + sSolarbeamBigOrbAnimCmds2, + sSolarbeamBigOrbAnimCmds3, + sSolarbeamBigOrbAnimCmds4, + sSolarbeamBigOrbAnimCmds5, + sSolarbeamBigOrbAnimCmds6, + sSolarbeamBigOrbAnimCmds7, }; -static const union AnimCmd *const gSolarbeamSmallOrbAnimTable[] = +static const union AnimCmd *const sSolarbeamSmallOrbAnimTable[] = { - gSolarbeamSmallOrbAnimCms, + sSolarbeamSmallOrbAnimCms, }; -static const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] = +static const union AnimCmd *const sPowerAbsorptionOrbAnimTable[] = { - gPowerAbsorptionOrbAnimCmds, + sPowerAbsorptionOrbAnimCmds, }; -static const union AffineAnimCmd gPowerAbsorptionOrbAffineAnimCmds[] = +static const union AffineAnimCmd sPowerAbsorptionOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-5, -5, 0, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gPowerAbsorptionOrbAffineAnimTable[] = +static const union AffineAnimCmd *const sPowerAbsorptionOrbAffineAnimTable[] = { - gPowerAbsorptionOrbAffineAnimCmds, + sPowerAbsorptionOrbAffineAnimCmds, }; const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate = @@ -235,9 +236,9 @@ const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineNormal_ObjBlend_16x16, - .anims = gPowerAbsorptionOrbAnimTable, + .anims = sPowerAbsorptionOrbAnimTable, .images = NULL, - .affineAnims = gPowerAbsorptionOrbAffineAnimTable, + .affineAnims = sPowerAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb, }; @@ -246,7 +247,7 @@ const struct SpriteTemplate gSolarbeamBigOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gSolarbeamBigOrbAnimTable, + .anims = sSolarbeamBigOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSolarbeamBigOrb, @@ -257,22 +258,22 @@ const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gSolarbeamSmallOrbAnimTable, + .anims = sSolarbeamSmallOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSolarbeamSmallOrb, }; -static const union AffineAnimCmd gStockpileAbsorptionOrbAffineCmds[] = +static const union AffineAnimCmd sStockpileAbsorptionOrbAffineCmds[] = { AFFINEANIMCMD_FRAME(320, 320, 0, 0), AFFINEANIMCMD_FRAME(-14, -14, 0, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd *const gStockpileAbsorptionOrbAffineAnimTable[] = +static const union AffineAnimCmd *const sStockpileAbsorptionOrbAffineAnimTable[] = { - gStockpileAbsorptionOrbAffineCmds, + sStockpileAbsorptionOrbAffineCmds, }; const struct SpriteTemplate gStockpileAbsorptionOrbSpriteTemplate = @@ -282,19 +283,19 @@ const struct SpriteTemplate gStockpileAbsorptionOrbSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_8x8, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, + .affineAnims = sStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb, }; -static const union AffineAnimCmd gAbsorptionOrbAffineAnimCmds[] = +static const union AffineAnimCmd sAbsorptionOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-5, -5, 0, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gAbsorptionOrbAffineAnimTable[] = +static const union AffineAnimCmd *const sAbsorptionOrbAffineAnimTable[] = { - gAbsorptionOrbAffineAnimCmds, + sAbsorptionOrbAffineAnimCmds, }; const struct SpriteTemplate gAbsorptionOrbSpriteTemplate = @@ -302,9 +303,9 @@ const struct SpriteTemplate gAbsorptionOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineNormal_ObjBlend_16x16, - .anims = gPowerAbsorptionOrbAnimTable, + .anims = sPowerAbsorptionOrbAnimTable, .images = NULL, - .affineAnims = gAbsorptionOrbAffineAnimTable, + .affineAnims = sAbsorptionOrbAffineAnimTable, .callback = AnimAbsorptionOrb, }; @@ -313,29 +314,29 @@ const struct SpriteTemplate gHyperBeamOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gSolarbeamBigOrbAnimTable, + .anims = sSolarbeamBigOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb, }; -static const union AnimCmd gLeechSeedAnimCmds1[] = +static const union AnimCmd sLeechSeedAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gLeechSeedAnimCmds2[] = +static const union AnimCmd sLeechSeedAnimCmds2[] = { ANIMCMD_FRAME(4, 7), ANIMCMD_FRAME(8, 7), ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gLeechSeedAnimTable[] = +static const union AnimCmd *const sLeechSeedAnimTable[] = { - gLeechSeedAnimCmds1, - gLeechSeedAnimCmds2, + sLeechSeedAnimCmds1, + sLeechSeedAnimCmds2, }; const struct SpriteTemplate gLeechSeedSpriteTemplate = @@ -343,28 +344,28 @@ const struct SpriteTemplate gLeechSeedSpriteTemplate = .tileTag = ANIM_TAG_SEED, .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gLeechSeedAnimTable, + .anims = sLeechSeedAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimLeechSeed, }; -static const union AnimCmd gSporeParticleAnimCmds1[] = +static const union AnimCmd sSporeParticleAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gSporeParticleAnimCmds2[] = +static const union AnimCmd sSporeParticleAnimCmds2[] = { ANIMCMD_FRAME(4, 7), ANIMCMD_END, }; -static const union AnimCmd *const gSporeParticleAnimTable[] = +static const union AnimCmd *const sSporeParticleAnimTable[] = { - gSporeParticleAnimCmds1, - gSporeParticleAnimCmds2, + sSporeParticleAnimCmds1, + sSporeParticleAnimCmds2, }; const struct SpriteTemplate gSporeParticleSpriteTemplate = @@ -372,32 +373,32 @@ const struct SpriteTemplate gSporeParticleSpriteTemplate = .tileTag = ANIM_TAG_SPORE, .paletteTag = ANIM_TAG_SPORE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gSporeParticleAnimTable, + .anims = sSporeParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSporeParticle, }; -static const union AnimCmd gPetalDanceBigFlowerAnimCmds[] = +static const union AnimCmd sPetalDanceBigFlowerAnimCmds[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gPetalDanceSmallFlowerAnimCmds[] = +static const union AnimCmd sPetalDanceSmallFlowerAnimCmds[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -static const union AnimCmd *const gPetalDanceBigFlowerAnimTable[] = +static const union AnimCmd *const sPetalDanceBigFlowerAnimTable[] = { - gPetalDanceBigFlowerAnimCmds, + sPetalDanceBigFlowerAnimCmds, }; -static const union AnimCmd *const gPetalDanceSmallFlowerAnimTable[] = +static const union AnimCmd *const sPetalDanceSmallFlowerAnimTable[] = { - gPetalDanceSmallFlowerAnimCmds, + sPetalDanceSmallFlowerAnimCmds, }; const struct SpriteTemplate gPetalDanceBigFlowerSpriteTemplate = @@ -405,7 +406,7 @@ const struct SpriteTemplate gPetalDanceBigFlowerSpriteTemplate = .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gPetalDanceBigFlowerAnimTable, + .anims = sPetalDanceBigFlowerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimPetalDanceBigFlower, @@ -416,13 +417,13 @@ const struct SpriteTemplate gPetalDanceSmallFlowerSpriteTemplate = .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gPetalDanceSmallFlowerAnimTable, + .anims = sPetalDanceSmallFlowerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimPetalDanceSmallFlower, }; -static const union AnimCmd gRazorLeafParticleAnimCmds1[] = +static const union AnimCmd sRazorLeafParticleAnimCmds1[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(4, 5), @@ -437,7 +438,7 @@ static const union AnimCmd gRazorLeafParticleAnimCmds1[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd gRazorLeafParticleAnimCmds2[] = +static const union AnimCmd sRazorLeafParticleAnimCmds2[] = { ANIMCMD_FRAME(24, 5), ANIMCMD_FRAME(28, 5), @@ -445,10 +446,10 @@ static const union AnimCmd gRazorLeafParticleAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gRazorLeafParticleAnimTable[] = +static const union AnimCmd *const sRazorLeafParticleAnimTable[] = { - gRazorLeafParticleAnimCmds1, - gRazorLeafParticleAnimCmds2, + sRazorLeafParticleAnimCmds1, + sRazorLeafParticleAnimCmds2, }; const struct SpriteTemplate gRazorLeafParticleSpriteTemplate = @@ -456,7 +457,7 @@ const struct SpriteTemplate gRazorLeafParticleSpriteTemplate = .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gRazorLeafParticleAnimTable, + .anims = sRazorLeafParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimRazorLeafParticle, @@ -467,13 +468,13 @@ const struct SpriteTemplate gTwisterLeafParticleSpriteTemplate = .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gRazorLeafParticleAnimTable, + .anims = sRazorLeafParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMoveTwisterParticle, }; -static const union AnimCmd gRazorLeafCutterAnimCmds[] = +static const union AnimCmd sRazorLeafCutterAnimCmds[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3, .hFlip = TRUE), @@ -482,9 +483,9 @@ static const union AnimCmd gRazorLeafCutterAnimCmds[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gRazorLeafCutterAnimTable[] = +static const union AnimCmd *const sRazorLeafCutterAnimTable[] = { - gRazorLeafCutterAnimCmds, + sRazorLeafCutterAnimCmds, }; const struct SpriteTemplate gRazorLeafCutterSpriteTemplate = @@ -492,21 +493,21 @@ const struct SpriteTemplate gRazorLeafCutterSpriteTemplate = .tileTag = ANIM_TAG_RAZOR_LEAF, .paletteTag = ANIM_TAG_RAZOR_LEAF, .oam = &gOamData_AffineOff_ObjNormal_32x16, - .anims = gRazorLeafCutterAnimTable, + .anims = sRazorLeafCutterAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimTranslateLinearSingleSineWave, }; -static const union AffineAnimCmd gSwiftStarAffineAnimCmds[] = +static const union AffineAnimCmd sSwiftStarAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gSwiftStarAffineAnimTable[] = +static const union AffineAnimCmd *const sSwiftStarAffineAnimTable[] = { - gSwiftStarAffineAnimCmds, + sSwiftStarAffineAnimCmds, }; const struct SpriteTemplate gSwiftStarSpriteTemplate = @@ -516,11 +517,11 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSwiftStarAffineAnimTable, + .affineAnims = sSwiftStarAffineAnimTable, .callback = AnimTranslateLinearSingleSineWave, }; -static const union AnimCmd gConstrictBindingAnimCmds1[] = +static const union AnimCmd sConstrictBindingAnimCmds1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(32, 4), @@ -529,7 +530,7 @@ static const union AnimCmd gConstrictBindingAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gConstrictBindingAnimCmds2[] = +static const union AnimCmd sConstrictBindingAnimCmds2[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(32, 4, .hFlip = TRUE), @@ -538,13 +539,13 @@ static const union AnimCmd gConstrictBindingAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gConstrictBindingAnimTable[] = +static const union AnimCmd *const sConstrictBindingAnimTable[] = { - gConstrictBindingAnimCmds1, - gConstrictBindingAnimCmds2, + sConstrictBindingAnimCmds1, + sConstrictBindingAnimCmds2, }; -static const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = +static const union AffineAnimCmd sConstrictBindingAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(-11, 0, 0, 6), @@ -552,7 +553,7 @@ static const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = +static const union AffineAnimCmd sConstrictBindingAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(11, 0, 0, 6), @@ -560,10 +561,10 @@ static const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gConstrictBindingAffineAnimTable[] = +static const union AffineAnimCmd *const sConstrictBindingAffineAnimTable[] = { - gConstrictBindingAffineAnimCmds1, - gConstrictBindingAffineAnimCmds2, + sConstrictBindingAffineAnimCmds1, + sConstrictBindingAffineAnimCmds2, }; const struct SpriteTemplate gConstrictBindingSpriteTemplate = @@ -571,29 +572,29 @@ const struct SpriteTemplate gConstrictBindingSpriteTemplate = .tileTag = ANIM_TAG_TENDRILS, .paletteTag = ANIM_TAG_TENDRILS, .oam = &gOamData_AffineNormal_ObjNormal_64x32, - .anims = gConstrictBindingAnimTable, + .anims = sConstrictBindingAnimTable, .images = NULL, - .affineAnims = gConstrictBindingAffineAnimTable, + .affineAnims = sConstrictBindingAffineAnimTable, .callback = AnimConstrictBinding, }; -static const union AffineAnimCmd gMimicOrbAffineAnimCmds1[] = +static const union AffineAnimCmd sMimicOrbAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 0), AFFINEANIMCMD_FRAME(48, 48, 0, 14), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gMimicOrbAffineAnimCmds2[] = +static const union AffineAnimCmd sMimicOrbAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(-16, -16, 0, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gMimicOrbAffineAnimTable[] = +static const union AffineAnimCmd *const sMimicOrbAffineAnimTable[] = { - gMimicOrbAffineAnimCmds1, - gMimicOrbAffineAnimCmds2, + sMimicOrbAffineAnimCmds1, + sMimicOrbAffineAnimCmds2, }; const struct SpriteTemplate gMimicOrbSpriteTemplate = @@ -601,13 +602,13 @@ const struct SpriteTemplate gMimicOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineDouble_ObjNormal_16x16, - .anims = gPowerAbsorptionOrbAnimTable, + .anims = sPowerAbsorptionOrbAnimTable, .images = NULL, - .affineAnims = gMimicOrbAffineAnimTable, + .affineAnims = sMimicOrbAffineAnimTable, .callback = AnimMimicOrb, }; -static const union AnimCmd gIngrainRootAnimCmds1[] = +static const union AnimCmd sIngrainRootAnimCmds1[] = { ANIMCMD_FRAME(0, 7), ANIMCMD_FRAME(16, 7), @@ -616,7 +617,7 @@ static const union AnimCmd gIngrainRootAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gIngrainRootAnimCmds2[] = +static const union AnimCmd sIngrainRootAnimCmds2[] = { ANIMCMD_FRAME(0, 7, .hFlip = TRUE), ANIMCMD_FRAME(16, 7, .hFlip = TRUE), @@ -625,7 +626,7 @@ static const union AnimCmd gIngrainRootAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd gIngrainRootAnimCmds3[] = +static const union AnimCmd sIngrainRootAnimCmds3[] = { ANIMCMD_FRAME(0, 7), ANIMCMD_FRAME(16, 7), @@ -633,7 +634,7 @@ static const union AnimCmd gIngrainRootAnimCmds3[] = ANIMCMD_END, }; -static const union AnimCmd gIngrainRootAnimCmds4[] = +static const union AnimCmd sIngrainRootAnimCmds4[] = { ANIMCMD_FRAME(0, 7, .hFlip = TRUE), ANIMCMD_FRAME(16, 7, .hFlip = TRUE), @@ -641,12 +642,12 @@ static const union AnimCmd gIngrainRootAnimCmds4[] = ANIMCMD_END, }; -static const union AnimCmd *const gIngrainRootAnimTable[] = +static const union AnimCmd *const sIngrainRootAnimTable[] = { - gIngrainRootAnimCmds1, - gIngrainRootAnimCmds2, - gIngrainRootAnimCmds3, - gIngrainRootAnimCmds4, + sIngrainRootAnimCmds1, + sIngrainRootAnimCmds2, + sIngrainRootAnimCmds3, + sIngrainRootAnimCmds4, }; const struct SpriteTemplate gIngrainRootSpriteTemplate = @@ -654,7 +655,7 @@ const struct SpriteTemplate gIngrainRootSpriteTemplate = .tileTag = ANIM_TAG_ROOTS, .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gIngrainRootAnimTable, + .anims = sIngrainRootAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimIngrainRoot, @@ -665,22 +666,22 @@ const struct SpriteTemplate gFrenzyPlantRootSpriteTemplate = .tileTag = ANIM_TAG_ROOTS, .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gIngrainRootAnimTable, + .anims = sIngrainRootAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFrenzyPlantRoot, }; -static const union AnimCmd gIngrainOrbAnimCmds[] = +static const union AnimCmd sIngrainOrbAnimCmds[] = { ANIMCMD_FRAME(3, 3), ANIMCMD_FRAME(0, 5), ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gIngrainOrbAnimTable[] = +static const union AnimCmd *const sIngrainOrbAnimTable[] = { - gIngrainOrbAnimCmds, + sIngrainOrbAnimCmds, }; const struct SpriteTemplate gIngrainOrbSpriteTemplate = @@ -688,24 +689,24 @@ const struct SpriteTemplate gIngrainOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gIngrainOrbAnimTable, + .anims = sIngrainOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimIngrainOrb, }; -static const union AnimCmd gFallingBagAnimCmds[] = +static const union AnimCmd sFallingBagAnimCmds[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; -static const union AnimCmd *const gFallingBagAnimTable[] = +static const union AnimCmd *const sFallingBagAnimTable[] = { - gFallingBagAnimCmds, + sFallingBagAnimCmds, }; -static const union AffineAnimCmd gFallingBagAffineAnimCmds1[] = +static const union AffineAnimCmd sFallingBagAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, -4, 10), AFFINEANIMCMD_FRAME(0, 0, 4, 20), @@ -713,7 +714,7 @@ static const union AffineAnimCmd gFallingBagAffineAnimCmds1[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gFallingBagAffineAnimCmds2[] = +static const union AffineAnimCmd sFallingBagAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0, 0, -1, 2), AFFINEANIMCMD_FRAME(0, 0, 1, 4), @@ -724,10 +725,10 @@ static const union AffineAnimCmd gFallingBagAffineAnimCmds2[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gFallingBagAffineAnimTable[] = +static const union AffineAnimCmd *const sFallingBagAffineAnimTable[] = { - gFallingBagAffineAnimCmds1, - gFallingBagAffineAnimCmds2, + sFallingBagAffineAnimCmds1, + sFallingBagAffineAnimCmds2, }; const struct SpriteTemplate gPresentSpriteTemplate = @@ -735,9 +736,9 @@ const struct SpriteTemplate gPresentSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gFallingBagAnimTable, + .anims = sFallingBagAnimTable, .images = NULL, - .affineAnims = gFallingBagAffineAnimTable, + .affineAnims = sFallingBagAffineAnimTable, .callback = AnimPresent, }; @@ -746,13 +747,13 @@ const struct SpriteTemplate gKnockOffItemSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gFallingBagAnimTable, + .anims = sFallingBagAnimTable, .images = NULL, - .affineAnims = gFallingBagAffineAnimTable, + .affineAnims = sFallingBagAffineAnimTable, .callback = AnimKnockOffItem, }; -static const union AnimCmd gPresentHealParticleAnimCmds[] = +static const union AnimCmd sPresentHealParticleAnimCmds[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -761,9 +762,9 @@ static const union AnimCmd gPresentHealParticleAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gPresentHealParticleAnimTable[] = +static const union AnimCmd *const sPresentHealParticleAnimTable[] = { - gPresentHealParticleAnimCmds, + sPresentHealParticleAnimCmds, }; const struct SpriteTemplate gPresentHealParticleSpriteTemplate = @@ -771,7 +772,7 @@ const struct SpriteTemplate gPresentHealParticleSpriteTemplate = .tileTag = ANIM_TAG_GREEN_SPARKLE, .paletteTag = ANIM_TAG_GREEN_SPARKLE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gPresentHealParticleAnimTable, + .anims = sPresentHealParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimPresentHealParticle, @@ -782,19 +783,19 @@ const struct SpriteTemplate gItemStealSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gFallingBagAnimTable, + .anims = sFallingBagAnimTable, .images = NULL, - .affineAnims = gFallingBagAffineAnimTable, + .affineAnims = sFallingBagAffineAnimTable, .callback = AnimItemSteal, }; -static const union AffineAnimCmd gTrickBagAffineAnimCmds1[] = +static const union AffineAnimCmd sTrickBagAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 3), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gTrickBagAffineAnimCmds2[] = +static const union AffineAnimCmd sTrickBagAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0, -10, 0, 3), AFFINEANIMCMD_FRAME(0, -6, 0, 3), @@ -806,12 +807,12 @@ static const union AffineAnimCmd gTrickBagAffineAnimCmds2[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gTrickBagAffineAnimTable[] = +static const union AffineAnimCmd *const sTrickBagAffineAnimTable[] = { - gTrickBagAffineAnimCmds1, - gTrickBagAffineAnimCmds2, - gFallingBagAffineAnimCmds1, - gFallingBagAffineAnimCmds2, + sTrickBagAffineAnimCmds1, + sTrickBagAffineAnimCmds2, + sFallingBagAffineAnimCmds1, + sFallingBagAffineAnimCmds2, }; const struct SpriteTemplate gTrickBagSpriteTemplate = @@ -819,9 +820,9 @@ const struct SpriteTemplate gTrickBagSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gFallingBagAnimTable, + .anims = sFallingBagAnimTable, .images = NULL, - .affineAnims = gTrickBagAffineAnimTable, + .affineAnims = sTrickBagAffineAnimTable, .callback = AnimTrickBag, }; @@ -840,57 +841,57 @@ static const s8 gTrickBagCoordinates[][3] = {0, 0, 127}, }; -static const union AnimCmd gLeafBladeAnimCmds1[] = +static const union AnimCmd sLeafBladeAnimCmds1[] = { ANIMCMD_FRAME(28, 1), ANIMCMD_END, }; -static const union AnimCmd gLeafBladeAnimCmds2[] = +static const union AnimCmd sLeafBladeAnimCmds2[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END, }; -static const union AnimCmd gLeafBladeAnimCmds3[] = +static const union AnimCmd sLeafBladeAnimCmds3[] = { ANIMCMD_FRAME(20, 1), ANIMCMD_END, }; -static const union AnimCmd gLeafBladeAnimCmds4[] = +static const union AnimCmd sLeafBladeAnimCmds4[] = { ANIMCMD_FRAME(28, 1, .hFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gLeafBladeAnimCmds5[] = +static const union AnimCmd sLeafBladeAnimCmds5[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END, }; -static const union AnimCmd gLeafBladeAnimCmds6[] = +static const union AnimCmd sLeafBladeAnimCmds6[] = { ANIMCMD_FRAME(16, 1, .hFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gLeafBladeAnimCmds7[] = +static const union AnimCmd sLeafBladeAnimCmds7[] = { ANIMCMD_FRAME(28, 1), ANIMCMD_END, }; -static const union AnimCmd *const gLeafBladeAnimTable[] = +static const union AnimCmd *const sLeafBladeAnimTable[] = { - gLeafBladeAnimCmds1, - gLeafBladeAnimCmds2, - gLeafBladeAnimCmds3, - gLeafBladeAnimCmds4, - gLeafBladeAnimCmds5, - gLeafBladeAnimCmds6, - gLeafBladeAnimCmds7, + sLeafBladeAnimCmds1, + sLeafBladeAnimCmds2, + sLeafBladeAnimCmds3, + sLeafBladeAnimCmds4, + sLeafBladeAnimCmds5, + sLeafBladeAnimCmds6, + sLeafBladeAnimCmds7, }; const struct SpriteTemplate gLeafBladeSpriteTemplate = @@ -898,22 +899,22 @@ const struct SpriteTemplate gLeafBladeSpriteTemplate = .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gLeafBladeAnimTable, + .anims = sLeafBladeAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const union AffineAnimCmd gAromatherapyBigFlowerAffineAnimCmds[] = +static const union AffineAnimCmd sAromatherapyBigFlowerAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(0, 0, 4, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd *const gAromatherapyBigFlowerAffineAnimTable[] = +static const union AffineAnimCmd *const sAromatherapyBigFlowerAffineAnimTable[] = { - gAromatherapyBigFlowerAffineAnimCmds, + sAromatherapyBigFlowerAffineAnimCmds, }; const struct SpriteTemplate gAromatherapySmallFlowerSpriteTemplate = @@ -921,7 +922,7 @@ const struct SpriteTemplate gAromatherapySmallFlowerSpriteTemplate = .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gPetalDanceSmallFlowerAnimTable, + .anims = sPetalDanceSmallFlowerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFlyingParticle, @@ -932,46 +933,46 @@ const struct SpriteTemplate gAromatherapyBigFlowerSpriteTemplate = .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gPetalDanceBigFlowerAnimTable, + .anims = sPetalDanceBigFlowerAnimTable, .images = NULL, - .affineAnims = gAromatherapyBigFlowerAffineAnimTable, + .affineAnims = sAromatherapyBigFlowerAffineAnimTable, .callback = AnimFlyingParticle, }; -static const union AffineAnimCmd gSilverWindBigSparkAffineAnimCmds[] = +static const union AffineAnimCmd sSilverWindBigSparkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(0, 0, -10, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd gSilverWindMediumSparkAffineAnimCmds[] = +static const union AffineAnimCmd sSilverWindMediumSparkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(192, 192, 0, 0), AFFINEANIMCMD_FRAME(0, 0, -12, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd gSilverWindSmallSparkAffineAnimCmds[] = +static const union AffineAnimCmd sSilverWindSmallSparkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(143, 143, 0, 0), AFFINEANIMCMD_FRAME(0, 0, -15, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd *const gSilverWindBigSparkAffineAnimTable[] = +static const union AffineAnimCmd *const sSilverWindBigSparkAffineAnimTable[] = { - gSilverWindBigSparkAffineAnimCmds, + sSilverWindBigSparkAffineAnimCmds, }; -static const union AffineAnimCmd *const gSilverWindMediumSparkAffineAnimTable[] = +static const union AffineAnimCmd *const sSilverWindMediumSparkAffineAnimTable[] = { - gSilverWindMediumSparkAffineAnimCmds, + sSilverWindMediumSparkAffineAnimCmds, }; -static const union AffineAnimCmd *const gSilverWindSmallSparkAffineAnimTable[] = +static const union AffineAnimCmd *const sSilverWindSmallSparkAffineAnimTable[] = { - gSilverWindSmallSparkAffineAnimCmds, + sSilverWindSmallSparkAffineAnimCmds, }; const struct SpriteTemplate gSilverWindBigSparkSpriteTemplate = @@ -981,7 +982,7 @@ const struct SpriteTemplate gSilverWindBigSparkSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSilverWindBigSparkAffineAnimTable, + .affineAnims = sSilverWindBigSparkAffineAnimTable, .callback = AnimFlyingParticle, }; @@ -992,7 +993,7 @@ const struct SpriteTemplate gSilverWindMediumSparkSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSilverWindMediumSparkAffineAnimTable, + .affineAnims = sSilverWindMediumSparkAffineAnimTable, .callback = AnimFlyingParticle, }; @@ -1003,11 +1004,11 @@ const struct SpriteTemplate gSilverWindSmallSparkSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSilverWindSmallSparkAffineAnimTable, + .affineAnims = sSilverWindSmallSparkAffineAnimTable, .callback = AnimFlyingParticle, }; -static const u16 gMagicalLeafBlendColors[] = +static const u16 sMagicalLeafBlendColors[] = { RGB(31, 0, 0), RGB(31, 19, 0), @@ -1029,7 +1030,7 @@ const struct SpriteTemplate gNeedleArmSpikeSpriteTemplate = .callback = AnimNeedleArmSpike, }; -static const union AnimCmd gWhipAnimCmds1[] = +static const union AnimCmd sWhipAnimCmds1[] = { ANIMCMD_FRAME(64, 3), ANIMCMD_FRAME(80, 3), @@ -1038,7 +1039,7 @@ static const union AnimCmd gWhipAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gWhipAnimCmds2[] = +static const union AnimCmd sWhipAnimCmds2[] = { ANIMCMD_FRAME(64, 3, .hFlip = TRUE), ANIMCMD_FRAME(80, 3, .hFlip = TRUE), @@ -1047,10 +1048,10 @@ static const union AnimCmd gWhipAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gWhipAnimTable[] = +static const union AnimCmd *const sWhipAnimTable[] = { - gWhipAnimCmds1, - gWhipAnimCmds2, + sWhipAnimCmds1, + sWhipAnimCmds2, }; const struct SpriteTemplate gSlamHitSpriteTemplate = @@ -1058,7 +1059,7 @@ const struct SpriteTemplate gSlamHitSpriteTemplate = .tileTag = ANIM_TAG_SLAM_HIT, .paletteTag = ANIM_TAG_SLAM_HIT, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gWhipAnimTable, + .anims = sWhipAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimWhipHit, @@ -1069,13 +1070,13 @@ const struct SpriteTemplate gVineWhipSpriteTemplate = .tileTag = ANIM_TAG_WHIP_HIT, .paletteTag = ANIM_TAG_WHIP_HIT, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gWhipAnimTable, + .anims = sWhipAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimWhipHit, }; -static const union AnimCmd gUnknown_83E3178[] = +static const union AnimCmd sUnknown_83E3178[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(16, 4), @@ -1085,108 +1086,109 @@ static const union AnimCmd gUnknown_83E3178[] = ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_83E3190[] = +// Unused +static const union AnimCmd *const sUnknown_83E3190[] = { - gUnknown_83E3178, + sUnknown_83E3178, }; // Unused -static const struct SpriteTemplate gUnknown_83E3194 = +static const struct SpriteTemplate sUnknown_83E3194 = { .tileTag = ANIM_TAG_HIT, .paletteTag = ANIM_TAG_HIT, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_83E3190, + .anims = sUnknown_83E3190, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_80A43F8, }; // Unused -static const struct SpriteTemplate gUnknown_83E31AC = +static const struct SpriteTemplate sUnknown_83E31AC = { .tileTag = ANIM_TAG_HIT_2, .paletteTag = ANIM_TAG_HIT_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_83E3190, + .anims = sUnknown_83E3190, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_80A43F8, }; -static const union AffineAnimCmd gUnknown_83E31C4[] = +static const union AffineAnimCmd sUnknown_83E31C4[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E31D4[] = +static const union AffineAnimCmd sUnknown_83E31D4[] = { AFFINEANIMCMD_FRAME(256, 256, 32, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E31E4[] = +static const union AffineAnimCmd sUnknown_83E31E4[] = { AFFINEANIMCMD_FRAME(256, 256, 64, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E31F4[] = +static const union AffineAnimCmd sUnknown_83E31F4[] = { AFFINEANIMCMD_FRAME(256, 256, 96, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E3204[] = +static const union AffineAnimCmd sUnknown_83E3204[] = { AFFINEANIMCMD_FRAME(256, 256, -128, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E3214[] = +static const union AffineAnimCmd sUnknown_83E3214[] = { AFFINEANIMCMD_FRAME(256, 256, -96, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E3224[] = +static const union AffineAnimCmd sUnknown_83E3224[] = { AFFINEANIMCMD_FRAME(256, 256, -64, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gUnknown_83E3234[] = +static const union AffineAnimCmd sUnknown_83E3234[] = { AFFINEANIMCMD_FRAME(256, 256, -32, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gUnknown_83E3244[] = +static const union AffineAnimCmd *const sUnknown_83E3244[] = { - gUnknown_83E31C4, - gUnknown_83E31D4, - gUnknown_83E31E4, - gUnknown_83E31F4, - gUnknown_83E3204, - gUnknown_83E3214, - gUnknown_83E3224, - gUnknown_83E3234, + sUnknown_83E31C4, + sUnknown_83E31D4, + sUnknown_83E31E4, + sUnknown_83E31F4, + sUnknown_83E3204, + sUnknown_83E3214, + sUnknown_83E3224, + sUnknown_83E3234, }; // Unused -static const struct SpriteTemplate gUnknown_83E3264 = +static const struct SpriteTemplate sUnknown_83E3264 = { .tileTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_AffineNormal_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_83E3244, + .affineAnims = sUnknown_83E3244, .callback = sub_80A4494, }; -static const union AnimCmd gCuttingSliceAnimCmds[] = +static const union AnimCmd sCuttingSliceAnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(16, 5), @@ -1195,9 +1197,9 @@ static const union AnimCmd gCuttingSliceAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gCuttingSliceAnimTable[] = +static const union AnimCmd *const sCuttingSliceAnimTable[] = { - gCuttingSliceAnimCmds, + sCuttingSliceAnimCmds, }; const struct SpriteTemplate gCuttingSliceSpriteTemplate = @@ -1205,7 +1207,7 @@ const struct SpriteTemplate gCuttingSliceSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gCuttingSliceAnimTable, + .anims = sCuttingSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimCuttingSlice, @@ -1216,93 +1218,93 @@ const struct SpriteTemplate gAirCutterSliceSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gCuttingSliceAnimTable, + .anims = sCuttingSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimAirCutterSlice, }; -static const union AnimCmd gUnknown_83E32C4[] = +static const union AnimCmd sUnknown_83E32C4[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32CC[] = +static const union AnimCmd sUnknown_83E32CC[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32D4[] = +static const union AnimCmd sUnknown_83E32D4[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32DC[] = +static const union AnimCmd sUnknown_83E32DC[] = { ANIMCMD_FRAME(12, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32E4[] = +static const union AnimCmd sUnknown_83E32E4[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32EC[] = +static const union AnimCmd sUnknown_83E32EC[] = { ANIMCMD_FRAME(20, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32F4[] = +static const union AnimCmd sUnknown_83E32F4[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E32FC[] = +static const union AnimCmd sUnknown_83E32FC[] = { ANIMCMD_FRAME(4, 1, .vFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E3304[] = +static const union AnimCmd sUnknown_83E3304[] = { ANIMCMD_FRAME(8, 1, .vFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E330C[] = +static const union AnimCmd sUnknown_83E330C[] = { ANIMCMD_FRAME(12, 1, .vFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_83E3314[] = +static const union AnimCmd *const sUnknown_83E3314[] = { - gUnknown_83E32C4, - gUnknown_83E32CC, - gUnknown_83E32D4, - gUnknown_83E32DC, - gUnknown_83E32E4, - gUnknown_83E32EC, - gUnknown_83E32F4, - gUnknown_83E32FC, - gUnknown_83E3304, - gUnknown_83E330C, + sUnknown_83E32C4, + sUnknown_83E32CC, + sUnknown_83E32D4, + sUnknown_83E32DC, + sUnknown_83E32E4, + sUnknown_83E32EC, + sUnknown_83E32F4, + sUnknown_83E32FC, + sUnknown_83E3304, + sUnknown_83E330C, }; // Unused -static const struct SpriteTemplate gUnknown_83E333C = +static const struct SpriteTemplate sUnknown_83E333C = { .tileTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_83E3314, + .anims = sUnknown_83E3314, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_80A481C, @@ -1319,13 +1321,13 @@ const struct SpriteTemplate gProtectWallSpriteTemplate = .callback = AnimProtect, }; -static const union AffineAnimCmd gMilkBottleAffineAnimCmds1[] = +static const union AffineAnimCmd sMilkBottleAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gMilkBottleAffineAnimCmds2[] = +static const union AffineAnimCmd sMilkBottleAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6), @@ -1335,10 +1337,10 @@ static const union AffineAnimCmd gMilkBottleAffineAnimCmds2[] = AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gMilkBottleAffineAnimTable[] = +static const union AffineAnimCmd *const sMilkBottleAffineAnimTable[] = { - gMilkBottleAffineAnimCmds1, - gMilkBottleAffineAnimCmds2, + sMilkBottleAffineAnimCmds1, + sMilkBottleAffineAnimCmds2, }; const struct SpriteTemplate gMilkBottleSpriteTemplate = @@ -1348,11 +1350,11 @@ const struct SpriteTemplate gMilkBottleSpriteTemplate = .oam = &gOamData_AffineNormal_ObjBlend_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gMilkBottleAffineAnimTable, + .affineAnims = sMilkBottleAffineAnimTable, .callback = AnimMilkBottle, }; -static const union AnimCmd gGrantingStarsAnimCmds[] = +static const union AnimCmd sGrantingStarsAnimCmds[] = { ANIMCMD_FRAME(0, 7), ANIMCMD_FRAME(16, 7), @@ -1365,9 +1367,9 @@ static const union AnimCmd gGrantingStarsAnimCmds[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gGrantingStarsAnimTable[] = +static const union AnimCmd *const sGrantingStarsAnimTable[] = { - gGrantingStarsAnimCmds, + sGrantingStarsAnimCmds, }; const struct SpriteTemplate gGrantingStarsSpriteTemplate = @@ -1375,7 +1377,7 @@ const struct SpriteTemplate gGrantingStarsSpriteTemplate = .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gGrantingStarsAnimTable, + .anims = sGrantingStarsAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimGrantingStars, @@ -1386,13 +1388,13 @@ const struct SpriteTemplate gSparklingStarsSpriteTemplate = .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gGrantingStarsAnimTable, + .anims = sGrantingStarsAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSparkingStars, }; -static const union AnimCmd gUnknown_83E3424[] = +static const union AnimCmd sUnknown_83E3424[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(4, 10), @@ -1405,7 +1407,7 @@ static const union AnimCmd gUnknown_83E3424[] = ANIMCMD_END, }; -static const union AnimCmd gUnknown_83E3448[] = +static const union AnimCmd sUnknown_83E3448[] = { ANIMCMD_FRAME(0, 10, .hFlip = TRUE), ANIMCMD_FRAME(4, 10, .hFlip = TRUE), @@ -1418,67 +1420,67 @@ static const union AnimCmd gUnknown_83E3448[] = ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_83E346C[] = +static const union AnimCmd *const sUnknown_83E346C[] = { - gUnknown_83E3424, - gUnknown_83E3448, + sUnknown_83E3424, + sUnknown_83E3448, }; // Unused -static const struct SpriteTemplate gUnknown_83E3474 = +static const struct SpriteTemplate sUnknown_83E3474 = { .tileTag = ANIM_TAG_BUBBLE_BURST, .paletteTag = ANIM_TAG_BUBBLE_BURST, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_83E346C, + .anims = sUnknown_83E346C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_80A4E40, }; -static const union AnimCmd gSleepLetterZAnimCmds[] = +static const union AnimCmd sSleepLetterZAnimCmds[] = { ANIMCMD_FRAME(0, 40), ANIMCMD_END, }; -static const union AnimCmd *const gSleepLetterZAnimTable[] = +static const union AnimCmd *const sSleepLetterZAnimTable[] = { - gSleepLetterZAnimCmds, + sSleepLetterZAnimCmds, }; -static const union AffineAnimCmd gSleepLetterZAffineAnimCmds1[] = +static const union AffineAnimCmd sSleepLetterZAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x14, 0x14, -30, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, 1, 24), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gSleepLetterZAffineAnimCmds1_2[] = +static const union AffineAnimCmd sSleepLetterZAffineAnimCmds1_2[] = { AFFINEANIMCMD_LOOP(0), AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24), AFFINEANIMCMD_LOOP(10), }; -static const union AffineAnimCmd gSleepLetterZAffineAnimCmds2[] = +static const union AffineAnimCmd sSleepLetterZAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x14, 0x14, 30, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, -1, 24), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gSleepLetterZAffineAnimCmds2_2[] = +static const union AffineAnimCmd sSleepLetterZAffineAnimCmds2_2[] = { AFFINEANIMCMD_LOOP(0), AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 24), AFFINEANIMCMD_LOOP(10), }; -static const union AffineAnimCmd *const gSleepLetterZAffineAnimTable[] = +static const union AffineAnimCmd *const sSleepLetterZAffineAnimTable[] = { - gSleepLetterZAffineAnimCmds1, - gSleepLetterZAffineAnimCmds2, + sSleepLetterZAffineAnimCmds1, + sSleepLetterZAffineAnimCmds2, }; const struct SpriteTemplate gSleepLetterZSpriteTemplate = @@ -1486,9 +1488,9 @@ const struct SpriteTemplate gSleepLetterZSpriteTemplate = .tileTag = ANIM_TAG_LETTER_Z, .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gSleepLetterZAnimTable, + .anims = sSleepLetterZAnimTable, .images = NULL, - .affineAnims = gSleepLetterZAffineAnimTable, + .affineAnims = sSleepLetterZAffineAnimTable, .callback = AnimSleepLetterZ, }; @@ -1514,7 +1516,7 @@ const struct SpriteTemplate gLockOnMoveTargetSpriteTemplate = .callback = AnimLockOnMoveTarget, }; -static const s8 gInclineMonCoordTable[][2] = +static const s8 sInclineMonCoordTable[][2] = { { 64, 64}, { 0, -64}, @@ -1534,7 +1536,7 @@ const struct SpriteTemplate gBowMonSpriteTemplate = }; // Unused -static const struct SpriteTemplate gUnknown_83E3568 = +static const struct SpriteTemplate sUnknown_83E3568 = { .tileTag = 0, .paletteTag = 0, @@ -1545,7 +1547,7 @@ static const struct SpriteTemplate gUnknown_83E3568 = .callback = sub_80A5590, }; -static const union AnimCmd gSlashSliceAnimCmds1[] = +static const union AnimCmd sSlashSliceAnimCmds1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(16, 4), @@ -1554,16 +1556,16 @@ static const union AnimCmd gSlashSliceAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gSlashSliceAnimCmds2[] = +static const union AnimCmd sSlashSliceAnimCmds2[] = { ANIMCMD_FRAME(48, 4), ANIMCMD_END, }; -static const union AnimCmd *const gSlashSliceAnimTable[] = +static const union AnimCmd *const sSlashSliceAnimTable[] = { - gSlashSliceAnimCmds1, - gSlashSliceAnimCmds2, + sSlashSliceAnimCmds1, + sSlashSliceAnimCmds2, }; const struct SpriteTemplate gSlashSliceSpriteTemplate = @@ -1571,7 +1573,7 @@ const struct SpriteTemplate gSlashSliceSpriteTemplate = .tileTag = ANIM_TAG_SLASH, .paletteTag = ANIM_TAG_SLASH, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gSlashSliceAnimTable, + .anims = sSlashSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSlashSlice, @@ -1582,7 +1584,7 @@ const struct SpriteTemplate gFalseSwipeSliceSpriteTemplate = .tileTag = ANIM_TAG_SLASH_2, .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gSlashSliceAnimTable, + .anims = sSlashSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFalseSwipeSlice, @@ -1593,13 +1595,13 @@ const struct SpriteTemplate gFalseSwipePositionedSliceSpriteTemplate = .tileTag = ANIM_TAG_SLASH_2, .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gSlashSliceAnimTable, + .anims = sSlashSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFalseSwipePositionedSlice, }; -static const union AnimCmd gEndureEnergyAnimCmds[] = +static const union AnimCmd sEndureEnergyAnimCmds[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(8, 12), @@ -1608,9 +1610,9 @@ static const union AnimCmd gEndureEnergyAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gEndureEnergyAnimTable[] = +static const union AnimCmd *const sEndureEnergyAnimTable[] = { - gEndureEnergyAnimCmds, + sEndureEnergyAnimCmds, }; const struct SpriteTemplate gEndureEnergySpriteTemplate = @@ -1618,13 +1620,13 @@ const struct SpriteTemplate gEndureEnergySpriteTemplate = .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_FOCUS_ENERGY, .oam = &gOamData_AffineOff_ObjNormal_16x32, - .anims = gEndureEnergyAnimTable, + .anims = sEndureEnergyAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy, }; -static const union AnimCmd gSharpenSphereAnimCmds[] = +static const union AnimCmd sSharpenSphereAnimCmds[] = { ANIMCMD_FRAME(0, 18), ANIMCMD_FRAME(0, 6), @@ -1643,9 +1645,9 @@ static const union AnimCmd gSharpenSphereAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gSharpenSphereAnimTable[] = +static const union AnimCmd *const sSharpenSphereAnimTable[] = { - gSharpenSphereAnimCmds, + sSharpenSphereAnimCmds, }; const struct SpriteTemplate gSharpenSphereSpriteTemplate = @@ -1653,7 +1655,7 @@ const struct SpriteTemplate gSharpenSphereSpriteTemplate = .tileTag = ANIM_TAG_SPHERE_TO_CUBE, .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gSharpenSphereAnimTable, + .anims = sSharpenSphereAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSharpenSphere, @@ -1670,7 +1672,7 @@ const struct SpriteTemplate gOctazookaBallSpriteTemplate = .callback = TranslateAnimSpriteToTargetMonLocation, }; -static const union AnimCmd gOctazookaAnimCmds[] = +static const union AnimCmd sOctazookaAnimCmds[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(16, 3), @@ -1680,9 +1682,9 @@ static const union AnimCmd gOctazookaAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gOctazookaAnimTable[] = +static const union AnimCmd *const sOctazookaAnimTable[] = { - gOctazookaAnimCmds, + sOctazookaAnimCmds, }; const struct SpriteTemplate gOctazookaSmokeSpriteTemplate = @@ -1690,13 +1692,13 @@ const struct SpriteTemplate gOctazookaSmokeSpriteTemplate = .tileTag = ANIM_TAG_GRAY_SMOKE, .paletteTag = ANIM_TAG_GRAY_SMOKE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gOctazookaAnimTable, + .anims = sOctazookaAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos, }; -static const union AnimCmd gConversionAnimCmds[] = +static const union AnimCmd sConversionAnimCmds[] = { ANIMCMD_FRAME(3, 5), ANIMCMD_FRAME(2, 5), @@ -1705,20 +1707,20 @@ static const union AnimCmd gConversionAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gConversionAnimTable[] = +static const union AnimCmd *const sConversionAnimTable[] = { - gConversionAnimCmds, + sConversionAnimCmds, }; -static const union AffineAnimCmd gConversionAffineAnimCmds[] = +static const union AffineAnimCmd sConversionAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gConversionAffineAnimTable[] = +static const union AffineAnimCmd *const sConversionAffineAnimTable[] = { - gConversionAffineAnimCmds, + sConversionAffineAnimCmds, }; const struct SpriteTemplate gConversionSpriteTemplate = @@ -1726,13 +1728,13 @@ const struct SpriteTemplate gConversionSpriteTemplate = .tileTag = ANIM_TAG_CONVERSION, .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_AffineDouble_ObjBlend_8x8, - .anims = gConversionAnimTable, + .anims = sConversionAnimTable, .images = NULL, - .affineAnims = gConversionAffineAnimTable, + .affineAnims = sConversionAffineAnimTable, .callback = AnimConversion, }; -static const union AnimCmd gConversion2AnimCmds[] = +static const union AnimCmd sConversion2AnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(1, 5), @@ -1741,9 +1743,9 @@ static const union AnimCmd gConversion2AnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gConversion2AnimTable[] = +static const union AnimCmd *const sConversion2AnimTable[] = { - gConversion2AnimCmds, + sConversion2AnimCmds, }; const struct SpriteTemplate gConversion2SpriteTemplate = @@ -1751,9 +1753,9 @@ const struct SpriteTemplate gConversion2SpriteTemplate = .tileTag = ANIM_TAG_CONVERSION, .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_AffineDouble_ObjBlend_8x8, - .anims = gConversion2AnimTable, + .anims = sConversion2AnimTable, .images = NULL, - .affineAnims = gConversionAffineAnimTable, + .affineAnims = sConversionAffineAnimTable, .callback = AnimConversion2, }; @@ -1768,7 +1770,7 @@ const struct SpriteTemplate gMoonSpriteTemplate = .callback = AnimMoon, }; -static const union AnimCmd gMoonlightSparkleAnimCmds[] = +static const union AnimCmd sMoonlightSparkleAnimCmds[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(4, 8), @@ -1777,9 +1779,9 @@ static const union AnimCmd gMoonlightSparkleAnimCmds[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gMoonlightSparkleAnimTable[] = +static const union AnimCmd *const sMoonlightSparkleAnimTable[] = { - gMoonlightSparkleAnimCmds, + sMoonlightSparkleAnimCmds, }; const struct SpriteTemplate gMoonlightSparkleSpriteTemplate = @@ -1787,13 +1789,13 @@ const struct SpriteTemplate gMoonlightSparkleSpriteTemplate = .tileTag = ANIM_TAG_GREEN_SPARKLE, .paletteTag = ANIM_TAG_GREEN_SPARKLE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gMoonlightSparkleAnimTable, + .anims = sMoonlightSparkleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMoonlightSparkle, }; -static const union AnimCmd gHealingBlueStarAnimCmds[] = +static const union AnimCmd sHealingBlueStarAnimCmds[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -1806,9 +1808,9 @@ static const union AnimCmd gHealingBlueStarAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gHealingBlueStarAnimTable[] = +static const union AnimCmd *const sHealingBlueStarAnimTable[] = { - gHealingBlueStarAnimCmds, + sHealingBlueStarAnimCmds, }; const struct SpriteTemplate gHealingBlueStarSpriteTemplate = @@ -1816,7 +1818,7 @@ const struct SpriteTemplate gHealingBlueStarSpriteTemplate = .tileTag = ANIM_TAG_BLUE_STAR, .paletteTag = ANIM_TAG_BLUE_STAR, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gHealingBlueStarAnimTable, + .anims = sHealingBlueStarAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos, @@ -1833,7 +1835,7 @@ const struct SpriteTemplate gHornHitSpriteTemplate = .callback = AnimHornHit, }; -static const union AnimCmd gSuperFangAnimCmds[] = +static const union AnimCmd sSuperFangAnimCmds[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -1842,9 +1844,9 @@ static const union AnimCmd gSuperFangAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gSuperFangAnimTable[] = +static const union AnimCmd *const sSuperFangAnimTable[] = { - gSuperFangAnimCmds, + sSuperFangAnimCmds, }; const struct SpriteTemplate gSuperFangSpriteTemplate = @@ -1852,55 +1854,55 @@ const struct SpriteTemplate gSuperFangSpriteTemplate = .tileTag = ANIM_TAG_FANG_ATTACK, .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gSuperFangAnimTable, + .anims = sSuperFangAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSuperFang, }; -static const union AnimCmd gWavyMusicNotesAnimCmds1[] = +static const union AnimCmd sWavyMusicNotesAnimCmds1[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds2[] = +static const union AnimCmd sWavyMusicNotesAnimCmds2[] = { ANIMCMD_FRAME(4, 10), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds3[] = +static const union AnimCmd sWavyMusicNotesAnimCmds3[] = { ANIMCMD_FRAME(8, 41), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds4[] = +static const union AnimCmd sWavyMusicNotesAnimCmds4[] = { ANIMCMD_FRAME(12, 10), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds5[] = +static const union AnimCmd sWavyMusicNotesAnimCmds5[] = { ANIMCMD_FRAME(16, 10), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds6[] = +static const union AnimCmd sWavyMusicNotesAnimCmds6[] = { ANIMCMD_FRAME(20, 10), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds7[] = +static const union AnimCmd sWavyMusicNotesAnimCmds7[] = { ANIMCMD_FRAME(0, 10, .vFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gWavyMusicNotesAnimCmds8[] = +static const union AnimCmd sWavyMusicNotesAnimCmds8[] = { ANIMCMD_FRAME(4, 10, .vFlip = TRUE), ANIMCMD_END, @@ -1908,26 +1910,26 @@ static const union AnimCmd gWavyMusicNotesAnimCmds8[] = const union AnimCmd *const gMusicNotesAnimTable[] = { - gWavyMusicNotesAnimCmds1, - gWavyMusicNotesAnimCmds2, - gWavyMusicNotesAnimCmds3, - gWavyMusicNotesAnimCmds4, - gWavyMusicNotesAnimCmds5, - gWavyMusicNotesAnimCmds6, - gWavyMusicNotesAnimCmds7, - gWavyMusicNotesAnimCmds8, + sWavyMusicNotesAnimCmds1, + sWavyMusicNotesAnimCmds2, + sWavyMusicNotesAnimCmds3, + sWavyMusicNotesAnimCmds4, + sWavyMusicNotesAnimCmds5, + sWavyMusicNotesAnimCmds6, + sWavyMusicNotesAnimCmds7, + sWavyMusicNotesAnimCmds8, }; -static const union AffineAnimCmd gWavyMusicNotesAffineAnimCmds[] = +static const union AffineAnimCmd sWavyMusicNotesAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0xC, 0xC, 0, 16), AFFINEANIMCMD_FRAME(0xFFF4, 0xFFF4, 0, 16), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gMusicNotesAffineAnimTable[] = +static const union AffineAnimCmd *const sMusicNotesAffineAnimTable[] = { - gWavyMusicNotesAffineAnimCmds, + sWavyMusicNotesAffineAnimCmds, }; const struct SpriteTemplate gWavyMusicNotesSpriteTemplate = @@ -1937,11 +1939,11 @@ const struct SpriteTemplate gWavyMusicNotesSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x16, .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gMusicNotesAffineAnimTable, + .affineAnims = sMusicNotesAffineAnimTable, .callback = AnimWavyMusicNotes, }; -static const u16 gParticlesColorBlendTable[][6] = +static const u16 sParticlesColorBlendTable[][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)}, @@ -1956,7 +1958,7 @@ const struct SpriteTemplate gFastFlyingMusicNotesSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x16, .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gMusicNotesAffineAnimTable, + .affineAnims = sMusicNotesAffineAnimTable, .callback = AnimFlyingMusicNotes, }; @@ -1971,16 +1973,16 @@ const struct SpriteTemplate gBellyDrumHandSpriteTemplate = .callback = AnimBellyDrumHand, }; -static const union AffineAnimCmd gSlowFlyingMusicNotesAffineAnimCmds[] = +static const union AffineAnimCmd sSlowFlyingMusicNotesAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0), AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd *const gSlowFlyingMusicNotesAffineAnimTable[] = +static const union AffineAnimCmd *const sSlowFlyinsMusicNotesAffineAnimTable[] = { - gSlowFlyingMusicNotesAffineAnimCmds, + sSlowFlyingMusicNotesAffineAnimCmds, }; const struct SpriteTemplate gSlowFlyingMusicNotesSpriteTemplate = @@ -1990,11 +1992,11 @@ const struct SpriteTemplate gSlowFlyingMusicNotesSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x16, .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gSlowFlyingMusicNotesAffineAnimTable, + .affineAnims = sSlowFlyinsMusicNotesAffineAnimTable, .callback = AnimSlowFlyingMusicNotes, }; -static const union AnimCmd gMetronomeThroughtBubbleAnimCmds1[] = +static const union AnimCmd sMetronomeThroughtBubbleAnimCmds1[] = { ANIMCMD_FRAME(0, 2, .hFlip = TRUE), ANIMCMD_FRAME(16, 2, .hFlip = TRUE), @@ -2003,7 +2005,7 @@ static const union AnimCmd gMetronomeThroughtBubbleAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gMetronomeThroughtBubbleAnimCmds3[] = +static const union AnimCmd sMetronomeThroughtBubbleAnimCmds3[] = { ANIMCMD_FRAME(48, 2, .hFlip = TRUE), ANIMCMD_FRAME(32, 2, .hFlip = TRUE), @@ -2012,7 +2014,7 @@ static const union AnimCmd gMetronomeThroughtBubbleAnimCmds3[] = ANIMCMD_END, }; -static const union AnimCmd gMetronomeThroughtBubbleAnimCmds2[] = +static const union AnimCmd sMetronomeThroughtBubbleAnimCmds2[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -2021,7 +2023,7 @@ static const union AnimCmd gMetronomeThroughtBubbleAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd gMetronomeThroughtBubbleAnimCmds4[] = +static const union AnimCmd sMetronomeThroughtBubbleAnimCmds4[] = { ANIMCMD_FRAME(48, 2), ANIMCMD_FRAME(32, 2), @@ -2030,12 +2032,12 @@ static const union AnimCmd gMetronomeThroughtBubbleAnimCmds4[] = ANIMCMD_END, }; -static const union AnimCmd *const gMetronomeThroughtBubbleAnimTable[] = +static const union AnimCmd *const sMetronomeThroughtBubbleAnimTable[] = { - gMetronomeThroughtBubbleAnimCmds1, - gMetronomeThroughtBubbleAnimCmds2, - gMetronomeThroughtBubbleAnimCmds3, - gMetronomeThroughtBubbleAnimCmds4, + sMetronomeThroughtBubbleAnimCmds1, + sMetronomeThroughtBubbleAnimCmds2, + sMetronomeThroughtBubbleAnimCmds3, + sMetronomeThroughtBubbleAnimCmds4, }; const struct SpriteTemplate gThoughtBubbleSpriteTemplate = @@ -2043,20 +2045,20 @@ const struct SpriteTemplate gThoughtBubbleSpriteTemplate = .tileTag = ANIM_TAG_THOUGHT_BUBBLE, .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gMetronomeThroughtBubbleAnimTable, + .anims = sMetronomeThroughtBubbleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimThoughtBubble, }; -static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds1[] = +static const union AffineAnimCmd sMetronomeFingerAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x1E, 0x1E, 0, 8), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2[] = +static const union AffineAnimCmd sMetronomeFingerAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 11), AFFINEANIMCMD_FRAME(0x0, 0x0, -4, 11), @@ -2065,7 +2067,7 @@ static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2_2[] = +static const union AffineAnimCmd sMetronomeFingerAffineAnimCmds2_2[] = { AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(30, 30, 0, 8), @@ -2078,10 +2080,10 @@ static const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2_2[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gMetronomeFingerAffineAnimTable[] = +static const union AffineAnimCmd *const sMetronomeFingerAffineAnimTable[] = { - gMetronomeFingerAffineAnimCmds1, - gMetronomeFingerAffineAnimCmds2, + sMetronomeFingerAffineAnimCmds1, + sMetronomeFingerAffineAnimCmds2, }; const struct SpriteTemplate gMetronomeFingerSpriteTemplate = @@ -2091,7 +2093,7 @@ const struct SpriteTemplate gMetronomeFingerSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gMetronomeFingerAffineAnimTable, + .affineAnims = sMetronomeFingerAffineAnimTable, .callback = AnimMetronomeFinger, }; @@ -2102,23 +2104,23 @@ const struct SpriteTemplate gFollowMeFingerSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gMetronomeFingerAffineAnimTable, + .affineAnims = sMetronomeFingerAffineAnimTable, .callback = AnimFollowMeFinger, }; -static const union AnimCmd gTauntFingerAnimCmds1[] = +static const union AnimCmd sTauntFingerAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gTauntFingerAnimCmds2[] = +static const union AnimCmd sTauntFingerAnimCmds2[] = { ANIMCMD_FRAME(0, 1, .hFlip = TRUE), ANIMCMD_END, }; -static const union AnimCmd gTauntFingerAnimCmds3[] = +static const union AnimCmd sTauntFingerAnimCmds3[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(16, 4), @@ -2130,7 +2132,7 @@ static const union AnimCmd gTauntFingerAnimCmds3[] = ANIMCMD_END, }; -static const union AnimCmd gTauntFingerAnimCmds4[] = +static const union AnimCmd sTauntFingerAnimCmds4[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE), @@ -2142,12 +2144,12 @@ static const union AnimCmd gTauntFingerAnimCmds4[] = ANIMCMD_END, }; -static const union AnimCmd *const gTauntFingerAnimTable[] = +static const union AnimCmd *const sTauntFingerAnimTable[] = { - gTauntFingerAnimCmds1, - gTauntFingerAnimCmds2, - gTauntFingerAnimCmds3, - gTauntFingerAnimCmds4, + sTauntFingerAnimCmds1, + sTauntFingerAnimCmds2, + sTauntFingerAnimCmds3, + sTauntFingerAnimCmds4, }; const struct SpriteTemplate gTauntFingerSpriteTemplate = @@ -2155,7 +2157,7 @@ const struct SpriteTemplate gTauntFingerSpriteTemplate = .tileTag = ANIM_TAG_FINGER_2, .paletteTag = ANIM_TAG_FINGER_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gTauntFingerAnimTable, + .anims = sTauntFingerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimTauntFinger, @@ -3626,8 +3628,8 @@ void sub_80A41C4(u8 taskId) if (++task->data[9] >= 0) { task->data[9] = 0; - BlendPalette(task->data[8], 16, task->data[10], gMagicalLeafBlendColors[task->data[11]]); - BlendPalette(task->data[12], 16, task->data[10], gMagicalLeafBlendColors[task->data[11]]); + BlendPalette(task->data[8], 16, task->data[10], sMagicalLeafBlendColors[task->data[11]]); + BlendPalette(task->data[12], 16, task->data[10], sMagicalLeafBlendColors[task->data[11]]); if (++task->data[10] == 17) { task->data[10] = 0; @@ -4240,8 +4242,8 @@ static void AnimLockOnTargetStep1(struct Sprite* sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 8; - sprite->data[2] = sprite->pos1.x + gInclineMonCoordTable[sprite->data[5] >> 8][0]; - sprite->data[4] = sprite->pos1.y + gInclineMonCoordTable[sprite->data[5] >> 8][1]; + sprite->data[2] = sprite->pos1.x + sInclineMonCoordTable[sprite->data[5] >> 8][0]; + sprite->data[4] = sprite->pos1.y + sInclineMonCoordTable[sprite->data[5] >> 8][1]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep2); sprite->data[5] += 0x100; @@ -5238,22 +5240,22 @@ void AnimTask_MusicNotesRainbowBlend(u8 taskId) u16 j; u16 index; - index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[0][0]); + index = IndexOfSpritePaletteTag(sParticlesColorBlendTable[0][0]); if (index != 0xFF) { index = (index << 4) + 0x100; - for (i = 1; i < NELEMS(gParticlesColorBlendTable[0]); i++) - gPlttBufferFaded[index + i] = gParticlesColorBlendTable[0][i]; + for (i = 1; i < NELEMS(sParticlesColorBlendTable[0]); i++) + gPlttBufferFaded[index + i] = sParticlesColorBlendTable[0][i]; } - for (j = 1; j < NELEMS(gParticlesColorBlendTable); j++) + for (j = 1; j < NELEMS(sParticlesColorBlendTable); j++) { - index = AllocSpritePalette(gParticlesColorBlendTable[j][0]); + index = AllocSpritePalette(sParticlesColorBlendTable[j][0]); if (index != 0xFF) { index = (index << 4) + 0x100; - for (i = 1; i < NELEMS(gParticlesColorBlendTable[0]); i++) - gPlttBufferFaded[index + i] = gParticlesColorBlendTable[j][i]; + for (i = 1; i < NELEMS(sParticlesColorBlendTable[0]); i++) + gPlttBufferFaded[index + i] = sParticlesColorBlendTable[j][i]; } } DestroyAnimVisualTask(taskId); @@ -5264,8 +5266,8 @@ void AnimTask_MusicNotesClearRainbowBlend(u8 taskId) { u16 i; - for (i = 1; i < NELEMS(gParticlesColorBlendTable); i++) - FreeSpritePaletteByTag(gParticlesColorBlendTable[i][0]); + for (i = 1; i < NELEMS(sParticlesColorBlendTable); i++) + FreeSpritePaletteByTag(sParticlesColorBlendTable[i][0]); DestroyAnimVisualTask(taskId); } @@ -5278,7 +5280,7 @@ void AnimWavyMusicNotes(struct Sprite* sprite) SetSpriteCoordsToAnimAttackerCoords(sprite); StartSpriteAnim(sprite, gBattleAnimArgs[0]); - if ((index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[gBattleAnimArgs[1]][0])) != 0xFF) + if ((index = IndexOfSpritePaletteTag(sParticlesColorBlendTable[gBattleAnimArgs[1]][0])) != 0xFF) sprite->oam.paletteNum = index; sprite->data[1] = gBattleAnimArgs[1]; @@ -5344,7 +5346,7 @@ static void AnimWavyMusicNotesStep(struct Sprite* sprite) if (++sprite->data[1] > 3) sprite->data[1] = 0; - index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[sprite->data[1]][0]); + index = IndexOfSpritePaletteTag(sParticlesColorBlendTable[sprite->data[1]][0]); if (index != 0xFF) sprite->oam.paletteNum = index; } @@ -5416,7 +5418,7 @@ void AnimSlowFlyingMusicNotes(struct Sprite* sprite) SetSpriteCoordsToAnimAttackerCoords(sprite); sprite->pos1.y += 8; StartSpriteAnim(sprite, gBattleAnimArgs[1]); - index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[gBattleAnimArgs[2]][0]); + index = IndexOfSpritePaletteTag(sParticlesColorBlendTable[gBattleAnimArgs[2]][0]); if (index != 0xFF) sprite->oam.paletteNum = index; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 3a33276a1..23be07785 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 -static const struct SpriteTemplate gUnknown_83E3ADC = +static const struct SpriteTemplate sUnknown_83E3ADC = { .tileTag = ANIM_TAG_FINGER, .paletteTag = ANIM_TAG_FINGER, @@ -76,19 +76,19 @@ static const struct SpriteTemplate gUnknown_83E3ADC = .callback = sub_80A6E48, }; -static const union AnimCmd gUnknown_83E3AF4[] = +static const union AnimCmd sUnknown_83E3AF4[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_83E3AFC[] = +static const union AnimCmd *const sUnknown_83E3AFC[] = { - gUnknown_83E3AF4, + sUnknown_83E3AF4, }; // Unused -static const struct SpriteTemplate gUnknown_83E3B00 = +static const struct SpriteTemplate sUnknown_83E3B00 = { .tileTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES, @@ -100,7 +100,7 @@ static const struct SpriteTemplate gUnknown_83E3B00 = }; // Unused -static const struct SpriteTemplate gUnknown_83E3B18 = +static const struct SpriteTemplate sUnknown_83E3B18 = { .tileTag = 0, .paletteTag = 0, @@ -112,7 +112,7 @@ static const struct SpriteTemplate gUnknown_83E3B18 = }; // Unused -static const struct SpriteTemplate gUnknown_83E3B30 = +static const struct SpriteTemplate sUnknown_83E3B30 = { .tileTag = ANIM_TAG_CLAMP, .paletteTag = ANIM_TAG_CLAMP, @@ -123,7 +123,7 @@ static const struct SpriteTemplate gUnknown_83E3B30 = .callback = sub_80A7020, }; -static const union AnimCmd gUnknown_83E3B48[] = +static const union AnimCmd sUnknown_83E3B48[] = { ANIMCMD_FRAME(0, 9), ANIMCMD_FRAME(16, 3), @@ -132,36 +132,36 @@ static const union AnimCmd gUnknown_83E3B48[] = ANIMCMD_END, }; -static const union AnimCmd *const gUnknown_83E3B5C[] = +static const union AnimCmd *const sUnknown_83E3B5C[] = { - gUnknown_83E3B48, + sUnknown_83E3B48, }; -static const union AffineAnimCmd gUnknown_83E3B60[] = +static const union AffineAnimCmd sUnknown_83E3B60[] = { AFFINEANIMCMD_FRAME(80, 80, 0, 0), AFFINEANIMCMD_FRAME(9, 9, 0, 18), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gUnknown_83E3B78[] = +static const union AffineAnimCmd *const sUnknown_83E3B78[] = { - gUnknown_83E3B60, + sUnknown_83E3B60, }; // Unused -static const struct SpriteTemplate gUnknown_83E3B7C = +static const struct SpriteTemplate sUnknown_83E3B7C = { .tileTag = ANIM_TAG_EXPLOSION_6, .paletteTag = ANIM_TAG_EXPLOSION_6, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gUnknown_83E3B5C, + .anims = sUnknown_83E3B5C, .images = NULL, - .affineAnims = gUnknown_83E3B78, + .affineAnims = sUnknown_83E3B78, .callback = AnimSpriteOnMonPos, }; -static const union AnimCmd gKinesisZapEnergyAnimCmds[] = +static const union AnimCmd sKinesisZapEnergyAnimCmds[] = { ANIMCMD_FRAME(0, 3, .hFlip = TRUE), ANIMCMD_FRAME(8, 3, .hFlip = TRUE), @@ -174,9 +174,9 @@ static const union AnimCmd gKinesisZapEnergyAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gKinesisZapEnergyAnimTable[] = +static const union AnimCmd *const sKinesisZapEnergyAnimTable[] = { - gKinesisZapEnergyAnimCmds, + sKinesisZapEnergyAnimCmds, }; const struct SpriteTemplate gKinesisZapEnergySpriteTemplate = @@ -184,13 +184,13 @@ const struct SpriteTemplate gKinesisZapEnergySpriteTemplate = .tileTag = ANIM_TAG_ALERT, .paletteTag = ANIM_TAG_ALERT, .oam = &gOamData_AffineOff_ObjNormal_32x16, - .anims = gKinesisZapEnergyAnimTable, + .anims = sKinesisZapEnergyAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = Anim_KinesisZapEnergy, }; -static const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] = +static const union AffineAnimCmd sSwordsDanceBladeAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(16, 256, 0, 0), AFFINEANIMCMD_FRAME(20, 0, 0, 12), @@ -198,9 +198,9 @@ static const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gSwordsDanceBladeAffineAnimTable[] = +static const union AffineAnimCmd *const sSwordsDanceBladeAffineAnimTable[] = { - gSwordsDanceBladeAffineAnimCmds, + sSwordsDanceBladeAffineAnimCmds, }; const struct SpriteTemplate gSwordsDanceBladeSpriteTemplate = @@ -210,7 +210,7 @@ const struct SpriteTemplate gSwordsDanceBladeSpriteTemplate = .oam = &gOamData_AffineNormal_ObjBlend_32x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSwordsDanceBladeAffineAnimTable, + .affineAnims = sSwordsDanceBladeAffineAnimTable, .callback = Anim_SwordsDanceBlade, }; @@ -236,14 +236,14 @@ const struct SpriteTemplate gAirWaveProjectileSpriteTemplate = .callback = AnimAirWaveProjectile, }; -static const union AffineAnimCmd gGrowingRingAffineAnimCmds[] = +static const union AffineAnimCmd sGrowingRingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(32, 32, 0, 0), AFFINEANIMCMD_FRAME(7, 7, 0, -56), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] = +static const union AffineAnimCmd sWaterPulseRingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(5, 5, 0, 10), AFFINEANIMCMD_FRAME(-10, -10, 0, 10), @@ -257,12 +257,12 @@ static const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] = const union AffineAnimCmd *const gGrowingRingAffineAnimTable[] = { - gGrowingRingAffineAnimCmds, + sGrowingRingAffineAnimCmds, }; -static const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] = +static const union AffineAnimCmd *const sWaterPulseRingAffineAnimTable[] = { - gWaterPulseRingAffineAnimCmds, + sWaterPulseRingAffineAnimCmds, }; const struct SpriteTemplate gSupersonicWaveSpriteTemplate = @@ -305,7 +305,7 @@ const struct SpriteTemplate gWaterPulseRingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gWaterPulseRingAffineAnimTable, + .affineAnims = sWaterPulseRingAffineAnimTable, .callback = AnimWaterPulseRing, }; @@ -320,7 +320,7 @@ const struct SpriteTemplate gEggThrowSpriteTemplate = .callback = AnimThrowProjectile, }; -const struct SpriteTemplate gUnknown_83E3D18 = +static const struct SpriteTemplate sUnknown_83E3D18 = { .tileTag = ANIM_TAG_VOID_LINES, .paletteTag = ANIM_TAG_VOID_LINES, @@ -331,26 +331,26 @@ const struct SpriteTemplate gUnknown_83E3D18 = .callback = sub_80A79E8, }; -static const union AnimCmd gCoinAnimCmds[] = +static const union AnimCmd sCoinAnimCmds[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END, }; -static const union AnimCmd *const gCoinAnimTable[] = +static const union AnimCmd *const sCoinAnimTable[] = { - gCoinAnimCmds, + sCoinAnimCmds, }; -static const union AffineAnimCmd gFallingCoinAffineAnimCmds[] = +static const union AffineAnimCmd sFallingCoinAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0, 0, 10, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gFallingCoinAffineAnimTable[] = +static const union AffineAnimCmd *const sFallingCoinAffineAnimTable[] = { - gFallingCoinAffineAnimCmds, + sFallingCoinAffineAnimCmds, }; const struct SpriteTemplate gCoinThrowSpriteTemplate = @@ -358,7 +358,7 @@ const struct SpriteTemplate gCoinThrowSpriteTemplate = .tileTag = ANIM_TAG_COIN, .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gCoinAnimTable, + .anims = sCoinAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimCoinThrow, @@ -369,21 +369,21 @@ const struct SpriteTemplate gFallingCoinSpriteTemplate = .tileTag = ANIM_TAG_COIN, .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gCoinAnimTable, + .anims = sCoinAnimTable, .images = NULL, - .affineAnims = gFallingCoinAffineAnimTable, + .affineAnims = sFallingCoinAffineAnimTable, .callback = AnimFallingCoin, }; -static const union AffineAnimCmd gBulletSeedAffineAnimCmds[] = +static const union AffineAnimCmd sBulletSeedAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0, 0, 20, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const gBulletSeedAffineAnimTable[] = +static const union AffineAnimCmd *const sBulletSeedAffineAnimTable[] = { - gBulletSeedAffineAnimCmds, + sBulletSeedAffineAnimCmds, }; const struct SpriteTemplate gBulletSeedSpriteTemplate = @@ -393,20 +393,20 @@ const struct SpriteTemplate gBulletSeedSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gBulletSeedAffineAnimTable, + .affineAnims = sBulletSeedAffineAnimTable, .callback = AnimBulletSeed, }; -static const union AffineAnimCmd gRazorWindTornadoAffineAnimCmds[] = +static const union AffineAnimCmd sRazorWindTornadoAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(16, 256, 0, 0), AFFINEANIMCMD_FRAME(4, 0, 0, 40), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gRazorWindTornadoAffineAnimTable[] = +static const union AffineAnimCmd *const sRazorWindTornadoAffineAnimTable[] = { - gRazorWindTornadoAffineAnimCmds, + sRazorWindTornadoAffineAnimCmds, }; const struct SpriteTemplate gRazorWindTornadoSpriteTemplate = @@ -416,11 +416,11 @@ const struct SpriteTemplate gRazorWindTornadoSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_32x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gRazorWindTornadoAffineAnimTable, + .affineAnims = sRazorWindTornadoAffineAnimTable, .callback = AnimRazorWindTornado, }; -static const union AnimCmd gViceGripAnimCmds1[] = +static const union AnimCmd sViceGripAnimCmds1[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(16, 3), @@ -428,7 +428,7 @@ static const union AnimCmd gViceGripAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gViceGripAnimCmds2[] = +static const union AnimCmd sViceGripAnimCmds2[] = { ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE), @@ -436,10 +436,10 @@ static const union AnimCmd gViceGripAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gViceGripAnimTable[] = +static const union AnimCmd *const sViceGripAnimTable[] = { - gViceGripAnimCmds1, - gViceGripAnimCmds2, + sViceGripAnimCmds1, + sViceGripAnimCmds2, }; const struct SpriteTemplate gViceGripSpriteTemplate = @@ -447,13 +447,13 @@ const struct SpriteTemplate gViceGripSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gViceGripAnimTable, + .anims = sViceGripAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimViceGripPincer, }; -static const union AnimCmd gGuillotineAnimCmds1[] = +static const union AnimCmd sGuillotineAnimCmds1[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -461,7 +461,7 @@ static const union AnimCmd gGuillotineAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gGuillotineAnimCmds2[] = +static const union AnimCmd sGuillotineAnimCmds2[] = { ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE), @@ -469,10 +469,10 @@ static const union AnimCmd gGuillotineAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gGuillotineAnimTable[] = +static const union AnimCmd *const sGuillotineAnimTable[] = { - gGuillotineAnimCmds1, - gGuillotineAnimCmds2, + sGuillotineAnimCmds1, + sGuillotineAnimCmds2, }; const struct SpriteTemplate gGuillotineSpriteTemplate = @@ -480,13 +480,13 @@ const struct SpriteTemplate gGuillotineSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gGuillotineAnimTable, + .anims = sGuillotineAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimGuillotinePincer, }; -static const union AffineAnimCmd gSplashEffectAffineAnimCmds[] = +static const union AffineAnimCmd sSplashEffectAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-6, 4, 0, 8), AFFINEANIMCMD_FRAME(10, -10, 0, 8), @@ -494,7 +494,7 @@ static const union AffineAnimCmd gSplashEffectAffineAnimCmds[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] = +static const union AffineAnimCmd sGrowAndShrinkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-4, -5, 0, 12), AFFINEANIMCMD_FRAME(0, 0, 0, 24), @@ -502,7 +502,7 @@ static const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] = AFFINEANIMCMD_END, }; -static const union AnimCmd gBreathPuffAnimCmds1[] = +static const union AnimCmd sBreathPuffAnimCmds1[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(4, 40, .hFlip = TRUE), @@ -511,7 +511,7 @@ static const union AnimCmd gBreathPuffAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gBreathPuffAnimCmds2[] = +static const union AnimCmd sBreathPuffAnimCmds2[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 40), @@ -520,10 +520,10 @@ static const union AnimCmd gBreathPuffAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gBreathPuffAnimTable[] = +static const union AnimCmd *const sBreathPuffAnimTable[] = { - gBreathPuffAnimCmds1, - gBreathPuffAnimCmds2, + sBreathPuffAnimCmds1, + sBreathPuffAnimCmds2, }; const struct SpriteTemplate gBreathPuffSpriteTemplate = @@ -531,22 +531,22 @@ const struct SpriteTemplate gBreathPuffSpriteTemplate = .tileTag = ANIM_TAG_BREATH, .paletteTag = ANIM_TAG_BREATH, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gBreathPuffAnimTable, + .anims = sBreathPuffAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimBreathPuff, }; -static const union AffineAnimCmd gAngerMarkAffineAnimCmds[] = +static const union AffineAnimCmd sAngerMarkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(11, 11, 0, 8), AFFINEANIMCMD_FRAME(-11, -11, 0, 8), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] = +static const union AffineAnimCmd *const sAngerMarkAffineAnimTable[] = { - gAngerMarkAffineAnimCmds, + sAngerMarkAffineAnimCmds, }; const struct SpriteTemplate gAngerMarkSpriteTemplate = @@ -556,11 +556,11 @@ const struct SpriteTemplate gAngerMarkSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gAngerMarkAffineAnimTable, + .affineAnims = sAngerMarkAffineAnimTable, .callback = AnimAngerMark, }; -static const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] = +static const union AffineAnimCmd sThrashMoveMonAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-10, 9, 0, 7), AFFINEANIMCMD_FRAME(20, -20, 0, 7), @@ -592,7 +592,7 @@ const struct SpriteTemplate gSnoreZSpriteTemplate = .callback = AnimSnoreZ, }; -static const union AnimCmd gExplosionAnimCmds[] = +static const union AnimCmd sExplosionAnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(16, 5), @@ -601,9 +601,9 @@ static const union AnimCmd gExplosionAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gExplosionAnimTable[] = +static const union AnimCmd *const sExplosionAnimTable[] = { - gExplosionAnimCmds, + sExplosionAnimCmds, }; const struct SpriteTemplate gExplosionSpriteTemplate = @@ -611,13 +611,13 @@ const struct SpriteTemplate gExplosionSpriteTemplate = .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_EXPLOSION, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gExplosionAnimTable, + .anims = sExplosionAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos, }; -static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] = +static const union AffineAnimCmd sSoftBoiledEggAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, -8, 2), AFFINEANIMCMD_FRAME(0, 0, 8, 4), @@ -625,13 +625,13 @@ static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] = AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] = +static const union AffineAnimCmd sSoftBoiledEggAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] = +static const union AffineAnimCmd sSoftBoiledEggAffineAnimCmds3[] = { AFFINEANIMCMD_FRAME(-8, 4, 0, 8), AFFINEANIMCMD_LOOP(0), @@ -643,11 +643,11 @@ static const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gSoftBoiledEggAffineAnimTable[] = +static const union AffineAnimCmd *const sSoftBoiledEggAffineAnimTable[] = { - gSoftBoiledEggAffineAnimCmds1, - gSoftBoiledEggAffineAnimCmds2, - gSoftBoiledEggAffineAnimCmds3, + sSoftBoiledEggAffineAnimCmds1, + sSoftBoiledEggAffineAnimCmds2, + sSoftBoiledEggAffineAnimCmds3, }; const struct SpriteTemplate gSoftBoiledEggSpriteTemplate = @@ -657,40 +657,40 @@ const struct SpriteTemplate gSoftBoiledEggSpriteTemplate = .oam = &gOamData_AffineDouble_ObjBlend_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSoftBoiledEggAffineAnimTable, + .affineAnims = sSoftBoiledEggAffineAnimTable, .callback = AnimSoftBoiledEgg, }; -static const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] = +static const union AffineAnimCmd sThinRingExpandingAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(16, 16, 0, 30), AFFINEANIMCMD_END_ALT(1), }; -static const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] = +static const union AffineAnimCmd sThinRingExpandingAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(32, 32, 0, 15), AFFINEANIMCMD_END_ALT(1), }; -static const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] = +static const union AffineAnimCmd sHyperVoiceRingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(11, 11, 0, 45), AFFINEANIMCMD_END_ALT(1), }; -static const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] = +static const union AffineAnimCmd *const sThinRingExpandingAffineAnimTable[] = { - gThinRingExpandingAffineAnimCmds1, - gThinRingExpandingAffineAnimCmds2, + sThinRingExpandingAffineAnimCmds1, + sThinRingExpandingAffineAnimCmds2, }; -static const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] = +static const union AffineAnimCmd *const sHyperVoiceRingAffineAnimTable[] = { - gHyperVoiceRingAffineAnimCmds, + sHyperVoiceRingAffineAnimCmds, }; const struct SpriteTemplate gThinRingExpandingSpriteTemplate = @@ -700,20 +700,20 @@ const struct SpriteTemplate gThinRingExpandingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gThinRingExpandingAffineAnimTable, + .affineAnims = sThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos, }; -static const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] = +static const union AffineAnimCmd sThinRingShrinkingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(512, 512, 0, 0), AFFINEANIMCMD_FRAME(-16, -16, 0, 30), AFFINEANIMCMD_END_ALT(1), }; -static const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] = +static const union AffineAnimCmd *const sThinRingShrinkingAffineAnimTable[] = { - gThinRingShrinkingAffineAnimCmds, + sThinRingShrinkingAffineAnimCmds, }; const struct SpriteTemplate gThinRingShrinkingSpriteTemplate = @@ -723,7 +723,7 @@ const struct SpriteTemplate gThinRingShrinkingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gThinRingShrinkingAffineAnimTable, + .affineAnims = sThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos, }; @@ -734,7 +734,7 @@ const struct SpriteTemplate gBlendThinRingExpandingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gThinRingExpandingAffineAnimTable, + .affineAnims = sThinRingExpandingAffineAnimTable, .callback = AnimBlendThinRing, }; @@ -745,7 +745,7 @@ const struct SpriteTemplate gHyperVoiceRingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gHyperVoiceRingAffineAnimTable, + .affineAnims = sHyperVoiceRingAffineAnimTable, .callback = AnimHyperVoiceRing, }; @@ -756,17 +756,17 @@ const struct SpriteTemplate gUproarRingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gThinRingExpandingAffineAnimTable, + .affineAnims = sThinRingExpandingAffineAnimTable, .callback = AnimUproarRing, }; -static const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] = +static const union AffineAnimCmd sStretchAttackerAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(96, -13, 0, 8), AFFINEANIMCMD_END, }; -static const union AnimCmd gSpeedDustAnimCmds[] = +static const union AnimCmd sSpeedDustAnimCmds[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(4, 3), @@ -776,9 +776,9 @@ static const union AnimCmd gSpeedDustAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gSpeedDustAnimTable[] = +static const union AnimCmd *const sSpeedDustAnimTable[] = { - gSpeedDustAnimCmds, + sSpeedDustAnimCmds, }; const struct SpriteTemplate gSpeedDustSpriteTemplate = @@ -786,13 +786,13 @@ const struct SpriteTemplate gSpeedDustSpriteTemplate = .tileTag = ANIM_TAG_SPEED_DUST, .paletteTag = ANIM_TAG_SPEED_DUST, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gSpeedDustAnimTable, + .anims = sSpeedDustAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpeedDust, }; -const s8 gSpeedDustPosTable[][2] = +static const s8 sSpeedDustPosTable[][2] = { {30, 28}, {-20, 24}, @@ -800,7 +800,7 @@ const s8 gSpeedDustPosTable[][2] = {-10, 28}, }; -static const union AnimCmd gBellAnimCmds[] = +static const union AnimCmd sBellAnimCmds[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(16, 6), @@ -818,9 +818,9 @@ static const union AnimCmd gBellAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gBellAnimTable[] = +static const union AnimCmd *const sBellAnimTable[] = { - gBellAnimCmds, + sBellAnimCmds, }; const struct SpriteTemplate gBellSpriteTemplate = @@ -828,7 +828,7 @@ const struct SpriteTemplate gBellSpriteTemplate = .tileTag = ANIM_TAG_BELL, .paletteTag = ANIM_TAG_BELL, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gBellAnimTable, + .anims = sBellAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos, @@ -863,7 +863,7 @@ const struct SpriteTemplate gMagentaHeartSpriteTemplate = .callback = AnimMagentaHeart, }; -static const union AffineAnimCmd gUnknown_83E4200[] = +static const union AffineAnimCmd sUnknown_83E4200[] = { AFFINEANIMCMD_FRAME(10, -13, 0, 10), AFFINEANIMCMD_FRAME(-10, 13, 0, 10), @@ -903,16 +903,16 @@ const struct SpriteTemplate gRedHeartRisingSpriteTemplate = .callback = AnimRedHeartRising, }; -static const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] = +static const union AffineAnimCmd sHiddenPowerOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(128, 128, 0, 0), AFFINEANIMCMD_FRAME(8, 8, 0, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] = +static const union AffineAnimCmd *const sHiddenPowerOrbAffineAnimTable[] = { - gHiddenPowerOrbAffineAnimCmds, + sHiddenPowerOrbAffineAnimCmds, }; const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = @@ -922,7 +922,7 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gHiddenPowerOrbAffineAnimTable, + .affineAnims = sHiddenPowerOrbAffineAnimTable, .callback = AnimOrbitFast, }; @@ -933,20 +933,20 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gHiddenPowerOrbAffineAnimTable, + .affineAnims = sHiddenPowerOrbAffineAnimTable, .callback = AnimOrbitScatter, }; -static const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] = +static const union AffineAnimCmd sSpitUpOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(128, 128, 0, 0), AFFINEANIMCMD_FRAME(8, 8, 0, 1), AFFINEANIMCMD_JUMP(1), }; -static const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] = +static const union AffineAnimCmd *const sSpitUpOrbAffineAnimTable[] = { - gSpitUpOrbAffineAnimCmds, + sSpitUpOrbAffineAnimCmds, }; const struct SpriteTemplate gSpitUpOrbSpriteTemplate = @@ -956,11 +956,11 @@ const struct SpriteTemplate gSpitUpOrbSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_8x8, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gSpitUpOrbAffineAnimTable, + .affineAnims = sSpitUpOrbAffineAnimTable, .callback = AnimSpitUpOrb, }; -static const union AnimCmd gEyeSparkleAnimCmds[] = +static const union AnimCmd sEyeSparkleAnimCmds[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -970,9 +970,9 @@ static const union AnimCmd gEyeSparkleAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const gEyeSparkleAnimTable[] = +static const union AnimCmd *const sEyeSparkleAnimTable[] = { - gEyeSparkleAnimCmds, + sEyeSparkleAnimCmds, }; const struct SpriteTemplate gEyeSparkleSpriteTemplate = @@ -980,21 +980,21 @@ const struct SpriteTemplate gEyeSparkleSpriteTemplate = .tileTag = ANIM_TAG_EYE_SPARKLE, .paletteTag = ANIM_TAG_EYE_SPARKLE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gEyeSparkleAnimTable, + .anims = sEyeSparkleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEyeSparkle, }; -static const union AnimCmd gAngelSpriteAnimCmds[] = +static const union AnimCmd sAngelSpriteAnimCmds[] = { ANIMCMD_FRAME(0, 24), ANIMCMD_END, }; -static const union AnimCmd *const gAngelSpriteAnimTable[] = +static const union AnimCmd *const sAngelSpriteAnimTable[] = { - gAngelSpriteAnimCmds, + sAngelSpriteAnimCmds, }; const struct SpriteTemplate gAngelSpriteTemplate = @@ -1002,7 +1002,7 @@ const struct SpriteTemplate gAngelSpriteTemplate = .tileTag = ANIM_TAG_ANGEL, .paletteTag = ANIM_TAG_ANGEL, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gAngelSpriteAnimTable, + .anims = sAngelSpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimAngel, @@ -1019,22 +1019,22 @@ const struct SpriteTemplate gPinkHeartSpriteTemplate = .callback = AnimPinkHeart, }; -static const union AnimCmd gDevilAnimCmds1[] = +static const union AnimCmd sDevilAnimCmds1[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_JUMP(0), }; -static const union AnimCmd gDevilAnimCmds2[] = +static const union AnimCmd sDevilAnimCmds2[] = { ANIMCMD_FRAME(16, 3), ANIMCMD_JUMP(0), }; -static const union AnimCmd *const gDevilAnimTable[] = +static const union AnimCmd *const sDevilAnimTable[] = { - gDevilAnimCmds1, - gDevilAnimCmds2, + sDevilAnimCmds1, + sDevilAnimCmds2, }; const struct SpriteTemplate gDevilSpriteTemplate = @@ -1042,13 +1042,13 @@ const struct SpriteTemplate gDevilSpriteTemplate = .tileTag = ANIM_TAG_DEVIL, .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gDevilAnimTable, + .anims = sDevilAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimDevil, }; -static const union AnimCmd gUnknown_08593B08[] = +static const union AnimCmd sFurySwipesAnimCmd1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(16, 4), @@ -1057,7 +1057,7 @@ static const union AnimCmd gUnknown_08593B08[] = ANIMCMD_END, }; -static const union AnimCmd gUnknown_08593B1C[] = +static const union AnimCmd sFurySwipesAnimCmd2[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE), @@ -1066,10 +1066,10 @@ static const union AnimCmd gUnknown_08593B1C[] = ANIMCMD_END, }; -static const union AnimCmd *const gFurySwipesAnimTable[] = +static const union AnimCmd *const sFurySwipesAnimTable[] = { - gUnknown_08593B08, - gUnknown_08593B1C, + sFurySwipesAnimCmd1, + sFurySwipesAnimCmd2, }; const struct SpriteTemplate gFurySwipesSpriteTemplate = @@ -1077,13 +1077,13 @@ const struct SpriteTemplate gFurySwipesSpriteTemplate = .tileTag = ANIM_TAG_SWIPE, .paletteTag = ANIM_TAG_SWIPE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gFurySwipesAnimTable, + .anims = sFurySwipesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFurySwipes, }; -static const union AnimCmd gMovementWavesAnimCmds1[] = +static const union AnimCmd sMovementWavesAnimCmds1[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(16, 8), @@ -1092,7 +1092,7 @@ static const union AnimCmd gMovementWavesAnimCmds1[] = ANIMCMD_END, }; -static const union AnimCmd gMovementWavesAnimCmds2[] = +static const union AnimCmd sMovementWavesAnimCmds2[] = { ANIMCMD_FRAME(16, 8, .hFlip = TRUE), ANIMCMD_FRAME(32, 8, .hFlip = TRUE), @@ -1101,10 +1101,10 @@ static const union AnimCmd gMovementWavesAnimCmds2[] = ANIMCMD_END, }; -static const union AnimCmd *const gMovementWavesAnimTable[] = +static const union AnimCmd *const sMovementWavesAnimTable[] = { - gMovementWavesAnimCmds1, - gMovementWavesAnimCmds2, + sMovementWavesAnimCmds1, + sMovementWavesAnimCmds2, }; const struct SpriteTemplate gMovementWavesSpriteTemplate = @@ -1112,13 +1112,13 @@ const struct SpriteTemplate gMovementWavesSpriteTemplate = .tileTag = ANIM_TAG_MOVEMENT_WAVES, .paletteTag = ANIM_TAG_MOVEMENT_WAVES, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gMovementWavesAnimTable, + .anims = sMovementWavesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovementWaves, }; -static const union AffineAnimCmd gUnknown_08593B98[] = +static const union AffineAnimCmd sUproarAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-12, 8, 0, 4), AFFINEANIMCMD_FRAME(20, -20, 0, 4), @@ -1137,29 +1137,29 @@ const struct SpriteTemplate gJaggedMusicNoteSpriteTemplate = .callback = AnimJaggedMusicNote, }; -static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] = +static const union AffineAnimCmd sPerishSongMusicNoteAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 5), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] = +static const union AffineAnimCmd sPerishSongMusicNoteAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0, 0, -8, 16), AFFINEANIMCMD_END_ALT(1), }; -static const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] = +static const union AffineAnimCmd sPerishSongMusicNoteAffineAnimCmds3[] = { AFFINEANIMCMD_FRAME(0, 0, 8, 16), AFFINEANIMCMD_END_ALT(1), }; -static const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] = +static const union AffineAnimCmd *const sPerishSongMusicNoteAffineAnimTable[] = { - gPerishSongMusicNoteAffineAnimCmds1, - gPerishSongMusicNoteAffineAnimCmds2, - gPerishSongMusicNoteAffineAnimCmds3, + sPerishSongMusicNoteAffineAnimCmds1, + sPerishSongMusicNoteAffineAnimCmds2, + sPerishSongMusicNoteAffineAnimCmds3, }; const struct SpriteTemplate gPerishSongMusicNoteSpriteTemplate = @@ -1169,7 +1169,7 @@ const struct SpriteTemplate gPerishSongMusicNoteSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gPerishSongMusicNoteAffineAnimTable, + .affineAnims = sPerishSongMusicNoteAffineAnimTable, .callback = AnimPerishSongMusicNote, }; @@ -1180,26 +1180,26 @@ const struct SpriteTemplate gPerishSongMusicNote2SpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gPerishSongMusicNoteAffineAnimTable, + .affineAnims = sPerishSongMusicNoteAffineAnimTable, .callback = AnimPerishSongMusicNote2, }; -static const union AffineAnimCmd gGuardRingAffineAnimCmds1[] = +static const union AffineAnimCmd sGuardRingAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd gGuardRingAffineAnimCmds2[] = +static const union AffineAnimCmd sGuardRingAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(512, 256, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd *const gGuardRingAffineAnimTable[] = +static const union AffineAnimCmd *const sGuardRingAffineAnimTable[] = { - gGuardRingAffineAnimCmds1, - gGuardRingAffineAnimCmds2, + sGuardRingAffineAnimCmds1, + sGuardRingAffineAnimCmds2, }; const struct SpriteTemplate gGuardRingSpriteTemplate = @@ -1209,7 +1209,7 @@ const struct SpriteTemplate gGuardRingSpriteTemplate = .oam = &gOamData_AffineDouble_ObjBlend_64x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gGuardRingAffineAnimTable, + .affineAnims = sGuardRingAffineAnimTable, .callback = AnimGuardRing, }; @@ -1699,7 +1699,7 @@ void AnimTask_AirCutterProjectile(u8 taskId) void sub_80A79E8(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); - sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(gUnknown_83E3D18.paletteTag) << 4); + sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(sUnknown_83E3D18.paletteTag) << 4); sprite->callback = sub_80A7A18; } @@ -2129,7 +2129,7 @@ void AnimTask_Splash(u8 taskId) task->data[2] = gBattleAnimArgs[1]; task->data[3] = 0; task->data[4] = 0; - PrepareAffineAnimInTaskData(task, spriteId, gSplashEffectAffineAnimCmds); + PrepareAffineAnimInTaskData(task, spriteId, sSplashEffectAffineAnimCmds); task->func = AnimTask_SplashStep; } } @@ -2178,7 +2178,7 @@ static void AnimTask_SplashStep(u8 taskId) } else { - PrepareAffineAnimInTaskData(task, task->data[0], gSplashEffectAffineAnimCmds); + PrepareAffineAnimInTaskData(task, task->data[0], sSplashEffectAffineAnimCmds); task->data[1] = 0; } } @@ -2194,7 +2194,7 @@ void AnimTask_GrowAndShrink(u8 taskId) struct Task* task = &gTasks[taskId]; u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); - PrepareAffineAnimInTaskData(task, spriteId, gGrowAndShrinkAffineAnimCmds); + PrepareAffineAnimInTaskData(task, spriteId, sGrowAndShrinkAffineAnimCmds); task->func = AnimTask_GrowAndShrinkStep; } @@ -2266,7 +2266,7 @@ void AnimTask_ThrashMoveMonHorizontal(u8 taskId) task->data[0] = spriteId; task->data[1] = 0; - PrepareAffineAnimInTaskData(task, spriteId, gThrashMoveMonAffineAnimCmds); + PrepareAffineAnimInTaskData(task, spriteId, sThrashMoveMonAffineAnimCmds); task->func = ThrashMoveMonStep; } @@ -2761,7 +2761,7 @@ void AnimTask_StretchAttacker(u8 taskId) u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[0] = spriteId; - PrepareAffineAnimInTaskData(task, spriteId, gStretchAttackerAffineAnimCmds); + PrepareAffineAnimInTaskData(task, spriteId, sStretchAttackerAffineAnimCmds); task->func = StretchAttacker_Step; } @@ -2958,8 +2958,8 @@ static void SpeedDust_Step1(u8 taskId) { gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 13; - gSprites[spriteId].pos2.x = gSpeedDustPosTable[task->data[2]][0]; - gSprites[spriteId].pos2.y = gSpeedDustPosTable[task->data[2]][1]; + gSprites[spriteId].pos2.x = sSpeedDustPosTable[task->data[2]][0]; + gSprites[spriteId].pos2.y = sSpeedDustPosTable[task->data[2]][1]; task->data[13]++; if (++task->data[2] > 3) { @@ -3111,7 +3111,7 @@ void sub_80A9A20(u8 taskId) if (++gTasks[taskId].data[0] == 1) { - PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_TARGET), gUnknown_83E4200); + PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_TARGET), sUnknown_83E4200); gSprites[spriteId].pos2.x = 4; } else @@ -3132,7 +3132,7 @@ void sub_80A9AB0(u8 taskId) if (++gTasks[taskId].data[0] == 1) { - PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_83E4200); + PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), sUnknown_83E4200); gSprites[spriteId].pos2.x = 4; } else @@ -3648,7 +3648,7 @@ void AnimTask_UproarDistortion(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - PrepareAffineAnimInTaskData(&gTasks[taskId], spriteId, gUnknown_08593B98); + PrepareAffineAnimInTaskData(&gTasks[taskId], spriteId, sUproarAffineAnimCmds); gTasks[taskId].func = UproarDistortion_Step; } diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index cb2f8b78e..69bae2c6f 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 -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; } diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 44a7928d8..7590c0e58 100644 --- a/src/battle_anim_special.c +++ b/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]++; } diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index afa0c5c42..2e7f30ff1 100644 --- a/src/battle_anim_status_effects.c +++ b/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; } |