data type fixes

7 files changed, 131 insertions, 288 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index fd219bc11..ce20a4f01 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -111,9 +111,6 @@ static void ScriptCmd_doublebattle_2E(void);
 static void ScriptCmd_stopsound(void);
 
 // Data
-extern const u16 gMovesWithQuietBGM[];
-extern const u8 *const gBattleAnims_Moves[];
-
 const struct OamData gOamData_AffineOff_ObjNormal_8x8 =
 {
     .y = 0,
@@ -1740,7 +1737,7 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
     [BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests},
 };
 
-static void (* const sScriptCmdTable[])(void) =
+static void (*const sScriptCmdTable[])(void) =
 {
     ScriptCmd_loadspritegfx,
     ScriptCmd_unloadspritegfx,
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index b1209bb81..1cbbf92de 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -19,66 +19,6 @@
 EWRAM_DATA s16 gUnknown_203999C[4] = {0};
 
 // Function Declarations
-void AnimMovePowderParticle(struct Sprite *);
-void AnimPowerAbsorptionOrb(struct Sprite *);
-void AnimSolarbeamBigOrb(struct Sprite *);
-void AnimSolarbeamSmallOrb(struct Sprite *);
-void AnimAbsorptionOrb(struct Sprite *);
-void AnimHyperBeamOrb(struct Sprite *);
-void AnimSporeParticle(struct Sprite *);
-void AnimPetalDanceBigFlower(struct Sprite *);
-void AnimPetalDanceSmallFlower(struct Sprite *);
-void AnimRazorLeafParticle(struct Sprite *);
-void AnimLeechSeed(struct Sprite *);
-void AnimTranslateLinearSingleSineWave(struct Sprite *);
-void AnimMoveTwisterParticle(struct Sprite *);
-void AnimConstrictBinding(struct Sprite *);
-void AnimMimicOrb(struct Sprite *);
-void AnimIngrainRoot(struct Sprite *);
-void AnimFrenzyPlantRoot(struct Sprite *);
-void AnimIngrainOrb(struct Sprite *);
-void AnimPresent(struct Sprite *);
-void AnimKnockOffItem(struct Sprite *);
-void AnimPresentHealParticle(struct Sprite *);
-void AnimItemSteal(struct Sprite *);
-void AnimTrickBag(struct Sprite *);
-void AnimFlyingParticle(struct Sprite *);
-void AnimNeedleArmSpike(struct Sprite *);
-void sub_80A43F8(struct Sprite *);
-void AnimWhipHit(struct Sprite *);
-void sub_80A4494(struct Sprite *);
-void AnimCuttingSlice(struct Sprite *);
-void AnimAirCutterSlice(struct Sprite *);
-void sub_80A481C(struct Sprite *);
-void AnimProtect(struct Sprite *);
-void AnimMilkBottle(struct Sprite *);
-void AnimGrantingStars(struct Sprite *);
-void AnimSparkingStars(struct Sprite *);
-void sub_80A4E40(struct Sprite *);
-void AnimSleepLetterZ(struct Sprite *);
-void AnimLockOnTarget(struct Sprite *);
-void AnimLockOnMoveTarget(struct Sprite *);
-void AnimBowMon(struct Sprite *);
-void sub_80A5590(struct Sprite *);
-void AnimSlashSlice(struct Sprite *);
-void AnimFalseSwipeSlice(struct Sprite *);
-void AnimFalseSwipePositionedSlice(struct Sprite *);
-void AnimEndureEnergy(struct Sprite *);
-void AnimSharpenSphere(struct Sprite *);
-void AnimConversion(struct Sprite *);
-void AnimConversion2(struct Sprite *);
-void AnimMoon(struct Sprite *);
-void AnimMoonlightSparkle(struct Sprite *);
-void AnimHornHit(struct Sprite *);
-void AnimSuperFang(struct Sprite *);
-void AnimWavyMusicNotes(struct Sprite *);
-void AnimFlyingMusicNotes(struct Sprite *);
-void AnimBellyDrumHand(struct Sprite *);
-void AnimSlowFlyingMusicNotes(struct Sprite *);
-void AnimThoughtBubble(struct Sprite *);
-void AnimMetronomeFinger(struct Sprite *);
-void AnimFollowMeFinger(struct Sprite *);
-void AnimTauntFinger(struct Sprite *);
 static void AnimMovePowderParticleStep(struct Sprite *);
 static void AnimSolarbeamSmallOrbStep(struct Sprite *);
 static void AnimAbsorptionOrbStep(struct Sprite *);
@@ -2003,10 +1943,10 @@ const struct SpriteTemplate gWavyMusicNotesSpriteTemplate =
 
 const u16 gParticlesColorBlendTable[][6] =    
 {
-    {ANIM_TAG_MUSIC_NOTES,     RGB(31, 31, 31), RGB(31, 26, 28), RGB(31, 22, 26), RGB(31, 17, 24), RGB(31, 13, 22)},
-    {ANIM_TAG_BENT_SPOON,      RGB(31, 31, 31), RGB(25, 31, 26), RGB(20, 31, 21), RGB(15, 31, 16), RGB(10, 31, 12)},
-    {ANIM_TAG_SPHERE_TO_CUBE,  RGB(31, 31, 31), RGB(31, 31, 24), RGB(31, 31, 17), RGB(31, 31, 10), RGB(31, 31, 3)},
-    {ANIM_TAG_LARGE_FRESH_EGG, RGB(31, 31, 31), RGB(26, 28, 31), RGB(21, 26, 31), RGB(16, 24, 31), RGB(12, 22, 31)},
+    {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)},
+    {ANIM_TAG_SPHERE_TO_CUBE,  RGB_WHITE, RGB(31, 31, 24), RGB(31, 31, 17), RGB(31, 31, 10), RGB(31, 31, 3)},
+    {ANIM_TAG_LARGE_FRESH_EGG, RGB_WHITE, RGB(26, 28, 31), RGB(21, 26, 31), RGB(16, 24, 31), RGB(12, 22, 31)},
 };
 
 const struct SpriteTemplate gFastFlyingMusicNotesSpriteTemplate =
