diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 23a655d5ed..8c69b695c0 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -71,11 +71,11 @@ void GetAIPartyIndexes(u32 battler, s32 *firstId, s32 *lastId)
 static bool32 HasBadOdds(u32 battler, bool32 emitResult)
 {
     //Variable initialization
-	u8 opposingPosition, atkType1, atkType2, defType1, defType2, effectiveness;
+    u8 opposingPosition, atkType1, atkType2, defType1, defType2, effectiveness;
     s32 i, damageDealt = 0, maxDamageDealt = 0, damageTaken = 0, maxDamageTaken = 0;
     u32 aiMove, playerMove, aiBestMove = MOVE_NONE, aiAbility = AI_DATA->abilities[battler], opposingBattler, weather = AI_GetWeather(AI_DATA);
     bool32 getsOneShot = FALSE, hasStatusMove = FALSE, hasSuperEffectiveMove = FALSE;
-	u16 typeEffectiveness = UQ_4_12(1.0), aiMoveEffect; //baseline typing damage
+    u16 typeEffectiveness = UQ_4_12(1.0), aiMoveEffect; //baseline typing damage
 
     // Only use this if AI_FLAG_SMART_SWITCHING is set for the trainer
     if (!(AI_THINKING_STRUCT->aiFlags[battler] & AI_FLAG_SMART_SWITCHING))
@@ -85,14 +85,14 @@ static bool32 HasBadOdds(u32 battler, bool32 emitResult)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         return FALSE;
 
-	opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(battler));
+    opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(battler));
     opposingBattler = GetBattlerAtPosition(opposingPosition);
 
     // Gets types of player (opposingBattler) and computer (battler)
-	atkType1 = gBattleMons[opposingBattler].types[0];
-	atkType2 = gBattleMons[opposingBattler].types[1];
-	defType1 = gBattleMons[battler].types[0];
-	defType2 = gBattleMons[battler].types[1];
+    atkType1 = gBattleMons[opposingBattler].types[0];
+    atkType2 = gBattleMons[opposingBattler].types[1];
+    defType1 = gBattleMons[battler].types[0];
+    defType2 = gBattleMons[battler].types[1];
 
     // Check AI moves for damage dealt
     for (i = 0; i < MAX_MON_MOVES; i++)
@@ -191,13 +191,13 @@ static bool32 HasBadOdds(u32 battler, bool32 emitResult)
     }
 
     // General bad type matchups have more wiggle room
-	if (typeEffectiveness >= UQ_4_12(2.0)) // If the player has at least a 2x type advantage
-	{
-		if (!hasSuperEffectiveMove // If the AI doesn't have a super effective move
-		&& (gBattleMons[battler].hp >= gBattleMons[battler].maxHP / 2 // And the current mon has at least 1/2 their HP, or 1/4 HP and Regenerator
+    if (typeEffectiveness >= UQ_4_12(2.0)) // If the player has at least a 2x type advantage
+    {
+        if (!hasSuperEffectiveMove // If the AI doesn't have a super effective move
+        && (gBattleMons[battler].hp >= gBattleMons[battler].maxHP / 2 // And the current mon has at least 1/2 their HP, or 1/4 HP and Regenerator
             || (aiAbility == ABILITY_REGENERATOR
             && gBattleMons[battler].hp >= gBattleMons[battler].maxHP / 4)))
-		{
+        {
             // Then check if they have an important status move, which is worth using even in a bad matchup
             if (hasStatusMove)
                 return FALSE;
@@ -207,13 +207,13 @@ static bool32 HasBadOdds(u32 battler, bool32 emitResult)
                 return FALSE;
 
             // Switch mon out
-			gBattleStruct->AI_monToSwitchIntoId[battler] = PARTY_SIZE;
-			if (emitResult)
+            gBattleStruct->AI_monToSwitchIntoId[battler] = PARTY_SIZE;
+            if (emitResult)
                 BtlController_EmitTwoReturnValues(battler, 1, B_ACTION_SWITCH, 0);
-			return TRUE;
-		}
-	}
-	return FALSE;
+            return TRUE;
+        }
+    }
+    return FALSE;
 }
 
 static bool32 ShouldSwitchIfAllBadMoves(u32 battler, bool32 emitResult)
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 59ed0d0fd9..ad22ed8fda 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -2197,7 +2197,7 @@ bool32 IsAttackBoostMoveEffect(u32 effect)
     switch (effect)
     {
     case EFFECT_ATTACK_UP:
-	case EFFECT_ATTACK_UP_2:
+    case EFFECT_ATTACK_UP_2:
     case EFFECT_ATTACK_ACCURACY_UP:
     case EFFECT_ATTACK_SPATK_UP:
     case EFFECT_DRAGON_DANCE:
@@ -2217,34 +2217,34 @@ bool32 IsStatRaisingEffect(u32 effect)
     switch (effect)
     {
     case EFFECT_ATTACK_UP:
-	case EFFECT_ATTACK_UP_2:
-	case EFFECT_DEFENSE_UP:
-	case EFFECT_DEFENSE_UP_2:
+    case EFFECT_ATTACK_UP_2:
+    case EFFECT_DEFENSE_UP:
+    case EFFECT_DEFENSE_UP_2:
     case EFFECT_DEFENSE_UP_3:
-	case EFFECT_SPEED_UP:
-	case EFFECT_SPEED_UP_2:
-	case EFFECT_SPECIAL_ATTACK_UP:
-	case EFFECT_SPECIAL_ATTACK_UP_2:
+    case EFFECT_SPEED_UP:
+    case EFFECT_SPEED_UP_2:
+    case EFFECT_SPECIAL_ATTACK_UP:
+    case EFFECT_SPECIAL_ATTACK_UP_2:
     case EFFECT_SPECIAL_ATTACK_UP_3:
-	case EFFECT_SPECIAL_DEFENSE_UP:
-	case EFFECT_SPECIAL_DEFENSE_UP_2:
+    case EFFECT_SPECIAL_DEFENSE_UP:
+    case EFFECT_SPECIAL_DEFENSE_UP_2:
     case EFFECT_ACCURACY_UP:
     case EFFECT_ACCURACY_UP_2:
     case EFFECT_EVASION_UP:
     case EFFECT_EVASION_UP_2:
     case EFFECT_MINIMIZE:
     case EFFECT_DEFENSE_CURL:
-	case EFFECT_CALM_MIND:
+    case EFFECT_CALM_MIND:
     case EFFECT_COSMIC_POWER:
-	case EFFECT_DRAGON_DANCE:
-	case EFFECT_ACUPRESSURE:
-	case EFFECT_SHELL_SMASH:
-	case EFFECT_SHIFT_GEAR:
-	case EFFECT_ATTACK_ACCURACY_UP:
-	case EFFECT_ATTACK_SPATK_UP:
-	case EFFECT_GROWTH:
-	case EFFECT_COIL:
-	case EFFECT_QUIVER_DANCE:
+    case EFFECT_DRAGON_DANCE:
+    case EFFECT_ACUPRESSURE:
+    case EFFECT_SHELL_SMASH:
+    case EFFECT_SHIFT_GEAR:
+    case EFFECT_ATTACK_ACCURACY_UP:
+    case EFFECT_ATTACK_SPATK_UP:
+    case EFFECT_GROWTH:
+    case EFFECT_COIL:
+    case EFFECT_QUIVER_DANCE:
     case EFFECT_BULK_UP:
     case EFFECT_GEOMANCY:
     case EFFECT_STOCKPILE:
diff --git a/src/battle_anim_dragon.c b/src/battle_anim_dragon.c
index 862c0ad069..f3ee2a3818 100644
--- a/src/battle_anim_dragon.c
+++ b/src/battle_anim_dragon.c
@@ -627,36 +627,36 @@ static void AnimOverheatFlame_Step(struct Sprite *sprite)
 
 void AnimDracoMeteorRock(struct Sprite *sprite)
 {
-	if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
-	{
-		sprite->data[0] = sprite->x - gBattleAnimArgs[0];
-		sprite->data[2] = sprite->x - gBattleAnimArgs[2];
-	}
-	else
-	{
-		sprite->data[0] = sprite->x + gBattleAnimArgs[0];
-		sprite->data[2] = sprite->x + gBattleAnimArgs[2];
-	}
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
+    {
+        sprite->data[0] = sprite->x - gBattleAnimArgs[0];
+        sprite->data[2] = sprite->x - gBattleAnimArgs[2];
+    }
+    else
+    {
+        sprite->data[0] = sprite->x + gBattleAnimArgs[0];
+        sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+    }
 
-	sprite->data[1] = sprite->y + gBattleAnimArgs[1];
-	sprite->data[3] = sprite->y + gBattleAnimArgs[3];
-	sprite->data[4] = gBattleAnimArgs[4];
+    sprite->data[1] = sprite->y + gBattleAnimArgs[1];
+    sprite->data[3] = sprite->y + gBattleAnimArgs[3];
+    sprite->data[4] = gBattleAnimArgs[4];
 
-	sprite->data[6] = gBattleAnimArgs[2];
-	sprite->data[7] = gBattleAnimArgs[3];
+    sprite->data[6] = gBattleAnimArgs[2];
+    sprite->data[7] = gBattleAnimArgs[3];
 
-	sprite->x = sprite->data[0];
-	sprite->y = sprite->data[1];
-	sprite->callback = AnimDracoMeteorRock_Step;
+    sprite->x = sprite->data[0];
+    sprite->y = sprite->data[1];
+    sprite->callback = AnimDracoMeteorRock_Step;
 }
 
 static void AnimDracoMeteorRock_Step(struct Sprite *sprite)
 {
-	sprite->x2 = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4];
-	sprite->y2 = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4];
+    sprite->x2 = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4];
+    sprite->y2 = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4];
 
-	if (sprite->data[5] == sprite->data[4])
-		DestroyAnimSprite(sprite);
+    if (sprite->data[5] == sprite->data[4])
+        DestroyAnimSprite(sprite);
 
-	sprite->data[5]++;
+    sprite->data[5]++;
 }
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index b29d9b2b94..c4b50fa797 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -2535,13 +2535,13 @@ const struct SpriteTemplate gTauntFingerSpriteTemplate =
 
 const struct SpriteTemplate gPowerOrbs_Float =
 {
-	.tileTag = ANIM_TAG_RED_ORB,
-	.paletteTag = ANIM_TAG_RED_ORB,
-	.oam = &gOamData_AffineOff_ObjNormal_16x16,
-	.anims = gSporeParticleAnimTable,
-	.images = NULL,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = AnimSporeParticle,
+    .tileTag = ANIM_TAG_RED_ORB,
+    .paletteTag = ANIM_TAG_RED_ORB,
+    .oam = &gOamData_AffineOff_ObjNormal_16x16,
+    .anims = gSporeParticleAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = AnimSporeParticle,
 };
 
 const union AnimCmd gRockPolishStreak_AnimCmd[] =