@@ -2450,7 +2390,7 @@ static void AnimLeechSeedStep(struct Sprite* sprite)
 {
     if (TranslateAnimHorizontalArc(sprite))
     {
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
         sprite->data[0] = 10;
         sprite->callback = WaitAnimForDuration;
         StoreSpriteCallbackInData6(sprite, AnimLeechSeedSprouts);
@@ -2459,7 +2399,7 @@ static void AnimLeechSeedStep(struct Sprite* sprite)
 
 static void AnimLeechSeedSprouts(struct Sprite* sprite)
 {
-    sprite->invisible = 0;
+    sprite->invisible = FALSE;
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 60;
     sprite->callback = WaitAnimForDuration;
@@ -2789,7 +2729,7 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite)
 void AnimConstrictBinding(struct Sprite* sprite)
 {
     InitSpritePosToAnimTarget(sprite, FALSE);
-    sprite->affineAnimPaused = 1;
+    sprite->affineAnimPaused = TRUE;
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]);
     sprite->data[6] = gBattleAnimArgs[2];
     sprite->data[7] = gBattleAnimArgs[3];
@@ -2802,7 +2742,7 @@ static void AnimConstrictBindingStep1(struct Sprite* sprite)
 
     if ((u16)gBattleAnimArgs[7] == 0xFFFF)
     {
-        sprite->affineAnimPaused = 0;
+        sprite->affineAnimPaused = FALSE;
         spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         sprite->data[0] = 0x100;
         sprite->callback = AnimConstrictBindingStep2;
@@ -2908,11 +2848,11 @@ void AnimMimicOrb(struct Sprite* sprite)
 
         sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[0];
         sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[1];
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
         sprite->data[0]++;
         break;
     case 1:
-        sprite->invisible = 0;
+        sprite->invisible = FALSE;
         if (sprite->affineAnimEnded)
         {
             ChangeSpriteAffineAnim(sprite, 1);
@@ -3930,15 +3870,15 @@ void sub_80A4738(struct Sprite* sprite)
     {
         if (sprite->data[3] & 1)
         {
-            sprite->invisible = 0;
-            gSprites[sprite->data[0]].invisible = 0;
-            gSprites[sprite->data[1]].invisible = 0;
+            sprite->invisible = FALSE;
+            gSprites[sprite->data[0]].invisible = FALSE;
+            gSprites[sprite->data[1]].invisible = FALSE;
         }
         else
         {
-            sprite->invisible = 1;
-            gSprites[sprite->data[0]].invisible = 1;
-            gSprites[sprite->data[1]].invisible = 1;
+            sprite->invisible = TRUE;
+            gSprites[sprite->data[0]].invisible = TRUE;
+            gSprites[sprite->data[1]].invisible = TRUE;
         }
 
         sprite->data[2] = 0;
@@ -4048,7 +3988,7 @@ static void AnimProtectStep(struct Sprite *sprite)
         SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[7], sprite->data[7]));
         if (sprite->data[7] == 16)
         {
-            sprite->invisible = 1;
+            sprite->invisible = TRUE;
             sprite->callback = DestroyAnimSpriteAndDisableBlend;
         }
     }
@@ -4132,7 +4072,7 @@ static void AnimMilkBottleStep1(struct Sprite* sprite)
         }
         break;
     case 3:
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
         sprite->data[0]++;
         break;
     case 4:
@@ -4386,7 +4326,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite)
         sprite->data[1] = 0;
     }
 
-    BlendPalettes(sub_8075BE8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31));
+    BlendPalettes(sub_8075BE8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE);
     if (sprite->data[1] == 16)
     {
         int pal;
@@ -4458,7 +4398,7 @@ void AnimLockOnMoveTarget(struct Sprite* sprite)
 
 void AnimBowMon(struct Sprite* sprite)
 {
-    sprite->invisible = 1;
+    sprite->invisible = TRUE;
     sprite->data[0] = 0;
     switch (gBattleAnimArgs[0])
     {
@@ -5228,7 +5168,7 @@ void AnimTask_DoubleTeam(u8 taskId)
     for (i = 1; i < 16; i++)
         gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i];
 
-    BlendPalette(r3, 16, 11, RGB(0, 0, 0));
+    BlendPalette(r3, 16, 11, RGB_BLACK);
     task->data[3] = 0;
     i = 0;
     while (i < 2 && (obj = CloneBattlerSpriteWithBlend(0)) >= 0)
@@ -5303,17 +5243,17 @@ void AnimTask_MusicNotesRainbowBlend(u8 taskId)
     if (index != 0xFF)
     {
         index = (index << 4) + 0x100;
-        for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable[0]); i++)
+        for (i = 1; i < NELEMS(gParticlesColorBlendTable[0]); i++)
             gPlttBufferFaded[index + i] = gParticlesColorBlendTable[0][i];
     }
 
-    for (j = 1; j < ARRAY_COUNT(gParticlesColorBlendTable); j++)
+    for (j = 1; j < NELEMS(gParticlesColorBlendTable); j++)
     {
         index = AllocSpritePalette(gParticlesColorBlendTable[j][0]);
         if (index != 0xFF)
         {
             index = (index << 4) + 0x100;
-            for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable[0]); i++)
+            for (i = 1; i < NELEMS(gParticlesColorBlendTable[0]); i++)
                 gPlttBufferFaded[index + i] = gParticlesColorBlendTable[j][i];
         }
     }
@@ -5325,7 +5265,7 @@ void AnimTask_MusicNotesClearRainbowBlend(u8 taskId)
 {
     u16 i;
     
-    for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable); i++)
+    for (i = 1; i < NELEMS(gParticlesColorBlendTable); i++)
         FreeSpritePaletteByTag(gParticlesColorBlendTable[i][0]);
 
     DestroyAnimVisualTask(taskId);
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index b58a88799..2a1ee41e2 100644
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -15,47 +15,6 @@
 #include "util.h"
 #include "constants/songs.h"
 
-void sub_80A6E48(struct Sprite *);
-void sub_80A6E98(struct Sprite *);
-void sub_80A6F8C(struct Sprite *);
-void sub_80A7020(struct Sprite *);
-void Anim_KinesisZapEnergy(struct Sprite *);
-void Anim_SwordsDanceBlade(struct Sprite *);
-void AnimSonicBoomProjectile(struct Sprite *);
-void AnimAirWaveProjectile(struct Sprite *);
-void sub_80A79E8(struct Sprite *);
-void AnimCoinThrow(struct Sprite *);
-void AnimFallingCoin(struct Sprite *);
-void AnimBulletSeed(struct Sprite *);
-void AnimRazorWindTornado(struct Sprite *);
-void AnimViceGripPincer(struct Sprite *);
-void AnimGuillotinePincer(struct Sprite *);
-void AnimBreathPuff(struct Sprite *);
-void AnimAngerMark(struct Sprite *);
-void AnimPencil(struct Sprite *);
-void AnimBlendThinRing(struct Sprite *);
-void AnimHyperVoiceRing(struct Sprite *);
-void AnimUproarRing(struct Sprite *);
-void AnimSoftBoiledEgg(struct Sprite *);
-void AnimSpeedDust(struct Sprite *);
-void AnimHealBellMusicNote(struct Sprite *);
-void AnimMagentaHeart(struct Sprite *);
-void AnimRedHeartProjectile(struct Sprite *);
-void AnimParticuleBurst(struct Sprite *);
-void AnimRedHeartRising(struct Sprite *);
-void AnimOrbitFast(struct Sprite *);
-void AnimOrbitScatter(struct Sprite *);
-void AnimSpitUpOrb(struct Sprite *);
-void AnimEyeSparkle(struct Sprite *);
-void AnimAngel(struct Sprite *);
-void AnimPinkHeart(struct Sprite *);
-void AnimDevil(struct Sprite *);
-void AnimFurySwipes(struct Sprite *);
-void AnimMovementWaves(struct Sprite *);
-void AnimJaggedMusicNote(struct Sprite *);
-void AnimPerishSongMusicNote2(struct Sprite *);
-void AnimPerishSongMusicNote(struct Sprite *);
-void AnimGuardRing(struct Sprite *);
 static void sub_80A6ED8(struct Sprite *);
 static void sub_80A7058(struct Sprite *);
 static void sub_80A7080(struct Sprite *);
@@ -105,8 +64,6 @@ static void AnimPerishSongMusicNote_Step1(struct Sprite *);
 static void AnimPerishSongMusicNote_Step2(struct Sprite *);
 
 // Data
-extern const union AffineAnimCmd *const gUnknown_83E7910[];
-extern const union AnimCmd *const gMusicNotesAnimTable[];
 // Unused
 const struct SpriteTemplate gUnknown_83E3ADC =
 {
@@ -289,11 +246,11 @@ const union AffineAnimCmd gGrowingRingAffineAnimCmds[] =
 const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 10),
-    AFFINEANIMCMD_FRAME(0xFFF6, 0xFFF6, 0, 10),
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 10),
     AFFINEANIMCMD_FRAME(0xA, 0xA, 0, 10),
-    AFFINEANIMCMD_FRAME(0xFFF6, 0xFFF6, 0, 10),
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 10),
     AFFINEANIMCMD_FRAME(0xA, 0xA, 0, 10),
-    AFFINEANIMCMD_FRAME(0xFFF6, 0xFFF6, 0, 10),
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 10),
     AFFINEANIMCMD_FRAME(0xA, 0xA, 0, 10),
     AFFINEANIMCMD_END,
 };
@@ -583,7 +540,7 @@ const struct SpriteTemplate gBreathPuffSpriteTemplate =
 const union AffineAnimCmd gAngerMarkAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0xB, 0xB, 0, 8),
-    AFFINEANIMCMD_FRAME(0xFFF5, 0xFFF5, 0, 8),
+    AFFINEANIMCMD_FRAME(-11, -11, 0, 8),
     AFFINEANIMCMD_END,
 };
 
@@ -676,10 +633,10 @@ const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] =
 
 const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] =
 {
-    AFFINEANIMCMD_FRAME(0xFFF8, 0x4, 0, 8),
+    AFFINEANIMCMD_FRAME(-8, 0x4, 0, 8),
     AFFINEANIMCMD_LOOP(0),
-    AFFINEANIMCMD_FRAME(0x10, 0xFFF8, 0, 8),
-    AFFINEANIMCMD_FRAME(0xFFF0, 0x8, 0, 8),
+    AFFINEANIMCMD_FRAME(0x10, -8, 0, 8),
+    AFFINEANIMCMD_FRAME(-16, 0x8, 0, 8),
     AFFINEANIMCMD_LOOP(1),
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 15),
@@ -750,7 +707,7 @@ const struct SpriteTemplate gThinRingExpandingSpriteTemplate =
 const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] =
 {
     AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
-    AFFINEANIMCMD_FRAME(0xFFF0, 0xFFF0, 0, 30),
+    AFFINEANIMCMD_FRAME(-16, -16, 0, 30),
     AFFINEANIMCMD_END_ALT(1),
 };
 
@@ -908,8 +865,8 @@ const struct SpriteTemplate gMagentaHeartSpriteTemplate =
 
 const union AffineAnimCmd gUnknown_83E4200[] =
 {
-    AFFINEANIMCMD_FRAME(0x000A, 0xFFF3, 0x00, 0x0A),
-    AFFINEANIMCMD_FRAME(0xFFF6, 0x000D, 0x00, 0x0A),
+    AFFINEANIMCMD_FRAME(0xA, -13, 0x0, 0xA),
+    AFFINEANIMCMD_FRAME(-10, 0xD, 0x0, 0xA),
     AFFINEANIMCMD_END,
 };
 
@@ -1340,7 +1297,7 @@ void sub_80A6F8C(struct Sprite *sprite)
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = spriteId;
     sprite->callback = sub_80A6F3C;
-    sprite->invisible = 1;
+    sprite->invisible = TRUE;
 }
 
 void sub_80A7020(struct Sprite *sprite)
@@ -1439,14 +1396,14 @@ void Anim_KinesisZapEnergy(struct Sprite *sprite)
     sprite->pos1.y += gBattleAnimArgs[1];
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->hFlip = 1;
+        sprite->hFlip = TRUE;
         if (gBattleAnimArgs[2])
-            sprite->vFlip = 1;
+            sprite->vFlip = TRUE;
     }
     else
     {
         if (gBattleAnimArgs[2])
-            sprite->vFlip = 1;
+            sprite->vFlip = TRUE;
     }
 
     sprite->callback = RunStoredCallbackWhenAnimEnds;