@@ -7234,42 +7234,42 @@ static void AnimNightSlash(struct Sprite *sprite)
 
 static const union AffineAnimCmd sCompressTargetHorizontallyAffineAnimCmds[] =
 {
-	AFFINEANIMCMD_FRAME(64, 0, 0, 16), //Compress
-	AFFINEANIMCMD_FRAME(0, 0, 0, 64),
-	AFFINEANIMCMD_FRAME(-64, 0, 0, 16),
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(64, 0, 0, 16), //Compress
+    AFFINEANIMCMD_FRAME(0, 0, 0, 64),
+    AFFINEANIMCMD_FRAME(-64, 0, 0, 16),
+    AFFINEANIMCMD_END,
 };
 
 static const union AffineAnimCmd sCompressTargetHorizontallyAffineAnimCmdsFast[] =
 {
-	AFFINEANIMCMD_FRAME(32, 0, 0, 16), //Compress
-	AFFINEANIMCMD_FRAME(0, 0, 0, 32),
-	AFFINEANIMCMD_FRAME(-32, 0, 0, 16),
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(32, 0, 0, 16), //Compress
+    AFFINEANIMCMD_FRAME(0, 0, 0, 32),
+    AFFINEANIMCMD_FRAME(-32, 0, 0, 16),
+    AFFINEANIMCMD_END,
 };
 
 static void AnimTask_CompressTargetStep(u8 taskId)
 {
-	struct Task* task = &gTasks[taskId];
+    struct Task* task = &gTasks[taskId];
 
-	if (!RunAffineAnimFromTaskData(task))
-		DestroyAnimVisualTask(taskId);
+    if (!RunAffineAnimFromTaskData(task))
+        DestroyAnimVisualTask(taskId);
 }
 
 void AnimTask_CompressTargetHorizontally(u8 taskId)
 {
-	struct Task* task = &gTasks[taskId];
-	u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
-	PrepareAffineAnimInTaskData(task, spriteId, sCompressTargetHorizontallyAffineAnimCmds);
-	task->func = AnimTask_CompressTargetStep;
+    struct Task* task = &gTasks[taskId];
+    u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
+    PrepareAffineAnimInTaskData(task, spriteId, sCompressTargetHorizontallyAffineAnimCmds);
+    task->func = AnimTask_CompressTargetStep;
 }
 
 void AnimTask_CompressTargetHorizontallyFast(u8 taskId)
 {
-	struct Task* task = &gTasks[taskId];
-	u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
-	PrepareAffineAnimInTaskData(task, spriteId, sCompressTargetHorizontallyAffineAnimCmdsFast);
-	task->func = AnimTask_CompressTargetStep;
+    struct Task* task = &gTasks[taskId];
+    u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
+    PrepareAffineAnimInTaskData(task, spriteId, sCompressTargetHorizontallyAffineAnimCmdsFast);
+    task->func = AnimTask_CompressTargetStep;
 }
 
 void AnimTask_CreateSmallSteelBeamOrbs(u8 taskId)
diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c
index 38ca948749..de6d820264 100644
--- a/src/battle_anim_electric.c
+++ b/src/battle_anim_electric.c
@@ -525,17 +525,17 @@ const struct SpriteTemplate gFlashCannonGrayChargeTemplate =
 
 static const union AffineAnimCmd sSpriteAffineAnim_JudgmentBall[] =
 {
-	AFFINEANIMCMD_FRAME(16, 16, 0, 0),
-	AFFINEANIMCMD_FRAME(8, 8, 0, 15), //Half size
-	AFFINEANIMCMD_FRAME(0, 0, 0, 120), //Delay
-	AFFINEANIMCMD_FRAME(24, 24, 0, 5), //Normal size
-	AFFINEANIMCMD_FRAME(0, 0, 0, 10), //Delay
-	AFFINEANIMCMD_FRAME(-16, -16, 0, 15), //Revert to 1 px
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(16, 16, 0, 0),
+    AFFINEANIMCMD_FRAME(8, 8, 0, 15), //Half size
+    AFFINEANIMCMD_FRAME(0, 0, 0, 120), //Delay
+    AFFINEANIMCMD_FRAME(24, 24, 0, 5), //Normal size
+    AFFINEANIMCMD_FRAME(0, 0, 0, 10), //Delay
+    AFFINEANIMCMD_FRAME(-16, -16, 0, 15), //Revert to 1 px
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_JudgmentBall[] =
 {
-	sSpriteAffineAnim_JudgmentBall,
+    sSpriteAffineAnim_JudgmentBall,
 };
 const struct SpriteTemplate gJudgmentBlackChargeTemplate =
 {
diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c
index 0db2a92afc..e150a2a57d 100644
--- a/src/battle_anim_fight.c
+++ b/src/battle_anim_fight.c
@@ -403,24 +403,24 @@ const struct SpriteTemplate gFocusPunchFistSpriteTemplate =
 
 const struct SpriteTemplate gPalmSpriteTemplate =
 {
-	.tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE,
-	.paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE,
-	.oam = &gOamData_AffineOff_ObjNormal_32x32,
-	.anims = gAnims_HandsAndFeet,
-	.images = NULL,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = AnimBasicFistOrFoot,
+    .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE,
+    .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE,
+    .oam = &gOamData_AffineOff_ObjNormal_32x32,
+    .anims = gAnims_HandsAndFeet,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = AnimBasicFistOrFoot,
 };
 
 const struct SpriteTemplate gAuraSphereBlast =
 {
-	.tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
-	.paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
-	.oam = &gOamData_AffineOff_ObjNormal_64x64,
-	.anims = gDummySpriteAnimTable,
-	.images = NULL,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = AnimSuperpowerFireball,
+    .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
+    .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT,
+    .oam = &gOamData_AffineOff_ObjNormal_64x64,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = AnimSuperpowerFireball,
 };
 
 const union AffineAnimCmd gForcePalmAffineAnimCmd_1[] =
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index 3a770a7c8c..401cc09eaf 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -530,13 +530,13 @@ const struct SpriteTemplate gSpacialRendBladesTemplate2 =
 // Sea of Fire
 const struct SpriteTemplate gTwisterEmberSpriteTemplate =
 {
-	.tileTag = ANIM_TAG_SMALL_EMBER,
-	.paletteTag = ANIM_TAG_SMALL_EMBER,
-	.oam = &gOamData_AffineOff_ObjNormal_32x32,
-	.anims = gAnims_BasicFire,
-	.images = NULL,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = AnimMoveTwisterParticle,
+    .tileTag = ANIM_TAG_SMALL_EMBER,
+    .paletteTag = ANIM_TAG_SMALL_EMBER,
+    .oam = &gOamData_AffineOff_ObjNormal_32x32,
+    .anims = gAnims_BasicFire,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = AnimMoveTwisterParticle,
 };
 
 static void AnimLavaPlumeOrbitScatter(struct Sprite *sprite)
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c
index 6afe1e9f36..1fd587fa4c 100644
--- a/src/battle_anim_flying.c
+++ b/src/battle_anim_flying.c
@@ -527,7 +527,7 @@ void AnimFlyBallAttack(struct Sprite *sprite)
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
     sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
-	sprite->data[5] = gBattleAnimArgs[1]; // if sprite is to remain invisible
+    sprite->data[5] = gBattleAnimArgs[1]; // if sprite is to remain invisible
 
     InitAnimLinearTranslation(sprite);
     sprite->callback = AnimFlyBallAttack_Step;
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c
index cbd70817f5..051524a689 100644
--- a/src/battle_anim_mon_movement.c
+++ b/src/battle_anim_mon_movement.c
@@ -730,13 +730,13 @@ static void AnimTask_DuckDownHop_Step1(u8 taskId)
 {
     u8 spriteId;
 
-	spriteId = gTasks[taskId].data[0];
-	gTasks[taskId].data[12] += gTasks[taskId].data[5];
-	gSprites[spriteId].y2 = (gTasks[taskId].data[12] >> 8);
-	if (--gTasks[taskId].data[6] == 0)
-	{
+    spriteId = gTasks[taskId].data[0];
+    gTasks[taskId].data[12] += gTasks[taskId].data[5];
+    gSprites[spriteId].y2 = (gTasks[taskId].data[12] >> 8);
+    if (--gTasks[taskId].data[6] == 0)
+    {
         gTasks[taskId].func = AnimTask_DuckDownHop_Step2;
-	}
+    }
 }
 
 static void AnimTask_DuckDownHop_Step2(u8 taskId)
@@ -748,11 +748,11 @@ static void AnimTask_DuckDownHop_Step2(u8 taskId)
     }
     else
     {
-		spriteId = gTasks[taskId].data[0];
-		gTasks[taskId].data[11] += gTasks[taskId].data[1];
-		gSprites[spriteId].x2 = gTasks[taskId].data[11] >> 8;
-		gSprites[spriteId].y2 = Sin((u8)(gTasks[taskId].data[10] >> 8), gTasks[taskId].data[2]) + (gTasks[taskId].data[12] >> 8);
-		gTasks[taskId].data[10] += gTasks[taskId].data[7];
+        spriteId = gTasks[taskId].data[0];
+        gTasks[taskId].data[11] += gTasks[taskId].data[1];
+        gSprites[spriteId].x2 = gTasks[taskId].data[11] >> 8;
+        gSprites[spriteId].y2 = Sin((u8)(gTasks[taskId].data[10] >> 8), gTasks[taskId].data[2]) + (gTasks[taskId].data[12] >> 8);
+        gTasks[taskId].data[10] += gTasks[taskId].data[7];
         if (--gTasks[taskId].data[3] == 0)
         {
             DestroyAnimVisualTask(taskId);
diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c
index cd89b6aab7..eba6496f20 100644
--- a/src/battle_anim_new.c
+++ b/src/battle_anim_new.c
@@ -4202,13 +4202,13 @@ const struct SpriteTemplate gTripleAxelIceCrystalSpriteTemplate =
 // dual wingbeat
 static const union AffineAnimCmd sSpriteAffineAnim_WingAttackFeather[] =
 {
-	AFFINEANIMCMD_FRAME(0, 0, -1, 14), //Rotate a little right
-	AFFINEANIMCMD_FRAME(0, 0, 1, 28), //Rotate a little left
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(0, 0, -1, 14), //Rotate a little right
+    AFFINEANIMCMD_FRAME(0, 0, 1, 28), //Rotate a little left
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_WingAttackFeather[] =
 {
-	sSpriteAffineAnim_WingAttackFeather,
+    sSpriteAffineAnim_WingAttackFeather,
 };
 const struct SpriteTemplate gDualWingbeatFeatherSpriteTemplate =
 {
@@ -4234,11 +4234,11 @@ const struct SpriteTemplate gSpriteTemplate_LargeCrossImpact = {
 
 // expanding force
 static const struct OamData sGeyserOam = {
-	.affineMode = ST_OAM_AFFINE_OFF,
-	.objMode = ST_OAM_OBJ_NORMAL,
-	.shape = SPRITE_SHAPE(32x32),
-	.size = SPRITE_SIZE(32x32),
-	.priority = 1, //Above sprites
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
+    .priority = 1, //Above sprites
 };
 const struct SpriteTemplate gSpriteTemplate_ExpandingForceExplode = {
     .tileTag = ANIM_TAG_EXPLOSION_2,
@@ -4252,12 +4252,12 @@ const struct SpriteTemplate gSpriteTemplate_ExpandingForceExplode = {
 
 // spirit break
 static const union AffineAnimCmd sSpriteAffineAnim_SpiritBreakBall[] = {
-	AFFINEANIMCMD_FRAME(16, 16, 0, 0),
-	AFFINEANIMCMD_FRAME(2, 2, 0, 50), //Grow slowly to half size
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(16, 16, 0, 0),
+    AFFINEANIMCMD_FRAME(2, 2, 0, 50), //Grow slowly to half size
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_SpiritBreakBall[] = {
-	sSpriteAffineAnim_SpiritBreakBall,
+    sSpriteAffineAnim_SpiritBreakBall,
 };
 const struct SpriteTemplate gSpriteTemplate_SpiritBreakChargeBall = {
     .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT,
@@ -4281,11 +4281,11 @@ const struct SpriteTemplate gSpriteTemplate_SpiritBreakExplode = {
 
 // chloroblast
 const union AffineAnimCmd sSpriteAffineAnim_HydroCannonBall[] = {
-	AFFINEANIMCMD_FRAME(16, 16, 0, 16), //Double in size
-	AFFINEANIMCMD_END
+    AFFINEANIMCMD_FRAME(16, 16, 0, 16), //Double in size
+    AFFINEANIMCMD_END
 };
 const union AffineAnimCmd* const sSpriteAffineAnimTable_HydroCannonBall[] = {
-	sSpriteAffineAnim_HydroCannonBall,
+    sSpriteAffineAnim_HydroCannonBall,
 };
 const struct SpriteTemplate gSpriteTemplate_ChloroblastShot = {
     .tileTag = ANIM_TAG_HYDRO_PUMP,
@@ -4394,12 +4394,12 @@ const struct SpriteTemplate gSpriteTemplate_FlipTurnBack = {
 
 // wicked blow
 static const union AffineAnimCmd sSpriteAffineAnim_DrainPunchFist[] = {
-	AFFINEANIMCMD_FRAME(256, 256, 0, 1), //Double sprite size
-	AFFINEANIMCMD_FRAME(-32, -32, 0, 8),
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(256, 256, 0, 1), //Double sprite size
+    AFFINEANIMCMD_FRAME(-32, -32, 0, 8),
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_DrainPunchFist[] = {
-	sSpriteAffineAnim_DrainPunchFist,
+    sSpriteAffineAnim_DrainPunchFist,
 };
 
 const struct SpriteTemplate gSpriteTemplate_WickedBlowFist = {
@@ -4432,14 +4432,14 @@ const struct SpriteTemplate gSpriteTemplate_WickedBlowRedStars = {
 
 // surging strikes
 static const union AnimCmd sAnimCmdSurgingStrike[] = {
-	//Only tthe first three frames of the animation
-	ANIMCMD_FRAME(64, 4),
-	ANIMCMD_FRAME(48, 4),
-	ANIMCMD_FRAME(32, 4),
-	ANIMCMD_END,
+    //Only tthe first three frames of the animation
+    ANIMCMD_FRAME(64, 4),
+    ANIMCMD_FRAME(48, 4),
+    ANIMCMD_FRAME(32, 4),
+    ANIMCMD_END,
 };
 static const union AnimCmd *const sAnimCmdTable_SurgingStrike[] = {
-	sAnimCmdSurgingStrike,
+    sAnimCmdSurgingStrike,
 };
 const struct SpriteTemplate gSpriteTemplate_SurgingStrikesImpact = {
     .tileTag = ANIM_TAG_IMPACT_2,
@@ -4477,22 +4477,22 @@ const struct SpriteTemplate gSpriteTemplate_FieryWrathGeyser = {
 static const union AffineAnimCmd sSpriteAffineAnim_GlacialLance_Grow[] = {
     AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0),
     AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 30), //Double sprite size
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd sSpriteAffineAnim_GlacialLance_OnFoe[] = {
-	AFFINEANIMCMD_FRAME(256, 256, 0, 1), //Double sprite size
-	AFFINEANIMCMD_FRAME(0, 0, -8, 4), //Rotate 45 degrees right
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(256, 256, 0, 1), //Double sprite size
+    AFFINEANIMCMD_FRAME(0, 0, -8, 4), //Rotate 45 degrees right
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd sSpriteAffineAnim_GlacialLance_OnPlayer[] = {
-	AFFINEANIMCMD_FRAME(256, 256, 0, 1), //Double sprite size
-	AFFINEANIMCMD_FRAME(0, 0, 24, 4), //Rotate 135 degrees left
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(256, 256, 0, 1), //Double sprite size
+    AFFINEANIMCMD_FRAME(0, 0, 24, 4), //Rotate 135 degrees left
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_GlacialLance[] = {
-	sSpriteAffineAnim_GlacialLance_Grow,
-	sSpriteAffineAnim_GlacialLance_OnFoe,
-	sSpriteAffineAnim_GlacialLance_OnPlayer,
+    sSpriteAffineAnim_GlacialLance_Grow,
+    sSpriteAffineAnim_GlacialLance_OnFoe,
+    sSpriteAffineAnim_GlacialLance_OnPlayer,
 };
 const struct SpriteTemplate gSpriteTemplate_GlacialLance = {
     .tileTag = ANIM_TAG_ICICLE_SPEAR,
@@ -4562,11 +4562,11 @@ const struct SpriteTemplate gSpriteTemplate_PowerShiftDefenseBall = {
 
 // stone axe
 static const union AnimCmd sAnimCmdFlippedX[] = {
-	ANIMCMD_FRAME(0, 1, .hFlip = TRUE),
-	ANIMCMD_END,
+    ANIMCMD_FRAME(0, 1, .hFlip = TRUE),
+    ANIMCMD_END,
 };
 static const union AnimCmd *const sAnimCmdTable_FlippedX[] = {
-	sAnimCmdFlippedX,
+    sAnimCmdFlippedX,
 };
 const struct SpriteTemplate gSpriteTemplate_StoneAxeSlash = {
     .tileTag = ANIM_TAG_SLAM_HIT_2,
@@ -4600,12 +4600,12 @@ const struct SpriteTemplate gSpriteTemplate_VioletMind = {  // also psystrike
     .callback = AnimSpriteOnMonPos
 };
 static const union AffineAnimCmd sSpriteAffineAnim_MysticalPowerRing[] = {
-	AFFINEANIMCMD_FRAME(16, 16, 0, 0), //Start small
-	AFFINEANIMCMD_FRAME(16, 16, 0, 15), //Grow sprite
+    AFFINEANIMCMD_FRAME(16, 16, 0, 0), //Start small
+    AFFINEANIMCMD_FRAME(16, 16, 0, 15), //Grow sprite
     AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_MysticalPowerRing[] = {
-	sSpriteAffineAnim_MysticalPowerRing,
+    sSpriteAffineAnim_MysticalPowerRing,
 };
 const struct SpriteTemplate gSpriteTemplate_MysticalPowerRing = {
     .tileTag = ANIM_TAG_THIN_RING,
@@ -4703,17 +4703,17 @@ const struct SpriteTemplate gSpriteTemplate_TripleArrowKick = {
 
 // infernal parade
 static const union AffineAnimCmd sSpriteAffineAnim_FlutterbyPulsate[] = {
-	AFFINEANIMCMD_FRAME(16, 16, 0, 4),
-	AFFINEANIMCMD_FRAME(-16, -16, 0, 4),
-	AFFINEANIMCMD_JUMP(0),
+    AFFINEANIMCMD_FRAME(16, 16, 0, 4),
+    AFFINEANIMCMD_FRAME(-16, -16, 0, 4),
+    AFFINEANIMCMD_JUMP(0),
 };
 static const union AffineAnimCmd sSpriteAffineAnim_FlutterbyGrow[] = {
-	AFFINEANIMCMD_FRAME(8, 8, 0, 16), //Double in size
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(8, 8, 0, 16), //Double in size
+    AFFINEANIMCMD_END,
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_Flutterby[] = {
-	sSpriteAffineAnim_FlutterbyPulsate,
-	sSpriteAffineAnim_FlutterbyGrow,
+    sSpriteAffineAnim_FlutterbyPulsate,
+    sSpriteAffineAnim_FlutterbyGrow,
 };
 const struct SpriteTemplate gSpriteTemplate_InfernalParadeFlame = {
     .tileTag = ANIM_TAG_PURPLE_FLAME,
@@ -4738,13 +4738,13 @@ const struct SpriteTemplate gSpriteTemplate_CeaselessEdgeSlash = {
 
 // wildbolt storm
 static const union AnimCmd sAnimCmdAnimatedSpark2[] = {
-	ANIMCMD_FRAME((16 * 16) / (8 * 8) * 0, 8),
-	ANIMCMD_FRAME((16 * 16) / (8 * 8) * 1, 8),
-	ANIMCMD_FRAME((16 * 16) / (8 * 8) * 2, 8),
-	ANIMCMD_JUMP(0)
+    ANIMCMD_FRAME((16 * 16) / (8 * 8) * 0, 8),
+    ANIMCMD_FRAME((16 * 16) / (8 * 8) * 1, 8),
+    ANIMCMD_FRAME((16 * 16) / (8 * 8) * 2, 8),
+    ANIMCMD_JUMP(0)
 };
 static const union AnimCmd *const sAnimCmdTable_AnimatedSpark2[] = {
-	sAnimCmdAnimatedSpark2,
+    sAnimCmdAnimatedSpark2,
 };
 const struct SpriteTemplate gSpriteTemplate_WildboltStormSpark = {
     .tileTag = ANIM_TAG_SPARK_2,
@@ -8318,69 +8318,69 @@ static void SpriteCB_GeyserTarget(struct Sprite *sprite)
 //// Anim Tasks Functions
 void AnimTask_IsAttackerPlayerSide(u8 taskId)
 {
-	if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
-		gBattleAnimArgs[7] = 0;
-	else
-		gBattleAnimArgs[7] = 1;
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
+        gBattleAnimArgs[7] = 0;
+    else
+        gBattleAnimArgs[7] = 1;
 
-	DestroyAnimVisualTask(taskId);
+    DestroyAnimVisualTask(taskId);
 }
 
 static void AnimTask_FadeOutParticlesHelper(u8 taskId)
 {
-	if (gTasks[taskId].data[1] == 0) //Target reached
-	{
-		DestroyAnimVisualTask(taskId);
-	}
-	else if (gTasks[taskId].data[4]++ >= gTasks[taskId].data[3])
-	{
-		gTasks[taskId].data[4] = 0; //Reset timer
-		gTasks[taskId].data[1]--;
-		gTasks[taskId].data[2]++;
-		SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[2] * 256) + gTasks[taskId].data[1]);
-	}
+    if (gTasks[taskId].data[1] == 0) //Target reached
+    {
+        DestroyAnimVisualTask(taskId);
+    }
+    else if (gTasks[taskId].data[4]++ >= gTasks[taskId].data[3])
+    {
+        gTasks[taskId].data[4] = 0; //Reset timer
+        gTasks[taskId].data[1]--;
+        gTasks[taskId].data[2]++;
+        SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[2] * 256) + gTasks[taskId].data[1]);
+    }
 }
 
 void AnimTask_FadeOutParticles(u8 taskId)
 {
-	u8 existingTaskId = FindTaskIdByFunc(AnimTask_FadeOutParticlesHelper);
-	if (existingTaskId != 0xFF)
-		DestroyAnimVisualTask(existingTaskId); //Can only have one of these tasks going at a time
+    u8 existingTaskId = FindTaskIdByFunc(AnimTask_FadeOutParticlesHelper);
+    if (existingTaskId != 0xFF)
+        DestroyAnimVisualTask(existingTaskId); //Can only have one of these tasks going at a time
 
-	SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
-	SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); //Blend sprites out
-	gTasks[taskId].data[1] = 16;
-	gTasks[taskId].data[2] = 0;
-	gTasks[taskId].data[3] = gBattleAnimArgs[0]; //Delay
-	gTasks[taskId].data[4] = 0; //Delay Timer
-	gTasks[taskId].func = AnimTask_FadeOutParticlesHelper;
+    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); //Blend sprites out
+    gTasks[taskId].data[1] = 16;
+    gTasks[taskId].data[2] = 0;
+    gTasks[taskId].data[3] = gBattleAnimArgs[0]; //Delay
+    gTasks[taskId].data[4] = 0; //Delay Timer
+    gTasks[taskId].func = AnimTask_FadeOutParticlesHelper;
 }
 
 
 static const union AffineAnimCmd sShellSmashShrinkAffineAnimCmds[] =
 {
-	AFFINEANIMCMD_FRAME(64, 64, 0, 16), //Flatten
-	AFFINEANIMCMD_FRAME(0, 0, 0, 48),
-	AFFINEANIMCMD_FRAME(-64, -64, 0, 16),
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(64, 64, 0, 16), //Flatten
+    AFFINEANIMCMD_FRAME(0, 0, 0, 48),
+    AFFINEANIMCMD_FRAME(-64, -64, 0, 16),
+    AFFINEANIMCMD_END,
 };
 //Shrinks the attacker, pauses, then scales up the attacker again
 void AnimTask_ShellSmashShrinkAttacker(u8 taskId)
 {
-	struct Task* task = &gTasks[taskId];
-	u8 spriteId;
+    struct Task* task = &gTasks[taskId];
+    u8 spriteId;
 
-	task->data[0] = gBattleAnimArgs[0]; //Pause
-	spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
-	PrepareAffineAnimInTaskData(task, spriteId, sShellSmashShrinkAffineAnimCmds);
-	task->func = AnimTask_DynamaxGrowthStep;
+    task->data[0] = gBattleAnimArgs[0]; //Pause
+    spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
+    PrepareAffineAnimInTaskData(task, spriteId, sShellSmashShrinkAffineAnimCmds);
+    task->func = AnimTask_DynamaxGrowthStep;
 }
 
 static void AnimTask_DynamaxGrowthStep(u8 taskId) // from CFRU
 {
-	struct Task* task = &gTasks[taskId];
-	if (!RunAffineAnimFromTaskData(task))
-		DestroyAnimVisualTask(taskId);
+    struct Task* task = &gTasks[taskId];
+    if (!RunAffineAnimFromTaskData(task))
+        DestroyAnimVisualTask(taskId);
 }
 
 void AnimTask_AllBattlersInvisible(u8 taskId)
@@ -8398,14 +8398,14 @@ void AnimTask_AllBattlersInvisible(u8 taskId)
 void AnimTask_AllBattlersVisible(u8 taskId)
 {
     u32 i, spriteId;
-	for (i = 0; i < gBattlersCount; ++i)
-	{
-		spriteId = gBattlerSpriteIds[i];
-		if (IsBattlerSpriteVisible(i) && spriteId != 0xFF)
-			gSprites[spriteId].invisible = FALSE;
-	}
+    for (i = 0; i < gBattlersCount; ++i)
+    {
+        spriteId = gBattlerSpriteIds[i];
+        if (IsBattlerSpriteVisible(i) && spriteId != 0xFF)
+            gSprites[spriteId].invisible = FALSE;
+    }
 
-	DestroyAnimVisualTask(taskId);
+    DestroyAnimVisualTask(taskId);
 }
 
 void AnimTask_AllBattlersInvisibleExceptAttackerAndTarget(u8 taskId)
@@ -8747,24 +8747,24 @@ void AnimTask_AffectionHangedOn(u8 taskId)
 //arg 5: Wave Amplitude
 static void SpriteCB_PowerShiftBall(struct Sprite* sprite)
 {
-	InitSpritePosToAnimAttacker(sprite, TRUE);
+    InitSpritePosToAnimAttacker(sprite, TRUE);
 
-	if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
-		gBattleAnimArgs[2] *= -1; //Flip X
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
+        gBattleAnimArgs[2] *= -1; //Flip X
 
-	sprite->data[0] = gBattleAnimArgs[4]; //Duration
-	sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; //Target X
-	sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; //Target Y
-	sprite->data[5] = gBattleAnimArgs[5]; //Wave Amplitude
+    sprite->data[0] = gBattleAnimArgs[4]; //Duration
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; //Target X
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; //Target Y
+    sprite->data[5] = gBattleAnimArgs[5]; //Wave Amplitude
 
-	InitAnimArcTranslation(sprite);
-	sprite->callback = SpriteCB_PowerShiftBallStep;
+    InitAnimArcTranslation(sprite);
+    sprite->callback = SpriteCB_PowerShiftBallStep;
 }
 
 static void SpriteCB_PowerShiftBallStep(struct Sprite* sprite) // Also used by Triple Arrows
 {
-	if (TranslateAnimHorizontalArc(sprite))
-		DestroySpriteAndMatrix(sprite);
+    if (TranslateAnimHorizontalArc(sprite))
+        DestroySpriteAndMatrix(sprite);
 }
 
 //Creates a sprite that moves left or right along the target.
@@ -8775,28 +8775,28 @@ static void SpriteCB_PowerShiftBallStep(struct Sprite* sprite) // Also used by T
 //arg 4: direction
 static void SpriteCB_HorizontalSlice(struct Sprite *sprite)
 {
-	sprite->x2 = gBattleAnimArgs[0];
-	sprite->y2 = gBattleAnimArgs[1];
+    sprite->x2 = gBattleAnimArgs[0];
+    sprite->y2 = gBattleAnimArgs[1];
 
-	sprite->data[0] = gBattleAnimArgs[2]; //Slice distance
-	sprite->data[1] = gBattleAnimArgs[3]; //Slice speed
-	sprite->data[2] = gBattleAnimArgs[4]; //Slice direction
-	sprite->data[3] = 0; //Timer
+    sprite->data[0] = gBattleAnimArgs[2]; //Slice distance
+    sprite->data[1] = gBattleAnimArgs[3]; //Slice speed
+    sprite->data[2] = gBattleAnimArgs[4]; //Slice direction
+    sprite->data[3] = 0; //Timer
 
-	sprite->callback = SpriteCB_HorizontalSliceStep;
+    sprite->callback = SpriteCB_HorizontalSliceStep;
 }
 
 void SpriteCB_HorizontalSliceStep(struct Sprite *sprite)
 {
-	if (sprite->data[2] == 1) //Move left
-		sprite->x2 -= sprite->data[1];
-	else
-		sprite->x2 += sprite->data[1];
+    if (sprite->data[2] == 1) //Move left
+        sprite->x2 -= sprite->data[1];
+    else
+        sprite->x2 += sprite->data[1];
 
-	sprite->data[3] += sprite->data[1];
+    sprite->data[3] += sprite->data[1];
 
-	if (sprite->data[3] >= sprite->data[0])
-		DestroySpriteAndMatrix(sprite);
+    if (sprite->data[3] >= sprite->data[0])
+        DestroySpriteAndMatrix(sprite);
 }
 
 //Creates the slam hit for LashOut
@@ -8805,27 +8805,27 @@ void SpriteCB_HorizontalSliceStep(struct Sprite *sprite)
 //arg 2: flip
 static void SpriteCB_LashOutStrike(struct Sprite* sprite)
 {
-	bool8 flip = GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER;
+    bool8 flip = GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER;
 
-	if (gBattleAnimArgs[2])
-		flip ^= 1;
+    if (gBattleAnimArgs[2])
+        flip ^= 1;
 
-	sprite->data[0] = 11;
+    sprite->data[0] = 11;
 
-	if (flip)
-	{
-		sprite->x -= gBattleAnimArgs[0];
-		sprite->data[0] *= -1;
-		StartSpriteAffineAnim(sprite, 1);
-	}
-	else
-	{
-		sprite->x += gBattleAnimArgs[0];
-	}
+    if (flip)
+    {
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->data[0] *= -1;
+        StartSpriteAffineAnim(sprite, 1);
+    }
+    else
+    {
+        sprite->x += gBattleAnimArgs[0];
+    }
 
-	sprite->y += gBattleAnimArgs[1];
-	sprite->data[1] = 192;
-	sprite->callback = AnimKnockOffStrike_Step;
+    sprite->y += gBattleAnimArgs[1];
+    sprite->data[1] = 192;
+    sprite->callback = AnimKnockOffStrike_Step;
 }
 
 /* TODO - Use the ShellSmash Anim
@@ -8836,91 +8836,91 @@ static void SpriteCB_LashOutStrike(struct Sprite* sprite)
 //arg 3: Affine anim
 static void SpriteCB_ShellSmashShell(struct Sprite* sprite)
 {
-	//Init Position
-	sprite->x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
-	sprite->y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + 2; //2 to slightly encompass the entire sprite
+    //Init Position
+    sprite->x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + 2; //2 to slightly encompass the entire sprite
 
-	//Prepare linear movement
-	sprite->data[0] = gBattleAnimArgs[2]; //Duration
-	sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
-	sprite->data[4] = sprite->y;
-	sprite->callback = StartAnimLinearTranslation;
-	StoreSpriteCallbackInData6(sprite, SpriteCB_ShellSmashShell_DestroyDuringFadeOut);
+    //Prepare linear movement
+    sprite->data[0] = gBattleAnimArgs[2]; //Duration
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
+    sprite->data[4] = sprite->y;
+    sprite->callback = StartAnimLinearTranslation;
+    StoreSpriteCallbackInData6(sprite, SpriteCB_ShellSmashShell_DestroyDuringFadeOut);
 
-	//Rotate properly
-	StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
+    //Rotate properly
+    StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
 }
 
 static void SpriteCB_ShellSmashShell_DestroyDuringFadeOut(struct Sprite* sprite)
 {
-	if (GetGpuReg(REG_OFFSET_BLDALPHA) >= BLDALPHA_BLEND(0, 8)) //Fade out 1/2 done
-		DestroyAnimSprite(sprite);
+    if (GetGpuReg(REG_OFFSET_BLDALPHA) >= BLDALPHA_BLEND(0, 8)) //Fade out 1/2 done
+        DestroyAnimSprite(sprite);
 }
 */
 
 static void SpriteCB_AnimSpriteOnTargetSideCentre(struct Sprite *sprite)
 {
-	u8 target = LoadBattleAnimTarget(2);
+    u8 target = LoadBattleAnimTarget(2);
 
-	if (!sprite->data[0])
-	{
-		if (IsAlly(gBattleAnimAttacker, target))
-		{
-			if (IsDoubleBattle())
-				InitSpritePosToAnimAttackersCentre(sprite, FALSE);
-			else
-				InitSpritePosToAnimAttacker(sprite, FALSE);
-		}
-		else
-		{
-			if (IsDoubleBattle())
-				InitSpritePosToAnimTargetsCentre(sprite, FALSE);
-			else
-				InitSpritePosToAnimTarget(sprite, FALSE);
-		}
+    if (!sprite->data[0])
+    {
+        if (IsAlly(gBattleAnimAttacker, target))
+        {
+            if (IsDoubleBattle())
+                InitSpritePosToAnimAttackersCentre(sprite, FALSE);
+            else
+                InitSpritePosToAnimAttacker(sprite, FALSE);
+        }
+        else
+        {
+            if (IsDoubleBattle())
+                InitSpritePosToAnimTargetsCentre(sprite, FALSE);
+            else
+                InitSpritePosToAnimTarget(sprite, FALSE);
+        }
 
-		sprite->data[0]++;
-	}
-	else if (sprite->animEnded || sprite->affineAnimEnded)
-	{
-		DestroySpriteAndMatrix(sprite);
-	}
+        sprite->data[0]++;
+    }
+    else if (sprite->animEnded || sprite->affineAnimEnded)
+    {
+        DestroySpriteAndMatrix(sprite);
+    }
 }
 
 static void SpriteCB_SpriteOnMonUntilAffineAnimEnds(struct Sprite* sprite)
 {
-	u8 target = LoadBattleAnimTarget(0);
+    u8 target = LoadBattleAnimTarget(0);
 
-	if (!IsBattlerSpriteVisible(target))
-		DestroyAnimSprite(sprite);
-	else
-	{
-		sprite->x = GetBattlerSpriteCoord(target, BATTLER_COORD_X_2);
-		sprite->y = GetBattlerSpriteCoord(target, BATTLER_COORD_Y_PIC_OFFSET);
-		StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
-		sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
-	}
+    if (!IsBattlerSpriteVisible(target))
+        DestroyAnimSprite(sprite);
+    else
+    {
+        sprite->x = GetBattlerSpriteCoord(target, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(target, BATTLER_COORD_Y_PIC_OFFSET);
+        StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
+        sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
+    }
 }
 
 static void SpriteCB_SpriteOnMonForDurationUseY(struct Sprite *sprite)
 {
-	u8 target = LoadBattleAnimTarget(0);
+    u8 target = LoadBattleAnimTarget(0);
 
-	if (!IsBattlerSpriteVisible(target))
-		DestroyAnimSprite(sprite);
-	else
-	{
-		sprite->x = GetBattlerSpriteCoord(target, BATTLER_COORD_X);
-		sprite->y = GetBattlerSpriteCoord(target, BATTLER_COORD_Y_PIC_OFFSET);
+    if (!IsBattlerSpriteVisible(target))
+        DestroyAnimSprite(sprite);
+    else
+    {
+        sprite->x = GetBattlerSpriteCoord(target, BATTLER_COORD_X);
+        sprite->y = GetBattlerSpriteCoord(target, BATTLER_COORD_Y_PIC_OFFSET);
 
-		sprite->x2 = gBattleAnimArgs[1];
-		sprite->y2 = gBattleAnimArgs[2];
-		sprite->data[0] = 0;
-		sprite->data[1] = gBattleAnimArgs[3];
-		sprite->data[2] = gBattleAnimArgs[4];
-		sprite->data[3] = 0;
-		sprite->callback = AnimBrickBreakWall_Step;
-	}
+        sprite->x2 = gBattleAnimArgs[1];
+        sprite->y2 = gBattleAnimArgs[2];
+        sprite->data[0] = 0;
+        sprite->data[1] = gBattleAnimArgs[3];
+        sprite->data[2] = gBattleAnimArgs[4];
+        sprite->data[3] = 0;
+        sprite->callback = AnimBrickBreakWall_Step;
+    }
 }
 
 //Moves a sprite upward for set amount of time
@@ -8931,28 +8931,28 @@ static void SpriteCB_SpriteOnMonForDurationUseY(struct Sprite *sprite)
 //arg 4: Duration
 static void SpriteCB_MoveSpriteUpwardsForDuration(struct Sprite* sprite)
 {
-	if (gBattleAnimArgs[0] == ANIM_ATTACKER)
-	{
-		sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
-		sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2];
-	}
-	else
-	{
-		sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
-		sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2];
-	}
+    if (gBattleAnimArgs[0] == ANIM_ATTACKER)
+    {
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2];
+    }
+    else
+    {
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2];
+    }
 
-	sprite->data[0] = 0;
-	sprite->data[1] = gBattleAnimArgs[3]; //Speed
-	sprite->data[2] = gBattleAnimArgs[4]; //Duration
-	sprite->callback = SpriteCB_MoveSpriteUpwardsForDurationStep;
+    sprite->data[0] = 0;
+    sprite->data[1] = gBattleAnimArgs[3]; //Speed
+    sprite->data[2] = gBattleAnimArgs[4]; //Duration
+    sprite->callback = SpriteCB_MoveSpriteUpwardsForDurationStep;
 }
 
 static void SpriteCB_MoveSpriteUpwardsForDurationStep(struct Sprite* sprite)
 {
-	sprite->y -= sprite->data[1];
-	if (sprite->data[0]++ > sprite->data[2])
-		DestroyAnimSprite(sprite);
+    sprite->y -= sprite->data[1];
+    if (sprite->data[0]++ > sprite->data[2])
+        DestroyAnimSprite(sprite);
 }
 
 //Creates arc impacts for Surging Strikes
@@ -8964,13 +8964,13 @@ static void SpriteCB_MoveSpriteUpwardsForDurationStep(struct Sprite* sprite)
 //arg 5: wave amplitude
 static void SpriteCB_SurgingStrikes(struct Sprite* sprite)
 {
-	InitSpritePosToAnimTarget(sprite, TRUE);
-	sprite->data[0] = gBattleAnimArgs[4];
-	sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; //Target X
-	sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; //Target Y
-	sprite->data[5] = gBattleAnimArgs[5];
-	InitAnimArcTranslation(sprite);
-	sprite->callback = AnimMissileArc_Step;
+    InitSpritePosToAnimTarget(sprite, TRUE);
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; //Target X
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; //Target Y
+    sprite->data[5] = gBattleAnimArgs[5];
+    InitAnimArcTranslation(sprite);
+    sprite->callback = AnimMissileArc_Step;
 }
 
 //Creates the moving Steel Wheel for Steel Roller
@@ -8981,34 +8981,34 @@ static void SpriteCB_SurgingStrikes(struct Sprite* sprite)
 //arg 4: horizontal speed
 static void SpriteCB_SteelRoller(struct Sprite* sprite)
 {
-	sprite->x = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_X);
-	sprite->y = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_Y);
+    sprite->x = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_X);
+    sprite->y = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_Y);
 
-	sprite->x2 = gBattleAnimArgs[0];
-	sprite->y2 += gBattleAnimArgs[1];
+    sprite->x2 = gBattleAnimArgs[0];
+    sprite->y2 += gBattleAnimArgs[1];
 
-	sprite->data[4] = gBattleAnimArgs[3]; //Left/Right distance
-	sprite->data[5] = gBattleAnimArgs[4]; //Left/Right speed
+    sprite->data[4] = gBattleAnimArgs[3]; //Left/Right distance
+    sprite->data[5] = gBattleAnimArgs[4]; //Left/Right speed
 
-	sprite->data[3] = gBattleAnimArgs[2]; //Falling Speed
-	sprite->callback = SpriteCB_SteelRoller_Down;
+    sprite->data[3] = gBattleAnimArgs[2]; //Falling Speed
+    sprite->callback = SpriteCB_SteelRoller_Down;
 }
 
 static void SpriteCB_SteelRoller_Down(struct Sprite *sprite)
 {
-	sprite->y2 += sprite->data[3];
-	if (sprite->y2 >= 0)
-	{
-		sprite->y2 = 0;
-		sprite->callback = SpriteCB_SteelRoller_LeftRight;
-	}
+    sprite->y2 += sprite->data[3];
+    if (sprite->y2 >= 0)
+    {
+        sprite->y2 = 0;
+        sprite->callback = SpriteCB_SteelRoller_LeftRight;
+    }
 }
 
 static void SpriteCB_SteelRoller_LeftRight(struct Sprite* sprite)
 {
-	sprite->data[0] = -sprite->data[4]; //Slice distance
-	sprite->data[1] = sprite->data[5]; //Slice speed
-	sprite->callback = SpriteCB_LeftRightSliceStep0;
+    sprite->data[0] = -sprite->data[4]; //Slice distance
+    sprite->data[1] = sprite->data[5]; //Slice speed
+    sprite->callback = SpriteCB_LeftRightSliceStep0;
 }
 
 //Creates slashes that can be flipped.
@@ -9018,63 +9018,63 @@ static void SpriteCB_SteelRoller_LeftRight(struct Sprite* sprite)
 //arg 3: flip y
 static void SpriteCB_FlippableSlash(struct Sprite* sprite)
 {
-	InitSpritePosToAnimTarget(sprite, TRUE);
+    InitSpritePosToAnimTarget(sprite, TRUE);
 
-	if (gBattleAnimArgs[2]) //Flip X
-		sprite->hFlip = TRUE;
+    if (gBattleAnimArgs[2]) //Flip X
+        sprite->hFlip = TRUE;
 
-	if (gBattleAnimArgs[3]) //Flip Y
-		sprite->vFlip = TRUE;
+    if (gBattleAnimArgs[3]) //Flip Y
+        sprite->vFlip = TRUE;
 
-	sprite->data[0] = 0;
-	sprite->data[1] = 0;
-	StoreSpriteCallbackInData6(sprite, AnimFalseSwipeSlice_Step3);
-	sprite->callback = RunStoredCallbackWhenAnimEnds;
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    StoreSpriteCallbackInData6(sprite, AnimFalseSwipeSlice_Step3);
+    sprite->callback = RunStoredCallbackWhenAnimEnds;
 }
 
 //Moves the balls for Dragon Energy sideways along the target side
 //arg 0: Duration
 static void SpriteCB_DragonEnergyShot(struct Sprite* sprite)
 {
-	s16 startingX, finishingX, y;
-	u8 def1 = gBattleAnimTarget;
-	u8 def2 = BATTLE_PARTNER(def1);
+    s16 startingX, finishingX, y;
+    u8 def1 = gBattleAnimTarget;
+    u8 def2 = BATTLE_PARTNER(def1);
 
-	if (!IsDoubleBattle() || IsAlly(gBattleAnimAttacker, gBattleAnimTarget))
-		y = GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET);
-	else
-	{
-		y = 0;
+    if (!IsDoubleBattle() || IsAlly(gBattleAnimAttacker, gBattleAnimTarget))
+        y = GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET);
+    else
+    {
+        y = 0;
 
-		if (IsBattlerSpritePresent(def1))
-			y = GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET);
+        if (IsBattlerSpritePresent(def1))
+            y = GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET);
 
-		if (IsBattlerSpritePresent(def2))
-			y += GetBattlerSpriteCoord(def2, BATTLER_COORD_Y_PIC_OFFSET);
+        if (IsBattlerSpritePresent(def2))
+            y += GetBattlerSpriteCoord(def2, BATTLER_COORD_Y_PIC_OFFSET);
 
-		if (IsBattlerSpritePresent(def1) && IsBattlerSpritePresent(def2)) //Both targets are visible
-			y /= 2;
-	}
+        if (IsBattlerSpritePresent(def1) && IsBattlerSpritePresent(def2)) //Both targets are visible
+            y /= 2;
+    }
 
-	if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
-	{
-		startingX = 0;
-		finishingX = 255;
-	}
-	else
-	{
-		startingX = 255;
-		finishingX = 0;
-	}
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
+    {
+        startingX = 0;
+        finishingX = 255;
+    }
+    else
+    {
+        startingX = 255;
+        finishingX = 0;
+    }
 
-	sprite->x = startingX;
-	sprite->y = y;
-	sprite->x2 = 0;
-	sprite->data[0] = gBattleAnimArgs[0];
-	sprite->data[2] = finishingX;
-	sprite->data[4] = y;
-	sprite->callback = StartAnimLinearTranslation;
-	StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
+    sprite->x = startingX;
+    sprite->y = y;
+    sprite->x2 = 0;
+    sprite->data[0] = gBattleAnimArgs[0];
+    sprite->data[2] = finishingX;
+    sprite->data[4] = y;
+    sprite->callback = StartAnimLinearTranslation;
+    StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
 }
 
 //Moves the butterflies created in Max Flutterby
@@ -9083,42 +9083,42 @@ static void SpriteCB_DragonEnergyShot(struct Sprite* sprite)
 //arg 2: wave amplitude
 static void SpriteCB_MaxFlutterby(struct Sprite* sprite)
 {
-	InitSpritePosToAnimAttacker(sprite, FALSE);
+    InitSpritePosToAnimAttacker(sprite, FALSE);
 
-	sprite->data[0] = 0x10; //Speed delay
-	sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); //Target X
-	sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); //Target Y
-	sprite->data[5] = gBattleAnimArgs[2]; //Wave amplitude
+    sprite->data[0] = 0x10; //Speed delay
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); //Target X
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); //Target Y
+    sprite->data[5] = gBattleAnimArgs[2]; //Wave amplitude
 
-	sprite->callback = SpriteCB_MaxFlutterbyStep1;
+    sprite->callback = SpriteCB_MaxFlutterbyStep1;
 }
 
 //The butterflies prepare to move towards the target
 static void SpriteCB_MaxFlutterbyStep1(struct Sprite* sprite)
 {
-	if (!FuncIsActiveTask(AnimTask_DynamaxGrowthStep))
-	{
-		if (gAnimMoveIndex != MOVE_INFERNAL_PARADE)
-			PlaySE(SE_M_SAND_ATTACK);
+    if (!FuncIsActiveTask(AnimTask_DynamaxGrowthStep))
+    {
+        if (gAnimMoveIndex != MOVE_INFERNAL_PARADE)
+            PlaySE(SE_M_SAND_ATTACK);
 
-		StartSpriteAffineAnim(sprite, 1);
-		InitAnimArcTranslation(sprite);
-		sprite->callback = SpriteCB_MaxFlutterbyStep2;
-	}
+        StartSpriteAffineAnim(sprite, 1);
+        InitAnimArcTranslation(sprite);
+        sprite->callback = SpriteCB_MaxFlutterbyStep2;
+    }
 }
 
 //Destroys the butterflies when they reach the target
 static void SpriteCB_MaxFlutterbyStep2(struct Sprite* sprite)
 {
-	sprite->invisible = FALSE;
+    sprite->invisible = FALSE;
 
-	if (TranslateAnimHorizontalArc(sprite))
-	{
-		if (gAnimMoveIndex == MOVE_INFERNAL_PARADE)
-			PlaySE(SE_M_FLAME_WHEEL2);
+    if (TranslateAnimHorizontalArc(sprite))
+    {
+        if (gAnimMoveIndex == MOVE_INFERNAL_PARADE)
+            PlaySE(SE_M_FLAME_WHEEL2);
 
-		DestroySpriteAndMatrix(sprite);
-	}
+        DestroySpriteAndMatrix(sprite);
+    }
 }
 
 //Moves the ice lance for Glacial Lance
@@ -9131,56 +9131,56 @@ static void SpriteCB_MaxFlutterbyStep2(struct Sprite* sprite)
 //arg 6: duration to target
 static void SpriteCB_GlacialLance(struct Sprite* sprite)
 {
-	u8 def1 = gBattleAnimTarget;
-	u8 def2 = BATTLE_PARTNER(def1);
+    u8 def1 = gBattleAnimTarget;
+    u8 def2 = BATTLE_PARTNER(def1);
 
-	InitSpritePosToAnimAttacker(sprite, TRUE);
-	sprite->data[5] = gBattleAnimArgs[4];
-	sprite->data[6] = gBattleAnimArgs[5];
+    InitSpritePosToAnimAttacker(sprite, TRUE);
+    sprite->data[5] = gBattleAnimArgs[4];
+    sprite->data[6] = gBattleAnimArgs[5];
 
-	sprite->data[0] = gBattleAnimArgs[6];
+    sprite->data[0] = gBattleAnimArgs[6];
 
-	if (!IsDoubleBattle() || IsAlly(gBattleAnimAttacker, gBattleAnimTarget))
-	{
-		sprite->data[2] = GetBattlerSpriteCoord(def1, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; //Converge on target
-		sprite->data[4] = GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
-	}
-	else
-	{
-		sprite->data[2] = (GetBattlerSpriteCoord(def1, BATTLER_COORD_X_2) + GetBattlerSpriteCoord(def2, BATTLER_COORD_X_2)) / 2 + gBattleAnimArgs[2]; //Converge on target
-		sprite->data[4] = (GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET) + GetBattlerSpriteCoord(def2, BATTLER_COORD_Y_PIC_OFFSET)) / 2 + gBattleAnimArgs[3];
-	}
+    if (!IsDoubleBattle() || IsAlly(gBattleAnimAttacker, gBattleAnimTarget))
+    {
+        sprite->data[2] = GetBattlerSpriteCoord(def1, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; //Converge on target
+        sprite->data[4] = GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
+    }
+    else
+    {
+        sprite->data[2] = (GetBattlerSpriteCoord(def1, BATTLER_COORD_X_2) + GetBattlerSpriteCoord(def2, BATTLER_COORD_X_2)) / 2 + gBattleAnimArgs[2]; //Converge on target
+        sprite->data[4] = (GetBattlerSpriteCoord(def1, BATTLER_COORD_Y_PIC_OFFSET) + GetBattlerSpriteCoord(def2, BATTLER_COORD_Y_PIC_OFFSET)) / 2 + gBattleAnimArgs[3];
+    }
 
-	sprite->oam.priority = 1; //Above the ice cube
-	sprite->callback = SpriteCB_GlacialLance_Step1;
+    sprite->oam.priority = 1; //Above the ice cube
+    sprite->callback = SpriteCB_GlacialLance_Step1;
 }
 
 static void SpriteCB_GlacialLance_Step1(struct Sprite* sprite)
 {
-	if (sprite->data[7]++ >= sprite->data[5])
-	{
-		sprite->data[7] = 0;
-		sprite->callback = SpriteCB_GlacialLance_Step2;
-	}
-	else
-		--sprite->y; //Move up
+    if (sprite->data[7]++ >= sprite->data[5])
+    {
+        sprite->data[7] = 0;
+        sprite->callback = SpriteCB_GlacialLance_Step2;
+    }
+    else
+        --sprite->y; //Move up
 }
 
 static void SpriteCB_GlacialLance_Step2(struct Sprite* sprite)
 {
-	if (sprite->data[7]++ >= sprite->data[6])
-	{
-		if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
-			StartSpriteAffineAnim(sprite, 2);
-		else
-			StartSpriteAffineAnim(sprite, 1);
+    if (sprite->data[7]++ >= sprite->data[6])
+    {
+        if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
+            StartSpriteAffineAnim(sprite, 2);
+        else
+            StartSpriteAffineAnim(sprite, 1);
 
-		sprite->data[5] = 0;
-		sprite->data[6] = 0;
-		sprite->data[7] = 0;
-		sprite->callback = StartAnimLinearTranslation;
-		StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
-	}
+        sprite->data[5] = 0;
+        sprite->data[6] = 0;
+        sprite->data[7] = 0;
+        sprite->callback = StartAnimLinearTranslation;
+        StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
+    }
 }
 
 
@@ -9191,46 +9191,46 @@ static void SpriteCB_GlacialLance_Step2(struct Sprite* sprite)
 //arg 3: Wave Amplitude
 static void SpriteCB_TripleArrowKick(struct Sprite* sprite)
 {
-	InitSpritePosToAnimTarget(sprite, TRUE);
-	StartSpriteAnim(sprite, 1); //Feet
+    InitSpritePosToAnimTarget(sprite, TRUE);
+    StartSpriteAnim(sprite, 1); //Feet
 
-	sprite->data[0] = gBattleAnimArgs[2];
-	sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); //Target X
-	sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); //Target Y
-	sprite->data[5] = gBattleAnimArgs[3];
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); //Target X
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); //Target Y
+    sprite->data[5] = gBattleAnimArgs[3];
 
-	InitAnimArcTranslation(sprite);
-	sprite->callback = SpriteCB_PowerShiftBallStep; //Arc until complete
+    InitAnimArcTranslation(sprite);
+    sprite->callback = SpriteCB_PowerShiftBallStep; //Arc until complete
 }
 
 // DYNAMAX
 static const union AffineAnimCmd sDynamaxGrowthAffineAnimCmds[] = // from CFRU
 {
-	AFFINEANIMCMD_FRAME(-2, -2, 0, 64), //Double in size over 1 second
-	AFFINEANIMCMD_FRAME(0, 0, 0, 64), //Pause for 1 seconds
-	AFFINEANIMCMD_FRAME(16, 16, 0, 8), //Shrink back down in 1/8 of a second
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(-2, -2, 0, 64), //Double in size over 1 second
+    AFFINEANIMCMD_FRAME(0, 0, 0, 64), //Pause for 1 seconds
+    AFFINEANIMCMD_FRAME(16, 16, 0, 8), //Shrink back down in 1/8 of a second
+    AFFINEANIMCMD_END,
 };
 
 static const union AffineAnimCmd sDynamaxGrowthAttackAnimationAffineAnimCmds[] =
 {
-	AFFINEANIMCMD_FRAME(-4, -4, 0, 32), //Double in size quicker
-	AFFINEANIMCMD_FRAME(0, 0, 0, 32), //Pause for less
-	AFFINEANIMCMD_FRAME(16, 16, 0, 8),
-	AFFINEANIMCMD_END,
+    AFFINEANIMCMD_FRAME(-4, -4, 0, 32), //Double in size quicker
+    AFFINEANIMCMD_FRAME(0, 0, 0, 32), //Pause for less
+    AFFINEANIMCMD_FRAME(16, 16, 0, 8),
+    AFFINEANIMCMD_END,
 };
 
 //Arg 0: Animation for attack
 void AnimTask_DynamaxGrowth(u8 taskId) // from CFRU
 {
-	struct Task* task = &gTasks[taskId];
-	u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
+    struct Task* task = &gTasks[taskId];
+    u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
 
-	if (gBattleAnimArgs[0] == 0)
-		PrepareAffineAnimInTaskData(task, spriteId, sDynamaxGrowthAffineAnimCmds);
-	else
-		PrepareAffineAnimInTaskData(task, spriteId, sDynamaxGrowthAttackAnimationAffineAnimCmds);
-	task->func = AnimTask_DynamaxGrowthStep;
+    if (gBattleAnimArgs[0] == 0)
+        PrepareAffineAnimInTaskData(task, spriteId, sDynamaxGrowthAffineAnimCmds);
+    else
+        PrepareAffineAnimInTaskData(task, spriteId, sDynamaxGrowthAttackAnimationAffineAnimCmds);
+    task->func = AnimTask_DynamaxGrowthStep;
 }
 
 void AnimTask_GetWeatherToSet(u8 taskId)
@@ -9250,7 +9250,7 @@ void AnimTask_GetWeatherToSet(u8 taskId)
             gBattleAnimArgs[ARG_RET_ID] = 4;
             break;
     }
-	DestroyAnimVisualTask(taskId);
+    DestroyAnimVisualTask(taskId);
 }
 
 void AnimTask_SyrupBomb(u8 taskId)
diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c
index 759c410946..d9fc8aa412 100644
--- a/src/battle_anim_normal.c
+++ b/src/battle_anim_normal.c
@@ -830,7 +830,7 @@ void AnimTask_InvertScreenColor(u8 taskId)
         selectedPalettes |= (0x10000 << gBattleAnimTarget);
     if (gBattleAnimArgs[0] & 0x8 && IsBattlerAlive(BATTLE_PARTNER(gBattleAnimTarget)))
         selectedPalettes |= (0x10000 << BATTLE_PARTNER(gBattleAnimTarget));
-	if (gBattleAnimArgs[0] & 0x10 && IsBattlerAlive(BATTLE_PARTNER(gBattleAnimAttacker)))
+    if (gBattleAnimArgs[0] & 0x10 && IsBattlerAlive(BATTLE_PARTNER(gBattleAnimAttacker)))
         selectedPalettes |= (0x10000 << BATTLE_PARTNER(gBattleAnimAttacker));
 
     InvertPlttBuffer(selectedPalettes);
diff --git a/src/battle_anim_poison.c b/src/battle_anim_poison.c
index dfaa32cc5e..301cdd4643 100644
--- a/src/battle_anim_poison.c
+++ b/src/battle_anim_poison.c
@@ -182,24 +182,24 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate =
 
 const struct SpriteTemplate gGreenPoisonDrip =
 {
-	.tileTag = ANIM_TAG_GREEN_POISON_BUBBLE,
-	.paletteTag = ANIM_TAG_GREEN_POISON_BUBBLE,
-	.oam = &gOamData_AffineDouble_ObjNormal_16x16,
+    .tileTag = ANIM_TAG_GREEN_POISON_BUBBLE,
+    .paletteTag = ANIM_TAG_GREEN_POISON_BUBBLE,
+    .oam = &gOamData_AffineDouble_ObjNormal_16x16,
     .anims = &gAnims_PoisonProjectile[1],
-	.images = NULL,
-	.affineAnims = gAffineAnims_Droplet,
-	.callback = AnimAcidPoisonDroplet,
+    .images = NULL,
+    .affineAnims = gAffineAnims_Droplet,
+    .callback = AnimAcidPoisonDroplet,
 };
 
 const struct SpriteTemplate gGreenPoisonBubble =
 {
-	.tileTag = ANIM_TAG_GREEN_POISON_BUBBLE,
-	.paletteTag = ANIM_TAG_GREEN_POISON_BUBBLE,
-	.oam = &gOamData_AffineDouble_ObjNormal_16x16,
-	.anims = gAnims_PoisonProjectile,
-	.images = NULL,
-	.affineAnims = gAffineAnims_PoisonProjectile,
-	.callback = AnimAcidPoisonBubble,
+    .tileTag = ANIM_TAG_GREEN_POISON_BUBBLE,
+    .paletteTag = ANIM_TAG_GREEN_POISON_BUBBLE,
+    .oam = &gOamData_AffineDouble_ObjNormal_16x16,
+    .anims = gAnims_PoisonProjectile,
+    .images = NULL,
+    .affineAnims = gAffineAnims_PoisonProjectile,
+    .callback = AnimAcidPoisonBubble,
 };
 
 const union AnimCmd gSuckerPunchAnimCmd[] =
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c
index f9b93a727a..5aa14ffa34 100644
--- a/src/battle_anim_rock.c
+++ b/src/battle_anim_rock.c
@@ -314,18 +314,18 @@ const struct SpriteTemplate gStealthRockSpriteTemplate =
 
 static const union AffineAnimCmd sSpriteAffineAnim_CrushGripHandEnemyAttack[] =
 {
-	AFFINEANIMCMD_FRAME(0, 0, 96, 1), //180 degree turn
-	AFFINEANIMCMD_END
+    AFFINEANIMCMD_FRAME(0, 0, 96, 1), //180 degree turn
+    AFFINEANIMCMD_END
 };
 static const union AffineAnimCmd sSpriteAffineAnim_DoNothing[] =
 {
-	AFFINEANIMCMD_FRAME(0, 0, 0, 1), //Do nothing
-	AFFINEANIMCMD_END
+    AFFINEANIMCMD_FRAME(0, 0, 0, 1), //Do nothing
+    AFFINEANIMCMD_END
 };
 static const union AffineAnimCmd* const sSpriteAffineAnimTable_CrushGripHand[] =
 {
-	sSpriteAffineAnim_DoNothing,
-	sSpriteAffineAnim_CrushGripHandEnemyAttack,
+    sSpriteAffineAnim_DoNothing,
+    sSpriteAffineAnim_CrushGripHandEnemyAttack,
 };
 const struct SpriteTemplate gCrushGripHandTemplate =
 {
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index 7e7ded7676..f746f186aa 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -398,28 +398,28 @@ void AnimTask_FrozenIceCubeAttacker(u8 taskId)
 void AnimTask_CentredFrozenIceCube(u8 taskId)
 {
     // same as AnimTask_FrozenIceCube but center position on target(s)
-	s16 x, y;
-	u8 spriteId;
-	u8 battler1 = gBattleAnimTarget;
-	u8 battler2 = BATTLE_PARTNER(battler1);
+    s16 x, y;
+    u8 spriteId;
+    u8 battler1 = gBattleAnimTarget;
+    u8 battler2 = BATTLE_PARTNER(battler1);
 
-	if (!IsDoubleBattle() || IsAlly(gBattleAnimAttacker, gBattleAnimTarget))
-	{
-		x = GetBattlerSpriteCoord(battler1, BATTLER_COORD_X_2);
-		y = GetBattlerSpriteCoord(battler1, BATTLER_COORD_Y_PIC_OFFSET);
-	}
-	else
-	{
-		x = (GetBattlerSpriteCoord(battler1, BATTLER_COORD_X_2) + GetBattlerSpriteCoord(battler2, BATTLER_COORD_X_2)) / 2;
-		y = (GetBattlerSpriteCoord(battler1, BATTLER_COORD_Y_PIC_OFFSET) + GetBattlerSpriteCoord(battler2, BATTLER_COORD_Y_PIC_OFFSET)) / 2;
-	}
+    if (!IsDoubleBattle() || IsAlly(gBattleAnimAttacker, gBattleAnimTarget))
+    {
+        x = GetBattlerSpriteCoord(battler1, BATTLER_COORD_X_2);
+        y = GetBattlerSpriteCoord(battler1, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+    else
+    {
+        x = (GetBattlerSpriteCoord(battler1, BATTLER_COORD_X_2) + GetBattlerSpriteCoord(battler2, BATTLER_COORD_X_2)) / 2;
+        y = (GetBattlerSpriteCoord(battler1, BATTLER_COORD_Y_PIC_OFFSET) + GetBattlerSpriteCoord(battler2, BATTLER_COORD_Y_PIC_OFFSET)) / 2;
+    }
 
-	x -= 32;
-	y -= 36;
+    x -= 32;
+    y -= 36;
 
-	spriteId = CreateSprite(&sFrozenIceCubeSpriteTemplate, x, y, 4);
-	if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF)
-		gSprites[spriteId].invisible = TRUE;
+    spriteId = CreateSprite(&sFrozenIceCubeSpriteTemplate, x, y, 4);
+    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF)
+        gSprites[spriteId].invisible = TRUE;
 
     SetSubspriteTables(&gSprites[spriteId], sFrozenIceCubeSubspriteTable);
     gTasks[taskId].data[15] = spriteId;
diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c
index 159b27dec9..65f8178d13 100644
--- a/src/battle_anim_water.c
+++ b/src/battle_anim_water.c
@@ -585,14 +585,14 @@ const struct SpriteTemplate gAquaTailHitSpriteTemplate =
 };
 
 static const union AnimCmd sAnimCmdAnimatedSpark2[] = {
-	ANIMCMD_FRAME((8 * 8) / (16 * 16) * 0, 8),
-	ANIMCMD_FRAME((8 * 8) / (16 * 16) * 1, 8),
-	ANIMCMD_FRAME((8 * 8) / (16 * 16) * 2, 8),
-	ANIMCMD_JUMP(0)
+    ANIMCMD_FRAME((8 * 8) / (16 * 16) * 0, 8),
+    ANIMCMD_FRAME((8 * 8) / (16 * 16) * 1, 8),
+    ANIMCMD_FRAME((8 * 8) / (16 * 16) * 2, 8),
+    ANIMCMD_JUMP(0)
 };
 
 static const union AnimCmd *const sAnimCmdTable_AnimatedSpark2[] = {
-	sAnimCmdAnimatedSpark2,
+    sAnimCmdAnimatedSpark2,
 };
 
 const struct SpriteTemplate gSparkBeamSpriteTemplate =
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index d6b2fbdc3a..929aa2a59d 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -75,7 +75,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
     gBattleControllerExecFlags = 0;
     ClearBattleAnimationVars();
     BattleAI_SetupItems();
-	BattleAI_SetupFlags();
+    BattleAI_SetupFlags();
 
     if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
     {
@@ -611,7 +611,7 @@ bool32 IsValidForBattle(struct Pokemon *mon)
 {
     u32 species = GetMonData(mon, MON_DATA_SPECIES_OR_EGG);
     return (species != SPECIES_NONE
-	 && species != SPECIES_EGG
+         && species != SPECIES_EGG
          && GetMonData(mon, MON_DATA_HP) != 0
          && GetMonData(mon, MON_DATA_IS_EGG) == FALSE);
 }
diff --git a/src/battle_util.c b/src/battle_util.c
index b1d3eec450..b7c61862fc 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2954,7 +2954,7 @@ u8 DoBattlerEndTurnEffects(void)
                 && --gBattleStruct->dynamax.dynamaxTurns[battler] == 0)
             {
                 gBattleScripting.battler = battler;
-	            UndoDynamax(battler);
+                UndoDynamax(battler);
                 BattleScriptExecute(BattleScript_DynamaxEnds);
                 effect++;
             }
diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 3b9dafd2cb..1a169007c5 100755
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -432,33 +432,33 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {
 };
 
 static const struct SpriteFrameImage sPicTable_BugTracks[] = {
-	overworld_frame(gFieldEffectObjectPic_BugTracks, 2, 2, 0),
-	overworld_frame(gFieldEffectObjectPic_BugTracks, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_BugTracks, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_BugTracks, 2, 2, 1),
 };
 
 static const struct SpriteFrameImage sPicTable_SpotTracks[] = {
-	overworld_frame(gFieldEffectObjectPic_SpotTracks, 2, 2, 0),
-	overworld_frame(gFieldEffectObjectPic_SpotTracks, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_SpotTracks, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_SpotTracks, 2, 2, 1),
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_BugTracks = {
-	.tileTag = 0xFFFF,
-	.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
-	.oam = &gObjectEventBaseOam_16x16,
-	.anims = sAnimTable_DeepSandFootprints,
-	.images = sPicTable_BugTracks,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = UpdateFootprintsTireTracksFieldEffect,
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_DeepSandFootprints,
+    .images = sPicTable_BugTracks,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateFootprintsTireTracksFieldEffect,
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SpotTracks = {
-	.tileTag = 0xFFFF,
-	.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
-	.oam = &gObjectEventBaseOam_16x16,
-	.anims = sAnimTable_DeepSandFootprints,
-	.images = sPicTable_SpotTracks,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = UpdateFootprintsTireTracksFieldEffect,
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_DeepSandFootprints,
+    .images = sPicTable_SpotTracks,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateFootprintsTireTracksFieldEffect,
 };
 
 static const struct SpriteFrameImage sPicTable_BikeTireTracks[] = {
@@ -470,10 +470,10 @@ static const struct SpriteFrameImage sPicTable_BikeTireTracks[] = {
 
 
 static const struct SpriteFrameImage sPicTable_SlitherTracks[] = {
-	overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 0),
-	overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 1),
-	overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 2),
-	overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 3),
 };
 
 static const union AnimCmd sBikeTireTracksAnim_South[] =
@@ -549,13 +549,13 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {
 
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SlitherTracks = {
-	.tileTag = 0xFFFF,
-	.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
-	.oam = &gObjectEventBaseOam_16x16,
-	.anims = sAnimTable_BikeTireTracks,
-	.images = sPicTable_SlitherTracks,
-	.affineAnims = gDummySpriteAffineAnimTable,
-	.callback = UpdateFootprintsTireTracksFieldEffect,
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_BikeTireTracks,
+    .images = sPicTable_SlitherTracks,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateFootprintsTireTracksFieldEffect,
 };
 
 static const struct SpriteFrameImage sPicTable_JumpBigSplash[] = {
diff --git a/src/data/pokemon/level_up_learnsets/gen_3.h b/src/data/pokemon/level_up_learnsets/gen_3.h
index 35af1dfbe6..99b8cc397f 100644
--- a/src/data/pokemon/level_up_learnsets/gen_3.h
+++ b/src/data/pokemon/level_up_learnsets/gen_3.h
@@ -3620,7 +3620,7 @@ static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = {
     LEVEL_UP_MOVE(60, MOVE_ENDURE),
     LEVEL_UP_MOVE(65, MOVE_MEMENTO),
     LEVEL_UP_MOVE(70, MOVE_SKY_ATTACK),
-	LEVEL_UP_END
+    LEVEL_UP_END
 };
 #endif //P_GALARIAN_FORMS
 #endif //P_FAMILY_MOLTRES
diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h
index f7bd77cf12..21968dd6ea 100644
--- a/src/data/pokemon/pokedex_orders.h
+++ b/src/data/pokemon/pokedex_orders.h
@@ -1604,7 +1604,7 @@ const u16 gPokedexOrder_Weight[] =
     NATIONAL_DEX_MORGREM,
     // 28.7 lbs / 13.0 kg
     NATIONAL_DEX_IVYSAUR,
-	//NATIONAL_DEX_VOLTORB_HISUIAN,
+    //NATIONAL_DEX_VOLTORB_HISUIAN,
     //NATIONAL_DEX_BANETTE_MEGA,
     NATIONAL_DEX_MIME_JR,
     NATIONAL_DEX_LAMPENT,
diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h
index 2fdc28d213..a4cec62cf5 100644
--- a/src/data/tilesets/graphics.h
+++ b/src/data/tilesets/graphics.h
@@ -2,528 +2,528 @@ const u32 gTilesetTiles_Petalburg[] = INCBIN_U32("data/tilesets/secondary/petalb
 
 const u16 gTilesetPalettes_Petalburg[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Rustboro[] = INCBIN_U32("data/tilesets/secondary/rustboro/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Rustboro[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Dewford[] = INCBIN_U32("data/tilesets/secondary/dewford/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Dewford[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Slateport[] = INCBIN_U32("data/tilesets/secondary/slateport/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Slateport[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/slateport/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/slateport/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Mauville[] = INCBIN_U32("data/tilesets/secondary/mauville/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Mauville[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Lavaridge[] = INCBIN_U32("data/tilesets/secondary/lavaridge/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Lavaridge[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Fallarbor[] = INCBIN_U32("data/tilesets/secondary/fallarbor/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Fallarbor[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fallarbor/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Fortree[] = INCBIN_U32("data/tilesets/secondary/fortree/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Fortree[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Lilycove[] = INCBIN_U32("data/tilesets/secondary/lilycove/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Lilycove[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Mossdeep[] = INCBIN_U32("data/tilesets/secondary/mossdeep/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Mossdeep[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_EverGrande[] = INCBIN_U32("data/tilesets/secondary/ever_grande/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_EverGrande[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/ever_grande/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Pacifidlog[] = INCBIN_U32("data/tilesets/secondary/pacifidlog/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Pacifidlog[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pacifidlog/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Sootopolis[] = INCBIN_U32("data/tilesets/secondary/sootopolis/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Sootopolis[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleFrontierOutsideWest[] = INCBIN_U32("data/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleFrontierOutsideWest[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleFrontierOutsideEast[] = INCBIN_U32("data/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleFrontierOutsideEast[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_InsideBuilding[] = INCBIN_U32("data/tilesets/primary/building/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_InsideBuilding[][16] =
 {
-	INCBIN_U16("data/tilesets/primary/building/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/primary/building/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/primary/building/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Shop[] = INCBIN_U32("data/tilesets/secondary/shop/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Shop[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/shop/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/shop/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_PokemonCenter[] = INCBIN_U32("data/tilesets/secondary/pokemon_center/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_PokemonCenter[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_center/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Cave[] = INCBIN_U32("data/tilesets/secondary/cave/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Cave[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cave/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cave/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_PokemonSchool[] = INCBIN_U32("data/tilesets/secondary/pokemon_school/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_PokemonSchool[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_school/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_PokemonFanClub[] = INCBIN_U32("data/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_PokemonFanClub[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Unused1[] = INCBIN_U32("data/tilesets/secondary/unused_1/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Unused1[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_1/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_1/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MeteorFalls[] = INCBIN_U32("data/tilesets/secondary/meteor_falls/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MeteorFalls[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/meteor_falls/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_OceanicMuseum[] = INCBIN_U32("data/tilesets/secondary/oceanic_museum/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_OceanicMuseum[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/oceanic_museum/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_CableClub[] = INCBIN_U32("data/tilesets/secondary/cable_club/tiles.4bpp");
@@ -531,286 +531,286 @@ const u32 gTilesetTiles_UnknownCableClub[] = INCBIN_U32("data/tilesets/secondary
 
 const u16 gTilesetPalettes_CableClub[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/cable_club/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/cable_club/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SeashoreHouse[] = INCBIN_U32("data/tilesets/secondary/seashore_house/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SeashoreHouse[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/seashore_house/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_PrettyPetalFlowerShop[] = INCBIN_U32("data/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_PrettyPetalFlowerShop[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_PokemonDayCare[] = INCBIN_U32("data/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_PokemonDayCare[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/pokemon_day_care/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Facility[] = INCBIN_U32("data/tilesets/secondary/facility/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Facility[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/facility/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/facility/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BikeShop[] = INCBIN_U32("data/tilesets/secondary/bike_shop/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BikeShop[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/bike_shop/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_RusturfTunnel[] = INCBIN_U32("data/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_RusturfTunnel[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseBrownCaveCompressed[] = INCBIN_U32("data/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SecretBaseBrownCave[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/brown_cave/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseTreeCompressed[] = INCBIN_U32("data/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SecretBaseTree[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/tree/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseShrubCompressed[] = INCBIN_U32("data/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SecretBaseShrub[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/shrub/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseBlueCaveCompressed[] = INCBIN_U32("data/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SecretBaseBlueCave[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/blue_cave/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseYellowCaveCompressed[] = INCBIN_U32("data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SecretBaseYellowCave[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/yellow_cave/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseRedCaveCompressed[] = INCBIN_U32("data/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SecretBaseRedCave[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBaseBrownCave[] = INCBIN_U32("data/tilesets/secondary/secret_base/brown_cave/tiles.4bpp");
@@ -824,418 +824,418 @@ const u32 gTilesetTiles_InsideOfTruck[] = INCBIN_U32("data/tilesets/secondary/in
 
 const u16 gTilesetPalettes_InsideOfTruck[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_of_truck/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Contest[] = INCBIN_U32("data/tilesets/secondary/contest/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Contest[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/contest/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/contest/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_LilycoveMuseum[] = INCBIN_U32("data/tilesets/secondary/lilycove_museum/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_LilycoveMuseum[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lilycove_museum/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BrendansMaysHouse[] = INCBIN_U32("data/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BrendansMaysHouse[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/brendans_mays_house/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Lab[] = INCBIN_U32("data/tilesets/secondary/lab/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Lab[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lab/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lab/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Underwater[] = INCBIN_U32("data/tilesets/secondary/underwater/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Underwater[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/underwater/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/underwater/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_GenericBuilding[] = INCBIN_U32("data/tilesets/secondary/generic_building/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_GenericBuilding[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/generic_building/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/generic_building/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MauvilleGameCorner[] = INCBIN_U32("data/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MauvilleGameCorner[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_game_corner/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_Unused2[] = INCBIN_U32("data/tilesets/secondary/unused_2/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_Unused2[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/unused_2/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/unused_2/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_RustboroGym[] = INCBIN_U32("data/tilesets/secondary/rustboro_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_RustboroGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/rustboro_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_DewfordGym[] = INCBIN_U32("data/tilesets/secondary/dewford_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_DewfordGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/dewford_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MauvilleGym[] = INCBIN_U32("data/tilesets/secondary/mauville_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MauvilleGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mauville_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_LavaridgeGym[] = INCBIN_U32("data/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_LavaridgeGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/lavaridge_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_PetalburgGym[] = INCBIN_U32("data/tilesets/secondary/petalburg_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_PetalburgGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/petalburg_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_FortreeGym[] = INCBIN_U32("data/tilesets/secondary/fortree_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_FortreeGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/fortree_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MossdeepGym[] = INCBIN_U32("data/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MossdeepGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SootopolisGym[] = INCBIN_U32("data/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_SootopolisGym[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/sootopolis_gym/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_TrickHousePuzzle[] = INCBIN_U32("data/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_TrickHousePuzzle[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_InsideShip[] = INCBIN_U32("data/tilesets/secondary/inside_ship/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_InsideShip[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/inside_ship/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_SecretBase[] = INCBIN_U32("data/tilesets/primary/secret_base/tiles.4bpp");
@@ -1243,394 +1243,394 @@ const u32 gTilesetTiles_UnknownSecretBase[] = INCBIN_U32("data/tilesets/primary/
 
 const u16 gTilesetPalettes_SecretBase[][16] =
 {
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/primary/secret_base/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/primary/secret_base/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_EliteFour[] = INCBIN_U32("data/tilesets/secondary/elite_four/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_EliteFour[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/elite_four/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/elite_four/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleFrontier[] = INCBIN_U32("data/tilesets/secondary/battle_frontier/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleFrontier[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattlePalace[] = INCBIN_U32("data/tilesets/secondary/battle_palace/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattlePalace[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_palace/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleDome[] = INCBIN_U32("data/tilesets/secondary/battle_dome/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleDome[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_dome/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleFactory[] = INCBIN_U32("data/tilesets/secondary/battle_factory/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleFactory[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_factory/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattlePike[] = INCBIN_U32("data/tilesets/secondary/battle_pike/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattlePike[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pike/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleArena[] = INCBIN_U32("data/tilesets/secondary/battle_arena/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleArena[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_arena/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattlePyramid[] = INCBIN_U32("data/tilesets/secondary/battle_pyramid/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattlePyramid[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_pyramid/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MirageTower[] = INCBIN_U32("data/tilesets/secondary/mirage_tower/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MirageTower[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mirage_tower/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MossdeepGameCorner[] = INCBIN_U32("data/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MossdeepGameCorner[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_IslandHarbor[] = INCBIN_U32("data/tilesets/secondary/island_harbor/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_IslandHarbor[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/island_harbor/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_TrainerHill[] = INCBIN_U32("data/tilesets/secondary/trainer_hill/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_TrainerHill[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/trainer_hill/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_NavelRock[] = INCBIN_U32("data/tilesets/secondary/navel_rock/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_NavelRock[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/navel_rock/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleFrontierRankingHall[] = INCBIN_U32("data/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleFrontierRankingHall[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_BattleTent[] = INCBIN_U32("data/tilesets/secondary/battle_tent/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_BattleTent[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/battle_tent/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_MysteryEventsHouse[] = INCBIN_U32("data/tilesets/secondary/mystery_events_house/tiles.4bpp.lz");
 
 const u16 gTilesetPalettes_MysteryEventsHouse[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/mystery_events_house/palettes/15.gbapal"),
 };
 
 const u16 gTilesetPalettes_UnionRoom[][16] =
 {
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/00.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/01.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/02.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/03.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/04.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/05.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/06.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/07.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/08.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/09.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/10.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/11.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/12.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/13.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/14.gbapal"),
-	INCBIN_U16("data/tilesets/secondary/union_room/palettes/15.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/12.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/13.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/14.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/union_room/palettes/15.gbapal"),
 };
 
 const u32 gTilesetTiles_UnionRoom[] = INCBIN_U32("data/tilesets/secondary/union_room/tiles.4bpp.lz");
diff --git a/src/debug.c b/src/debug.c
index f4b6f68840..a2bf55d95a 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -649,7 +649,7 @@ static const u8 sDebugText_Give_BattlePoints[] =        _("Max Battle Points");
 static const u8 sDebugText_Give_DaycareEgg[] =          _("Daycare Egg");
 // Sound Menu
 static const u8 sDebugText_Sound_SFX[] =                _("SFX…{CLEAR_TO 110}{RIGHT_ARROW}");
-static const u8 sDebugText_Sound_SFX_ID[] =   	        _("SFX ID: {STR_VAR_3}   {START_BUTTON} Stop\n{STR_VAR_1}    \n{STR_VAR_2}");
+static const u8 sDebugText_Sound_SFX_ID[] =             _("SFX ID: {STR_VAR_3}   {START_BUTTON} Stop\n{STR_VAR_1}    \n{STR_VAR_2}");
 static const u8 sDebugText_Sound_Music[] =              _("Music…{CLEAR_TO 110}{RIGHT_ARROW}");
 static const u8 sDebugText_Sound_Music_ID[] =           _("Music ID: {STR_VAR_3}   {START_BUTTON} Stop\n{STR_VAR_1}    \n{STR_VAR_2}");
 // Berry Function Menu
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 1edc986c9b..d82504a32f 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -9496,30 +9496,30 @@ static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *objEvent, st
 
 static void DoTracksGroundEffect_SlitherTracks(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a)
 {
-	//  Specifies which bike track shape to show next.
-	//  For example, when the bike turns from up to right, it will show
-	//  a track that curves to the right.
-	//  Each 4-byte row corresponds to the initial direction of the bike, and
-	//  each byte in that row is for the next direction of the bike in the order
-	//  of down, up, left, right.
-	static const u8 slitherTracks_Transitions[4][4] = {
-		{1, 2, 7, 8},
-		{1, 2, 6, 5},
-		{5, 8, 3, 4},
-		{6, 7, 3, 4},
-	};
+    //  Specifies which bike track shape to show next.
+    //  For example, when the bike turns from up to right, it will show
+    //  a track that curves to the right.
+    //  Each 4-byte row corresponds to the initial direction of the bike, and
+    //  each byte in that row is for the next direction of the bike in the order
+    //  of down, up, left, right.
+    static const u8 slitherTracks_Transitions[4][4] = {
+        {1, 2, 7, 8},
+        {1, 2, 6, 5},
+        {5, 8, 3, 4},
+        {6, 7, 3, 4},
+    };
 
-	if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y)
-	{
-		gFieldEffectArguments[0] = objEvent->previousCoords.x;
-		gFieldEffectArguments[1] = objEvent->previousCoords.y;
-		gFieldEffectArguments[2] = 149;
-		gFieldEffectArguments[3] = 2;
-		gFieldEffectArguments[4] =
-			slitherTracks_Transitions[objEvent->previousMovementDirection][objEvent->facingDirection - 5];
+    if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y)
+    {
+        gFieldEffectArguments[0] = objEvent->previousCoords.x;
+        gFieldEffectArguments[1] = objEvent->previousCoords.y;
+        gFieldEffectArguments[2] = 149;
+        gFieldEffectArguments[3] = 2;
+        gFieldEffectArguments[4] =
+        slitherTracks_Transitions[objEvent->previousMovementDirection][objEvent->facingDirection - 5];
         gFieldEffectArguments[5] = objEvent->previousMetatileBehavior;
-		FieldEffectStart(FLDEFF_TRACKS_SLITHER);
-	}
+        FieldEffectStart(FLDEFF_TRACKS_SLITHER);
+    }
 }
 
 void GroundEffect_Ripple(struct ObjectEvent *objEvent, struct Sprite *sprite)
diff --git a/src/mini_printf.c b/src/mini_printf.c
index 7432395b79..2420efbd18 100644
--- a/src/mini_printf.c
+++ b/src/mini_printf.c
@@ -141,9 +141,9 @@ static s32 _putsEncoded(char *s, s32 len, void *buf)
 
 static s32 mini_strlen(const char *s)
 {
-	s32 len = 0;
-	while (s[len] != '\0') len++;
-	return len;
+    s32 len = 0;
+    while (s[len] != '\0') len++;
+    return len;
 }
 
 static s32 mini_itoa(s32 value, u32 radix, s32 uppercase, bool32 unsig, char *buffer)
diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c
index fa5279441b..e3b7793bbd 100644
--- a/src/pokedex_plus_hgss.c
+++ b/src/pokedex_plus_hgss.c
@@ -3511,14 +3511,14 @@ static void SpriteCB_DexListStartMenuCursor(struct Sprite *sprite)
 //************************************
 
 //Stat bars on main screen, code by DizzyEgg, idea by Jaizu
-#define PIXEL_COORDS_TO_OFFSET(x, y)(			\
-/*Add tiles by X*/								\
-((y / 8) * 32 * 8)								\
-/*Add tiles by X*/								\
-+ ((x / 8) * 32)								\
-/*Add pixels by Y*/								\
-+ ((((y) - ((y / 8) * 8))) * 4)				    \
-/*Add pixels by X*/								\
+#define PIXEL_COORDS_TO_OFFSET(x, y)(           \
+/*Add tiles by X*/                              \
+((y / 8) * 32 * 8)                              \
+/*Add tiles by X*/                              \
++ ((x / 8) * 32)                                \
+/*Add pixels by Y*/                             \
++ ((((y) - ((y / 8) * 8))) * 4)                 \
+/*Add pixels by X*/                             \
 + ((((x) - ((x / 8) * 8)) / 2)))
 
 static inline void WritePixel(u8 *dst, u32 x, u32 y, u32 value)