@@ -1633,7 +1590,7 @@ static void AirCutterProjectileStep1(u8 taskId)
         gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId;
         gTasks[taskId].data[0] = gTasks[taskId].data[3];
         gTasks[taskId].data[1]++;
-        PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-63));
+        PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-SOUND_PAN_TARGET));
         if (gTasks[taskId].data[1] > 2)
             gTasks[taskId].func = AirCutterProjectileStep2;
     }
@@ -1821,7 +1778,7 @@ void AnimBulletSeed(struct Sprite *sprite)
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->callback = StartAnimLinearTranslation;
-    sprite->affineAnimPaused = 1;
+    sprite->affineAnimPaused = TRUE;
     StoreSpriteCallbackInData6(sprite, AnimBulletSeed_Step1);
 }
 
@@ -1845,7 +1802,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
     rand = Random();
     sprite->data[7] = (rand % 0xA0) + 0xA0;
     sprite->callback = AnimBulletSeed_Step2;
-    sprite->affineAnimPaused = 0;
+    sprite->affineAnimPaused = FALSE;
 }
 
 static void AnimBulletSeed_Step2(struct Sprite *sprite)
@@ -1959,7 +1916,7 @@ static void AnimGuillotinePincerStep1(struct Sprite *sprite)
     if (AnimTranslateLinear(sprite) && sprite->animEnded)
     {
         SeekSpriteAnim(sprite, 0);
-        sprite->animPaused = 1;
+        sprite->animPaused = TRUE;
         sprite->pos1.x += sprite->pos2.x;
         sprite->pos1.y += sprite->pos2.y;
         sprite->pos2.x = 2;
@@ -1988,7 +1945,7 @@ static void AnimGuillotinePincerStep2(struct Sprite *sprite)
         sprite->pos2.x = 0;
         sprite->data[4] = 0;
         sprite->data[3] = 0;
-        sprite->animPaused = 0;
+        sprite->animPaused = FALSE;
         StartSpriteAnim(sprite, sprite->data[5] ^ 1);
         sprite->callback = AnimGuillotinePincerStep3;
     }
@@ -2137,7 +2094,7 @@ static void CreateMinimizeSprite(struct Task* task, u8 taskId)
             gSprites[spriteId].data[2] = 6;
             gSprites[spriteId].callback = ClonedMinizeSprite_Step;
             SetSpriteRotScale(spriteId, task->data[4], task->data[4], 0);
-            gSprites[spriteId].oam.affineMode = 1;
+            gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
             CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
         }
     }
@@ -2492,7 +2449,7 @@ void AnimPencil(struct Sprite *sprite)
     sprite->data[3] = 16;
     sprite->data[4] = 0;
     sprite->data[5] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_HEIGHT) + 2;
-    sprite->data[6] = BattleAnimAdjustPanning(63);
+    sprite->data[6] = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
     sprite->callback = AnimPencil_Step;
 }
 
@@ -2508,7 +2465,7 @@ static void AnimPencil_Step(struct Sprite *sprite)
         }
         if (++sprite->data[1] > 16)
         {
-            sprite->invisible = 0;
+            sprite->invisible = FALSE;
             sprite->data[0]++;
         }
         break;
@@ -2548,7 +2505,7 @@ static void AnimPencil_Step(struct Sprite *sprite)
         }
         if (++sprite->data[1] > 16)
         {
-            sprite->invisible = 0;
+            sprite->invisible = FALSE;
             DestroyAnimSprite(sprite);
         }
         break;
@@ -2783,7 +2740,7 @@ static void AnimSoftBoiledEgg_Step4(struct Sprite *sprite)
 {
     if ((u16)gBattleAnimArgs[7] == 0xFFFF)
     {
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
         if (sprite->data[7] == 0)
             sprite->callback = AnimSoftBoiledEgg_Step4_Callback;
         else
@@ -2815,7 +2772,7 @@ static void StretchAttacker_Step(u8 taskId)
     if (!RunAffineAnimFromTaskData(task))
     {
         gSprites[task->data[0]].pos2.y = 0;
-        gSprites[task->data[0]].invisible = 1;
+        gSprites[task->data[0]].invisible = TRUE;
         DestroyAnimVisualTask(taskId);
     }
 }
@@ -2913,9 +2870,9 @@ static void ExtremeSpeedMonReappear_Step(u8 taskId)
     {
         task->data[1] = 0;
         if (++task->data[2] & 1)
-            gSprites[task->data[15]].invisible = 0;
+            gSprites[task->data[15]].invisible = FALSE;
         else
-            gSprites[task->data[15]].invisible = 1;
+            gSprites[task->data[15]].invisible = TRUE;
 
         if (++task->data[3] >= task->data[13])
         {
@@ -2927,7 +2884,7 @@ static void ExtremeSpeedMonReappear_Step(u8 taskId)
             }
             else
             {
-                gSprites[task->data[15]].invisible = 0;
+                gSprites[task->data[15]].invisible = FALSE;
                 DestroyAnimVisualTask(taskId);
             }
         }
@@ -3104,10 +3061,10 @@ void AnimTask_FakeOut(u8 taskId)
     gBattle_WIN0V = 0xA0;
     SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H);
     SetGpuReg(REG_OFFSET_WIN0V, gBattle_WIN0V);
-    SetGpuReg(REG_OFFSET_WININ, 0x3F1F);
-    SetGpuReg(REG_OFFSET_WINOUT, 0x3F3F);
+    SetGpuReg(REG_OFFSET_WININ,  WININ_WIN1_CLR | WININ_WIN1_OBJ | WININ_WIN1_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_BG_ALL);
+    SetGpuReg(REG_OFFSET_WINOUT, WININ_WIN1_CLR | WININ_WIN1_OBJ | WININ_WIN1_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN0_BG_ALL);    
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_DARKEN);
-    SetGpuReg(REG_OFFSET_BLDY, 0x10);
+    SetGpuReg(REG_OFFSET_BLDY, BLDCNT_TGT1_OBJ);
     gTasks[taskId].data[0] = win0v;
     gTasks[taskId].data[1] = win0h;
     gTasks[taskId].func = FakeOutStep1;
@@ -3134,7 +3091,7 @@ static void FakeOutStep2(u8 taskId)
     {
         gTasks[taskId].data[11] = 0x88;
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_LIGHTEN);
-        BlendPalettes(sub_8075BE8(1, 0, 0, 0, 0, 0, 0), 16, RGB(31, 31, 31));
+        BlendPalettes(sub_8075BE8(1, 0, 0, 0, 0, 0, 0), 16, RGB_WHITE);
     }
     else if (gTasks[taskId].data[10] > 4)
     {
@@ -3442,7 +3399,7 @@ void AnimOrbitFast(struct Sprite *sprite)
 {
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
-    sprite->affineAnimPaused = 1;
+    sprite->affineAnimPaused = TRUE;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[7] = GetBattlerSpriteSubpriority(gBattleAnimAttacker);
@@ -3744,7 +3701,7 @@ void AnimPerishSongMusicNote2(struct Sprite *sprite)
     if (!sprite->data[0])
     {
         sprite->data[1] = 120 - gBattleAnimArgs[0];
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
     }
 
     if (++sprite->data[0] == sprite->data[1])
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 4bb839a02..3faaa88ab 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -23,46 +23,6 @@
 #include "constants/weather.h"
 
 // Function Declarations
-void AnimBlackSmoke(struct Sprite *);
-void AnimWhiteHalo(struct Sprite *);
-void AnimTealAlert(struct Sprite *);
-void AnimMeanLookEye(struct Sprite *);
-void AnimSpikes(struct Sprite *);
-void AnimLeer(struct Sprite *);
-void AnimLetterZ(struct Sprite *);
-void AnimFang(struct Sprite *);
-void AnimSpotlight(struct Sprite *);
-void AnimClappingHand(struct Sprite *);
-void AnimClappingHand2(struct Sprite *);
-void AnimRapidSpin(struct Sprite *);
-void AnimTriAttackTriangle(struct Sprite *);
-void AnimBatonPassPokeball(struct Sprite *);
-void AnimWishStar(struct Sprite *);
-void AnimMiniTwinklingStar(struct Sprite *);
-void AnimSwallowBlueOrb(struct Sprite *);
-void AnimGreenStar(struct Sprite *);
-void AnimWeakFrustrationAngerMark(struct Sprite *);
-void AnimSweetScentPetal(struct Sprite *);
-void AnimPainSplitProjectile(struct Sprite *);
-void AnimFlatterConfetti(struct Sprite *);
-void AnimFlatterSpotlight(struct Sprite *);
-void AnimReversalOrb(struct Sprite *);
-void AnimYawnCloud(struct Sprite *);
-void AnimSmokeBallEscapeCloud(struct Sprite *);
-void AnimFacadeSweatDrop(struct Sprite *);
-void AnimRoarNoiseLine(struct Sprite *);
-void AnimGlareEyeDot(struct Sprite *);
-void AnimAssistPawprint(struct Sprite *);
-void AnimSmellingSaltsHand(struct Sprite *);
-void AnimSmellingSaltExclamation(struct Sprite *);
-void AnimHelpingHandClap(struct Sprite *);
-void AnimForesightMagnifyingGlass(struct Sprite *);
-void AnimMeteorMashStar(struct Sprite *);
-void AnimBlockX(struct Sprite *);
-void sub_80E3E84(struct Sprite *);
-void AnimParticuleBurst(struct Sprite *);
-void AnimKnockOffStrike(struct Sprite *);
-void AnimRecycle(struct Sprite *);
 static void AnimBlackSmokeStep(struct Sprite *);
 static void AnimWhiteHalo_Step1(struct Sprite *);
 static void AnimWhiteHalo_Step2(struct Sprite *);
@@ -119,8 +79,6 @@ static void AnimRecycleStep(struct Sprite *);
 static void AnimTask_SlackOffSquishStep(u8);
 
 // Data
-extern const struct SpriteTemplate gThoughtBubbleSpriteTemplate;
-
 const union AnimCmd gScratchAnimCmds[] =
 {
     ANIMCMD_FRAME(0, 4),
@@ -1634,7 +1592,7 @@ static void AnimClappingHand_Step(struct Sprite *sprite)
             sprite->data[2]++;
             if (sprite->data[3] == 0)
             {
-                PlaySE1WithPanning(SE_W227, BattleAnimAdjustPanning(-64));
+                PlaySE1WithPanning(SE_W227, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
             }
         }
     }
@@ -1664,18 +1622,18 @@ void AnimTask_CreateSpotlight(u8 taskId)
 {
     if (IsContest())
     {
-        SetGpuReg(REG_OFFSET_WININ, 0x1F3F);
-        gBattle_WIN1H = 0x98F0;
-        gBattle_WIN1V = 0x00A0;
+        SetGpuReg(REG_OFFSET_WININ, WININ_WIN1_OBJ | WININ_WIN1_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ | WININ_WIN0_BG_ALL);
+        gBattle_WIN1H = WININ_WIN1_OBJ | WININ_WIN1_BG3 | WIN_RANGE(0, 0xF0) | WIN_RANGE(0x80, 0x0);
+        gBattle_WIN1V = WININ_WIN0_CLR | WIN_RANGE(0, 0x80);
         SetGpuReg(REG_OFFSET_WIN1H, gBattle_WIN0H);
         SetGpuReg(REG_OFFSET_WIN1V, gBattle_WIN0V);
     }
     else
     {
         SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ);
-        gBattle_WIN1H = 0x00F0;
-        gBattle_WIN1V = 0x78A0;
-        SetGpuReg(REG_OFFSET_WIN1H, 0x00F0);
+        gBattle_WIN1H = WIN_RANGE(0, 0xF0);
+        gBattle_WIN1V =    WININ_WIN0_CLR | WIN_RANGE(0, 0x80) | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR | WIN_RANGE(0x40, 0);
+        SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(0, 0xF0));
         SetGpuReg(REG_OFFSET_WIN1V, gBattle_WIN1V);
         SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON);
     }
@@ -1913,7 +1871,7 @@ static void TormentAttacker_Step(u8 taskId)
 
         y = task->data[3] + task->data[5];
         spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]);
-        PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
 
         if (spriteId != MAX_SPRITES)
         {
@@ -2273,7 +2231,7 @@ void AnimTask_TransformMon(u8 taskId)
 
         src = gMonSpritesGfxPtr->sprites[position] + (gBattleMonForms[gBattleAnimAttacker] << 11);
         dest = animBg.bgTiles;
-        CpuSet(src, dest, 0x4000200);
+        CpuCopy32(src, dest, 0x800);
         LoadBgTiles(1, animBg.bgTiles, 0x800, animBg.tilesOffset);
         gTasks[taskId].data[0]++;
         break;
@@ -2360,7 +2318,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
         gTasks[taskId].data[11] = gBattle_BG1_Y;
 
         gTasks[taskId].data[0]++;
-        PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
         break;
         break;
     case 1:
@@ -2396,7 +2354,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
         {
             gTasks[taskId].data[3] = 0;
             gTasks[taskId].data[0] = 1;
-            PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
         }
         break;
     case 4:
@@ -3134,7 +3092,7 @@ static void AnimReversalOrbStep(struct Sprite *sprite)
 // Copies the target mon's sprite, and makes a white silhouette that shrinks away.
 void AnimTask_RolePlaySilhouette(u8 taskId)
 {
-    u8 isBackPic;
+    bool8 isBackPic;
     u32 personality;
     u32 otId;
     u16 species;
@@ -3146,7 +3104,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
     GetAnimBattlerSpriteId(ANIM_ATTACKER);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        isBackPic = 0;
+        isBackPic = FALSE;
         personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY);
         otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID);
         if (gBattleSpritesDataPtr->battlerData[gBattleAnimTarget].transformSpecies == SPECIES_NONE)
@@ -3166,7 +3124,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
     }
     else
     {
-        isBackPic = 1;
+        isBackPic = TRUE;
         personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY);
         otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID);
         if (gBattleSpritesDataPtr->battlerData[gBattleAnimTarget].transformSpecies == SPECIES_NONE)
@@ -3797,7 +3755,7 @@ static void AnimTask_FacadeColorBlendStep(u8 taskId)
     }
     else
     {
-        BlendPalette(gTasks[taskId].data[2], 16, 0, RGB(0, 0, 0));
+        BlendPalette(gTasks[taskId].data[2], 16, 0, RGB_BLACK);
         DestroyAnimVisualTask(taskId);
     }
 }
@@ -3825,7 +3783,7 @@ void AnimRoarNoiseLine(struct Sprite *sprite)
     }
     else if (gBattleAnimArgs[2] == 1)
     {
-        sprite->vFlip = 1;
+        sprite->vFlip = TRUE;
         sprite->data[0] = 0x280;
         sprite->data[1] = 0x280;
     }
@@ -3838,7 +3796,7 @@ void AnimRoarNoiseLine(struct Sprite *sprite)
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         sprite->data[0] = -sprite->data[0];
-        sprite->hFlip = 1;
+        sprite->hFlip = TRUE;
     }
 
     sprite->callback = AnimRoarNoiseLineStep;
@@ -4673,7 +4631,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
 
         if (gSprites[spriteId].pos2.y == 0)
         {
-            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
             gTasks[taskId].data[10] -= 0x800;
             gTasks[taskId].data[0]++;
         }
@@ -4695,7 +4653,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
 
         if (gSprites[spriteId].pos2.y == 0)
         {
-            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
             DestroyAnimVisualTask(taskId);
         }
         break;
@@ -4732,7 +4690,7 @@ static void AnimBlockXStep(struct Sprite *sprite)
         sprite->pos2.y += 10;
         if (sprite->pos2.y >= 0)
         {
-            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->pos2.y = 0;
             sprite->data[0]++;
         }
@@ -4742,7 +4700,7 @@ static void AnimBlockXStep(struct Sprite *sprite)
         sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3);
         if (sprite->data[1] > 0x7F)
         {
-            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->data[1] = 0;
             sprite->pos2.y = 0;
             sprite->data[0]++;
@@ -4761,7 +4719,7 @@ static void AnimBlockXStep(struct Sprite *sprite)
     case 3:
         if (++sprite->data[1] > 8)
         {
-            PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->data[1] = 0;
             sprite->data[0]++;
         }
@@ -5694,7 +5652,7 @@ void sub_80E3E84(struct Sprite *sprite)
     case 0:
         if (gBattleAnimArgs[7] == -1)
         {
-            PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
             sprite->data[0] = -32;
             sprite->data[7]++;
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index 46bcc2cbb..8390857bb 100644
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -370,7 +370,7 @@ const u16 gBallOpenFadeColors[] =
     [BALL_PREMIER] = RGB(31, 9, 10),
 
     // Unused
-    RGB(0, 0, 0),
+    RGB_BLACK,
     RGB(1, 16, 0),
     RGB(3, 0, 1),
     RGB(1, 8, 0),
@@ -413,9 +413,6 @@ const struct SpriteTemplate gUnknown_840C210 =
     .callback = sub_80F1B3C,
 };
 
-extern const struct SpriteTemplate gWishStarSpriteTemplate;
-extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate;
-
 // Functions
 void sub_80EEC0C(u8 taskId)
 {
@@ -639,7 +636,7 @@ void sub_80EF298(u8 taskId)
         break;
     case 2:
         ResetSpriteRotScale(spriteId);
-        gSprites[spriteId].invisible = 1;
+        gSprites[spriteId].invisible = TRUE;
         DestroyAnimVisualTask(taskId);
         break;
     }
@@ -918,7 +915,7 @@ static void sub_80EFA0C(struct Sprite *sprite)
         break;
     case 2:
         ResetSpriteRotScale(spriteId);
-        gSprites[spriteId].invisible = 1;
+        gSprites[spriteId].invisible = TRUE;
         gTasks[taskId].data[0]++;
         break;
     default:
@@ -954,7 +951,7 @@ static void sub_80EFB9C(struct Sprite *sprite)
     bool8 lastBounce;
     int bounceCount;
 
-    lastBounce = 0;
+    lastBounce = FALSE;
     switch (sprite->data[3] & 0xFF)
     {
     case 0:
@@ -967,7 +964,7 @@ static void sub_80EFB9C(struct Sprite *sprite)
 
             bounceCount = sprite->data[3] >> 8;
             if (bounceCount == 4)
-                lastBounce = 1;
+                lastBounce = TRUE;
 
             // Play a different sound effect for each pokeball bounce.
             switch (bounceCount)
@@ -1022,7 +1019,7 @@ static void sub_80EFCA0(struct Sprite *sprite)
     if (++sprite->data[3] == 31)
     {
         sprite->data[3] = 0;
-        sprite->affineAnimPaused = 1;
+        sprite->affineAnimPaused = TRUE;
         StartSpriteAffineAnim(sprite, 1);
         gBattleSpritesDataPtr->animationData->field_C = 0;
         sprite->callback = sub_80EFCEC;
@@ -1049,7 +1046,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
         }
 
         sprite->data[5]++;
-        sprite->affineAnimPaused = 0;
+        sprite->affineAnimPaused = FALSE;
         var0 = sprite->data[5] + 7;
         if (var0 > 14)
         {
@@ -1064,7 +1061,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
             sprite->data[5] = 0;
             sprite->data[4] = -sprite->data[4];
             sprite->data[3]++;
-            sprite->affineAnimPaused = 0;
+            sprite->affineAnimPaused = FALSE;
             if (sprite->data[4] < 0)
                 ChangeSpriteAffineAnim(sprite, 2);
             else
@@ -1072,7 +1069,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
         }
         else
         {
-            sprite->affineAnimPaused = 1;
+            sprite->affineAnimPaused = TRUE;
         }
         break;
     case 2:
@@ -1087,7 +1084,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
         }
 
         sprite->data[5]++;
-        sprite->affineAnimPaused = 0;
+        sprite->affineAnimPaused = FALSE;
         var0 = sprite->data[5] + 12;
         if (var0 > 24)
         {
@@ -1099,14 +1096,14 @@ static void sub_80EFCEC(struct Sprite *sprite)
     case 3:
         if (sprite->data[5]++ < 0)
         {
-            sprite->affineAnimPaused = 1;
+            sprite->affineAnimPaused = TRUE;
             break;
         }
 
         sprite->data[5] = 0;
         sprite->data[4] = -sprite->data[4];
         sprite->data[3]++;
-        sprite->affineAnimPaused = 0;
+        sprite->affineAnimPaused = FALSE;
         if (sprite->data[4] < 0)
             ChangeSpriteAffineAnim(sprite, 2);
         else
@@ -1124,7 +1121,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
         }
 
         sprite->data[5]++;
-        sprite->affineAnimPaused = 0;
+        sprite->affineAnimPaused = FALSE;
         var0 = sprite->data[5] + 4;
         if (var0 > 8)
         {
@@ -1139,7 +1136,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
         state = sprite->data[3] >> 8;
         if (state == gBattleSpritesDataPtr->animationData->ballThrowCaseId)
         {
-            sprite->affineAnimPaused = 1;
+            sprite->affineAnimPaused = TRUE;
             sprite->callback = sub_80EFF80;
         }
         else
@@ -1147,12 +1144,12 @@ static void sub_80EFCEC(struct Sprite *sprite)
             if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_3_SHAKES_SUCCESS && state == 3)
             {
                 sprite->callback = sub_80EFFA4;
-                sprite->affineAnimPaused = 1;
+                sprite->affineAnimPaused = TRUE;
             }
             else
             {
                 sprite->data[3]++;
-                sprite->affineAnimPaused = 1;
+                sprite->affineAnimPaused = TRUE;
             }
         }
         break;
@@ -1185,7 +1182,7 @@ static void sub_80EFF80(struct Sprite *sprite)
 
 static void sub_80EFFA4(struct Sprite *sprite)
 {
-    sprite->animPaused = 1;
+    sprite->animPaused = TRUE;
     sprite->callback = sub_80EFFC4;
     sprite->data[3] = 0;
     sprite->data[4] = 0;
@@ -1200,12 +1197,12 @@ static void sub_80EFFC4(struct Sprite *sprite)
     if (sprite->data[4] == 40)
     {
         PlaySE(SE_GETTING);
-        BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0));
+        BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB_BLACK);
         sub_80F01B8(sprite);
     }
     else if (sprite->data[4] == 60)
     {
-        BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB(0, 0, 0));
+        BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB_BLACK);
     }
     else if (sprite->data[4] == 95)
     {
@@ -1236,7 +1233,7 @@ static void sub_80F00A4(struct Sprite *sprite)
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
         SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
         paletteIndex = IndexOfSpritePaletteTag(sprite->template->paletteTag);
-        BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB(31, 31, 31));
+        BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB_WHITE);
         sprite->data[0]++;
         break;
     case 1:
@@ -1250,7 +1247,7 @@ static void sub_80F00A4(struct Sprite *sprite)
         }
         break;
     case 2:
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
         sprite->data[0]++;
         break;
     default:
@@ -1333,7 +1330,7 @@ static void sub_80F02B0(struct Sprite *sprite)
         break;
     }
 
-    gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = 0;
+    gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = FALSE;
     StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1);
     AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]);
     gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0x1000;
@@ -1341,10 +1338,10 @@ static void sub_80F02B0(struct Sprite *sprite)
 
 static void sub_80F0378(struct Sprite *sprite)
 {
-    int next = FALSE;
+    bool32 next = FALSE;
 
     if (sprite->animEnded)
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
 
     if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded)
     {
@@ -1374,8 +1371,7 @@ static void sub_80F0478(struct Sprite *sprite)
 
     sprite->pos1.x += sprite->pos2.x;
     sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->pos2.x = sprite->pos2.y = 0;
     for (i = 0; i < 6; i++)
         sprite->data[i] = 0;
 
@@ -1880,7 +1876,7 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite)
     }
 }
 
-u8 LaunchBallFadeMonTask(u8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ballId)
+u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ballId)
 {
     u8 taskId;
 
@@ -1903,7 +1899,7 @@ u8 LaunchBallFadeMonTask(u8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ba
         gTasks[taskId].func = sub_80F1370;
     }
 
-    BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB(31, 31, 31));
+    BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB_WHITE);
     return taskId;
 }
 
@@ -1920,7 +1916,7 @@ static void sub_80F12E0(u8 taskId)
     else if (!gPaletteFade.active)
     {
         u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16);
-        BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31));
+        BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB_WHITE);
         DestroyTask(taskId);
     }
 }
@@ -1930,7 +1926,7 @@ static void sub_80F1370(u8 taskId)
     if (!gPaletteFade.active)
     {
         u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16);
-        BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31));
+        BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB_WHITE);
         gTasks[taskId].func = sub_80F13C0;
     }
 }
@@ -1955,7 +1951,7 @@ void sub_80F1420(u8 taskId)
 {
     u8 spriteId;
     u32 x;
-    u32 done = FALSE;
+    bool32 done = FALSE;
 
     spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
     switch (gTasks[taskId].data[10])
@@ -2057,12 +2053,12 @@ void AnimTask_TargetToEffectBattler(u8 taskId)
 
 void sub_80F1720(u8 battler, struct Pokemon *mon)
 {
-    int isShiny;
+    bool32 isShiny;
     u32 otId, personality;
     u32 shinyValue;
     u8 taskId1, taskId2;
 
-    isShiny = 0;
+    isShiny = FALSE;
     gBattleSpritesDataPtr->healthBoxesData[battler].flag_x80 = 1;
     otId = GetMonData(mon, MON_DATA_OT_ID);
     personality = GetMonData(mon, MON_DATA_PERSONALITY);
@@ -2135,7 +2131,7 @@ static void sub_80F181C(u8 taskId)
         gSprites[spriteId].oam.tileNum += 5;
     }
 
-    if (gTasks[taskId].data[1] == 0)
+    if (gTasks[taskId].data[1] == FALSE)
     {
         gSprites[spriteId].callback = sub_80F1A2C;
     }
@@ -2144,13 +2140,13 @@ static void sub_80F181C(u8 taskId)
         gSprites[spriteId].callback = sub_80F1A80;
         gSprites[spriteId].pos2.x = -32;
         gSprites[spriteId].pos2.y = 32;
-        gSprites[spriteId].invisible = 1;
-        if (gTasks[taskId].data[11] == 0)
+        gSprites[spriteId].invisible = TRUE;
+        if (gTasks[taskId].data[11] == FALSE)
         {
             if (GetBattlerSide(battler) == B_SIDE_PLAYER)
-                pan = -64;
+                pan = SOUND_PAN_ATTACKER;
             else
-                pan = 63;
+                pan = SOUND_PAN_TARGET;
 
             PlaySE12WithPanning(SE_REAPOKE, pan);
         }
@@ -2169,9 +2165,9 @@ static void sub_80F19E0(u8 taskId)
 {
     u8 battler;
 
-    if (gTasks[taskId].data[12] == 0)
+    if (gTasks[taskId].data[12] == FALSE)
     {
-        if (gTasks[taskId].data[1] == 1)
+        if (gTasks[taskId].data[1] == TRUE)
         {
             battler = gTasks[taskId].data[0];
             gBattleSpritesDataPtr->healthBoxesData[battler].field_1_x1 = 1;
@@ -2202,7 +2198,7 @@ static void sub_80F1A80(struct Sprite *sprite)
     }
     else
     {
-        sprite->invisible = 0;
+        sprite->invisible = FALSE;
         sprite->pos2.x += 5;
         sprite->pos2.y -= 5;
         if (sprite->pos2.x > 32)
@@ -2254,7 +2250,7 @@ static void sub_80F1C04(struct Sprite *sprite)
     if (TranslateAnimHorizontalArc(sprite))
     {
         sprite->data[0] = 0;
-        sprite->invisible = 1;
+        sprite->invisible = TRUE;
         sprite->callback = sub_80F1C30;
     }
 }
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index 1e05e0e68..afa0c5c42 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -23,10 +23,6 @@ static void sub_807834C(struct Sprite *sprite);
 static void sub_8078380(struct Sprite *sprite);
 
 // Data
-extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
-extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
-extern const u8 *const gBattleAnims_StatusConditions[];
-
 static const union AnimCmd gUnknown_83BF3E0[] =
 {
     ANIMCMD_FRAME(0, 3),
@@ -207,15 +203,15 @@ const u8 gUnknown_83BF52C[] = _("TASK OVER\nタスクがオ-バ-しました");
 
 static const struct Subsprite gSubsprites_83BF544[] =
 {
-    {.x = -16, .y = -16, .shape = ST_OAM_SQUARE,      .size = 3, .tileOffset =   0, .priority = 2},
-    {.x = -16, .y =  48, .shape = ST_OAM_H_RECTANGLE, .size = 3, .tileOffset =  64, .priority = 2},
-    {.x =  48, .y = -16, .shape = ST_OAM_V_RECTANGLE, .size = 3, .tileOffset =  96, .priority = 2},
-    {.x =  48, .y =  48, .shape = ST_OAM_SQUARE,      .size = 2, .tileOffset = 128, .priority = 2},
+    {.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},
+    {.x =  48, .y = -16, .shape = SPRITE_SHAPE(8x16), .size = 3, .tileOffset =  96, .priority = 2},
+    {.x =  48, .y =  48, .shape = SPRITE_SHAPE(8x8),  .size = 2, .tileOffset = 128, .priority = 2},
 };
 
 static const struct SubspriteTable gUnknown_83BF554[] =
 {
-    {ARRAY_COUNT(gSubsprites_83BF544), gSubsprites_83BF544},
+    {NELEMS(gSubsprites_83BF544), gSubsprites_83BF544},
 };
 
 static const struct SpriteTemplate gUnknown_83BF55C =
@@ -361,7 +357,7 @@ 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);
-    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF)
+    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == SPRITE_INVALID_TAG)
         gSprites[spriteId].invisible = TRUE;
     
     SetSubspriteTables(&gSprites[spriteId], gUnknown_83BF554);
diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c
index a35e9e9f8..3de09ab44 100644
--- a/src/mevent_8145654.c
+++ b/src/mevent_8145654.c
@@ -13,6 +13,7 @@
 #include "string_util.h"
 #include "link_rfu.h"
 #include "mevent.h"
+#include "battle_anim.h"
 
 struct UnkStruct_8467FB8
 {
@@ -59,8 +60,6 @@ void sub_8145D18(u8 whichWindow);
 void sub_8146060(void);
 void sub_81461D8(void);
 
-extern const struct OamData gOamData_AffineOff_ObjNormal_32x16;
-
 const u8 gUnknown_8467068[][3] = {
     {0, 2, 3},
     {0, 1, 2}