Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

140 files changed, 27722 insertions, 23929 deletions

diff --git a/include/global.h b/include/global.h
index 1bca4c344..cc8df049f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -25,14 +25,6 @@
 #define INCBIN_S32 {0}
 #endif // IDE support
 
-// Invalid / Out of Bound Placeholder values
-#define INVALID_U8 0xFF
-#define INVALID_U16 0xFFFF
-#define INVALID_U32 0xFFFFFFFF
-#define INVALID_S8 -1
-#define INVALID_S16 -1
-#define INVALID_S32 -1
-
 #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0]))
 
 #define SWAP(a, b, temp)    \
diff --git a/src/apprentice.c b/src/apprentice.c
index faed3756c..ec8fea27b 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -1079,7 +1079,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice)
     u8 i;
 
     for (i = 0; i < 6; i++)
-        apprentice->easyChatWords[i] |= INVALID_U16;
+        apprentice->easyChatWords[i] |= 0xFFFF;
 
     apprentice->playerName[0] = EOS;
     apprentice->id = 16;
@@ -1093,7 +1093,7 @@ void ResetAllApprenticeData(void)
     for (i = 0; i < 4; i++)
     {
         for (j = 0; j < 6; j++)
-            gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= INVALID_U16;
+            gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF;
         gSaveBlock2Ptr->apprentices[i].id = 16;
         gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS;
         gSaveBlock2Ptr->apprentices[i].lvlMode = 0;
@@ -1290,7 +1290,7 @@ static u16 sub_819FF98(u8 arg0)
     else
         level = 60;
 
-    for (j = 0; learnset[j] != INVALID_U16; j++)
+    for (j = 0; learnset[j] != 0xFFFF; j++)
     {
         if ((learnset[j] & 0xFE00) > (level << 9))
             break;
@@ -1393,7 +1393,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
         level = 60;
 
     learnset = gLevelUpLearnsets[species];
-    for (i = 0; learnset[i] != INVALID_U16; i++)
+    for (i = 0; learnset[i] != 0xFFFF; i++)
     {
         if ((learnset[i] & 0xFE00) > (level << 9))
             break;
@@ -2047,172 +2047,172 @@ NAKED
 static void sub_81A1224(void)
 {
     asm_unified("\n\
-                	push {r4-r7,lr}\n\
-	mov r7, r9\n\
-	mov r6, r8\n\
-	push {r6,r7}\n\
-	ldr r1, =gSaveBlock2Ptr\n\
-	ldr r3, [r1]\n\
-	adds r0, r3, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	adds r7, r1, 0\n\
-	cmp r0, 0x2\n\
-	bhi _081A1242\n\
-	b _081A1362\n\
+                    push {r4-r7,lr}\n\
+    mov r7, r9\n\
+    mov r6, r8\n\
+    push {r6,r7}\n\
+    ldr r1, =gSaveBlock2Ptr\n\
+    ldr r3, [r1]\n\
+    adds r0, r3, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    adds r7, r1, 0\n\
+    cmp r0, 0x2\n\
+    bhi _081A1242\n\
+    b _081A1362\n\
 _081A1242:\n\
-	movs r5, 0\n\
-	movs r2, 0\n\
-	adds r0, r3, 0\n\
-	adds r0, 0xB8\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 30\n\
-	ldr r1, =gSpecialVar_0x8005\n\
-	mov r12, r1\n\
-	ldr r1, =gSpecialVar_Result\n\
-	mov r8, r1\n\
-	cmp r0, 0\n\
-	beq _081A127C\n\
-	adds r3, r7, 0\n\
+    movs r5, 0\n\
+    movs r2, 0\n\
+    adds r0, r3, 0\n\
+    adds r0, 0xB8\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 30\n\
+    ldr r1, =gSpecialVar_0x8005\n\
+    mov r12, r1\n\
+    ldr r1, =gSpecialVar_Result\n\
+    mov r8, r1\n\
+    cmp r0, 0\n\
+    beq _081A127C\n\
+    adds r3, r7, 0\n\
 _081A125C:\n\
-	adds r0, r5, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	cmp r2, 0x8\n\
-	bhi _081A127C\n\
-	ldr r0, [r3]\n\
-	lsls r1, r2, 2\n\
-	adds r0, r1\n\
-	adds r0, 0xB8\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 30\n\
-	cmp r0, 0\n\
-	bne _081A125C\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    cmp r2, 0x8\n\
+    bhi _081A127C\n\
+    ldr r0, [r3]\n\
+    lsls r1, r2, 2\n\
+    adds r0, r1\n\
+    adds r0, 0xB8\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 30\n\
+    cmp r0, 0\n\
+    bne _081A125C\n\
 _081A127C:\n\
-	movs r4, 0\n\
-	cmp r4, r5\n\
-	bcs _081A1322\n\
-	ldr r0, [r7]\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	cmp r4, r0\n\
-	bge _081A1322\n\
-	adds r6, r7, 0\n\
-	mov r9, r4\n\
+    movs r4, 0\n\
+    cmp r4, r5\n\
+    bcs _081A1322\n\
+    ldr r0, [r7]\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    cmp r4, r0\n\
+    bge _081A1322\n\
+    adds r6, r7, 0\n\
+    mov r9, r4\n\
 _081A1296:\n\
-	ldr r3, [r6]\n\
-	lsls r0, r4, 2\n\
-	adds r2, r3, r0\n\
-	adds r0, r2, 0\n\
-	adds r0, 0xB8\n\
-	ldrb r1, [r0]\n\
-	lsls r0, r1, 30\n\
-	lsrs r0, 30\n\
-	cmp r0, 0x1\n\
-	bne _081A1308\n\
-	lsrs r0, r1, 6\n\
-	cmp r0, 0\n\
-	beq _081A1308\n\
-	adds r0, r2, 0\n\
-	adds r0, 0xBA\n\
-	ldrh r0, [r0]\n\
-	mov r2, r12\n\
-	ldrh r2, [r2]\n\
-	cmp r0, r2\n\
-	bne _081A1308\n\
-	adds r0, r3, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r0, r3, r0\n\
-	adds r0, 0xB8\n\
-	ldrb r2, [r0]\n\
-	movs r1, 0x3F\n\
-	ands r1, r2\n\
-	strb r1, [r0]\n\
-	ldr r1, [r6]\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r1, r0\n\
-	mov r2, r12\n\
-	ldrh r0, [r2]\n\
-	adds r1, 0xBA\n\
-	strh r0, [r1]\n\
-	mov r1, r9\n\
-	mov r0, r8\n\
-	strh r1, [r0]\n\
-	b _081A1362\n\
-	.pool\n\
+    ldr r3, [r6]\n\
+    lsls r0, r4, 2\n\
+    adds r2, r3, r0\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xB8\n\
+    ldrb r1, [r0]\n\
+    lsls r0, r1, 30\n\
+    lsrs r0, 30\n\
+    cmp r0, 0x1\n\
+    bne _081A1308\n\
+    lsrs r0, r1, 6\n\
+    cmp r0, 0\n\
+    beq _081A1308\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xBA\n\
+    ldrh r0, [r0]\n\
+    mov r2, r12\n\
+    ldrh r2, [r2]\n\
+    cmp r0, r2\n\
+    bne _081A1308\n\
+    adds r0, r3, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r0, r3, r0\n\
+    adds r0, 0xB8\n\
+    ldrb r2, [r0]\n\
+    movs r1, 0x3F\n\
+    ands r1, r2\n\
+    strb r1, [r0]\n\
+    ldr r1, [r6]\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r1, r0\n\
+    mov r2, r12\n\
+    ldrh r0, [r2]\n\
+    adds r1, 0xBA\n\
+    strh r0, [r1]\n\
+    mov r1, r9\n\
+    mov r0, r8\n\
+    strh r1, [r0]\n\
+    b _081A1362\n\
+    .pool\n\
 _081A1308:\n\
-	adds r0, r4, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	cmp r4, r5\n\
-	bcs _081A1322\n\
-	ldr r0, [r6]\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	cmp r4, r0\n\
-	blt _081A1296\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, r5\n\
+    bcs _081A1322\n\
+    ldr r0, [r6]\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    cmp r4, r0\n\
+    blt _081A1296\n\
 _081A1322:\n\
-	ldr r2, [r7]\n\
-	adds r0, r2, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r2, r0\n\
-	adds r2, 0xB8\n\
-	ldrb r1, [r2]\n\
-	movs r0, 0x3F\n\
-	ands r0, r1\n\
-	movs r1, 0x40\n\
-	orrs r0, r1\n\
-	strb r0, [r2]\n\
-	ldr r1, [r7]\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r1, r0\n\
-	mov r2, r12\n\
-	ldrh r0, [r2]\n\
-	adds r1, 0xBA\n\
-	strh r0, [r1]\n\
-	movs r0, 0x1\n\
-	mov r1, r8\n\
-	strh r0, [r1]\n\
+    ldr r2, [r7]\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r2, r0\n\
+    adds r2, 0xB8\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0x3F\n\
+    ands r0, r1\n\
+    movs r1, 0x40\n\
+    orrs r0, r1\n\
+    strb r0, [r2]\n\
+    ldr r1, [r7]\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r1, r0\n\
+    mov r2, r12\n\
+    ldrh r0, [r2]\n\
+    adds r1, 0xBA\n\
+    strh r0, [r1]\n\
+    movs r0, 0x1\n\
+    mov r1, r8\n\
+    strh r0, [r1]\n\
 _081A1362:\n\
-	pop {r3,r4}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
+    pop {r3,r4}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
 ");
 }
 #endif // NONMATCHING
@@ -2236,7 +2236,7 @@ static void sub_81A1370(void)
     }
 
     r10 = 0xFFFF;
-    r9 = INVALID_S32;
+    r9 = -1;
     for (i = 1; i < 4; i++)
     {
         if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId)
diff --git a/src/bard_music.c b/src/bard_music.c
index 4c28233c2..6c2578071 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -54,7 +54,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word)
     for (i = 0; i < 6; i ++)
     {
         sound = &song->sound[i];
-        if (sound->var00 != INVALID_U8)
+        if (sound->var00 != 0xFF)
         {
             song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00];
             song->phonemes[i].pitch = CalcWordPitch(word + 30, i);
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index e6c089b1b..687d81419 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -276,7 +276,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] =
     EFFECT_SUPERPOWER,
     EFFECT_ERUPTION,
     EFFECT_OVERHEAT,
-    INVALID_U16
+    0xFFFF
 };
 
 // code
@@ -463,8 +463,8 @@ static u8 ChooseMoveOrAction_Doubles(void)
     {
         if (i == sBattler_AI || gBattleMons[i].hp == 0)
         {
-            actionOrMoveIndex[i] = INVALID_U8;
-            bestMovePointsForTarget[i] = INVALID_S16    ;
+            actionOrMoveIndex[i] = 0xFF;
+            bestMovePointsForTarget[i] = -1    ;
         }
         else
         {
@@ -530,7 +530,7 @@ static u8 ChooseMoveOrAction_Doubles(void)
                 // Don't use a move against ally if it has less than 100 points.
                 if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100)
                 {
-                    bestMovePointsForTarget[i] = INVALID_S16;
+                    bestMovePointsForTarget[i] = -1;
                     mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match.
                 }
             }
@@ -1003,7 +1003,7 @@ static void BattleAICmd_if_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U8)
+    while (*ptr != 0xFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1019,7 +1019,7 @@ static void BattleAICmd_if_not_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U8)
+    while (*ptr != 0xFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1035,7 +1035,7 @@ static void BattleAICmd_if_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U16)
+    while (*ptr != 0xFFFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1051,7 +1051,7 @@ static void BattleAICmd_if_not_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U16)
+    while (*ptr != 0xFFFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1167,14 +1167,14 @@ static void BattleAICmd_get_how_powerful_move_is(void)
     s32 i, checkedMove;
     s32 moveDmgs[4];
 
-    for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++)
+    for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
     {
         if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i])
             break;
     }
 
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1
-        && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16)
+        && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF)
     {
         gDynamicBasePower = 0;
         *(&gBattleStruct->dynamicMoveType) = 0;
@@ -1184,14 +1184,14 @@ static void BattleAICmd_get_how_powerful_move_is(void)
 
         for (checkedMove = 0; checkedMove < 4; checkedMove++)
         {
-            for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++)
+            for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
             {
                 if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i])
                     break;
             }
 
             if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE
-                && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16
+                && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF
                 && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1)
             {
                 gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove];
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index d6a8e1336..ad25b483c 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -126,7 +126,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         return FALSE;
     if (gLastLandedMoves[gActiveBattler] == 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBattler] == INVALID_U16)
+    if (gLastLandedMoves[gActiveBattler] == 0xFFFF)
         return FALSE;
     if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0)
         return FALSE;
@@ -221,7 +221,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2)
         return FALSE;
 
-    if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == INVALID_U16) && Random() & 1)
+    if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE;
         BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
@@ -331,9 +331,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
 
     if (gLastLandedMoves[gActiveBattler] == 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBattler] == INVALID_U16)
+    if (gLastLandedMoves[gActiveBattler] == 0xFFFF)
         return FALSE;
-    if (gLastHitBy[gActiveBattler] == INVALID_U8)
+    if (gLastHitBy[gActiveBattler] == 0xFF)
         return FALSE;
     if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0)
         return FALSE;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 68ffed834..95c6f7b3c 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1386,54 +1386,54 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
 
 static void (* const sScriptCmdTable[])(void) =
 {
-	ScriptCmd_loadspritegfx,
-	ScriptCmd_unloadspritegfx,
-	ScriptCmd_createsprite,
-	ScriptCmd_createvisualtask,
-	ScriptCmd_delay,
-	ScriptCmd_waitforvisualfinish,
-	ScriptCmd_hang1,
-	ScriptCmd_hang2,
-	ScriptCmd_end,
-	ScriptCmd_playse,
-	ScriptCmd_monbg,
-	ScriptCmd_clearmonbg,
-	ScriptCmd_setalpha,
-	ScriptCmd_blendoff,
-	ScriptCmd_call,
-	ScriptCmd_return,
-	ScriptCmd_setarg,
-	ScriptCmd_choosetwoturnanim,
-	ScriptCmd_jumpifmoveturn,
-	ScriptCmd_goto,
-	ScriptCmd_fadetobg,
-	ScriptCmd_restorebg,
-	ScriptCmd_waitbgfadeout,
-	ScriptCmd_waitbgfadein,
-	ScriptCmd_changebg,
-	ScriptCmd_playsewithpan,
-	ScriptCmd_setpan,
-	ScriptCmd_panse_1B,
-	ScriptCmd_loopsewithpan,
-	ScriptCmd_waitplaysewithpan,
-	ScriptCmd_setbldcnt,
-	ScriptCmd_createsoundtask,
-	ScriptCmd_waitsound,
-	ScriptCmd_jumpargeq,
-	ScriptCmd_monbg_22,
-	ScriptCmd_clearmonbg_23,
-	ScriptCmd_jumpifcontest,
-	ScriptCmd_fadetobgfromset,
-	ScriptCmd_panse_26,
-	ScriptCmd_panse_27,
-	ScriptCmd_monbgprio_28,
-	ScriptCmd_monbgprio_29,
-	ScriptCmd_monbgprio_2A,
-	ScriptCmd_invisible,
-	ScriptCmd_visible,
-	ScriptCmd_doublebattle_2D,
-	ScriptCmd_doublebattle_2E,
-	ScriptCmd_stopsound
+    ScriptCmd_loadspritegfx,
+    ScriptCmd_unloadspritegfx,
+    ScriptCmd_createsprite,
+    ScriptCmd_createvisualtask,
+    ScriptCmd_delay,
+    ScriptCmd_waitforvisualfinish,
+    ScriptCmd_hang1,
+    ScriptCmd_hang2,
+    ScriptCmd_end,
+    ScriptCmd_playse,
+    ScriptCmd_monbg,
+    ScriptCmd_clearmonbg,
+    ScriptCmd_setalpha,
+    ScriptCmd_blendoff,
+    ScriptCmd_call,
+    ScriptCmd_return,
+    ScriptCmd_setarg,
+    ScriptCmd_choosetwoturnanim,
+    ScriptCmd_jumpifmoveturn,
+    ScriptCmd_goto,
+    ScriptCmd_fadetobg,
+    ScriptCmd_restorebg,
+    ScriptCmd_waitbgfadeout,
+    ScriptCmd_waitbgfadein,
+    ScriptCmd_changebg,
+    ScriptCmd_playsewithpan,
+    ScriptCmd_setpan,
+    ScriptCmd_panse_1B,
+    ScriptCmd_loopsewithpan,
+    ScriptCmd_waitplaysewithpan,
+    ScriptCmd_setbldcnt,
+    ScriptCmd_createsoundtask,
+    ScriptCmd_waitsound,
+    ScriptCmd_jumpargeq,
+    ScriptCmd_monbg_22,
+    ScriptCmd_clearmonbg_23,
+    ScriptCmd_jumpifcontest,
+    ScriptCmd_fadetobgfromset,
+    ScriptCmd_panse_26,
+    ScriptCmd_panse_27,
+    ScriptCmd_monbgprio_28,
+    ScriptCmd_monbgprio_29,
+    ScriptCmd_monbgprio_2A,
+    ScriptCmd_invisible,
+    ScriptCmd_visible,
+    ScriptCmd_doublebattle_2D,
+    ScriptCmd_doublebattle_2E,
+    ScriptCmd_stopsound
 };
 
 // code
@@ -1452,14 +1452,14 @@ void ClearBattleAnimationVars(void)
 
     // Clear index array.
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
-        sAnimSpriteIndexArray[i] |= INVALID_U16;
+        sAnimSpriteIndexArray[i] |= 0xFFFF;
 
     // Clear anim args.
     for (i = 0; i < ANIM_ARGS_COUNT; i++)
         gBattleAnimArgs[i] = 0;
 
-    sMonAnimTaskIdArray[0] = INVALID_U8;
-    sMonAnimTaskIdArray[1] = INVALID_U8;
+    sMonAnimTaskIdArray[0] = 0xFF;
+    sMonAnimTaskIdArray[1] = 0xFF;
     gAnimMoveTurn = 0;
     sAnimBackgroundFadeState = 0;
     sAnimMoveIndex = 0;
@@ -1505,19 +1505,19 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
     for (i = 0; i < ANIM_ARGS_COUNT; i++)
         gBattleAnimArgs[i] = 0;
 
-    sMonAnimTaskIdArray[0] = INVALID_U8;
-    sMonAnimTaskIdArray[1] = INVALID_U8;
+    sMonAnimTaskIdArray[0] = 0xFF;
+    sMonAnimTaskIdArray[1] = 0xFF;
     sBattleAnimScriptPtr = animsTable[tableId];
     gAnimScriptActive = TRUE;
     gAnimFramesToWait = 0;
     gAnimScriptCallback = RunAnimScriptCommand;
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
-        sAnimSpriteIndexArray[i] |= INVALID_U16;
+        sAnimSpriteIndexArray[i] |= 0xFFFF;
 
     if (isMoveAnim)
     {
-        for (i = 0; gMovesWithQuietBGM[i] != INVALID_U16; i++)
+        for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++)
         {
             if (tableId == gMovesWithQuietBGM[i])
             {
@@ -1558,7 +1558,7 @@ static void AddSpriteIndex(u16 index)
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
-        if (sAnimSpriteIndexArray[i] == INVALID_U16)
+        if (sAnimSpriteIndexArray[i] == 0xFFFF)
         {
             sAnimSpriteIndexArray[i] = index;
             return;
@@ -1574,7 +1574,7 @@ static void ClearSpriteIndex(u16 index)
     {
         if (sAnimSpriteIndexArray[i] == index)
         {
-            sAnimSpriteIndexArray[i] |= INVALID_U16;
+            sAnimSpriteIndexArray[i] |= 0xFFFF;
             return;
         }
     }
@@ -1712,7 +1712,7 @@ static void ScriptCmd_delay(void)
     sBattleAnimScriptPtr++;
     gAnimFramesToWait = sBattleAnimScriptPtr[0];
     if (gAnimFramesToWait == 0)
-        gAnimFramesToWait = INVALID_S8;
+        gAnimFramesToWait = -1;
     sBattleAnimScriptPtr++;
     gAnimScriptCallback = WaitAnimFrameCount;
 }
@@ -1746,7 +1746,7 @@ static void ScriptCmd_end(void)
 
     // Keep waiting as long as there are animations to be done.
     if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0
-     || sMonAnimTaskIdArray[0] != INVALID_U8 || sMonAnimTaskIdArray[1] != INVALID_U8)
+     || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF)
     {
         sSoundAnimFramesToWait = 0;
         gAnimFramesToWait = 1;
@@ -1773,11 +1773,11 @@ static void ScriptCmd_end(void)
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
-        if (sAnimSpriteIndexArray[i] != INVALID_U16)
+        if (sAnimSpriteIndexArray[i] != 0xFFFF)
         {
             FreeSpriteTilesByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag);
             FreeSpritePaletteByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag);
-            sAnimSpriteIndexArray[i] |= INVALID_U16; // set terminator.
+            sAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator.
         }
     }
 
@@ -2122,9 +2122,9 @@ static void ScriptCmd_clearmonbg(void)
     else
         battlerId = gBattleAnimTarget;
 
-    if (sMonAnimTaskIdArray[0] != INVALID_U8)
+    if (sMonAnimTaskIdArray[0] != 0xFF)
         gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE;
-    if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != INVALID_U8)
+    if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF)
         gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE;
     else
         animBattlerId = 0;
@@ -2148,17 +2148,17 @@ static void sub_80A4980(u8 taskId)
         else
             to_BG2 = TRUE;
 
-        if (sMonAnimTaskIdArray[0] != INVALID_U8)
+        if (sMonAnimTaskIdArray[0] != 0xFF)
         {
             sub_80A477C(to_BG2);
             DestroyTask(sMonAnimTaskIdArray[0]);
-            sMonAnimTaskIdArray[0] = INVALID_U8;
+            sMonAnimTaskIdArray[0] = 0xFF;
         }
         if (gTasks[taskId].data[0] > 1)
         {
             sub_80A477C(to_BG2 ^ 1);
             DestroyTask(sMonAnimTaskIdArray[1]);
-            sMonAnimTaskIdArray[1] = INVALID_U8;
+            sMonAnimTaskIdArray[1] = 0xFF;
         }
         DestroyTask(taskId);
     }
@@ -2421,7 +2421,7 @@ static void Task_FadeToBg(u8 taskId)
     {
         s16 bgId = gTasks[taskId].tBackgroundId;
 
-        if (bgId == INVALID_S16)
+        if (bgId == -1)
             LoadDefaultBg();
         else
             LoadMoveBg(bgId);
@@ -2477,7 +2477,7 @@ static void ScriptCmd_restorebg(void)
 
     sBattleAnimScriptPtr++;
     taskId = CreateTask(Task_FadeToBg, 5);
-    gTasks[taskId].tBackgroundId = INVALID_S16;
+    gTasks[taskId].tBackgroundId = -1;
     sAnimBackgroundFadeState = 1;
 }
 
@@ -3001,7 +3001,7 @@ static void ScriptCmd_invisible(void)
     u8 spriteId;
 
     spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
-    if (spriteId != INVALID_U8)
+    if (spriteId != 0xFF)
         gSprites[spriteId].invisible = TRUE;
 
     sBattleAnimScriptPtr += 2;
@@ -3012,7 +3012,7 @@ static void ScriptCmd_visible(void)
     u8 spriteId;
 
     spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
-    if (spriteId != INVALID_U8)
+    if (spriteId != 0xFF)
         gSprites[spriteId].invisible = FALSE;
 
     sBattleAnimScriptPtr += 2;
@@ -3039,7 +3039,7 @@ static void ScriptCmd_doublebattle_2D(void)
             r4 = sub_80A8364(gBattleAnimTarget);
             spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
-        if (spriteId != INVALID_U8)
+        if (spriteId != 0xFF)
         {
             gSprites[spriteId].invisible = FALSE;
             if (r4 == 2)
@@ -3075,7 +3075,7 @@ static void ScriptCmd_doublebattle_2E(void)
             spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
 
-        if (spriteId != INVALID_U8 && r4 == 2)
+        if (spriteId != 0xFF && r4 == 2)
             gSprites[spriteId].oam.priority = 2;
     }
 }
diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c
index 1a2c279ec..8ba1a8222 100644
--- a/src/battle_anim_80A5C6C.c
+++ b/src/battle_anim_80A5C6C.c
@@ -1590,7 +1590,7 @@ s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 whichBattler)
             }
         }
     }
-    return INVALID_S16;
+    return -1;
 }
 
 void obj_delete_but_dont_free_vram(struct Sprite *sprite)
diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c
index c329a134d..f1245a032 100644
--- a/src/battle_anim_80A9C70.c
+++ b/src/battle_anim_80A9C70.c
@@ -183,7 +183,7 @@ void sub_80A9EF4(u8 taskId)
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
     spriteId = CreateSprite(&gUnknown_0853EF48, x, y, 4);
-    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == INVALID_U16)
+    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF)
         gSprites[spriteId].invisible = TRUE;
     SetSubspriteTables(&gSprites[spriteId], gUnknown_0853EF40);
     gTasks[taskId].data[15] = spriteId;
@@ -315,10 +315,10 @@ void AnimTask_StatsChange(u8 taskId)
     CASE(MINUS2, STAT_ACC):     goesDown = TRUE;   animStatId = 2;     sharply = TRUE;   break;
     CASE(MINUS2, STAT_EVASION): goesDown = TRUE;   animStatId = 4;     sharply = TRUE;   break;
 
-    case STAT_ANIM_MULTIPLE_PLUS1:  goesDown = FALSE;  animStatId = INVALID_U8;  sharply = FALSE;  break;
-    case STAT_ANIM_MULTIPLE_PLUS2:  goesDown = FALSE;  animStatId = INVALID_U8;  sharply = TRUE;   break;
-    case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE;   animStatId = INVALID_U8;  sharply = FALSE;  break;
-    case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE;   animStatId = INVALID_U8;  sharply = TRUE;   break;
+    case STAT_ANIM_MULTIPLE_PLUS1:  goesDown = FALSE;  animStatId = 0xFF;  sharply = FALSE;  break;
+    case STAT_ANIM_MULTIPLE_PLUS2:  goesDown = FALSE;  animStatId = 0xFF;  sharply = TRUE;   break;
+    case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE;   animStatId = 0xFF;  sharply = FALSE;  break;
+    case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE;   animStatId = 0xFF;  sharply = TRUE;   break;
 
     default:
         DestroyAnimVisualTask(taskId);
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index 36738d36e..e5f0cd165 100644
--- a/src/battle_anim_sound_tasks.c
+++ b/src/battle_anim_sound_tasks.c
@@ -214,7 +214,7 @@ void sub_8158E9C(u8 taskId)
 
     if (species != SPECIES_NONE)
     {
-        if (gBattleAnimArgs[1] == INVALID_U8)
+        if (gBattleAnimArgs[1] == 0xFF)
             PlayCry3(species, pan, 9);
         else
             PlayCry3(species, pan, 7);
@@ -238,7 +238,7 @@ static void sub_8158FF4(u8 taskId)
     }
     else
     {
-        if (gTasks[taskId].data[0] == INVALID_U8)
+        if (gTasks[taskId].data[0] == 0xFF)
         {
             if (!IsCryPlaying())
             {
@@ -389,50 +389,50 @@ void sub_8159308(u8 taskId)
 NAKED
 void sub_8159308(u8 taskId)
 {
-    asm_unified("	push {r4,r5,lr}\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r5, r0, 0\n\
-	ldr r1, =gTasks\n\
-	lsls r0, r5, 2\n\
-	adds r0, r5\n\
-	lsls r0, 3\n\
-	adds r4, r0, r1\n\
-	ldrh r2, [r4, 0xE]\n\
-	ldrh r0, [r4, 0x1C]\n\
-	adds r1, r0, 0x1\n\
-	strh r1, [r4, 0x1C]\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r1, [r4, r3]\n\
-	cmp r0, r1\n\
-	bne _08159342\n\
-	movs r0, 0\n\
-	strh r0, [r4, 0x1C]\n\
-	ldrh r1, [r4, 0x1E]\n\
-	adds r0, r2, r1\n\
-	strh r0, [r4, 0x1E]\n\
-	movs r2, 0x1E\n\
-	ldrsh r0, [r4, r2]\n\
-	bl KeepPanInRange\n\
-	strh r0, [r4, 0x1E]\n\
+    asm_unified("    push {r4,r5,lr}\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r5, r0, 0\n\
+    ldr r1, =gTasks\n\
+    lsls r0, r5, 2\n\
+    adds r0, r5\n\
+    lsls r0, 3\n\
+    adds r4, r0, r1\n\
+    ldrh r2, [r4, 0xE]\n\
+    ldrh r0, [r4, 0x1C]\n\
+    adds r1, r0, 0x1\n\
+    strh r1, [r4, 0x1C]\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    movs r3, 0x12\n\
+    ldrsh r1, [r4, r3]\n\
+    cmp r0, r1\n\
+    bne _08159342\n\
+    movs r0, 0\n\
+    strh r0, [r4, 0x1C]\n\
+    ldrh r1, [r4, 0x1E]\n\
+    adds r0, r2, r1\n\
+    strh r0, [r4, 0x1E]\n\
+    movs r2, 0x1E\n\
+    ldrsh r0, [r4, r2]\n\
+    bl KeepPanInRange\n\
+    strh r0, [r4, 0x1E]\n\
 _08159342:\n\
-	ldr r1, =gUnknown_02038440\n\
-	ldrh r0, [r4, 0x1E]\n\
-	strb r0, [r1]\n\
-	movs r3, 0x1E\n\
-	ldrsh r1, [r4, r3]\n\
-	movs r2, 0xC\n\
-	ldrsh r0, [r4, r2]\n\
-	cmp r1, r0\n\
-	bne _0815935A\n\
-	adds r0, r5, 0\n\
-	bl DestroyAnimVisualTask\n\
+    ldr r1, =gUnknown_02038440\n\
+    ldrh r0, [r4, 0x1E]\n\
+    strb r0, [r1]\n\
+    movs r3, 0x1E\n\
+    ldrsh r1, [r4, r3]\n\
+    movs r2, 0xC\n\
+    ldrsh r0, [r4, r2]\n\
+    cmp r1, r0\n\
+    bne _0815935A\n\
+    adds r0, r5, 0\n\
+    bl DestroyAnimVisualTask\n\
 _0815935A:\n\
-	pop {r4,r5}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    pop {r4,r5}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 #endif
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index 5ed30ddc0..c3d0fe90f 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -82,7 +82,7 @@ void sub_8116664(u8 taskId)
         animBattlers[1] = gBattleAnimTarget;
         break;
     case 5:
-        animBattlers[0] = INVALID_U8;
+        animBattlers[0] = 0xFF;
         break;
     case 6:
         selectedPalettes = 0;
diff --git a/src/battle_arena.c b/src/battle_arena.c
index 591fc82b9..cd2c976da 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -449,7 +449,7 @@ static const union AnimCmd *const sSpriteAnimTable_8611F4C[] =
 static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon =
 {
     .tileTag = 0x3E8,
-    .paletteTag = INVALID_U16,
+    .paletteTag = 0xFFFF,
     .oam = &sOamData_8611F24,
     .anims = sSpriteAnimTable_8611F4C,
     .images = NULL,
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index d65c61884..8cbc62aab 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -212,7 +212,7 @@ static void sub_8064470(void)
 
 static void sub_80644D8(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         LinkOpponentBufferExecCompleted();
@@ -395,7 +395,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 8bbbcbfd1..0cd15f39e 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -203,7 +203,7 @@ static void sub_814AF54(void)
 
 static void sub_814AFBC(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         LinkPartnerBufferExecCompleted();
@@ -279,7 +279,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 0aeb24c32..c057e8575 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -220,7 +220,7 @@ static void sub_805F240(void)
 
 static void sub_805F2A8(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         OpponentBufferExecCompleted();
@@ -389,7 +389,7 @@ static void CompleteOnHealthbarDone(void)
 {
     s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 3053e6c37..2bd5ef365 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused
         PlaySE(SE_SELECT);
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 0x140;
-        var = INVALID_U8;
+        var = 0xFF;
     }
     if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1)
     {
@@ -936,7 +936,7 @@ static void sub_80588B4(void)
 
 static void sub_8058924(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         PlayerBufferExecCompleted();
@@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
@@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId)
 
         newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0);
         SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]);
-        if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points.
+        if (newExpPoints == -1) // The bar has been filled with given exp points.
         {
             u8 level;
             s32 currExp;
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 775b7676f..02dd1383b 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -218,7 +218,7 @@ static void sub_81BAE98(void)
 
 static void sub_81BAF00(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         PlayerPartnerBufferExecCompleted();
@@ -294,7 +294,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
@@ -397,7 +397,7 @@ static void sub_81BB4E4(u8 taskId)
 
         r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0);
         SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]);
-        if (r4 == INVALID_S16)
+        if (r4 == -1)
         {
             u8 level;
             s32 currExp;
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 842facd44..0cf3634dc 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -213,7 +213,7 @@ static void sub_81865C8(void)
 
 static void sub_8186630(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         RecordedOpponentBufferExecCompleted();
@@ -377,7 +377,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 60bec78b1..4d7fdc01e 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -202,7 +202,7 @@ static void sub_81899F0(void)
 
 static void sub_8189A58(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         RecordedPlayerBufferExecCompleted();
@@ -360,7 +360,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 9078ef577..5d87c4f90 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -348,7 +348,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index e24549d82..a6d6e9294 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -51,7 +51,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         gBattlerControllerFuncs[i] = nullsub_21;
-        gBattlerPositions[i] = INVALID_U8;
+        gBattlerPositions[i] = 0xFF;
         gActionSelectionCursor[i] = 0;
         gMoveSelectionCursor[i] = 0;
     }
diff --git a/src/battle_dome.c b/src/battle_dome.c
index f03de7505..29b41c5db 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -256,361 +256,361 @@ static EWRAM_DATA u8 *sTilemapBuffer = NULL;
 // Const rom data.
 static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] =
 {
-	[MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_KARATE_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_DOUBLE_SLAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_COMET_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_MEGA_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_PAY_DAY] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_FIRE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_ICE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_THUNDER_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SCRATCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_VICE_GRIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_GUILLOTINE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_RAZOR_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SWORDS_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0},
-	[MOVE_CUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_GUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_WING_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_WHIRLWIND] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FLY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BIND] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_VINE_WHIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_STOMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_DOUBLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_MEGA_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROLLING_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SAND_ATTACK] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_HEADBUTT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_HORN_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FURY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_HORN_DRILL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BODY_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_WRAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_TAKE_DOWN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_THRASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_DOUBLE_EDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TAIL_WHIP] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_POISON_STING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_TWINEEDLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_PIN_MISSILE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_LEER] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_BITE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_GROWL] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROAR] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SING] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SUPERSONIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SONIC_BOOM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_DISABLE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ACID] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_EMBER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_FLAMETHROWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
-	[MOVE_MIST] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_WATER_GUN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_HYDRO_PUMP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0},
-	[MOVE_SURF] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0},
-	[MOVE_ICE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
-	[MOVE_BLIZZARD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1},
-	[MOVE_PSYBEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_BUBBLE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_AURORA_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_HYPER_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0},
-	[MOVE_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_DRILL_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SUBMISSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_LOW_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_COUNTER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0},
-	[MOVE_SEISMIC_TOSS] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_STRENGTH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ABSORB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_MEGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_LEECH_SEED] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_GROWTH] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_RAZOR_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SOLAR_BEAM] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0},
-	[MOVE_POISON_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_STUN_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SLEEP_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_PETAL_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_STRING_SHOT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_DRAGON_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FIRE_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_THUNDER_SHOCK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_THUNDERBOLT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
-	[MOVE_THUNDER_WAVE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_THUNDER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
-	[MOVE_ROCK_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_EARTHQUAKE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0},
-	[MOVE_FISSURE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0},
-	[MOVE_DIG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TOXIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_CONFUSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_PSYCHIC] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
-	[MOVE_HYPNOSIS] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_MEDITATE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_AGILITY] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_QUICK_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TELEPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_NIGHT_SHADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_MIMIC] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SCREECH] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_DOUBLE_TEAM] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_RECOVER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_HARDEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_MINIMIZE] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SMOKESCREEN] = {0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CONFUSE_RAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_WITHDRAW] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_DEFENSE_CURL] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BARRIER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_LIGHT_SCREEN] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_HAZE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_REFLECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_FOCUS_ENERGY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BIDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_METRONOME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
-	[MOVE_MIRROR_MOVE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
-	[MOVE_SELF_DESTRUCT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
-	[MOVE_EGG_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
-	[MOVE_LICK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SMOG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SLUDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_BONE_CLUB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_FIRE_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
-	[MOVE_WATERFALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CLAMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SWIFT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SKULL_BASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
-	[MOVE_SPIKE_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CONSTRICT] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_AMNESIA] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_KINESIS] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SOFT_BOILED] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_HI_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_GLARE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_DREAM_EATER] = {1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0},
-	[MOVE_POISON_GAS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BARRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_LEECH_LIFE] = {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_LOVELY_KISS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SKY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
-	[MOVE_TRANSFORM] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BUBBLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_DIZZY_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FLASH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_PSYWAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SPLASH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ACID_ARMOR] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_CRABHAMMER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0},
-	[MOVE_EXPLOSION] = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0},
-	[MOVE_FURY_SWIPES] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BONEMERANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_REST] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROCK_SLIDE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_HYPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SHARPEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_CONVERSION] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_TRI_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SUPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SLASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SUBSTITUTE] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_STRUGGLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_SKETCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0},
-	[MOVE_TRIPLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_THIEF] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SPIDER_WEB] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_MIND_READER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_NIGHTMARE] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FLAME_WHEEL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SNORE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_CURSE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_FLAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CONVERSION_2] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_AEROBLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
-	[MOVE_COTTON_SPORE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_REVERSAL] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SPITE] = {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_POWDER_SNOW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_PROTECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0},
-	[MOVE_MACH_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SCARY_FACE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_FAINT_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SWEET_KISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BELLY_DRUM] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SLUDGE_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1},
-	[MOVE_MUD_SLAP] = {0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_OCTAZOOKA] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SPIKES] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ZAP_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1},
-	[MOVE_FORESIGHT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_DESTINY_BOND] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_PERISH_SONG] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_ICY_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_DETECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_BONE_RUSH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_LOCK_ON] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_OUTRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1},
-	[MOVE_SANDSTORM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_GIGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_ENDURE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_CHARM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROLLOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_FALSE_SWIPE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SWAGGER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_MILK_DRINK] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SPARK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_FURY_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_STEEL_WING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_MEAN_LOOK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_ATTRACT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SLEEP_TALK] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
-	[MOVE_HEAL_BELL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_RETURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_PRESENT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0},
-	[MOVE_FRUSTRATION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SAFEGUARD] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_PAIN_SPLIT] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SACRED_FIRE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1},
-	[MOVE_MAGNITUDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_DYNAMIC_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1},
-	[MOVE_MEGAHORN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0},
-	[MOVE_DRAGON_BREATH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_BATON_PASS] = {1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ENCORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_PURSUIT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_RAPID_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SWEET_SCENT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_IRON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1},
-	[MOVE_METAL_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_VITAL_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_MORNING_SUN] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_SYNTHESIS] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_MOONLIGHT] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_HIDDEN_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CROSS_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0},
-	[MOVE_TWISTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_RAIN_DANCE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_SUNNY_DAY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_CRUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_MIRROR_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_PSYCH_UP] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_EXTREME_SPEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_ANCIENT_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1},
-	[MOVE_SHADOW_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_FUTURE_SIGHT] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROCK_SMASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_WHIRLPOOL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_BEAT_UP] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FAKE_OUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_UPROAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_STOCKPILE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SPIT_UP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
-	[MOVE_SWALLOW] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_HEAT_WAVE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1},
-	[MOVE_HAIL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_TORMENT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FLATTER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_WILL_O_WISP] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_MEMENTO] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FACADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FOCUS_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
-	[MOVE_SMELLING_SALT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FOLLOW_ME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_NATURE_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_CHARGE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TAUNT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_HELPING_HAND] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TRICK] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROLE_PLAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_WISH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ASSIST] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
-	[MOVE_INGRAIN] = {1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_SUPERPOWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0},
-	[MOVE_MAGIC_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0},
-	[MOVE_RECYCLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_REVENGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0},
-	[MOVE_BRICK_BREAK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_YAWN] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_KNOCK_OFF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_ENDEAVOR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_ERUPTION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
-	[MOVE_SKILL_SWAP] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_IMPRISON] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
-	[MOVE_REFRESH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_GRUDGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_SNATCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
-	[MOVE_SECRET_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_DIVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ARM_THRUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CAMOUFLAGE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TAIL_GLOW] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_LUSTER_PURGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
-	[MOVE_MIST_BALL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
-	[MOVE_FEATHER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_TEETER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_BLAZE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_MUD_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ICE_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_NEEDLE_ARM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SLACK_OFF] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_HYPER_VOICE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
-	[MOVE_POISON_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_CRUSH_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_BLAST_BURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
-	[MOVE_HYDRO_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
-	[MOVE_METEOR_MASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
-	[MOVE_ASTONISH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_WEATHER_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_AROMATHERAPY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-	[MOVE_FAKE_TEARS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_AIR_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_OVERHEAT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1},
-	[MOVE_ODOR_SLEUTH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROCK_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SILVER_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1},
-	[MOVE_METAL_SOUND] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_GRASS_WHISTLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_TICKLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_COSMIC_POWER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_WATER_SPOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
-	[MOVE_SIGNAL_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SHADOW_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_EXTRASENSORY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_SKY_UPPERCUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SAND_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_SHEER_COLD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0},
-	[MOVE_MUDDY_WATER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1},
-	[MOVE_BULLET_SEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_AERIAL_ACE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ICICLE_SPEAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_IRON_DEFENSE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BLOCK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-	[MOVE_HOWL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_DRAGON_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_FRENZY_PLANT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
-	[MOVE_BULK_UP] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_BOUNCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1},
-	[MOVE_MUD_SHOT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
-	[MOVE_POISON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_COVET] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_VOLT_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0},
-	[MOVE_MAGICAL_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_WATER_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_CALM_MIND] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_LEAF_BLADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
-	[MOVE_DRAGON_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_ROCK_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_SHOCK_WAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
-	[MOVE_WATER_PULSE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
-	[MOVE_DOOM_DESIRE] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
-	[MOVE_PSYCHO_BOOST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
+    [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_KARATE_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_DOUBLE_SLAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_COMET_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_MEGA_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_PAY_DAY] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_FIRE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_ICE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_THUNDER_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SCRATCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_VICE_GRIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_GUILLOTINE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_RAZOR_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SWORDS_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0},
+    [MOVE_CUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_GUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_WING_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_WHIRLWIND] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FLY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BIND] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_VINE_WHIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_STOMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_DOUBLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_MEGA_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROLLING_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SAND_ATTACK] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_HEADBUTT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_HORN_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FURY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_HORN_DRILL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BODY_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_WRAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_TAKE_DOWN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_THRASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_DOUBLE_EDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TAIL_WHIP] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_POISON_STING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_TWINEEDLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_PIN_MISSILE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_LEER] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_BITE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_GROWL] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROAR] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SING] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SUPERSONIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SONIC_BOOM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_DISABLE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ACID] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_EMBER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_FLAMETHROWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
+    [MOVE_MIST] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_WATER_GUN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_HYDRO_PUMP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0},
+    [MOVE_SURF] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0},
+    [MOVE_ICE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
+    [MOVE_BLIZZARD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1},
+    [MOVE_PSYBEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_BUBBLE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_AURORA_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_HYPER_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0},
+    [MOVE_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_DRILL_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SUBMISSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_LOW_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_COUNTER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0},
+    [MOVE_SEISMIC_TOSS] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_STRENGTH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ABSORB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_MEGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_LEECH_SEED] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_GROWTH] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_RAZOR_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SOLAR_BEAM] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0},
+    [MOVE_POISON_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_STUN_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SLEEP_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_PETAL_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_STRING_SHOT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_DRAGON_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FIRE_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_THUNDER_SHOCK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_THUNDERBOLT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
+    [MOVE_THUNDER_WAVE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_THUNDER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
+    [MOVE_ROCK_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_EARTHQUAKE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0},
+    [MOVE_FISSURE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0},
+    [MOVE_DIG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TOXIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_CONFUSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_PSYCHIC] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1},
+    [MOVE_HYPNOSIS] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_MEDITATE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_AGILITY] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_QUICK_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TELEPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_NIGHT_SHADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_MIMIC] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SCREECH] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_DOUBLE_TEAM] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_RECOVER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_HARDEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_MINIMIZE] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SMOKESCREEN] = {0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CONFUSE_RAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_WITHDRAW] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_DEFENSE_CURL] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BARRIER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_LIGHT_SCREEN] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_HAZE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_REFLECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_FOCUS_ENERGY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BIDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_METRONOME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
+    [MOVE_MIRROR_MOVE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
+    [MOVE_SELF_DESTRUCT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+    [MOVE_EGG_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
+    [MOVE_LICK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SMOG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SLUDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_BONE_CLUB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_FIRE_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
+    [MOVE_WATERFALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CLAMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SWIFT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SKULL_BASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
+    [MOVE_SPIKE_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CONSTRICT] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_AMNESIA] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_KINESIS] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SOFT_BOILED] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_HI_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_GLARE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_DREAM_EATER] = {1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0},
+    [MOVE_POISON_GAS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BARRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_LEECH_LIFE] = {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_LOVELY_KISS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SKY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
+    [MOVE_TRANSFORM] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BUBBLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_DIZZY_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FLASH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_PSYWAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SPLASH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ACID_ARMOR] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_CRABHAMMER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0},
+    [MOVE_EXPLOSION] = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0},
+    [MOVE_FURY_SWIPES] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BONEMERANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_REST] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROCK_SLIDE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_HYPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SHARPEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_CONVERSION] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_TRI_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SUPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SLASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SUBSTITUTE] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_STRUGGLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_SKETCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0},
+    [MOVE_TRIPLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_THIEF] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SPIDER_WEB] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_MIND_READER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_NIGHTMARE] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FLAME_WHEEL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SNORE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_CURSE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_FLAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CONVERSION_2] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_AEROBLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+    [MOVE_COTTON_SPORE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_REVERSAL] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SPITE] = {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_POWDER_SNOW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_PROTECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0},
+    [MOVE_MACH_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SCARY_FACE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_FAINT_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SWEET_KISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BELLY_DRUM] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SLUDGE_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1},
+    [MOVE_MUD_SLAP] = {0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_OCTAZOOKA] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SPIKES] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ZAP_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1},
+    [MOVE_FORESIGHT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_DESTINY_BOND] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_PERISH_SONG] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_ICY_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_DETECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_BONE_RUSH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_LOCK_ON] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_OUTRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1},
+    [MOVE_SANDSTORM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_GIGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_ENDURE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_CHARM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROLLOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_FALSE_SWIPE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SWAGGER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_MILK_DRINK] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SPARK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_FURY_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_STEEL_WING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_MEAN_LOOK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_ATTRACT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SLEEP_TALK] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
+    [MOVE_HEAL_BELL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_RETURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_PRESENT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0},
+    [MOVE_FRUSTRATION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SAFEGUARD] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_PAIN_SPLIT] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SACRED_FIRE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1},
+    [MOVE_MAGNITUDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_DYNAMIC_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1},
+    [MOVE_MEGAHORN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0},
+    [MOVE_DRAGON_BREATH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_BATON_PASS] = {1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ENCORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_PURSUIT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_RAPID_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SWEET_SCENT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_IRON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1},
+    [MOVE_METAL_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_VITAL_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_MORNING_SUN] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_SYNTHESIS] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_MOONLIGHT] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_HIDDEN_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CROSS_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0},
+    [MOVE_TWISTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_RAIN_DANCE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_SUNNY_DAY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_CRUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_MIRROR_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_PSYCH_UP] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_EXTREME_SPEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_ANCIENT_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1},
+    [MOVE_SHADOW_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_FUTURE_SIGHT] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROCK_SMASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_WHIRLPOOL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_BEAT_UP] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FAKE_OUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_UPROAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_STOCKPILE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SPIT_UP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
+    [MOVE_SWALLOW] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_HEAT_WAVE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1},
+    [MOVE_HAIL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_TORMENT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FLATTER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_WILL_O_WISP] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_MEMENTO] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FACADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FOCUS_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
+    [MOVE_SMELLING_SALT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FOLLOW_ME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_NATURE_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_CHARGE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TAUNT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_HELPING_HAND] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TRICK] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROLE_PLAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_WISH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ASSIST] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
+    [MOVE_INGRAIN] = {1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_SUPERPOWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0},
+    [MOVE_MAGIC_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0},
+    [MOVE_RECYCLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_REVENGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0},
+    [MOVE_BRICK_BREAK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_YAWN] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_KNOCK_OFF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_ENDEAVOR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_ERUPTION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+    [MOVE_SKILL_SWAP] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_IMPRISON] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
+    [MOVE_REFRESH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_GRUDGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_SNATCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0},
+    [MOVE_SECRET_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_DIVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ARM_THRUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CAMOUFLAGE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TAIL_GLOW] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_LUSTER_PURGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
+    [MOVE_MIST_BALL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
+    [MOVE_FEATHER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_TEETER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_BLAZE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_MUD_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ICE_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_NEEDLE_ARM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SLACK_OFF] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_HYPER_VOICE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0},
+    [MOVE_POISON_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_CRUSH_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_BLAST_BURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+    [MOVE_HYDRO_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+    [MOVE_METEOR_MASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
+    [MOVE_ASTONISH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_WEATHER_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_AROMATHERAPY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+    [MOVE_FAKE_TEARS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_AIR_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_OVERHEAT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1},
+    [MOVE_ODOR_SLEUTH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROCK_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SILVER_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1},
+    [MOVE_METAL_SOUND] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_GRASS_WHISTLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_TICKLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_COSMIC_POWER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_WATER_SPOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+    [MOVE_SIGNAL_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SHADOW_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_EXTRASENSORY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_SKY_UPPERCUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SAND_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_SHEER_COLD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0},
+    [MOVE_MUDDY_WATER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1},
+    [MOVE_BULLET_SEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_AERIAL_ACE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ICICLE_SPEAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_IRON_DEFENSE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BLOCK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+    [MOVE_HOWL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_DRAGON_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_FRENZY_PLANT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+    [MOVE_BULK_UP] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_BOUNCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1},
+    [MOVE_MUD_SHOT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},
+    [MOVE_POISON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_COVET] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_VOLT_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0},
+    [MOVE_MAGICAL_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_WATER_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_CALM_MIND] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_LEAF_BLADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0},
+    [MOVE_DRAGON_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_ROCK_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_SHOCK_WAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0},
+    [MOVE_WATER_PULSE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1},
+    [MOVE_DOOM_DESIRE] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+    [MOVE_PSYCHO_BOOST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
 };
 
 static const u8 gUnknown_0860C988[][DOME_TOURNAMENT_TRAINERS_COUNT] =
@@ -3032,7 +3032,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2)
     s32 i = 0;
     s32 typePower = TYPE_x1;
 
-    if (move == MOVE_NONE || move == INVALID_U16 || gBattleMoves[move].power == 0)
+    if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0)
         return 0;
 
     defType1 = gBaseStats[targetSpecies].type1;
@@ -3148,239 +3148,239 @@ NAKED
 static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2)
 {
     asm_unified("\n\
-	push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x8\n\
-	adds r3, r0, 0\n\
-	adds r4, r1, 0\n\
-	str r2, [sp]\n\
-	movs r6, 0\n\
-	movs r2, 0x14\n\
-	cmp r3, 0\n\
-	beq _0818FFF0\n\
-	ldr r0, =0x0000ffff\n\
-	cmp r3, r0\n\
-	beq _0818FFF0\n\
-	ldr r0, =gBattleMoves\n\
-	lsls r1, r3, 1\n\
-	adds r1, r3\n\
-	lsls r1, 2\n\
-	adds r3, r1, r0\n\
-	ldrb r0, [r3, 0x1]\n\
-	cmp r0, 0\n\
-	bne _0818FFFC\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x8\n\
+    adds r3, r0, 0\n\
+    adds r4, r1, 0\n\
+    str r2, [sp]\n\
+    movs r6, 0\n\
+    movs r2, 0x14\n\
+    cmp r3, 0\n\
+    beq _0818FFF0\n\
+    ldr r0, =0x0000ffff\n\
+    cmp r3, r0\n\
+    beq _0818FFF0\n\
+    ldr r0, =gBattleMoves\n\
+    lsls r1, r3, 1\n\
+    adds r1, r3\n\
+    lsls r1, 2\n\
+    adds r3, r1, r0\n\
+    ldrb r0, [r3, 0x1]\n\
+    cmp r0, 0\n\
+    bne _0818FFFC\n\
 _0818FFF0:\n\
-	movs r0, 0\n\
-	b _08190156\n\
-	.pool\n\
+    movs r0, 0\n\
+    b _08190156\n\
+    .pool\n\
 _0818FFFC:\n\
-	ldr r1, =gBaseStats\n\
-	lsls r0, r4, 3\n\
-	subs r0, r4\n\
-	lsls r0, 2\n\
-	adds r0, r1\n\
-	ldrb r1, [r0, 0x6]\n\
-	mov r10, r1\n\
-	ldrb r1, [r0, 0x7]\n\
-	mov r9, r1\n\
-	ldrb r0, [r0, 0x16]\n\
-	mov r8, r0\n\
-	ldrb r3, [r3, 0x2]\n\
-	str r3, [sp, 0x4]\n\
-	cmp r0, 0x1A\n\
-	bne _0819002C\n\
-	cmp r3, 0x4\n\
-	bne _0819002C\n\
-	ldr r0, [sp]\n\
-	cmp r0, 0x1\n\
-	bne _081900AA\n\
-	movs r2, 0x8\n\
-	b _081900A4\n\
-	.pool\n\
+    ldr r1, =gBaseStats\n\
+    lsls r0, r4, 3\n\
+    subs r0, r4\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldrb r1, [r0, 0x6]\n\
+    mov r10, r1\n\
+    ldrb r1, [r0, 0x7]\n\
+    mov r9, r1\n\
+    ldrb r0, [r0, 0x16]\n\
+    mov r8, r0\n\
+    ldrb r3, [r3, 0x2]\n\
+    str r3, [sp, 0x4]\n\
+    cmp r0, 0x1A\n\
+    bne _0819002C\n\
+    cmp r3, 0x4\n\
+    bne _0819002C\n\
+    ldr r0, [sp]\n\
+    cmp r0, 0x1\n\
+    bne _081900AA\n\
+    movs r2, 0x8\n\
+    b _081900A4\n\
+    .pool\n\
 _0819002C:\n\
-	ldr r0, =gTypeEffectiveness\n\
-	adds r1, r6, r0\n\
-	ldrb r0, [r1]\n\
-	ldr r7, =gTypeEffectiveness\n\
-	cmp r0, 0xFF\n\
-	beq _081900A4\n\
-	adds r4, r1, 0\n\
+    ldr r0, =gTypeEffectiveness\n\
+    adds r1, r6, r0\n\
+    ldrb r0, [r1]\n\
+    ldr r7, =gTypeEffectiveness\n\
+    cmp r0, 0xFF\n\
+    beq _081900A4\n\
+    adds r4, r1, 0\n\
 _0819003A:\n\
-	ldrb r0, [r4]\n\
-	cmp r0, 0xFE\n\
-	beq _08190096\n\
-	ldrb r0, [r4]\n\
-	ldr r1, [sp, 0x4]\n\
-	cmp r0, r1\n\
-	bne _08190096\n\
-	ldrb r0, [r4, 0x1]\n\
-	adds r5, r6, 0x1\n\
-	cmp r0, r10\n\
-	bne _0819006C\n\
-	adds r1, r6, 0x2\n\
-	mov r0, r8\n\
-	cmp r0, 0x19\n\
-	bne _0819005E\n\
-	ldrb r0, [r4, 0x2]\n\
-	cmp r0, 0x28\n\
-	bne _0819006C\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0xFE\n\
+    beq _08190096\n\
+    ldrb r0, [r4]\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r0, r1\n\
+    bne _08190096\n\
+    ldrb r0, [r4, 0x1]\n\
+    adds r5, r6, 0x1\n\
+    cmp r0, r10\n\
+    bne _0819006C\n\
+    adds r1, r6, 0x2\n\
+    mov r0, r8\n\
+    cmp r0, 0x19\n\
+    bne _0819005E\n\
+    ldrb r0, [r4, 0x2]\n\
+    cmp r0, 0x28\n\
+    bne _0819006C\n\
 _0819005E:\n\
-	adds r0, r1, r7\n\
-	ldrb r0, [r0]\n\
-	muls r0, r2\n\
-	movs r1, 0xA\n\
-	bl __divsi3\n\
-	adds r2, r0, 0\n\
+    adds r0, r1, r7\n\
+    ldrb r0, [r0]\n\
+    muls r0, r2\n\
+    movs r1, 0xA\n\
+    bl __divsi3\n\
+    adds r2, r0, 0\n\
 _0819006C:\n\
-	adds r0, r5, r7\n\
-	ldrb r0, [r0]\n\
-	cmp r0, r9\n\
-	bne _08190096\n\
-	cmp r10, r9\n\
-	beq _08190096\n\
-	adds r1, r6, 0x2\n\
-	mov r0, r8\n\
-	cmp r0, 0x19\n\
-	bne _08190088\n\
-	adds r0, r1, r7\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0x28\n\
-	bne _08190096\n\
+    adds r0, r5, r7\n\
+    ldrb r0, [r0]\n\
+    cmp r0, r9\n\
+    bne _08190096\n\
+    cmp r10, r9\n\
+    beq _08190096\n\
+    adds r1, r6, 0x2\n\
+    mov r0, r8\n\
+    cmp r0, 0x19\n\
+    bne _08190088\n\
+    adds r0, r1, r7\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x28\n\
+    bne _08190096\n\
 _08190088:\n\
-	adds r0, r1, r7\n\
-	ldrb r0, [r0]\n\
-	muls r0, r2\n\
-	movs r1, 0xA\n\
-	bl __divsi3\n\
-	adds r2, r0, 0\n\
+    adds r0, r1, r7\n\
+    ldrb r0, [r0]\n\
+    muls r0, r2\n\
+    movs r1, 0xA\n\
+    bl __divsi3\n\
+    adds r2, r0, 0\n\
 _08190096:\n\
-	adds r4, 0x3\n\
-	adds r6, 0x3\n\
-	ldr r1, =gTypeEffectiveness\n\
-	adds r0, r6, r1\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0xFF\n\
-	bne _0819003A\n\
+    adds r4, 0x3\n\
+    adds r6, 0x3\n\
+    ldr r1, =gTypeEffectiveness\n\
+    adds r0, r6, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0xFF\n\
+    bne _0819003A\n\
 _081900A4:\n\
-	ldr r0, [sp]\n\
-	cmp r0, 0x1\n\
-	beq _081900E0\n\
+    ldr r0, [sp]\n\
+    cmp r0, 0x1\n\
+    beq _081900E0\n\
 _081900AA:\n\
-	ldr r1, [sp]\n\
-	cmp r1, 0x1\n\
-	bgt _081900BC\n\
-	cmp r1, 0\n\
-	beq _081900C4\n\
-	b _08190154\n\
-	.pool\n\
+    ldr r1, [sp]\n\
+    cmp r1, 0x1\n\
+    bgt _081900BC\n\
+    cmp r1, 0\n\
+    beq _081900C4\n\
+    b _08190154\n\
+    .pool\n\
 _081900BC:\n\
-	ldr r0, [sp]\n\
-	cmp r0, 0x2\n\
-	beq _08190114\n\
-	b _08190154\n\
+    ldr r0, [sp]\n\
+    cmp r0, 0x2\n\
+    beq _08190114\n\
+    b _08190154\n\
 _081900C4:\n\
-	cmp r2, 0xA\n\
-	beq _08190146\n\
-	cmp r2, 0xA\n\
-	ble _08190146\n\
-	cmp r2, 0x28\n\
-	beq _0819014A\n\
-	cmp r2, 0x28\n\
-	bgt _081900DA\n\
-	cmp r2, 0x14\n\
-	beq _08190104\n\
-	b _08190146\n\
+    cmp r2, 0xA\n\
+    beq _08190146\n\
+    cmp r2, 0xA\n\
+    ble _08190146\n\
+    cmp r2, 0x28\n\
+    beq _0819014A\n\
+    cmp r2, 0x28\n\
+    bgt _081900DA\n\
+    cmp r2, 0x14\n\
+    beq _08190104\n\
+    b _08190146\n\
 _081900DA:\n\
-	cmp r2, 0x50\n\
-	bne _08190146\n\
-	b _08190100\n\
+    cmp r2, 0x50\n\
+    bne _08190146\n\
+    b _08190100\n\
 _081900E0:\n\
-	cmp r2, 0xA\n\
-	beq _08190104\n\
-	cmp r2, 0xA\n\
-	bgt _081900F2\n\
-	cmp r2, 0\n\
-	beq _08190100\n\
-	cmp r2, 0x5\n\
-	beq _0819014A\n\
-	b _08190146\n\
+    cmp r2, 0xA\n\
+    beq _08190104\n\
+    cmp r2, 0xA\n\
+    bgt _081900F2\n\
+    cmp r2, 0\n\
+    beq _08190100\n\
+    cmp r2, 0x5\n\
+    beq _0819014A\n\
+    b _08190146\n\
 _081900F2:\n\
-	cmp r2, 0x28\n\
-	beq _08190108\n\
-	cmp r2, 0x28\n\
-	ble _08190146\n\
-	cmp r2, 0x50\n\
-	beq _0819010E\n\
-	b _08190146\n\
+    cmp r2, 0x28\n\
+    beq _08190108\n\
+    cmp r2, 0x28\n\
+    ble _08190146\n\
+    cmp r2, 0x50\n\
+    beq _0819010E\n\
+    b _08190146\n\
 _08190100:\n\
-	movs r2, 0x8\n\
-	b _08190154\n\
+    movs r2, 0x8\n\
+    b _08190154\n\
 _08190104:\n\
-	movs r2, 0x2\n\
-	b _08190154\n\
+    movs r2, 0x2\n\
+    b _08190154\n\
 _08190108:\n\
-	movs r2, 0x2\n\
-	negs r2, r2\n\
-	b _08190154\n\
+    movs r2, 0x2\n\
+    negs r2, r2\n\
+    b _08190154\n\
 _0819010E:\n\
-	movs r2, 0x4\n\
-	negs r2, r2\n\
-	b _08190154\n\
+    movs r2, 0x4\n\
+    negs r2, r2\n\
+    b _08190154\n\
 _08190114:\n\
-	cmp r2, 0xA\n\
-	beq _08190146\n\
-	cmp r2, 0xA\n\
-	bgt _08190126\n\
-	cmp r2, 0\n\
-	beq _0819013A\n\
-	cmp r2, 0x5\n\
-	beq _08190140\n\
-	b _08190146\n\
+    cmp r2, 0xA\n\
+    beq _08190146\n\
+    cmp r2, 0xA\n\
+    bgt _08190126\n\
+    cmp r2, 0\n\
+    beq _0819013A\n\
+    cmp r2, 0x5\n\
+    beq _08190140\n\
+    b _08190146\n\
 _08190126:\n\
-	cmp r2, 0x28\n\
-	beq _0819014E\n\
-	cmp r2, 0x28\n\
-	bgt _08190134\n\
-	cmp r2, 0x14\n\
-	beq _0819014A\n\
-	b _08190146\n\
+    cmp r2, 0x28\n\
+    beq _0819014E\n\
+    cmp r2, 0x28\n\
+    bgt _08190134\n\
+    cmp r2, 0x14\n\
+    beq _0819014A\n\
+    b _08190146\n\
 _08190134:\n\
-	cmp r2, 0x50\n\
-	beq _08190152\n\
-	b _08190146\n\
+    cmp r2, 0x50\n\
+    beq _08190152\n\
+    b _08190146\n\
 _0819013A:\n\
-	movs r2, 0x10\n\
-	negs r2, r2\n\
-	b _08190154\n\
+    movs r2, 0x10\n\
+    negs r2, r2\n\
+    b _08190154\n\
 _08190140:\n\
-	movs r2, 0x8\n\
-	negs r2, r2\n\
-	b _08190154\n\
+    movs r2, 0x8\n\
+    negs r2, r2\n\
+    b _08190154\n\
 _08190146:\n\
-	movs r2, 0\n\
-	b _08190154\n\
+    movs r2, 0\n\
+    b _08190154\n\
 _0819014A:\n\
-	movs r2, 0x4\n\
-	b _08190154\n\
+    movs r2, 0x4\n\
+    b _08190154\n\
 _0819014E:\n\
-	movs r2, 0xC\n\
-	b _08190154\n\
+    movs r2, 0xC\n\
+    b _08190154\n\
 _08190152:\n\
-	movs r2, 0x14\n\
+    movs r2, 0x14\n\
 _08190154:\n\
-	adds r0, r2, 0\n\
+    adds r0, r2, 0\n\
 _08190156:\n\
-	add sp, 0x8\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r1}\n\
-	bx r1\n\
+    add sp, 0x8\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
                 ");
 }
 #endif // NONMATCHING
@@ -3434,14 +3434,14 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId)
         if (j != val)
             return gUnknown_0860D14C[j];
         else
-            return INVALID_U8;
+            return 0xFF;
     }
     else
     {
         if (!gSaveBlock2Ptr->frontier.domeTrainers[sIdToOpponentId[i][roundId]].isEliminated)
             return sIdToOpponentId[i][roundId];
         else
-            return INVALID_U8;
+            return 0xFF;
     }
 }
 
@@ -3562,7 +3562,7 @@ static void sub_8190400(u8 taskId)
         SetVBlankCallback(VblankCb0_BattleDome);
         sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct));
         for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
-            sBattleDomeStruct->arr[i] |= INVALID_U8;
+            sBattleDomeStruct->arr[i] |= 0xFF;
         LoadMonIconPalettes();
         i = CreateTask(sub_8190CD4, 0);
         gTasks[i].data[0] = 0;
@@ -3624,7 +3624,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
     {
         if (sprite->pos1.y >= 192)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
     {
         if (sprite->pos1.y <= -32)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
     {
         if (sprite->pos1.x >= 272)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
     {
         if (sprite->pos1.x <= -32)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3714,7 +3714,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
     {
         if (sprite->pos1.y >= 176)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -3736,7 +3736,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
     {
         if (sprite->pos1.y <= -16)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -3758,7 +3758,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
     {
         if (sprite->pos1.x >= 256)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -3780,7 +3780,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
     {
         if (sprite->pos1.x <= -16)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -4005,7 +4005,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4016,7 +4016,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4029,7 +4029,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4040,7 +4040,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4121,7 +4121,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4132,7 +4132,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4145,7 +4145,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4156,7 +4156,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4204,7 +4204,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4215,7 +4215,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4228,7 +4228,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4239,7 +4239,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4287,7 +4287,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4298,7 +4298,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4311,7 +4311,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4322,7 +4322,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4368,7 +4368,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4379,7 +4379,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4392,7 +4392,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4403,7 +4403,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4451,7 +4451,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4462,7 +4462,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4475,7 +4475,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4486,7 +4486,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4556,12 +4556,12 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]);
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]);
                 }
             }
@@ -4569,12 +4569,12 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]);
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]);
                 }
             }
@@ -5483,13 +5483,13 @@ static u8 sub_8193BDC(u8 taskId)
     }
     else
     {
-        if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != INVALID_U8)
+        if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF)
             arrId = 0;
-        else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != INVALID_U8)
+        else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF)
             arrId = 1;
-        else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != INVALID_U8)
+        else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF)
             arrId = 2;
-        else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != INVALID_U8)
+        else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF)
             arrId = 3;
     }
 
@@ -6204,58 +6204,58 @@ static void sub_8194F58(void)
 
     monLevel = 50;
     for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
-	{
-		monTypesBits = 0;
-		statSums[i] = 0;
-		ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
-		for (j = 0; j < 3; j++)
-		{
-			CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
-							 monLevel, ivs,
-							 gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread,
-							 gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature,
-							 statValues);
-
-			statSums[i] += statValues[STAT_ATK];
-			statSums[i] += statValues[STAT_DEF];
-			statSums[i] += statValues[STAT_SPATK];
-			statSums[i] += statValues[STAT_SPDEF];
-			statSums[i] += statValues[STAT_SPEED];
-			statSums[i] += statValues[STAT_HP];
-			monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1];
-			monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2];
-		}
-
-		// Because GF hates temporary vars, trainerId acts like monTypesCount here.
-		for (trainerId = 0, j = 0; j < 32; j++)
-		{
-			if (monTypesBits & 1)
-				trainerId++;
-			monTypesBits >>= 1;
-		}
-		statSums[i] += (trainerId * monLevel) / 20;
-	}
-
-	for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++)
-	{
-		for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++)
-		{
-			if (statSums[i] < statSums[j])
-			{
-				SwapDomeTrainers(i, j, statSums);
-			}
-			else if (statSums[i] == statSums[j])
-			{
+    {
+        monTypesBits = 0;
+        statSums[i] = 0;
+        ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId);
+        for (j = 0; j < 3; j++)
+        {
+            CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species,
+                             monLevel, ivs,
+                             gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread,
+                             gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature,
+                             statValues);
+
+            statSums[i] += statValues[STAT_ATK];
+            statSums[i] += statValues[STAT_DEF];
+            statSums[i] += statValues[STAT_SPATK];
+            statSums[i] += statValues[STAT_SPDEF];
+            statSums[i] += statValues[STAT_SPEED];
+            statSums[i] += statValues[STAT_HP];
+            monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1];
+            monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2];
+        }
+
+        // Because GF hates temporary vars, trainerId acts like monTypesCount here.
+        for (trainerId = 0, j = 0; j < 32; j++)
+        {
+            if (monTypesBits & 1)
+                trainerId++;
+            monTypesBits >>= 1;
+        }
+        statSums[i] += (trainerId * monLevel) / 20;
+    }
+
+    for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++)
+    {
+        for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++)
+        {
+            if (statSums[i] < statSums[j])
+            {
+                SwapDomeTrainers(i, j, statSums);
+            }
+            else if (statSums[i] == statSums[j])
+            {
                 if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId > gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId)
                     SwapDomeTrainers(i, j, statSums);
-			}
-		}
-	}
+            }
+        }
+    }
 
-	Free(statSums);
-	Free(statValues);
+    Free(statSums);
+    Free(statValues);
 
-	for (i = 0; i < 4; i++)
+    for (i = 0; i < 4; i++)
         DecideRoundWinners(i);
 
     gSaveBlock2Ptr->frontier.lvlMode = lvlMode;
@@ -6314,21 +6314,21 @@ static void DecideRoundWinners(u8 roundId)
         tournamentId1 = i;
         tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId);
         // Frontier Brain always wins, check tournamentId1.
-        if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != INVALID_U8)
+        if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF)
         {
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1;
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId;
             gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId);
         }
         // Frontier Brain always wins, check tournamentId2.
-        else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != INVALID_U8)
+        else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF)
         {
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1;
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId;
             gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId);
         }
         // Decide which one of two trainers wins!
-        else if (tournamentId2 != INVALID_U8)
+        else if (tournamentId2 != 0xFF)
         {
             // BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results.
 
diff --git a/src/battle_factory.c b/src/battle_factory.c
index dd82da746..1d7fbafc9 100644
--- a/src/battle_factory.c
+++ b/src/battle_factory.c
@@ -202,9 +202,9 @@ static void sub_81A5E94(void)
 
     gUnknown_03001288 = FALSE;
     for (i = 0; i < 6; i++)
-        gSaveBlock2Ptr->frontier.field_E70[i].monId |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF;
     for (i = 0; i < 3; i++)
-        gUnknown_03006298[i] |= INVALID_U16;
+        gUnknown_03006298[i] |= 0xFFFF;
 
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
     gTrainerBattleOpponent_A = 0;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 88dbb5360..8d7ed2dce 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -122,7 +122,7 @@ void FreeBattleSpritesData(void)
 u16 ChooseMoveAndTargetInBattlePalace(void)
 {
     s32 i, var1, var2;
-    s32 chosenMoveId = INVALID_S32;
+    s32 chosenMoveId = -1;
     struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     s32 percent = Random() % 100;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index fd6d2a0ab..9fd8e116a 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -543,11 +543,11 @@ enum
 
 static const u16 sStatusIconColors[] =
 {
-    RGB(24, 12, 24), // PAL_STATUS_PSN
-    RGB(23, 23, 3), // PAL_STATUS_PAR
-    RGB(20, 20, 17), // PAL_STATUS_SLP
-    RGB(17, 22, 28), // PAL_STATUS_FRZ
-    RGB(28, 14, 10) // PAL_STATUS_BRN
+    [PAL_STATUS_PSN] = RGB(24, 12, 24),
+    [PAL_STATUS_PAR] = RGB(23, 23, 3),
+    [PAL_STATUS_SLP] = RGB(20, 20, 17),
+    [PAL_STATUS_FRZ] = RGB(17, 22, 28),
+    [PAL_STATUS_BRN] = RGB(28, 14, 10),
 };
 
 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2
@@ -589,17 +589,17 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
 
     for (; i > -1; i--)
     {
-        array[i] = INVALID_U8;
+        array[i] = 0xFF;
     }
 
-    if (arrayPtr[3] == INVALID_U8)
+    if (arrayPtr[3] == 0xFF)
         arrayPtr[3] = 0;
 
     if (arg2 == 0)
     {
         for (i = 0, j = 0; i < 4; i++)
         {
-            if (array[j] == INVALID_U8)
+            if (array[j] == 0xFF)
             {
                 arg1[j] &= 0xFC00;
                 arg1[j] |= 0x1E;
@@ -622,7 +622,7 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
     {
         for (i = 0; i < 4; i++)
         {
-            if (array[i] == INVALID_U8)
+            if (array[i] == 0xFF)
             {
                 arg1[i] &= 0xFC00;
                 arg1[i] |= 0x1E;
@@ -647,225 +647,225 @@ NAKED
 static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
 {
     asm(".syntax unified\n\
-        	push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x4\n\
-	adds r7, r1, 0\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	mov r10, r2\n\
-	movs r3, 0\n\
-	movs r2, 0\n\
+            push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    adds r7, r1, 0\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    mov r10, r2\n\
+    movs r3, 0\n\
+    movs r2, 0\n\
 _08072324:\n\
-	lsls r0, r3, 24\n\
-	asrs r0, 24\n\
-	mov r3, sp\n\
-	adds r1, r3, r0\n\
-	strb r2, [r1]\n\
-	adds r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r3, r0, 24\n\
-	asrs r0, 24\n\
-	cmp r0, 0x3\n\
-	ble _08072324\n\
-	movs r3, 0x3\n\
-	movs r0, 0x1\n\
-	negs r0, r0\n\
-	mov r9, r0\n\
-	mov r8, sp\n\
+    lsls r0, r3, 24\n\
+    asrs r0, 24\n\
+    mov r3, sp\n\
+    adds r1, r3, r0\n\
+    strb r2, [r1]\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3\n\
+    ble _08072324\n\
+    movs r3, 0x3\n\
+    movs r0, 0x1\n\
+    negs r0, r0\n\
+    mov r9, r0\n\
+    mov r8, sp\n\
 _08072344:\n\
-	lsls r0, r5, 16\n\
-	asrs r6, r0, 16\n\
-	cmp r6, 0\n\
-	ble _08072372\n\
-	lsls r4, r3, 24\n\
-	asrs r4, 24\n\
-	mov r1, sp\n\
-	adds r5, r1, r4\n\
-	adds r0, r6, 0\n\
-	movs r1, 0xA\n\
-	bl __modsi3\n\
-	strb r0, [r5]\n\
-	adds r0, r6, 0\n\
-	movs r1, 0xA\n\
-	bl __divsi3\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	subs r4, 0x1\n\
-	lsls r4, 24\n\
-	lsrs r3, r4, 24\n\
-	b _08072344\n\
+    lsls r0, r5, 16\n\
+    asrs r6, r0, 16\n\
+    cmp r6, 0\n\
+    ble _08072372\n\
+    lsls r4, r3, 24\n\
+    asrs r4, 24\n\
+    mov r1, sp\n\
+    adds r5, r1, r4\n\
+    adds r0, r6, 0\n\
+    movs r1, 0xA\n\
+    bl __modsi3\n\
+    strb r0, [r5]\n\
+    adds r0, r6, 0\n\
+    movs r1, 0xA\n\
+    bl __divsi3\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    subs r4, 0x1\n\
+    lsls r4, 24\n\
+    lsrs r3, r4, 24\n\
+    b _08072344\n\
 _08072372:\n\
-	lsls r1, r3, 24\n\
-	asrs r0, r1, 24\n\
-	cmp r0, r9\n\
-	ble _08072396\n\
-	movs r4, 0xFF\n\
-	movs r3, 0x1\n\
-	negs r3, r3\n\
+    lsls r1, r3, 24\n\
+    asrs r0, r1, 24\n\
+    cmp r0, r9\n\
+    ble _08072396\n\
+    movs r4, 0xFF\n\
+    movs r3, 0x1\n\
+    negs r3, r3\n\
 _08072380:\n\
-	asrs r2, r1, 24\n\
-	mov r5, sp\n\
-	adds r1, r5, r2\n\
-	ldrb r0, [r1]\n\
-	orrs r0, r4\n\
-	strb r0, [r1]\n\
-	subs r2, 0x1\n\
-	lsls r1, r2, 24\n\
-	asrs r0, r1, 24\n\
-	cmp r0, r3\n\
-	bgt _08072380\n\
+    asrs r2, r1, 24\n\
+    mov r5, sp\n\
+    adds r1, r5, r2\n\
+    ldrb r0, [r1]\n\
+    orrs r0, r4\n\
+    strb r0, [r1]\n\
+    subs r2, 0x1\n\
+    lsls r1, r2, 24\n\
+    asrs r0, r1, 24\n\
+    cmp r0, r3\n\
+    bgt _08072380\n\
 _08072396:\n\
-	mov r1, r8\n\
-	ldrb r0, [r1, 0x3]\n\
-	cmp r0, 0xFF\n\
-	bne _080723A2\n\
-	movs r0, 0\n\
-	strb r0, [r1, 0x3]\n\
+    mov r1, r8\n\
+    ldrb r0, [r1, 0x3]\n\
+    cmp r0, 0xFF\n\
+    bne _080723A2\n\
+    movs r0, 0\n\
+    strb r0, [r1, 0x3]\n\
 _080723A2:\n\
-	mov r2, r10\n\
-	cmp r2, 0\n\
-	bne _08072432\n\
-	movs r3, 0\n\
-	movs r1, 0\n\
-	movs r6, 0xFC\n\
-	lsls r6, 8\n\
-	movs r5, 0x1E\n\
-	mov r12, r5\n\
+    mov r2, r10\n\
+    cmp r2, 0\n\
+    bne _08072432\n\
+    movs r3, 0\n\
+    movs r1, 0\n\
+    movs r6, 0xFC\n\
+    lsls r6, 8\n\
+    movs r5, 0x1E\n\
+    mov r12, r5\n\
 _080723B4:\n\
-	lsls r1, 24\n\
-	asrs r2, r1, 24\n\
-	mov r0, sp\n\
-	adds r5, r0, r2\n\
-	ldrb r0, [r5]\n\
-	mov r8, r1\n\
-	cmp r0, 0xFF\n\
-	bne _080723EA\n\
-	lsls r1, r2, 1\n\
-	adds r1, r7\n\
-	ldrh r2, [r1]\n\
-	adds r0, r6, 0\n\
-	ands r0, r2\n\
-	mov r2, r12\n\
-	orrs r0, r2\n\
-	strh r0, [r1]\n\
-	lsls r3, 24\n\
-	asrs r1, r3, 23\n\
-	adds r1, r7\n\
-	adds r1, 0x40\n\
-	ldrh r2, [r1]\n\
-	adds r0, r6, 0\n\
-	ands r0, r2\n\
-	mov r5, r12\n\
-	orrs r0, r5\n\
-	strh r0, [r1]\n\
-	b _0807241A\n\
+    lsls r1, 24\n\
+    asrs r2, r1, 24\n\
+    mov r0, sp\n\
+    adds r5, r0, r2\n\
+    ldrb r0, [r5]\n\
+    mov r8, r1\n\
+    cmp r0, 0xFF\n\
+    bne _080723EA\n\
+    lsls r1, r2, 1\n\
+    adds r1, r7\n\
+    ldrh r2, [r1]\n\
+    adds r0, r6, 0\n\
+    ands r0, r2\n\
+    mov r2, r12\n\
+    orrs r0, r2\n\
+    strh r0, [r1]\n\
+    lsls r3, 24\n\
+    asrs r1, r3, 23\n\
+    adds r1, r7\n\
+    adds r1, 0x40\n\
+    ldrh r2, [r1]\n\
+    adds r0, r6, 0\n\
+    ands r0, r2\n\
+    mov r5, r12\n\
+    orrs r0, r5\n\
+    strh r0, [r1]\n\
+    b _0807241A\n\
 _080723EA:\n\
-	lsls r2, 1\n\
-	adds r2, r7\n\
-	ldrh r0, [r2]\n\
-	adds r1, r6, 0\n\
-	ands r1, r0\n\
-	ldrb r0, [r5]\n\
-	adds r0, 0x14\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
-	lsls r4, r3, 24\n\
-	asrs r3, r4, 24\n\
-	lsls r2, r3, 1\n\
-	adds r2, r7\n\
-	adds r2, 0x40\n\
-	ldrh r0, [r2]\n\
-	adds r1, r6, 0\n\
-	ands r1, r0\n\
-	mov r5, sp\n\
-	adds r0, r5, r3\n\
-	ldrb r0, [r0]\n\
-	adds r0, 0x34\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
-	adds r3, r4, 0\n\
+    lsls r2, 1\n\
+    adds r2, r7\n\
+    ldrh r0, [r2]\n\
+    adds r1, r6, 0\n\
+    ands r1, r0\n\
+    ldrb r0, [r5]\n\
+    adds r0, 0x14\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    lsls r4, r3, 24\n\
+    asrs r3, r4, 24\n\
+    lsls r2, r3, 1\n\
+    adds r2, r7\n\
+    adds r2, 0x40\n\
+    ldrh r0, [r2]\n\
+    adds r1, r6, 0\n\
+    ands r1, r0\n\
+    mov r5, sp\n\
+    adds r0, r5, r3\n\
+    ldrb r0, [r0]\n\
+    adds r0, 0x34\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    adds r3, r4, 0\n\
 _0807241A:\n\
-	movs r0, 0x80\n\
-	lsls r0, 17\n\
-	add r0, r8\n\
-	lsrs r1, r0, 24\n\
-	movs r2, 0x80\n\
-	lsls r2, 17\n\
-	adds r0, r3, r2\n\
-	lsrs r3, r0, 24\n\
-	asrs r0, 24\n\
-	cmp r0, 0x3\n\
-	ble _080723B4\n\
-	b _08072496\n\
+    movs r0, 0x80\n\
+    lsls r0, 17\n\
+    add r0, r8\n\
+    lsrs r1, r0, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r3, r2\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3\n\
+    ble _080723B4\n\
+    b _08072496\n\
 _08072432:\n\
-	movs r3, 0\n\
-	movs r4, 0xFC\n\
-	lsls r4, 8\n\
-	movs r6, 0x1E\n\
+    movs r3, 0\n\
+    movs r4, 0xFC\n\
+    lsls r4, 8\n\
+    movs r6, 0x1E\n\
 _0807243A:\n\
-	lsls r1, r3, 24\n\
-	asrs r2, r1, 24\n\
-	mov r3, sp\n\
-	adds r5, r3, r2\n\
-	ldrb r0, [r5]\n\
-	adds r3, r1, 0\n\
-	cmp r0, 0xFF\n\
-	bne _08072466\n\
-	lsls r1, r2, 1\n\
-	adds r1, r7\n\
-	ldrh r2, [r1]\n\
-	adds r0, r4, 0\n\
-	ands r0, r2\n\
-	orrs r0, r6\n\
-	strh r0, [r1]\n\
-	adds r1, 0x40\n\
-	ldrh r2, [r1]\n\
-	adds r0, r4, 0\n\
-	ands r0, r2\n\
-	orrs r0, r6\n\
-	strh r0, [r1]\n\
-	b _08072488\n\
+    lsls r1, r3, 24\n\
+    asrs r2, r1, 24\n\
+    mov r3, sp\n\
+    adds r5, r3, r2\n\
+    ldrb r0, [r5]\n\
+    adds r3, r1, 0\n\
+    cmp r0, 0xFF\n\
+    bne _08072466\n\
+    lsls r1, r2, 1\n\
+    adds r1, r7\n\
+    ldrh r2, [r1]\n\
+    adds r0, r4, 0\n\
+    ands r0, r2\n\
+    orrs r0, r6\n\
+    strh r0, [r1]\n\
+    adds r1, 0x40\n\
+    ldrh r2, [r1]\n\
+    adds r0, r4, 0\n\
+    ands r0, r2\n\
+    orrs r0, r6\n\
+    strh r0, [r1]\n\
+    b _08072488\n\
 _08072466:\n\
-	lsls r2, 1\n\
-	adds r2, r7\n\
-	ldrh r0, [r2]\n\
-	adds r1, r4, 0\n\
-	ands r1, r0\n\
-	ldrb r0, [r5]\n\
-	adds r0, 0x14\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
-	adds r2, 0x40\n\
-	ldrh r0, [r2]\n\
-	adds r1, r4, 0\n\
-	ands r1, r0\n\
-	ldrb r0, [r5]\n\
-	adds r0, 0x34\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
+    lsls r2, 1\n\
+    adds r2, r7\n\
+    ldrh r0, [r2]\n\
+    adds r1, r4, 0\n\
+    ands r1, r0\n\
+    ldrb r0, [r5]\n\
+    adds r0, 0x14\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    adds r2, 0x40\n\
+    ldrh r0, [r2]\n\
+    adds r1, r4, 0\n\
+    ands r1, r0\n\
+    ldrb r0, [r5]\n\
+    adds r0, 0x34\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
 _08072488:\n\
-	movs r5, 0x80\n\
-	lsls r5, 17\n\
-	adds r0, r3, r5\n\
-	lsrs r3, r0, 24\n\
-	asrs r0, 24\n\
-	cmp r0, 0x3\n\
-	ble _0807243A\n\
+    movs r5, 0x80\n\
+    lsls r5, 17\n\
+    adds r0, r3, r5\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3\n\
+    ble _0807243A\n\
 _08072496:\n\
-	add sp, 0x4\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
         .syntax divided");
 }
 
@@ -1580,7 +1580,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (i = 0; i < PARTY_SIZE; i++)
             {
-                if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[i]].data[7] = 1;
@@ -1599,7 +1599,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++)
             {
-                if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[var]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[var]].data[7] = 1;
@@ -1628,7 +1628,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (var = 5, i = 0; i < PARTY_SIZE; i++)
             {
-                if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[var]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[var]].data[7] = 1;
@@ -1648,7 +1648,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++)
             {
-                if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[i]].data[7] = 1;
@@ -1765,7 +1765,7 @@ static void sub_8073E64(u8 taskId)
     s32 i;
 
     u8 battlerId = gTasks[taskId].tBattler;
-    if (--gTasks[taskId].tData15 == INVALID_S16)
+    if (--gTasks[taskId].tData15 == -1)
     {
         u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId;
 
@@ -1808,7 +1808,7 @@ static void sub_8073F98(u8 taskId)
     {
         SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8));
     }
-    else if (gTasks[taskId].tData15 == INVALID_S16)
+    else if (gTasks[taskId].tData15 == -1)
     {
         u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId;
 
@@ -2289,7 +2289,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused)
     if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars))
         MoveBattleBarGraphically(battlerId, whichBar);
 
-    if (currentBarValue == INVALID_S32)
+    if (currentBarValue == -1)
         gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0;
 
     return currentBarValue;
@@ -2376,12 +2376,12 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c
     if (maxValue < scale)
     {
         if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0)
-            return INVALID_S32;
+            return -1;
     }
     else
     {
         if (newValue == *currValue) // we're done, the bar's value has been updated
-            return INVALID_S32;
+            return -1;
     }
 
     if (maxValue < scale) // handle cases of max var having less pixels than the whole bar
@@ -2403,7 +2403,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c
             *currValue -= toAdd;
             ret = Q_24_8_TO_INT(*currValue);
             // try round up
-            if ((*currValue & INVALID_U8) > 0)
+            if ((*currValue & 0xFF) > 0)
                 ret++;
             if (ret <= newValue)
             {
diff --git a/src/battle_main.c b/src/battle_main.c
index 19e85f1cf..9410946f6 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -500,7 +500,7 @@ const struct TrainerMoney gTrainerMoneyTable[] =
     {TRAINER_CLASS_HIKER, 10},
     {TRAINER_CLASS_YOUNG_COUPLE, 8},
     {TRAINER_CLASS_WINSTRATE, 10},
-    {INVALID_U8, 5},
+    {0xFF, 5},
 };
 
 #include "data/text/abilities.h"
@@ -2251,7 +2251,7 @@ static void sub_8038F34(void)
         ShowBg(0);
         ShowBg(1);
         ShowBg(2);
-        gBattleCommunication[1] = INVALID_U8;
+        gBattleCommunication[1] = 0xFF;
         gBattleCommunication[MULTIUSE_STATE]++;
         break;
     case 1:
@@ -2993,7 +2993,7 @@ static void BattleStartClearSetData(void)
         gLastLandedMoves[i] = 0;
         gLastHitByType[i] = 0;
         gLastResultingMoves[i] = 0;
-        gLastHitBy[i] = INVALID_U8;
+        gLastHitBy[i] = 0xFF;
         gLockedMoves[i] = 0;
         gLastPrintedMoves[i] = 0;
         gBattleResources->flags->flags[i] = 0;
@@ -3161,7 +3161,7 @@ void SwitchInClearSetData(void)
     gLastHitByType[gActiveBattler] = 0;
     gLastResultingMoves[gActiveBattler] = 0;
     gLastPrintedMoves[gActiveBattler] = 0;
-    gLastHitBy[gActiveBattler] = INVALID_U8;
+    gLastHitBy[gActiveBattler] = 0xFF;
 
     *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 0) = 0;
     *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 1) = 0;
@@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void)
 
     gBattleResources->flags->flags[gActiveBattler] = 0;
     gCurrentMove = 0;
-    gBattleStruct->field_DA = INVALID_U8;
+    gBattleStruct->field_DA = 0xFF;
 
     ClearBattlerMoveHistory(gActiveBattler);
     ClearBattlerAbilityHistory(gActiveBattler);
@@ -3253,7 +3253,7 @@ void FaintClearSetData(void)
     gLastHitByType[gActiveBattler] = 0;
     gLastResultingMoves[gActiveBattler] = 0;
     gLastPrintedMoves[gActiveBattler] = 0;
-    gLastHitBy[gActiveBattler] = INVALID_U8;
+    gLastHitBy[gActiveBattler] = 0xFF;
 
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0;
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0;
@@ -3440,7 +3440,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
             if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             {
-                hpStatus[i].hp = INVALID_U16;
+                hpStatus[i].hp = 0xFFFF;
                 hpStatus[i].status = 0;
             }
             else
@@ -3458,7 +3458,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             {
-                hpStatus[i].hp = INVALID_U16;
+                hpStatus[i].hp = 0xFFFF;
                 hpStatus[i].status = 0;
             }
             else
@@ -3484,7 +3484,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             {
-                hpStatus[i].hp = INVALID_U16;
+                hpStatus[i].hp = 0xFFFF;
                 hpStatus[i].status = 0;
             }
             else
@@ -3610,85 +3610,85 @@ NAKED
 static void BattleIntroOpponent1SendsOutMonAnimation(void)
 {
     asm(".syntax unified\n\
-        	push {r4-r6,lr}\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r2, [r0]\n\
-	movs r0, 0x80\n\
-	lsls r0, 17\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _0803B298\n\
-	movs r0, 0x80\n\
-	lsls r0, 18\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _0803B298\n\
-	movs r1, 0x80\n\
-	lsls r1, 24\n\
-	ands r1, r2\n\
-	negs r0, r1\n\
-	orrs r0, r1\n\
-	lsrs r5, r0, 31\n\
-	b _0803B29A\n\
-	.pool\n\
+            push {r4-r6,lr}\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r2, [r0]\n\
+    movs r0, 0x80\n\
+    lsls r0, 17\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0803B298\n\
+    movs r0, 0x80\n\
+    lsls r0, 18\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0803B298\n\
+    movs r1, 0x80\n\
+    lsls r1, 24\n\
+    ands r1, r2\n\
+    negs r0, r1\n\
+    orrs r0, r1\n\
+    lsrs r5, r0, 31\n\
+    b _0803B29A\n\
+    .pool\n\
 _0803B288:\n\
-	ldr r1, =gBattleMainFunc\n\
-	ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
-	b _0803B2F0\n\
-	.pool\n\
+    ldr r1, =gBattleMainFunc\n\
+    ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
+    b _0803B2F0\n\
+    .pool\n\
 _0803B298:\n\
-	movs r5, 0x1\n\
+    movs r5, 0x1\n\
 _0803B29A:\n\
-	ldr r0, =gBattleControllerExecFlags\n\
-	ldr r2, [r0]\n\
-	cmp r2, 0\n\
-	bne _0803B2F2\n\
-	ldr r0, =gActiveBattler\n\
-	strb r2, [r0]\n\
-	ldr r1, =gBattlersCount\n\
-	adds r4, r0, 0\n\
-	ldrb r1, [r1]\n\
-	cmp r2, r1\n\
-	bcs _0803B2EC\n\
-	adds r6, r4, 0\n\
+    ldr r0, =gBattleControllerExecFlags\n\
+    ldr r2, [r0]\n\
+    cmp r2, 0\n\
+    bne _0803B2F2\n\
+    ldr r0, =gActiveBattler\n\
+    strb r2, [r0]\n\
+    ldr r1, =gBattlersCount\n\
+    adds r4, r0, 0\n\
+    ldrb r1, [r1]\n\
+    cmp r2, r1\n\
+    bcs _0803B2EC\n\
+    adds r6, r4, 0\n\
 _0803B2B2:\n\
-	ldrb r0, [r4]\n\
-	bl GetBattlerPosition\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, r5\n\
-	bne _0803B2D8\n\
-	movs r0, 0\n\
-	bl BtlController_EmitIntroTrainerBallThrow\n\
-	ldrb r0, [r4]\n\
-	bl MarkBattlerForControllerExec\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	ldr r1, =0x00008040\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _0803B288\n\
+    ldrb r0, [r4]\n\
+    bl GetBattlerPosition\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, r5\n\
+    bne _0803B2D8\n\
+    movs r0, 0\n\
+    bl BtlController_EmitIntroTrainerBallThrow\n\
+    ldrb r0, [r4]\n\
+    bl MarkBattlerForControllerExec\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    ldr r1, =0x00008040\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _0803B288\n\
 _0803B2D8:\n\
-	ldrb r0, [r6]\n\
-	adds r0, 0x1\n\
-	strb r0, [r6]\n\
-	ldr r1, =gBattlersCount\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	ldr r4, =gActiveBattler\n\
-	ldrb r1, [r1]\n\
-	cmp r0, r1\n\
-	bcc _0803B2B2\n\
+    ldrb r0, [r6]\n\
+    adds r0, 0x1\n\
+    strb r0, [r6]\n\
+    ldr r1, =gBattlersCount\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    ldr r4, =gActiveBattler\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bcc _0803B2B2\n\
 _0803B2EC:\n\
-	ldr r1, =gBattleMainFunc\n\
-	ldr r0, =BattleIntroRecordMonsToDex\n\
+    ldr r1, =gBattleMainFunc\n\
+    ldr r0, =BattleIntroRecordMonsToDex\n\
 _0803B2F0:\n\
-	str r0, [r1]\n\
+    str r0, [r1]\n\
 _0803B2F2:\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
+    pop {r4-r6}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
         .syntax divided");
 }
 #endif // NONMATCHING
@@ -3991,7 +3991,7 @@ void BattleTurnPassed(void)
         return;
     }
 
-    if (gBattleResults.battleTurnCounter < INVALID_U8)
+    if (gBattleResults.battleTurnCounter < 0xFF)
     {
         gBattleResults.battleTurnCounter++;
         gBattleStruct->field_DA++;
@@ -4375,7 +4375,7 @@ static void HandleTurnActionSelectionState(void)
                         return;
                     default:
                         sub_818603C(2);
-                        if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == INVALID_U16)
+                        if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF)
                         {
                             gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
                             RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
@@ -4591,10 +4591,10 @@ static void sub_803CDF8(void)
 
 void SwapTurnOrder(u8 id1, u8 id2)
 {
-	u32 temp;
+    u32 temp;
 
-	SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
-	SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
+    SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
+    SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
 }
 
 u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
@@ -5740,7 +5740,7 @@ static void HandleAction_ThrowPokeblock(void)
     gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1;
     gLastUsedItem = gBattleBufferB[gBattlerAttacker][2];
 
-    if (gBattleResults.pokeblockThrows < INVALID_U8)
+    if (gBattleResults.pokeblockThrows < 0xFF)
         gBattleResults.pokeblockThrows++;
     if (gBattleStruct->safariPkblThrowCounter < 3)
         gBattleStruct->safariPkblThrowCounter++;
diff --git a/src/battle_message.c b/src/battle_message.c
index c483740f6..c5acf75c0 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] =
 
 const u16 gTrappingMoves[] =
 {
-    MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16
+    MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF
 };
 
 const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!");
@@ -1299,14 +1299,14 @@ static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS
 const u8 * const gRefereeStringsTable[] =
 {
     sText_RefIfNothingIsDecided,
-	sText_RefThatsIt,
-	sText_RefJudgeMind,
-	sText_RefJudgeSkill,
-	sText_RefJudgeBody,
-	sText_RefJudgement1,
-	sText_RefJudgement2,
-	sText_RefJudgement3,
-	sText_RefCommenceBattle,
+    sText_RefThatsIt,
+    sText_RefJudgeMind,
+    sText_RefJudgeSkill,
+    sText_RefJudgeBody,
+    sText_RefJudgement1,
+    sText_RefJudgement2,
+    sText_RefJudgement3,
+    sText_RefCommenceBattle,
 };
 
 static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the match\nand quit now?");
@@ -1368,574 +1368,574 @@ static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS,
 static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
 {
 // The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c
-	{ // 0 Standard battle message
-		.fillValue = 0xFF,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 1,
-		.fgColor = 1,
-		.bgColor = 15,
-		.shadowColor = 6,
-	},
-	{ // 1 "What will (pokemon) do?"
-		.fillValue = 0xFF,
-		.fontId = 1,
-		.x = 1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 15,
-		.shadowColor = 6,
-	},
-	{ // 2 "Fight/Pokemon/Bag/Run"
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 3 Top left move
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 4 Top right move
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 5 Bottom left move
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 6 Bottom right move
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 7 "PP"
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 12,
-		.bgColor = 14,
-		.shadowColor = 11,
-	},
-	{ // 8
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 9 PP remaining
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 2,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 12,
-		.bgColor = 14,
-		.shadowColor = 11,
-	},
-	{ // 10 "type"
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 11 "switch which?"
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 12 "gText_BattleYesNoChoice"
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 13
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 14
-		.fillValue = 0x0,
-		.fontId = 1,
-		.x = 32,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 0,
-		.shadowColor = 2,
-	},
-	{ // 15
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 16
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 17
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 18
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 19
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 20
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 21
-		.fillValue = 0x0,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 0,
-		.shadowColor = 6,
-	},
-	{ // 22
-		.fillValue = 0x0,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 0,
-		.shadowColor = 6,
-	},
-	{ // 23
-		.fillValue = 0x0,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 0,
-		.shadowColor = 6,
-	},
+    { // 0 Standard battle message
+        .fillValue = 0xFF,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 1,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
+    },
+    { // 1 "What will (pokemon) do?"
+        .fillValue = 0xFF,
+        .fontId = 1,
+        .x = 1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
+    },
+    { // 2 "Fight/Pokemon/Bag/Run"
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 3 Top left move
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 4 Top right move
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 5 Bottom left move
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 6 Bottom right move
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 7 "PP"
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
+    },
+    { // 8
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 9 PP remaining
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 2,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
+    },
+    { // 10 "type"
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 11 "switch which?"
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 12 "gText_BattleYesNoChoice"
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 13
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 14
+        .fillValue = 0x0,
+        .fontId = 1,
+        .x = 32,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 0,
+        .shadowColor = 2,
+    },
+    { // 15
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 16
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 17
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 18
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 19
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 20
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 21
+        .fillValue = 0x0,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 0,
+        .shadowColor = 6,
+    },
+    { // 22
+        .fillValue = 0x0,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 0,
+        .shadowColor = 6,
+    },
+    { // 23
+        .fillValue = 0x0,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 0,
+        .shadowColor = 6,
+    },
 };
 
 static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
 {
-	{ // 0
-		.fillValue = 0xFF,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 1,
-		.fgColor = 1,
-		.bgColor = 15,
-		.shadowColor = 6,
-	},
-	{ // 1
-		.fillValue = 0xFF,
-		.fontId = 1,
-		.x = 1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 15,
-		.shadowColor = 6,
-	},
-	{ // 2
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 3
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 4
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 5
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 6
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 7
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 12,
-		.bgColor = 14,
-		.shadowColor = 11,
-	},
-	{ // 8
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 9
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 2,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 12,
-		.bgColor = 14,
-		.shadowColor = 11,
-	},
-	{ // 10
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 11
-		.fillValue = 0xEE,
-		.fontId = 7,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 12
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 13
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 14
-		.fillValue = 0x0,
-		.fontId = 1,
-		.x = 32,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 0,
-		.shadowColor = 2,
-	},
-	{ // 15
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 1,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 16
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 17
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 18
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 19
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 20
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 21
-		.fillValue = 0xEE,
-		.fontId = 1,
-		.x = -1,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 0,
-		.fgColor = 13,
-		.bgColor = 14,
-		.shadowColor = 15,
-	},
-	{ // 22
-		.fillValue = 0x11,
-		.fontId = 1,
-		.x = 0,
-		.y = 1,
-		.letterSpacing = 0,
-		.lineSpacing = 0,
-		.speed = 1,
-		.fgColor = 2,
-		.bgColor = 1,
-		.shadowColor = 3,
-	},
+    { // 0
+        .fillValue = 0xFF,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 1,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
+    },
+    { // 1
+        .fillValue = 0xFF,
+        .fontId = 1,
+        .x = 1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
+    },
+    { // 2
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 3
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 4
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 5
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 6
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 7
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
+    },
+    { // 8
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 9
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 2,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
+    },
+    { // 10
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 11
+        .fillValue = 0xEE,
+        .fontId = 7,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 12
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 13
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 14
+        .fillValue = 0x0,
+        .fontId = 1,
+        .x = 32,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 0,
+        .shadowColor = 2,
+    },
+    { // 15
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 1,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 16
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 17
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 18
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 19
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 20
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 21
+        .fillValue = 0xEE,
+        .fontId = 1,
+        .x = -1,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 0,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
+    },
+    { // 22
+        .fillValue = 0x11,
+        .fontId = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .speed = 1,
+        .fgColor = 2,
+        .bgColor = 1,
+        .shadowColor = 3,
+    },
 };
 
 static const struct BattleWindowText *const sBattleTextOnWindowsInfo[] =
@@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId)
     printerTemplate.bgColor = textInfo[windowId].bgColor;
     printerTemplate.shadowColor = textInfo[windowId].shadowColor;
 
-    if (printerTemplate.x == INVALID_U8)
+    if (printerTemplate.x == 0xFF)
     {
         u32 width = sub_80397C4(gBattleScripting.windowsType, windowId);
         s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing);
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 590fd3d74..d86677e48 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -1228,7 +1228,7 @@ static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
 
 static bool8 sub_81A7EC4(void)
 {
-    if (FindTaskIdByFunc(sub_81A7D54) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_81A7D54) == 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -1448,7 +1448,7 @@ static void sub_81A84B4(void)
     u8 i;
 
     for (i = 0; i < 14; i++)
-        gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF;
 }
 
 static void sub_81A84EC(void)
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 36c757c93..f27af2615 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1541,7 +1541,7 @@ void sub_81AA1D8(void)
     u8 var0, var1;
 
     for (i = 0; i < 8; i++)
-        gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF;
 
     id = sub_81AA9E4();
     sub_81AA33C(&var0, &var1);
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 8b3a509b9..8a6348522 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -388,11 +388,11 @@ void sub_81C4F98(u8 a0, void (*callback)(void))
         gPyramidBagCursorData.callback = callback;
 
     gPyramidBagResources->callback2 = NULL;
-    gPyramidBagResources->unk814 = INVALID_U8;
-    gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8;
+    gPyramidBagResources->unk814 = 0xFF;
+    gPyramidBagResources->scrollIndicatorsTaskId = 0xFF;
 
-    memset(gPyramidBagResources->itemsSpriteIds, INVALID_U8, sizeof(gPyramidBagResources->itemsSpriteIds));
-    memset(gPyramidBagResources->windowIds, INVALID_U8, sizeof(gPyramidBagResources->windowIds));
+    memset(gPyramidBagResources->itemsSpriteIds, 0xFF, sizeof(gPyramidBagResources->itemsSpriteIds));
+    memset(gPyramidBagResources->windowIds, 0xFF, sizeof(gPyramidBagResources->windowIds));
 
     SetMainCallback2(sub_81C504C);
 }
@@ -604,7 +604,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
         PlaySE(SE_SELECT);
         sub_81C6F20();
     }
-    if (gPyramidBagResources->unk814 == INVALID_U8)
+    if (gPyramidBagResources->unk814 == 0xFF)
     {
         sub_81C6FF8(gPyramidBagResources->unk815 ^ 1);
         if (itemIndex != LIST_B_PRESSED)
@@ -622,7 +622,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y)
     if (itemIndex == LIST_B_PRESSED)
         return;
 
-    if (gPyramidBagResources->unk814 != INVALID_U8)
+    if (gPyramidBagResources->unk814 != 0xFF)
     {
         if (gPyramidBagResources->unk814 == (u8)(itemIndex))
             sub_81C5AB8(y, 1);
@@ -657,16 +657,16 @@ static void PrintItemDescription(s32 listMenuId)
 
 static void AddScrollArrow(void)
 {
-    if (gPyramidBagResources->scrollIndicatorsTaskId == INVALID_U8)
+    if (gPyramidBagResources->scrollIndicatorsTaskId == 0xFF)
         gPyramidBagResources->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(2, 172, 12, 148, gPyramidBagResources->listMenuCount - gPyramidBagResources->listMenuMaxShown, 0xB5E, 0xB5E, &gPyramidBagCursorData.scrollPosition);
 }
 
 static void RemoveScrollArrow(void)
 {
-    if (gPyramidBagResources->scrollIndicatorsTaskId != INVALID_U8)
+    if (gPyramidBagResources->scrollIndicatorsTaskId != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gPyramidBagResources->scrollIndicatorsTaskId);
-        gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8;
+        gPyramidBagResources->scrollIndicatorsTaskId = 0xFF;
     }
 }
 
@@ -803,7 +803,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1)
 
 static void sub_81C5AB8(u8 y, u8 arg1)
 {
-    if (arg1 == INVALID_U8)
+    if (arg1 == 0xFF)
         FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1);
@@ -1323,7 +1323,7 @@ static void PerformItemSwap(u8 taskId)
     else
     {
         MovePyramidBagItemSlotInList(data[1], var);
-        gPyramidBagResources->unk814 = INVALID_U8;
+        gPyramidBagResources->unk814 = 0xFF;
         sub_81C7028(TRUE);
         DestroyListMenuTask(data[0], scrollOffset, selectedRow);
         if (data[1] < var)
@@ -1340,7 +1340,7 @@ static void sub_81C6A14(u8 taskId)
     u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition;
     u16 *selectedRow = &gPyramidBagCursorData.cursorPosition;
 
-    gPyramidBagResources->unk814 = INVALID_U8;
+    gPyramidBagResources->unk814 = 0xFF;
     sub_81C7028(TRUE);
     DestroyListMenuTask(data[0], scrollOffset, selectedRow);
     if (data[1] < *scrollOffset + *selectedRow)
@@ -1427,7 +1427,7 @@ static u8 sub_81C6D08(u8 windowArrayId)
 static u8 sub_81C6D24(u8 windowArrayId)
 {
     u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId];
-    if (*windowId == INVALID_U8)
+    if (*windowId == 0xFF)
     {
         *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]);
         SetWindowBorderStyle(*windowId, FALSE, 1, 0xE);
@@ -1439,13 +1439,13 @@ static u8 sub_81C6D24(u8 windowArrayId)
 static void sub_81C6D6C(u8 windowArrayId)
 {
     u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId];
-    if (*windowId != INVALID_U8)
+    if (*windowId != 0xFF)
     {
         sub_8198070(*windowId, FALSE);
         ClearWindowTilemap(*windowId);
         RemoveWindow(*windowId);
         schedule_bg_copy_tilemap_to_vram(1);
-        *windowId = INVALID_U8;
+        *windowId = 0xFF;
     }
 }
 
@@ -1473,13 +1473,13 @@ static void sub_81C6E1C(void)
 static void sub_81C6E38(u8 itemSpriteArrayId)
 {
     u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId];
-    if (*spriteId != INVALID_U8)
+    if (*spriteId != 0xFF)
     {
         FreeSpriteTilesByTag(ITEM_IMAGE_TAG + itemSpriteArrayId);
         FreeSpritePaletteByTag(ITEM_IMAGE_TAG + itemSpriteArrayId);
         FreeSpriteOamMatrix(&gSprites[*spriteId]);
         DestroySprite(&gSprites[*spriteId]);
-        *spriteId = INVALID_U8;
+        *spriteId = 0xFF;
     }
 }
 
@@ -1524,7 +1524,7 @@ static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId)
 {
     u8 itemSpriteId;
     u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId + 1];
-    if (*spriteId == INVALID_U8)
+    if (*spriteId == 0xFF)
     {
         FreeSpriteTilesByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId);
         FreeSpritePaletteByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 53f8defa5..610d0050e 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] =
 
 static const u8* const sMoveEffectBS_Ptrs[] =
 {
-    BattleScript_MoveEffectSleep,	    //  0
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SLEEP
-    BattleScript_MoveEffectPoison,		//	MOVE_EFFECT_POISON
-    BattleScript_MoveEffectBurn,		//	MOVE_EFFECT_BURN
-    BattleScript_MoveEffectFreeze,		//	MOVE_EFFECT_FREEZE
-    BattleScript_MoveEffectParalysis,   //	MOVE_EFFECT_PARALYSIS
-    BattleScript_MoveEffectToxic,		//	MOVE_EFFECT_TOXIC
-    BattleScript_MoveEffectConfusion,	//	MOVE_EFFECT_CONFUSION
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_FLINCH
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_TRI_ATTACK
-    BattleScript_MoveEffectUproar,		//	MOVE_EFFECT_UPROAR
-    BattleScript_MoveEffectPayDay,		//	MOVE_EFFECT_PAYDAY
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_CHARGING
-    BattleScript_MoveEffectWrap,		//	MOVE_EFFECT_WRAP
-    BattleScript_MoveEffectRecoil,	    //	MOVE_EFFECT_RECOIL_25
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_DEF_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SPD_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_ATK_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_DEF_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ACC_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_EVS_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_DEF_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SPD_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_ATK_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_DEF_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ACC_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_EVS_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RECHARGE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RAGE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_STEAL_ITEM
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_PREVENT_ESCAPE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_NIGHTMARE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ALL_STATS_UP
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RAPIDSPIN
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_REMOVE_PARALYSIS
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_DEF_DOWN
-    BattleScript_MoveEffectRecoil,	    //	MOVE_EFFECT_RECOIL_33
+    BattleScript_MoveEffectSleep,        //  0
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SLEEP
+    BattleScript_MoveEffectPoison,        //    MOVE_EFFECT_POISON
+    BattleScript_MoveEffectBurn,        //    MOVE_EFFECT_BURN
+    BattleScript_MoveEffectFreeze,        //    MOVE_EFFECT_FREEZE
+    BattleScript_MoveEffectParalysis,   //    MOVE_EFFECT_PARALYSIS
+    BattleScript_MoveEffectToxic,        //    MOVE_EFFECT_TOXIC
+    BattleScript_MoveEffectConfusion,    //    MOVE_EFFECT_CONFUSION
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_FLINCH
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_TRI_ATTACK
+    BattleScript_MoveEffectUproar,        //    MOVE_EFFECT_UPROAR
+    BattleScript_MoveEffectPayDay,        //    MOVE_EFFECT_PAYDAY
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_CHARGING
+    BattleScript_MoveEffectWrap,        //    MOVE_EFFECT_WRAP
+    BattleScript_MoveEffectRecoil,        //    MOVE_EFFECT_RECOIL_25
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_ATK_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_DEF_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SPD_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SP_ATK_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SP_DEF_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_ACC_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_EVS_PLUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_ATK_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_DEF_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SPD_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SP_ATK_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_SP_DEF_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_ACC_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_EVS_MINUS_1
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_RECHARGE
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_RAGE
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_STEAL_ITEM
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_PREVENT_ESCAPE
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_NIGHTMARE
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_ALL_STATS_UP
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_RAPIDSPIN
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_REMOVE_PARALYSIS
+    BattleScript_MoveEffectSleep,        //    MOVE_EFFECT_ATK_DEF_DOWN
+    BattleScript_MoveEffectRecoil,        //    MOVE_EFFECT_RECOIL_33
 };
 
 static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};
@@ -763,8 +763,8 @@ static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox =
 static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8};
 
 #define MIMIC_FORBIDDEN_END             0xFFFE
-#define METRONOME_FORBIDDEN_END         INVALID_U16
-#define ASSIST_FORBIDDEN_END            INVALID_U16
+#define METRONOME_FORBIDDEN_END         0xFFFF
+#define ASSIST_FORBIDDEN_END            0xFFFF
 
 static const u16 sMovesForbiddenToCopy[] =
 {
@@ -822,44 +822,44 @@ static const u16 sWeightToDamageTable[] =
     500, 60,
     1000, 80,
     2000, 100,
-    INVALID_U16, INVALID_U16
+    0xFFFF, 0xFFFF
 };
 
 static const u16 sPickupItems[] =
 {
     ITEM_POTION,
-	ITEM_ANTIDOTE,
-	ITEM_SUPER_POTION,
-	ITEM_GREAT_BALL,
-	ITEM_REPEL,
-	ITEM_ESCAPE_ROPE,
-	ITEM_X_ATTACK,
-	ITEM_FULL_HEAL,
-	ITEM_ULTRA_BALL,
-	ITEM_HYPER_POTION,
-	ITEM_RARE_CANDY,
-	ITEM_PROTEIN,
-	ITEM_REVIVE,
-	ITEM_HP_UP,
-	ITEM_FULL_RESTORE,
-	ITEM_MAX_REVIVE,
-	ITEM_PP_UP,
-	ITEM_MAX_ELIXIR,
+    ITEM_ANTIDOTE,
+    ITEM_SUPER_POTION,
+    ITEM_GREAT_BALL,
+    ITEM_REPEL,
+    ITEM_ESCAPE_ROPE,
+    ITEM_X_ATTACK,
+    ITEM_FULL_HEAL,
+    ITEM_ULTRA_BALL,
+    ITEM_HYPER_POTION,
+    ITEM_RARE_CANDY,
+    ITEM_PROTEIN,
+    ITEM_REVIVE,
+    ITEM_HP_UP,
+    ITEM_FULL_RESTORE,
+    ITEM_MAX_REVIVE,
+    ITEM_PP_UP,
+    ITEM_MAX_ELIXIR,
 };
 
 static const u16 sRarePickupItems[] =
 {
     ITEM_HYPER_POTION,
-	ITEM_NUGGET,
-	ITEM_KINGS_ROCK,
-	ITEM_FULL_RESTORE,
-	ITEM_ETHER,
-	ITEM_WHITE_HERB,
-	ITEM_TM44_REST,
-	ITEM_ELIXIR,
-	ITEM_TM01_FOCUS_PUNCH,
-	ITEM_LEFTOVERS,
-	ITEM_TM26_EARTHQUAKE,
+    ITEM_NUGGET,
+    ITEM_KINGS_ROCK,
+    ITEM_FULL_RESTORE,
+    ITEM_ETHER,
+    ITEM_WHITE_HERB,
+    ITEM_TM44_REST,
+    ITEM_ELIXIR,
+    ITEM_TM01_FOCUS_PUNCH,
+    ITEM_LEFTOVERS,
+    ITEM_TM26_EARTHQUAKE,
 };
 
 static const u8 sPickupProbabilities[] =
@@ -917,10 +917,10 @@ const ALIGNED(4) u8 gUnknown_0831C494[][4] =
 
 static const u8 sUnknown_0831C4F8[] =
 {
-	0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00,
-	0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01,
-	0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02,
-	0x03, 0x00, 0x00, 0x00
+    0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00,
+    0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01,
+    0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02,
+    0x03, 0x00, 0x00, 0x00
 };
 
 static void atk00_attackcanceler(void)
@@ -1976,7 +1976,7 @@ static void atk0C_datahpupdate(void)
     {
         gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (gSpecialStatuses[gActiveBattler].dmg == 0)
-            gSpecialStatuses[gActiveBattler].dmg = INVALID_U16;
+            gSpecialStatuses[gActiveBattler].dmg = 0xFFFF;
     }
     gBattlescriptCurrInstr += 2;
 }
@@ -2579,7 +2579,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     u16 PayDay = gPaydayMoney;
                     gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5);
                     if (PayDay > gPaydayMoney)
-                        gPaydayMoney = INVALID_U16;
+                        gPaydayMoney = 0xFFFF;
                 }
                 BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -3403,8 +3403,8 @@ static void atk23_getexp(void)
 
                     PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId)
 
-					// buffer 'gained' or 'gained a boosted'
-					PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
+                    // buffer 'gained' or 'gained a boosted'
+                    PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
 
                     PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
 
@@ -4490,24 +4490,24 @@ static void atk48_playstatchangeanimation(void)
 
 enum
 {
-	ATK49_RAGE,
-	ATK49_DEFROST,
-	ATK49_SYNCHRONIZE_TARGET,
-	ATK49_MOVE_END_ABILITIES,
-	ATK49_STATUS_IMMUNITY_ABILITIES,
-	ATK49_SYNCHRONIZE_ATTACKER,
-	ATK49_CHOICE_MOVE,
-	ATK49_CHANGED_ITEMS,
-	ATK49_ATTACKER_INVISIBLE,
-	ATK49_ATTACKER_VISIBLE,
-	ATK49_TARGET_VISIBLE,
-	ATK49_ITEM_EFFECTS_ALL,
-	ATK49_KINGSROCK_SHELLBELL,
-	ATK49_SUBSTITUTE,
-	ATK49_UPDATE_LAST_MOVES,
-	ATK49_MIRROR_MOVE,
-	ATK49_NEXT_TARGET,
-	ATK49_COUNT,
+    ATK49_RAGE,
+    ATK49_DEFROST,
+    ATK49_SYNCHRONIZE_TARGET,
+    ATK49_MOVE_END_ABILITIES,
+    ATK49_STATUS_IMMUNITY_ABILITIES,
+    ATK49_SYNCHRONIZE_ATTACKER,
+    ATK49_CHOICE_MOVE,
+    ATK49_CHANGED_ITEMS,
+    ATK49_ATTACKER_INVISIBLE,
+    ATK49_ATTACKER_VISIBLE,
+    ATK49_TARGET_VISIBLE,
+    ATK49_ITEM_EFFECTS_ALL,
+    ATK49_KINGSROCK_SHELLBELL,
+    ATK49_SUBSTITUTE,
+    ATK49_UPDATE_LAST_MOVES,
+    ATK49_MIRROR_MOVE,
+    ATK49_NEXT_TARGET,
+    ATK49_COUNT,
 };
 
 static void atk49_moveend(void)
@@ -4520,7 +4520,7 @@ static void atk49_moveend(void)
     u8 arg1, arg2;
     u16 originallyUsedMove;
 
-    if (gChosenMove == INVALID_U16)
+    if (gChosenMove == 0xFFFF)
         originallyUsedMove = 0;
     else
         originallyUsedMove = gChosenMove;
@@ -4593,7 +4593,7 @@ static void atk49_moveend(void)
             break;
         case ATK49_CHOICE_MOVE: // update choice band move
             if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND
-                || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != INVALID_U16))
+                || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
                     goto LOOP;
             if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED))
             {
@@ -4708,8 +4708,8 @@ static void atk49_moveend(void)
                 }
                 else
                 {
-                    gLastMoves[gBattlerAttacker] = INVALID_U16;
-                    gLastResultingMoves[gBattlerAttacker] = INVALID_U16;
+                    gLastMoves[gBattlerAttacker] = 0xFFFF;
+                    gLastResultingMoves[gBattlerAttacker] = 0xFFFF;
                 }
 
                 if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget)))
@@ -4717,7 +4717,7 @@ static void atk49_moveend(void)
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
                 {
-                    if (gChosenMove == INVALID_U16)
+                    if (gChosenMove == 0xFFFF)
                     {
                         gLastLandedMoves[gBattlerTarget] = gChosenMove;
                     }
@@ -4729,7 +4729,7 @@ static void atk49_moveend(void)
                 }
                 else
                 {
-                    gLastLandedMoves[gBattlerTarget] = INVALID_U16;
+                    gLastLandedMoves[gBattlerTarget] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
@@ -5560,7 +5560,7 @@ static void atk52_switchineffects(void)
         gDisableStructs[gActiveBattler].truantUnknownBit = 0;
 
         if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0)
-			&& !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
+            && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
         {
             gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
 
@@ -5662,7 +5662,7 @@ static void atk59_handlelearnnewmove(void)
     {
         gBattlescriptCurrInstr = jumpPtr2;
     }
-    else if (ret == INVALID_U16)
+    else if (ret == 0xFFFF)
     {
         gBattlescriptCurrInstr += 10;
     }
@@ -6015,7 +6015,7 @@ static void atk61_drawpartystatussummary(void)
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE
             || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
         {
-            hpStatuses[i].hp = INVALID_U16;
+            hpStatuses[i].hp = 0xFFFF;
             hpStatuses[i].status = 0;
         }
         else
@@ -6930,7 +6930,7 @@ static void atk7C_trymirrormove(void)
             move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0)
                 | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) << 8);
 
-            if (move != 0 && move != INVALID_U16)
+            if (move != 0 && move != 0xFFFF)
             {
                 movesArray[validMovesCount] = move;
                 validMovesCount++;
@@ -6941,7 +6941,7 @@ static void atk7C_trymirrormove(void)
     move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0)
         | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8);
 
-    if (move != 0 && move != INVALID_U16)
+    if (move != 0 && move != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
@@ -7094,7 +7094,7 @@ bool8 UproarWakeUpCheck(u8 battlerId)
 
         gBattleScripting.battler = i;
 
-        if (gBattlerTarget == INVALID_U8)
+        if (gBattlerTarget == 0xFF)
             gBattlerTarget = i;
         else if (gBattlerTarget == i)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -8008,7 +8008,7 @@ static void atk9A_setfocusenergy(void)
 
 static void atk9B_transformdataexecution(void)
 {
-    gChosenMove = INVALID_U16;
+    gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED
         || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)
@@ -8088,12 +8088,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move)
 
 static void atk9D_mimicattackcopy(void)
 {
-    gChosenMove = INVALID_U16;
+    gChosenMove = 0xFFFF;
 
     if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget])
         || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED
         || gLastMoves[gBattlerTarget] == 0
-        || gLastMoves[gBattlerTarget] == INVALID_U16)
+        || gLastMoves[gBattlerTarget] == 0xFFFF)
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     }
@@ -8296,7 +8296,7 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff;
-        gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16;
+        gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8309,7 +8309,7 @@ static void atkA5_painsplitdmgcalc(void)
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
     if (gLastLandedMoves[gBattlerAttacker] == 0
-        || gLastLandedMoves[gBattlerAttacker] == INVALID_U16)
+        || gLastLandedMoves[gBattlerAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     }
@@ -8376,12 +8376,12 @@ static void atkA7_setalwayshitflag(void)
 
 static void atkA8_copymovepermanently(void) // sketch
 {
-    gChosenMove = INVALID_U16;
+    gChosenMove = 0xFFFF;
 
     if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)
         && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE
         && gLastPrintedMoves[gBattlerTarget] != 0
-        && gLastPrintedMoves[gBattlerTarget] != INVALID_U16
+        && gLastPrintedMoves[gBattlerTarget] != 0xFFFF
         && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH)
     {
         s32 i;
@@ -8550,7 +8550,7 @@ static void atkAC_remaininghptopower(void)
 static void atkAD_tryspiteppreduce(void)
 {
     if (gLastMoves[gBattlerTarget] != 0
-        && gLastMoves[gBattlerTarget] != INVALID_U16)
+        && gLastMoves[gBattlerTarget] != 0xFFFF)
     {
         s32 i;
 
@@ -9671,13 +9671,13 @@ static void atkDC_trysetgrudge(void)
 static void atkDD_weightdamagecalculation(void)
 {
     s32 i;
-    for (i = 0; sWeightToDamageTable[i] != INVALID_U16; i += 2)
+    for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
     {
         if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1))
             break;
     }
 
-    if (sWeightToDamageTable[i] != INVALID_U16)
+    if (sWeightToDamageTable[i] != 0xFFFF)
         gDynamicBasePower = sWeightToDamageTable[i + 1];
     else
         gDynamicBasePower = 120;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 0b5cd9e21..4243d2f3f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1530,7 +1530,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab
             return i;
     }
 
-    return INVALID_S32;
+    return -1;
 }
 
 static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId)
@@ -1548,7 +1548,7 @@ static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 tra
         }
     }
 
-    return INVALID_S32;
+    return -1;
 }
 
 static bool32 sub_80B1D94(s32 rematchTableId)
@@ -1640,7 +1640,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table,
 {
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
     if (tableId >= 100)
         return FALSE;
@@ -1654,7 +1654,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t
 {
     s32 tableId = TrainerIdToRematchTableId(table, trainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
     if (tableId >= 100)
         return FALSE;
@@ -1670,7 +1670,7 @@ static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16
     s32 i;
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
 
     trainerEntry = &table[tableId];
@@ -1691,7 +1691,7 @@ static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *t
     s32 i;
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
 
     trainerEntry = &table[tableId];
@@ -1710,7 +1710,7 @@ static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16
 {
     s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId != INVALID_S32)
+    if (tableId != -1)
         gSaveBlock1Ptr->trainerRematches[tableId] = 0;
 }
 
@@ -1724,7 +1724,7 @@ static u32 GetTrainerMatchCallFlag(u32 trainerId)
             return FLAG_MATCH_CALL_REGISTERED + i;
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 static void RegisterTrainerInMatchCall(void)
@@ -1732,7 +1732,7 @@ static void RegisterTrainerInMatchCall(void)
     if (FlagGet(FLAG_HAS_MATCH_CALL))
     {
         u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A);
-        if (matchCallFlagId != INVALID_U16)
+        if (matchCallFlagId != 0xFFFF)
             FlagSet(matchCallFlagId);
     }
 }
@@ -1741,7 +1741,7 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa
 {
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
     if (!HasTrainerBeenFought(table[tableId].trainerIds[1]))
         return FALSE;
diff --git a/src/battle_tent.c b/src/battle_tent.c
index 836b2b6de..c7e70912c 100644
--- a/src/battle_tent.c
+++ b/src/battle_tent.c
@@ -364,7 +364,7 @@ static void sub_81BA040(void)
         } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
 
         gTrainerBattleOpponent_A = trainerId;
-        while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != INVALID_U16)
+        while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF)
             setsCount++;
         if (setsCount > 8)
             break;
diff --git a/src/battle_tower.c b/src/battle_tower.c
index c74cfd9a0..f9dfcabd1 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
     // Attempt to fill the trainer's party with random Pokemon until 3 have been
     // successfully chosen. The trainer's party may not have duplicate pokemon species
     // or duplicate held items.
-    for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++)
+    for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++)
         ;
     i = 0;
     otID = Random32();
@@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId)
     u8 bfMonCount = 0;
     u32 monSetId = monSets[bfMonCount];
 
-    while (monSetId != INVALID_U16)
+    while (monSetId != 0xFFFF)
     {
         bfMonCount++;
         monSetId = monSets[bfMonCount];
-        if (monSetId == INVALID_U16)
+        if (monSetId == 0xFFFF)
             break;
     }
 
@@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
 
     bfMonCount = 0;
     monSetId = monSets[bfMonCount];
-    while (monSetId != INVALID_U16)
+    while (monSetId != 0xFFFF)
     {
         bfMonCount++;
         monSetId = monSets[bfMonCount];
-        if (monSetId == INVALID_U16)
+        if (monSetId == 0xFFFF)
             break;
     }
 
diff --git a/src/battle_transition.c b/src/battle_transition.c
index f15514f50..f74102467 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1};
 
 static const s16 *const gUnknown_085C8CF8[] =
 {
-	gUnknown_085C8C90,
-	gUnknown_085C8CA4,
-	gUnknown_085C8C98,
-	gUnknown_085C8C9E,
-	gUnknown_085C8CEA,
-	gUnknown_085C8CE4,
-	gUnknown_085C8CF2,
-	gUnknown_085C8CDE
+    gUnknown_085C8C90,
+    gUnknown_085C8CA4,
+    gUnknown_085C8C98,
+    gUnknown_085C8C9E,
+    gUnknown_085C8CEA,
+    gUnknown_085C8CE4,
+    gUnknown_085C8CF2,
+    gUnknown_085C8CDE
 };
 
 static const s16 *const gUnknown_085C8D18[] =
 {
-	gUnknown_085C8CBC,
-	gUnknown_085C8CB0,
-	gUnknown_085C8CB6,
-	gUnknown_085C8CAA,
-	gUnknown_085C8CCA,
-	gUnknown_085C8CD8,
-	gUnknown_085C8CC4,
-	gUnknown_085C8CD2
+    gUnknown_085C8CBC,
+    gUnknown_085C8CB0,
+    gUnknown_085C8CB6,
+    gUnknown_085C8CAA,
+    gUnknown_085C8CCA,
+    gUnknown_085C8CD8,
+    gUnknown_085C8CC4,
+    gUnknown_085C8CD2
 };
 
 static const s16 *const *const gUnknown_085C8D38[] =
 {
-	gUnknown_085C8CF8,
-	gUnknown_085C8D18
+    gUnknown_085C8CF8,
+    gUnknown_085C8D18
 };
 
 static const TransitionStateFunc sPhase2_Groudon_Funcs[] =
@@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] =
 
 static const struct SpriteTemplate gUnknown_085C8E68 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4105,
     .oam = &gEventObjectBaseOam_32x32,
     .anims = sSpriteAnimTable_85C8E3C,
@@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] =
 
 static const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4106,
     .oam = &gOamData_85C8E80,
     .anims = sSpriteAnimTable_85C8EA0,
@@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
 
 static const struct SpriteTemplate sSpriteTemplate_85C8EBC =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4106,
     .oam = &gOamData_85C8E80,
     .anims = sSpriteAnimTable_85C8EA0,
@@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task)
 
 static bool8 Transition_WaitForPhase1(struct Task *task)
 {
-    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8)
+    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF)
     {
         task->tState++;
         return TRUE;
@@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task)
 static bool8 Transition_WaitForPhase2(struct Task *task)
 {
     task->tTransitionDone = FALSE;
-    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8)
+    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF)
         task->tTransitionDone = TRUE;
     return FALSE;
 }
@@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
 
 static bool8 IsPhase1Done(void)
 {
-    if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8)
+    if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF)
         return TRUE;
     else
         return FALSE;
diff --git a/src/battle_tv.c b/src/battle_tv.c
index edd506708..487b6baac 100644
--- a/src/battle_tv.c
+++ b/src/battle_tv.c
@@ -26,9 +26,9 @@ static const u16 sVariableDmgMoves[] =
     MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL,
     MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE,
     MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR,
-    MOVE_PRESENT, MOVE_REVENGE, INVALID_U16,
+    MOVE_PRESENT, MOVE_REVENGE, 0xFFFF,
     // those are handled by the function itself
-    MOVE_MAGNITUDE, MOVE_PSYWAVE, INVALID_U16
+    MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF
 };
 
 static const u16 sUnknown_0860A4E0[] =
@@ -199,7 +199,7 @@ static const u16 sUnknown_0860A8A4[] =
     STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE,
     STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON,
     STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED,
-    STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, INVALID_U16
+    STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF
 };
 
 // code
@@ -625,9 +625,9 @@ static bool8 sub_817E0B8(u16 stringId)
         if (sUnknown_0860A8A4[i] == stringId)
             break;
         i++;
-    } while (sUnknown_0860A8A4[i] != INVALID_U16);
+    } while (sUnknown_0860A8A4[i] != 0xFFFF);
 
-    if (sUnknown_0860A8A4[i] == INVALID_U16)
+    if (sUnknown_0860A8A4[i] == 0xFFFF)
         return TRUE;
     else
         return FALSE;
@@ -815,324 +815,324 @@ void TryPutLinkBattleTvShowOnAir(void)
 {
     asm_unified(
     "push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x20\n\
-	movs r0, 0\n\
-	str r0, [sp]\n\
-	movs r1, 0\n\
-	str r1, [sp, 0x4]\n\
-	movs r2, 0\n\
-	str r2, [sp, 0x8]\n\
-	ldr r3, =0x00007fff\n\
-	str r3, [sp, 0xC]\n\
-	movs r4, 0\n\
-	str r4, [sp, 0x10]\n\
-	movs r7, 0\n\
-	str r7, [sp, 0x14]\n\
-	mov r8, r0\n\
-	ldr r0, =gBattleStruct\n\
-	ldr r1, [r0]\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xB3\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _0817E42A\n\
-	b _0817E670\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x20\n\
+    movs r0, 0\n\
+    str r0, [sp]\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x4]\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x8]\n\
+    ldr r3, =0x00007fff\n\
+    str r3, [sp, 0xC]\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x10]\n\
+    movs r7, 0\n\
+    str r7, [sp, 0x14]\n\
+    mov r8, r0\n\
+    ldr r0, =gBattleStruct\n\
+    ldr r1, [r0]\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xB3\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _0817E42A\n\
+    b _0817E670\n\
 _0817E42A:\n\
-	movs r2, 0xD2\n\
-	lsls r2, 1\n\
-	adds r2, r1\n\
-	mov r10, r2\n\
-	movs r6, 0\n\
+    movs r2, 0xD2\n\
+    lsls r2, 1\n\
+    adds r2, r1\n\
+    mov r10, r2\n\
+    movs r6, 0\n\
 _0817E434:\n\
-	movs r0, 0x64\n\
-	adds r4, r6, 0\n\
-	muls r4, r0\n\
-	ldr r0, =gPlayerParty\n\
-	adds r0, r4, r0\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	beq _0817E454\n\
-	mov r0, r8\n\
-	adds r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r8, r0\n\
+    movs r0, 0x64\n\
+    adds r4, r6, 0\n\
+    muls r4, r0\n\
+    ldr r0, =gPlayerParty\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    beq _0817E454\n\
+    mov r0, r8\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
 _0817E454:\n\
-	ldr r5, =gEnemyParty\n\
-	adds r0, r4, r5\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	beq _0817E46A\n\
-	adds r0, r7, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r7, r0, 24\n\
+    ldr r5, =gEnemyParty\n\
+    adds r0, r4, r5\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    beq _0817E46A\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r7, r0, 24\n\
 _0817E46A:\n\
-	adds r6, 0x1\n\
-	cmp r6, 0x5\n\
-	ble _0817E434\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	movs r1, 0x2\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _0817E47E\n\
-	b _0817E670\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x5\n\
+    ble _0817E434\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    movs r1, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _0817E47E\n\
+    b _0817E670\n\
 _0817E47E:\n\
-	cmp r8, r7\n\
-	beq _0817E484\n\
-	b _0817E670\n\
+    cmp r8, r7\n\
+    beq _0817E484\n\
+    b _0817E670\n\
 _0817E484:\n\
-	movs r6, 0\n\
-	lsls r3, r6, 1\n\
-	str r3, [sp, 0x18]\n\
-	movs r4, 0x64\n\
-	mov r8, r4\n\
+    movs r6, 0\n\
+    lsls r3, r6, 1\n\
+    str r3, [sp, 0x18]\n\
+    movs r4, 0x64\n\
+    mov r8, r4\n\
 _0817E48E:\n\
-	mov r1, r8\n\
-	muls r1, r6\n\
-	ldr r0, =gPlayerParty\n\
-	adds r4, r1, r0\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	lsls r0, 16\n\
-	lsrs r7, r0, 16\n\
-	adds r0, r6, 0x1\n\
-	mov r9, r0\n\
-	cmp r7, 0\n\
-	beq _0817E4EE\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x2D\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	bne _0817E4EE\n\
-	movs r4, 0\n\
-	lsls r0, r6, 3\n\
-	mov r2, r10\n\
-	adds r1, r0, r2\n\
-	movs r3, 0x3\n\
+    mov r1, r8\n\
+    muls r1, r6\n\
+    ldr r0, =gPlayerParty\n\
+    adds r4, r1, r0\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    adds r0, r6, 0x1\n\
+    mov r9, r0\n\
+    cmp r7, 0\n\
+    beq _0817E4EE\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x2D\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    bne _0817E4EE\n\
+    movs r4, 0\n\
+    lsls r0, r6, 3\n\
+    mov r2, r10\n\
+    adds r1, r0, r2\n\
+    movs r3, 0x3\n\
 _0817E4C4:\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	ldrh r4, [r1]\n\
-	adds r0, r4\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	adds r1, 0x2\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _0817E4C4\n\
-	ldr r1, [sp, 0x8]\n\
-	lsls r0, r1, 16\n\
-	lsls r1, r4, 16\n\
-	cmp r0, r1\n\
-	bge _0817E4EE\n\
-	lsls r0, r6, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x10]\n\
-	lsrs r1, 16\n\
-	str r1, [sp, 0x8]\n\
-	str r7, [sp]\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    ldrh r4, [r1]\n\
+    adds r0, r4\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    adds r1, 0x2\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _0817E4C4\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r0, r1, 16\n\
+    lsls r1, r4, 16\n\
+    cmp r0, r1\n\
+    bge _0817E4EE\n\
+    lsls r0, r6, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x10]\n\
+    lsrs r1, 16\n\
+    str r1, [sp, 0x8]\n\
+    str r7, [sp]\n\
 _0817E4EE:\n\
-	mov r0, r8\n\
-	muls r0, r6\n\
-	ldr r2, =gEnemyParty\n\
-	adds r4, r0, r2\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	lsls r0, 16\n\
-	lsrs r7, r0, 16\n\
-	ldr r3, [sp, 0x8]\n\
-	lsls r3, 16\n\
-	str r3, [sp, 0x1C]\n\
-	cmp r7, 0\n\
-	beq _0817E5A0\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x2D\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	bne _0817E5A0\n\
-	movs r4, 0\n\
-	ldr r0, [sp, 0xC]\n\
-	lsls r2, r0, 16\n\
-	movs r3, 0x1\n\
-	lsls r1, r3, 1\n\
-	adds r1, 0x1\n\
-	lsls r1, 4\n\
-	lsls r0, r6, 3\n\
-	adds r0, r1\n\
-	mov r3, r10\n\
-	adds r1, r0, r3\n\
-	movs r3, 0x3\n\
+    mov r0, r8\n\
+    muls r0, r6\n\
+    ldr r2, =gEnemyParty\n\
+    adds r4, r0, r2\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    ldr r3, [sp, 0x8]\n\
+    lsls r3, 16\n\
+    str r3, [sp, 0x1C]\n\
+    cmp r7, 0\n\
+    beq _0817E5A0\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x2D\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    bne _0817E5A0\n\
+    movs r4, 0\n\
+    ldr r0, [sp, 0xC]\n\
+    lsls r2, r0, 16\n\
+    movs r3, 0x1\n\
+    lsls r1, r3, 1\n\
+    adds r1, 0x1\n\
+    lsls r1, 4\n\
+    lsls r0, r6, 3\n\
+    adds r0, r1\n\
+    mov r3, r10\n\
+    adds r1, r0, r3\n\
+    movs r3, 0x3\n\
 _0817E534:\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	ldrh r4, [r1]\n\
-	adds r0, r4\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	adds r1, 0x2\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _0817E534\n\
-	asrs r1, r2, 16\n\
-	lsls r5, r4, 16\n\
-	asrs r0, r5, 16\n\
-	cmp r1, r0\n\
-	bne _0817E590\n\
-	mov r0, r8\n\
-	muls r0, r6\n\
-	ldr r1, =gEnemyParty\n\
-	adds r0, r1\n\
-	movs r1, 0x19\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	adds r4, r0, 0\n\
-	ldr r2, [sp, 0x14]\n\
-	mov r0, r8\n\
-	muls r0, r2\n\
-	ldr r3, =gEnemyParty\n\
-	adds r0, r3\n\
-	movs r1, 0x19\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r4, r0\n\
-	bls _0817E5A0\n\
-	b _0817E594\n\
-	.pool\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    ldrh r4, [r1]\n\
+    adds r0, r4\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    adds r1, 0x2\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _0817E534\n\
+    asrs r1, r2, 16\n\
+    lsls r5, r4, 16\n\
+    asrs r0, r5, 16\n\
+    cmp r1, r0\n\
+    bne _0817E590\n\
+    mov r0, r8\n\
+    muls r0, r6\n\
+    ldr r1, =gEnemyParty\n\
+    adds r0, r1\n\
+    movs r1, 0x19\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    adds r4, r0, 0\n\
+    ldr r2, [sp, 0x14]\n\
+    mov r0, r8\n\
+    muls r0, r2\n\
+    ldr r3, =gEnemyParty\n\
+    adds r0, r3\n\
+    movs r1, 0x19\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r4, r0\n\
+    bls _0817E5A0\n\
+    b _0817E594\n\
+    .pool\n\
 _0817E590:\n\
-	cmp r1, r0\n\
-	ble _0817E5A0\n\
+    cmp r1, r0\n\
+    ble _0817E5A0\n\
 _0817E594:\n\
-	lsls r0, r6, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x14]\n\
-	lsrs r5, 16\n\
-	str r5, [sp, 0xC]\n\
-	str r7, [sp, 0x4]\n\
+    lsls r0, r6, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x14]\n\
+    lsrs r5, 16\n\
+    str r5, [sp, 0xC]\n\
+    str r7, [sp, 0x4]\n\
 _0817E5A0:\n\
-	mov r6, r9\n\
-	cmp r6, 0x5\n\
-	bgt _0817E5A8\n\
-	b _0817E48E\n\
+    mov r6, r9\n\
+    cmp r6, 0x5\n\
+    bgt _0817E5A8\n\
+    b _0817E48E\n\
 _0817E5A8:\n\
-	movs r4, 0\n\
-	movs r6, 0\n\
-	movs r3, 0\n\
-	ldr r5, =gPlayerParty\n\
-	ldr r7, [sp, 0x10]\n\
-	lsls r0, r7, 3\n\
-	mov r1, r10\n\
-	adds r2, r0, r1\n\
+    movs r4, 0\n\
+    movs r6, 0\n\
+    movs r3, 0\n\
+    ldr r5, =gPlayerParty\n\
+    ldr r7, [sp, 0x10]\n\
+    lsls r0, r7, 3\n\
+    mov r1, r10\n\
+    adds r2, r0, r1\n\
 _0817E5B8:\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	movs r7, 0\n\
-	ldrsh r1, [r2, r7]\n\
-	cmp r0, r1\n\
-	bge _0817E5C8\n\
-	ldrh r4, [r2]\n\
-	adds r6, r3, 0\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    movs r7, 0\n\
+    ldrsh r1, [r2, r7]\n\
+    cmp r0, r1\n\
+    bge _0817E5C8\n\
+    ldrh r4, [r2]\n\
+    adds r6, r3, 0\n\
 _0817E5C8:\n\
-	adds r2, 0x2\n\
-	adds r3, 0x1\n\
-	cmp r3, 0x3\n\
-	ble _0817E5B8\n\
-	movs r0, 0x64\n\
-	ldr r1, [sp, 0x10]\n\
-	muls r0, r1\n\
-	adds r0, r5\n\
-	adds r1, r6, 0\n\
-	adds r1, 0xD\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	ldr r2, [sp, 0x1C]\n\
-	cmp r2, 0\n\
-	beq _0817E670\n\
-	cmp r4, 0\n\
-	beq _0817E670\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	movs r1, 0x40\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _0817E65C\n\
-	ldr r3, [sp, 0x10]\n\
-	cmp r3, 0x2\n\
-	bhi _0817E620\n\
-	ldr r0, =gBattleScripting\n\
-	adds r0, 0x25\n\
-	ldrb r0, [r0]\n\
-	bl GetLinkTrainerFlankId\n\
-	lsls r0, 16\n\
-	cmp r0, 0\n\
-	beq _0817E630\n\
-	b _0817E670\n\
-	.pool\n\
+    adds r2, 0x2\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x3\n\
+    ble _0817E5B8\n\
+    movs r0, 0x64\n\
+    ldr r1, [sp, 0x10]\n\
+    muls r0, r1\n\
+    adds r0, r5\n\
+    adds r1, r6, 0\n\
+    adds r1, 0xD\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    ldr r2, [sp, 0x1C]\n\
+    cmp r2, 0\n\
+    beq _0817E670\n\
+    cmp r4, 0\n\
+    beq _0817E670\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    movs r1, 0x40\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0817E65C\n\
+    ldr r3, [sp, 0x10]\n\
+    cmp r3, 0x2\n\
+    bhi _0817E620\n\
+    ldr r0, =gBattleScripting\n\
+    adds r0, 0x25\n\
+    ldrb r0, [r0]\n\
+    bl GetLinkTrainerFlankId\n\
+    lsls r0, 16\n\
+    cmp r0, 0\n\
+    beq _0817E630\n\
+    b _0817E670\n\
+    .pool\n\
 _0817E620:\n\
-	ldr r0, =gBattleScripting\n\
-	adds r0, 0x25\n\
-	ldrb r0, [r0]\n\
-	bl GetLinkTrainerFlankId\n\
-	lsls r0, 16\n\
-	cmp r0, 0\n\
-	beq _0817E670\n\
+    ldr r0, =gBattleScripting\n\
+    adds r0, 0x25\n\
+    ldrb r0, [r0]\n\
+    bl GetLinkTrainerFlankId\n\
+    lsls r0, 16\n\
+    cmp r0, 0\n\
+    beq _0817E670\n\
 _0817E630:\n\
-	movs r3, 0\n\
-	ldr r7, [sp, 0x14]\n\
-	cmp r7, 0x2\n\
-	bls _0817E63A\n\
-	movs r3, 0x1\n\
+    movs r3, 0\n\
+    ldr r7, [sp, 0x14]\n\
+    cmp r7, 0x2\n\
+    bls _0817E63A\n\
+    movs r3, 0x1\n\
 _0817E63A:\n\
-	lsls r0, r3, 24\n\
-	lsrs r0, 24\n\
-	ldr r1, =gBattleScripting\n\
-	adds r1, 0x25\n\
-	ldrb r1, [r1]\n\
-	bl sub_806EF84\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r1, r4, 0\n\
-	ldr r2, [sp]\n\
-	ldr r3, [sp, 0x4]\n\
-	bl PutBattleUpdateOnTheAir\n\
-	b _0817E670\n\
-	.pool\n\
+    lsls r0, r3, 24\n\
+    lsrs r0, 24\n\
+    ldr r1, =gBattleScripting\n\
+    adds r1, 0x25\n\
+    ldrb r1, [r1]\n\
+    bl sub_806EF84\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r1, r4, 0\n\
+    ldr r2, [sp]\n\
+    ldr r3, [sp, 0x4]\n\
+    bl PutBattleUpdateOnTheAir\n\
+    b _0817E670\n\
+    .pool\n\
 _0817E65C:\n\
-	ldr r0, =gBattleScripting\n\
-	adds r0, 0x25\n\
-	ldrb r1, [r0]\n\
-	movs r0, 0x1\n\
-	eors r0, r1\n\
-	adds r1, r4, 0\n\
-	ldr r2, [sp]\n\
-	ldr r3, [sp, 0x4]\n\
-	bl PutBattleUpdateOnTheAir\n\
+    ldr r0, =gBattleScripting\n\
+    adds r0, 0x25\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x1\n\
+    eors r0, r1\n\
+    adds r1, r4, 0\n\
+    ldr r2, [sp]\n\
+    ldr r3, [sp, 0x4]\n\
+    bl PutBattleUpdateOnTheAir\n\
 _0817E670:\n\
-	add sp, 0x20\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    add sp, 0x20\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 #endif
 
@@ -1164,7 +1164,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3)
                 break;
             }
             i += 2;
-        } while (ptr[i] != INVALID_U16);
+        } while (ptr[i] != 0xFFFF);
         break;
     case 19:
         tvPtr->side[arg2 ^ 1].faintCause = 0;
@@ -1415,9 +1415,9 @@ static void TrySetBattleSeminarShow(void)
         if (currMoveSaved == sVariableDmgMoves[i])
             break;
         i++;
-    } while (sVariableDmgMoves[i] != INVALID_U16);
+    } while (sVariableDmgMoves[i] != 0xFFFF);
 
-    if (sVariableDmgMoves[i] != INVALID_U16)
+    if (sVariableDmgMoves[i] != 0xFFFF)
         return;
 
     dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage;
@@ -1490,9 +1490,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride)
             if (moveId == sVariableDmgMoves[i])
                 break;
             i++;
-        } while (sVariableDmgMoves[i] != INVALID_U16);
+        } while (sVariableDmgMoves[i] != 0xFFFF);
 
-        if (sVariableDmgMoves[i] != INVALID_U16)
+        if (sVariableDmgMoves[i] != 0xFFFF)
         {
             *dmg = 0;
             return FALSE;
diff --git a/src/battle_util.c b/src/battle_util.c
index 12ca6bc9c..251a545c9 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -29,7 +29,7 @@ extern u8 weather_get_current(void);
 static const u16 sSoundMovesTable[] =
 {
     MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE,
-    MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, INVALID_U16
+    MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF
 };
 
 u8 GetBattlerForBattleScript(u8 caseId)
@@ -382,7 +382,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
 
     gPotentialItemEffectBattler = gActiveBattler;
 
-    if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != move)
+    if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
     {
         gCurrentMove = *choicedMove;
         gLastUsedItem = gBattleMons[gActiveBattler].item;
@@ -442,7 +442,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
             unusableMoves |= gBitTable[i];
         if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i])
             unusableMoves |= gBitTable[i];
-        if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != gBattleMons[battlerId].moves[i])
+        if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i])
             unusableMoves |= gBitTable[i];
     }
     return unusableMoves;
@@ -451,7 +451,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
 bool8 AreAllMovesUnusable(void)
 {
     u8 unusable;
-    unusable = CheckMoveLimitations(gActiveBattler, 0, INVALID_U8);
+    unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
 
     if (unusable == 0xF) // All moves are unusable.
     {
@@ -1137,7 +1137,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
                 gBattlerTarget = gActiveBattler;
                 gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
-                gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16;
+                gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
@@ -1996,12 +1996,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
         case ABILITYEFFECT_MOVES_BLOCK: // 2
             if (gLastUsedAbility == ABILITY_SOUNDPROOF)
             {
-                for (i = 0; sSoundMovesTable[i] != INVALID_U16; i++)
+                for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++)
                 {
                     if (sSoundMovesTable[i] == move)
                         break;
                 }
-                if (sSoundMovesTable[i] != INVALID_U16)
+                if (sSoundMovesTable[i] != 0xFFFF)
                 {
                     if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)
                         gHitMarker |= HITMARKER_NO_PPDEDUCT;
@@ -2527,7 +2527,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
             break;
         }
 
-        if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != INVALID_U8)
+        if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF)
             RecordAbilityBattle(battler, gLastUsedAbility);
     }
 
@@ -3213,7 +3213,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             case HOLD_EFFECT_SHELL_BELL:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                     && gSpecialStatuses[gBattlerTarget].dmg != 0
-                    && gSpecialStatuses[gBattlerTarget].dmg != INVALID_U16
+                    && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF
                     && gBattlerAttacker != gBattlerTarget
                     && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP
                     && gBattleMons[gBattlerAttacker].hp != 0)
@@ -3394,7 +3394,7 @@ u8 IsMonDisobedient(void)
     calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
     {
-        calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], INVALID_U8);
+        calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF);
         if (calc == 0xF) // all moves cannot be used
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3;
diff --git a/src/berry_blender.c b/src/berry_blender.c
index e977bdbeb..87d76bb07 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1455,7 +1455,7 @@ static void sub_808074C(void)
 
     for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
     {
-        sBerryBlenderData->field_96[i] = INVALID_U8;
+        sBerryBlenderData->field_96[i] = 0xFF;
         sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
     }
     for (j = 0; j < BLENDER_MAX_PLAYERS; j++)
@@ -1479,7 +1479,7 @@ static void Blender_PrintPlayerNames(void)
 
     for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
     {
-        if (sBerryBlenderData->field_8E[i] != INVALID_U8)
+        if (sBerryBlenderData->field_8E[i] != 0xFF)
         {
             sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i];
             StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i);
diff --git a/src/bg.c b/src/bg.c
index fd6ffca6e..a41075ad7 100644
--- a/src/bg.c
+++ b/src/bg.c
@@ -87,37 +87,37 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS
 {
     if (IsInvalidBg(bg) == FALSE)
     {
-        if (charBaseIndex != INVALID_U8)
+        if (charBaseIndex != 0xFF)
         {
             sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3;
         }
 
-        if (mapBaseIndex != INVALID_U8)
+        if (mapBaseIndex != 0xFF)
         {
             sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F;
         }
 
-        if (screenSize != INVALID_U8)
+        if (screenSize != 0xFF)
         {
             sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3;
         }
 
-        if (paletteMode != INVALID_U8)
+        if (paletteMode != 0xFF)
         {
             sGpuBgConfigs.configs[bg].paletteMode = paletteMode;
         }
 
-        if (priority != INVALID_U8)
+        if (priority != 0xFF)
         {
             sGpuBgConfigs.configs[bg].priority = priority & 0x3;
         }
 
-        if (mosaic != INVALID_U8)
+        if (mosaic != 0xFF)
         {
             sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1;
         }
 
-        if (wraparound != INVALID_U8)
+        if (wraparound != 0xFF)
         {
             sGpuBgConfigs.configs[bg].wraparound = wraparound;
         }
@@ -154,7 +154,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId)
         }
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode)
@@ -379,7 +379,7 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset)
 
     cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1);
 
-    if (cursor == INVALID_U8)
+    if (cursor == 0xFF)
     {
         return -1;
     }
@@ -400,7 +400,7 @@ u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset)
 
     cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2);
 
-    if (cursor == INVALID_U8)
+    if (cursor == 0xFF)
     {
         return -1;
     }
@@ -480,25 +480,25 @@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value)
     switch (attributeId)
     {
     case 1:
-        SetBgControlAttributes(bg, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
         break;
     case 2:
-        SetBgControlAttributes(bg, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
         break;
     case 3:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF);
         break;
     case 4:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF);
         break;
     case 7:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF);
         break;
     case 5:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF);
         break;
     case 6:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value);
         break;
     }
 }
@@ -1284,7 +1284,7 @@ u32 GetBgType(u8 bg)
         break;
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 bool32 IsInvalidBg32(u8 bg)
diff --git a/src/blit.c b/src/blit.c
index 2ba0e489c..b4d5f7de5 100644
--- a/src/blit.c
+++ b/src/blit.c
@@ -3,7 +3,7 @@
 
 void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height)
 {
-    BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, INVALID_U8);
+    BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, 0xFF);
 }
 
 void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey)
@@ -33,7 +33,7 @@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 sr
     multiplierSrcY = (src->width + (src->width & 7)) >> 3;
     multiplierDstY = (dst->width + (dst->width & 7)) >> 3;
 
-    if (colorKey == INVALID_U8)
+    if (colorKey == 0xFF)
     {
         for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++)
         {
@@ -132,7 +132,7 @@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX,
     multiplierSrcY = (src->width + (src->width & 7)) >> 3;
     multiplierDstY = (dst->width + (dst->width & 7)) >> 3;
 
-    if (colorKey == INVALID_U8)
+    if (colorKey == 0xFF)
     {
         for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++)
         {
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 6a2e42c4e..b17ffad33 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -465,7 +465,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
                 }
 
                 varValue = VarGet(0x403B);
-                if (varValue != INVALID_U16 || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF)
+                if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF)
                     return FALSE;
 
                 if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21)
diff --git a/src/cable_club.c b/src/cable_club.c
index 649534711..56154d5bf 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -70,7 +70,7 @@ static void sub_80B3220(u8 taskId);
 
 static void sub_80B236C(u8 arg0, u8 arg1)
 {
-    if (FindTaskIdByFunc(sub_80B2634) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_80B2634) == 0xFF)
     {
         u8 taskId1;
 
@@ -604,7 +604,7 @@ void sub_80B2EA8(void)
 {
     u32 taskId = FindTaskIdByFunc(sub_80B2EE4);
 
-    if (taskId == INVALID_U8)
+    if (taskId == 0xFF)
     {
         taskId = CreateTask(sub_80B2EE4, 80);
         gTasks[taskId].data[0] = 0;
@@ -702,7 +702,7 @@ void sub_80B3028(void)
 u8 sub_80B3050(void)
 {
     if (FuncIsActiveTask(sub_80B3144) != FALSE)
-        return INVALID_U8;
+        return 0xFF;
 
     switch (gSpecialVar_0x8004)
     {
diff --git a/src/contest.c b/src/contest.c
index 716ed5dfc..0c4397f30 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -324,7 +324,7 @@ void sub_80D787C(void)
     *gContestResources->field_0 = (struct Contest){};
     for (i = 0; i < 4; i++)
     {
-        gContestResources->field_0->unk19206[i] = INVALID_U8;
+        gContestResources->field_0->unk19206[i] = 0xFF;
     }
     for (i = 0; i < 4; i++)
     {
@@ -344,7 +344,7 @@ void sub_80D787C(void)
         sub_80DCE58(0);
     for (i = 0; i < 4; i++)
     {
-        gContestResources->field_4[i].nextTurnOrder = INVALID_U8;
+        gContestResources->field_4[i].nextTurnOrder = 0xFF;
         gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i];
     }
     sub_80DD590();
@@ -2097,7 +2097,7 @@ void sub_80DAB8C(u8 contestType, u8 rank)
                 opponents[opponentsCount++] = i;
         }
     }
-    opponents[opponentsCount] = INVALID_U8;
+    opponents[opponentsCount] = 0xFF;
 
     // Choose three random opponents from the list
     for (i = 0; i < 3; i++)
@@ -2106,7 +2106,7 @@ void sub_80DAB8C(u8 contestType, u8 rank)
         s32 j;
 
         gContestMons[i] = gContestOpponents[opponents[rnd]];
-        for (j = rnd; opponents[j] != INVALID_U8; j++)
+        for (j = rnd; opponents[j] != 0xFF; j++)
             opponents[j] = opponents[j + 1];
         opponentsCount--;
     }
@@ -2151,7 +2151,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
         else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough)
             opponents[opponentsCount++] = i;
     }
-    opponents[opponentsCount] = INVALID_U8;
+    opponents[opponentsCount] = 0xFF;
     for (i = 0; i < 4 - gUnknown_02039F30; i++)
     {
         u16 rnd = sub_80F903C() % opponentsCount;
@@ -2160,7 +2160,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
         gContestMons[gUnknown_02039F30 + i] = gContestOpponents[opponents[rnd]];
         sub_80DF9D4(gContestMons[gUnknown_02039F30 + i].trainerName);
         sub_80DF9E0(gContestMons[gUnknown_02039F30 + i].nickname, GAME_LANGUAGE);
-        for (j = rnd; opponents[j] != INVALID_U8; j++)
+        for (j = rnd; opponents[j] != 0xFF; j++)
             opponents[j] = opponents[j + 1];
         opponentsCount--;
     }
@@ -2591,7 +2591,7 @@ void prints_contest_move_description(u16 a)
     ContestBG_FillBoxWithIncrementingTile(0, categoryTile,        0x0b, 0x1f, 0x05, 0x01, 0x11, 0x01);
     ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01);
 
-    if (gContestEffects[gContestMoves[a].effect].appeal == INVALID_U8)
+    if (gContestEffects[gContestMoves[a].effect].appeal == 0xFF)
         numHearts = 0;
     else
         numHearts = gContestEffects[gContestMoves[a].effect].appeal / 10;
@@ -2600,7 +2600,7 @@ void prints_contest_move_description(u16 a)
     ContestBG_FillBoxWithTile(0, 0x5035, 0x15, 0x1f, 0x08,      0x01, 0x11);
     ContestBG_FillBoxWithTile(0, 0x5012, 0x15, 0x1f, numHearts, 0x01, 0x11);
 
-    if (gContestEffects[gContestMoves[a].effect].jam == INVALID_U8)
+    if (gContestEffects[gContestMoves[a].effect].jam == 0xFF)
         numHearts = 0;
     else
         numHearts = gContestEffects[gContestMoves[a].effect].jam / 10;
diff --git a/src/contest_effect.c b/src/contest_effect.c
index 6f1c19fe2..760d74d69 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -144,7 +144,7 @@ static void ContestEffect_StartleFrontMon(void)
                 break;
         }
         shared192D0.jamQueue[0] = i;
-        shared192D0.jamQueue[1] = INVALID_U8;
+        shared192D0.jamQueue[1] = 0xFF;
         idx = WasAtLeastOneOpponentJammed();
     }
     if (idx == 0)
@@ -168,7 +168,7 @@ static void ContestEffect_StartlePrevMons(void)
                 shared192D0.jamQueue[j++] = i;
         }
 
-        shared192D0.jamQueue[j] = INVALID_U8;
+        shared192D0.jamQueue[j] = 0xFF;
         idx = WasAtLeastOneOpponentJammed();
     }
     if (idx == 0)
@@ -211,7 +211,7 @@ static void ContestEffect_StartlePrevMons2(void)
                 u8 rval, jam;
 
                 shared192D0.jamQueue[0] = i;
-                shared192D0.jamQueue[1] = INVALID_U8;
+                shared192D0.jamQueue[1] = 0xFF;
                 rval = Random() % 10;
 
                 if (rval == 0)
@@ -288,7 +288,7 @@ static void ContestEffect_StartleMonWithJudgesAttention(void)
                 else
                     shared192D0.jam = 10;
                 shared192D0.jamQueue[0] = i;
-                shared192D0.jamQueue[1] = INVALID_U8;
+                shared192D0.jamQueue[1] = 0xFF;
                 if (WasAtLeastOneOpponentJammed())
                     numStartled++;
             }
@@ -393,7 +393,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void)
     s16 oddsMod[4];
     s16 odds[4];
 
-    memset(contestantIds, INVALID_U8, ARRAY_COUNT(contestantIds));
+    memset(contestantIds, 0xFF, ARRAY_COUNT(contestantIds));
     for (i = 0, numAfter = 0; i < 4; i++)
     {
         if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[i] &&
@@ -431,7 +431,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void)
     }
     if (odds[0] != 0)
     {
-        for (i = 0; contestantIds[i] != INVALID_U8; i++)
+        for (i = 0; contestantIds[i] != 0xFF; i++)
         {
             if (Random() % 100 < odds[i] + oddsMod[contestantIds[i]])
             {
@@ -504,7 +504,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void)
             else
                 shared192D0.jam = 10;
             shared192D0.jamQueue[0] = i;
-            shared192D0.jamQueue[1] = INVALID_U8;
+            shared192D0.jamQueue[1] = 0xFF;
             if (WasAtLeastOneOpponentJammed())
                 numHit++;
         }
@@ -755,7 +755,7 @@ static void ContestEffect_NextAppealEarlier(void)
         for (i = 0; i < 4; i++)
             turnOrder[i] = sContestantStatus[i].nextTurnOrder;
 
-        turnOrder[shared192D0.contestant] = INVALID_U8;
+        turnOrder[shared192D0.contestant] = 0xFF;
 
         for (i = 0; i < 4; i++)
         {
@@ -797,7 +797,7 @@ static void ContestEffect_NextAppealLater(void)
         for (i = 0; i < 4; i++)
             turnOrder[i] = sContestantStatus[i].nextTurnOrder;
 
-        turnOrder[shared192D0.contestant] = INVALID_U8;
+        turnOrder[shared192D0.contestant] = 0xFF;
 
         for (i = 3; i > -1; i--)
         {
@@ -855,12 +855,12 @@ static void ContestEffect_ScrambleNextTurnOrder(void)
 
             for (j = 0; j < 4; j++)
             {
-                if (unselectedContestants[j] != INVALID_U8)
+                if (unselectedContestants[j] != 0xFF)
                 {
                     if (rval == 0)
                     {
                         turnOrder[j] = i;
-                        unselectedContestants[j] = INVALID_U8;
+                        unselectedContestants[j] = 0xFF;
                         break;
                     }
                     else
@@ -906,7 +906,7 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void)
             else
                 shared192D0.jam = 10;
             shared192D0.jamQueue[0] = i;
-            shared192D0.jamQueue[1] = INVALID_U8;
+            shared192D0.jamQueue[1] = 0xFF;
             if (WasAtLeastOneOpponentJammed())
                 numJammed++;
         }
@@ -974,7 +974,7 @@ static void JamByMoveCategory(u8 category)
             else
                 shared192D0.jam = 10;
             shared192D0.jamQueue[0] = i;
-            shared192D0.jamQueue[1] = INVALID_U8;
+            shared192D0.jamQueue[1] = 0xFF;
             if (WasAtLeastOneOpponentJammed())
                 numJammed++;
         }
@@ -1013,7 +1013,7 @@ static bool8 WasAtLeastOneOpponentJammed(void)
     s16 jamBuffer[4] = {0};
     int i;
 
-    for (i = 0; shared192D0.jamQueue[i] != INVALID_U8; i++)
+    for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++)
     {
         u8 contestant = shared192D0.jamQueue[i];
         if (CanUnnerveContestant(contestant))
diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h
index ae560c833..5460ac806 100644
--- a/src/data/contest_moves.h
+++ b/src/data/contest_moves.h
@@ -1,2889 +1,3129 @@
 const struct ContestMove gContestMoves[MOVES_COUNT] =
 {
-	[MOVE_NONE] = {0},
-
-	[MOVE_POUND] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_POUND,
-		.comboMoves = {0},
-	},
-
-	[MOVE_KARATE_CHOP] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_DOUBLE_SLAP] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_POUND},
-	},
-
-	[MOVE_COMET_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MEGA_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER},
-	},
-
-	[MOVE_PAY_DAY] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FIRE_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_FIRE_PUNCH,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH},
-	},
-
-	[MOVE_ICE_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_ICE_PUNCH,
-		.comboMoves = {COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH},
-	},
-
-	[MOVE_THUNDER_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_THUNDER_PUNCH,
-		.comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH},
-	},
-
-	[MOVE_SCRATCH] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_SCRATCH,
-		.comboMoves = {COMBO_STARTER_LEER},
-	},
-
-	[MOVE_VICE_GRIP] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_VICE_GRIP,
-		.comboMoves = {0},
-	},
-
-	[MOVE_GUILLOTINE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_VICE_GRIP},
-	},
-
-	[MOVE_RAZOR_WIND] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SWORDS_DANCE] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_SWORDS_DANCE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CUT] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWORDS_DANCE},
-	},
-
-	[MOVE_GUST] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WING_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WHIRLWIND] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FLY] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BIND] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_VICE_GRIP},
-	},
-
-	[MOVE_SLAM] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_POUND},
-	},
-
-	[MOVE_VINE_WHIP] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_STOMP] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,{0, COMBO_STARTER_LEER},
-	},
-
-	[MOVE_DOUBLE_KICK] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MEGA_KICK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER},
-	},
-
-	[MOVE_JUMP_KICK] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_MIND_READER},
-	},
-
-	[MOVE_ROLLING_KICK] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SAND_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_SAND_ATTACK,
-		.comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM},
-	},
-
-	[MOVE_HEADBUTT] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_HORN_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_HORN_ATTACK,
-		.comboMoves = {COMBO_STARTER_LEER},
-	},
-
-	[MOVE_FURY_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK},
-	},
-
-	[MOVE_HORN_DRILL] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_HORN_ATTACK},
-	},
-
-	[MOVE_TACKLE] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN},
-	},
-
-	[MOVE_BODY_SLAM] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WRAP] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TAKE_DOWN] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN},
-	},
-
-	[MOVE_THRASH] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAGE},
-	},
-
-	[MOVE_DOUBLE_EDGE] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN},
-	},
-
-	[MOVE_TAIL_WHIP] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARM},
-	},
-
-	[MOVE_POISON_STING] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TWINEEDLE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PIN_MISSILE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_LEER] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_LEER,
-		.comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE},
-	},
-
-	[MOVE_BITE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE},
-	},
-
-	[MOVE_GROWL] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARM},
-	},
-
-	[MOVE_ROAR] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SING] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_SING,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SUPERSONIC] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SONIC_BOOM] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DISABLE] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ACID] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_EMBER] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_FLAMETHROWER] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_MIST] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WATER_GUN] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT},
-	},
-
-	[MOVE_HYDRO_PUMP] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_SURF] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_SURF,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE},
-	},
-
-	[MOVE_ICE_BEAM] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BLIZZARD] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL},
-	},
-
-	[MOVE_PSYBEAM] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_BUBBLE_BEAM] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_AURORA_BEAM] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_HYPER_BEAM] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PECK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_PECK,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DRILL_PECK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_PECK},
-	},
-
-	[MOVE_SUBMISSION] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_MIND_READER},
-	},
-
-	[MOVE_LOW_KICK] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_COUNTER] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_TAUNT},
-	},
-
-	[MOVE_SEISMIC_TOSS] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FAKE_OUT},
-	},
-
-	[MOVE_STRENGTH] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ABSORB] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_MEGA_DRAIN] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_LEECH_SEED] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_GROWTH] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_GROWTH,
-		.comboMoves = {0},
-	},
-
-	[MOVE_RAZOR_LEAF] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_SOLAR_BEAM] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_POISON_POWDER] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWEET_SCENT},
-	},
-
-	[MOVE_STUN_SPORE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWEET_SCENT},
-	},
-
-	[MOVE_SLEEP_POWDER] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWEET_SCENT},
-	},
-
-	[MOVE_PETAL_DANCE] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_STRING_SHOT] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_STRING_SHOT,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DRAGON_RAGE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_DRAGON_RAGE,
-		.comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE},
-	},
-
-	[MOVE_FIRE_SPIN] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_THUNDER_SHOCK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE},
-	},
-
-	[MOVE_THUNDERBOLT] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE},
-	},
-
-	[MOVE_THUNDER_WAVE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE},
-	},
-
-	[MOVE_THUNDER] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON},
-	},
-
-	[MOVE_ROCK_THROW] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_ROCK_THROW,
-		.comboMoves = {0},
-	},
-
-	[MOVE_EARTHQUAKE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_EARTHQUAKE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FISSURE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_EARTHQUAKE},
-	},
-
-	[MOVE_DIG] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TOXIC] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CONFUSION] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_CONFUSION,
-		.comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_PSYCHIC] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_PSYCHIC,
-		.comboMoves = {COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_HYPNOSIS] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_HYPNOSIS,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MEDITATE] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_AGILITY] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_DOUBLE_TEAM},
-	},
-
-	[MOVE_QUICK_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_DOUBLE_TEAM},
-	},
-
-	[MOVE_RAGE] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_RAGE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TELEPORT] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION},
-	},
-
-	[MOVE_NIGHT_SHADE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MIMIC] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SCREECH] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DOUBLE_TEAM] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_DOUBLE_TEAM,
-		.comboMoves = {0},
-	},
-
-	[MOVE_RECOVER] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_HARDEN] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_HARDEN,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MINIMIZE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SMOKESCREEN] =
-	{
-		.effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SMOG},
-	},
-
-	[MOVE_CONFUSE_RAY] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WITHDRAW] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_DEFENSE_CURL] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_DEFENSE_CURL,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BARRIER] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_LIGHT_SCREEN] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_HAZE] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_REFLECT] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_FOCUS_ENERGY] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_FOCUS_ENERGY,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BIDE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_METRONOME] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MIRROR_MOVE] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SELF_DESTRUCT] =
-	{
-		.effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_EGG_BOMB] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SOFT_BOILED},
-	},
-
-	[MOVE_LICK] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SMOG] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_SMOG,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SLUDGE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_SLUDGE,
-		.comboMoves = {COMBO_STARTER_SLUDGE_BOMB},
-	},
-
-	[MOVE_BONE_CLUB] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_BONE_CLUB,
-		.comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH},
-	},
-
-	[MOVE_FIRE_BLAST] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_WATERFALL] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_CLAMP] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_SWIFT] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SKULL_BASH] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SPIKE_CANNON] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CONSTRICT] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_AMNESIA] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_KINESIS] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_KINESIS,
-		.comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION},
-	},
-
-	[MOVE_SOFT_BOILED] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_SOFT_BOILED,
-		.comboMoves = {0},
-	},
-
-	[MOVE_HI_JUMP_KICK] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_MIND_READER},
-	},
-
-	[MOVE_GLARE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_LEER},
-	},
-
-	[MOVE_DREAM_EATER] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_POISON_GAS] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BARRAGE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_LEECH_LIFE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_LOVELY_KISS] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SKY_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TRANSFORM] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BUBBLE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_DIZZY_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SPORE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FLASH] =
-	{
-		.effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PSYWAVE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_SPLASH] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ACID_ARMOR] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CRABHAMMER] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE},
-	},
-
-	[MOVE_EXPLOSION] =
-	{
-		.effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FURY_SWIPES] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SCRATCH},
-	},
-
-	[MOVE_BONEMERANG] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_BONEMERANG,
-		.comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH},
-	},
-
-	[MOVE_REST] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_REST,
-		.comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN},
-	},
-
-	[MOVE_ROCK_SLIDE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ROCK_THROW},
-	},
-
-	[MOVE_HYPER_FANG] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SHARPEN] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CONVERSION] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TRI_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_LOCK_ON},
-	},
-
-	[MOVE_SUPER_FANG] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SCARY_FACE},
-	},
-
-	[MOVE_SLASH] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH},
-	},
-
-	[MOVE_SUBSTITUTE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_STRUGGLE] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SKETCH] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TRIPLE_KICK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_THIEF] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SPIDER_WEB] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_STRING_SHOT},
-	},
-
-	[MOVE_MIND_READER] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_MIND_READER,
-		.comboMoves = {0},
-	},
-
-	[MOVE_NIGHTMARE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_HYPNOSIS},
-	},
-
-	[MOVE_FLAME_WHEEL] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_SNORE] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_REST},
-	},
-
-	[MOVE_CURSE] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_CURSE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FLAIL] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ENDURE},
-	},
-
-	[MOVE_CONVERSION_2] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_AEROBLAST] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_COTTON_SPORE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_REVERSAL] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ENDURE},
-	},
-
-	[MOVE_SPITE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CURSE},
-	},
-
-	[MOVE_POWDER_SNOW] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_POWDER_SNOW,
-		.comboMoves = {COMBO_STARTER_HAIL},
-	},
-
-	[MOVE_PROTECT] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_HARDEN},
-	},
-
-	[MOVE_MACH_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SCARY_FACE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_SCARY_FACE,
-		.comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_LEER},
-	},
-
-	[MOVE_FAINT_ATTACK] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND},
-	},
-
-	[MOVE_SWEET_KISS] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARM},
-	},
-
-	[MOVE_BELLY_DRUM] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_BELLY_DRUM,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SLUDGE_BOMB] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_SLUDGE_BOMB,
-		.comboMoves = {COMBO_STARTER_SLUDGE},
-	},
-
-	[MOVE_MUD_SLAP] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_MUD_SLAP,
-		.comboMoves = {COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM},
-	},
-
-	[MOVE_OCTAZOOKA] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON},
-	},
-
-	[MOVE_SPIKES] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ZAP_CANNON] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_LOCK_ON},
-	},
-
-	[MOVE_FORESIGHT] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DESTINY_BOND] =
-	{
-		.effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE},
-	},
-
-	[MOVE_PERISH_SONG] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING},
-	},
-
-	[MOVE_ICY_WIND] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DETECT] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_TAUNT},
-	},
-
-	[MOVE_BONE_RUSH] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_BONE_RUSH,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG},
-	},
-
-	[MOVE_LOCK_ON] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_LOCK_ON,
-		.comboMoves = {0},
-	},
-
-	[MOVE_OUTRAGE] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SANDSTORM] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_SANDSTORM,
-		.comboMoves = {0},
-	},
-
-	[MOVE_GIGA_DRAIN] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_ENDURE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_ENDURE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CHARM] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_CHARM,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ROLLOUT] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN},
-	},
-
-	[MOVE_FALSE_SWIPE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWORDS_DANCE},
-	},
-
-	[MOVE_SWAGGER] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MILK_DRINK] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SPARK] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE},
-	},
-
-	[MOVE_FURY_CUTTER] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWORDS_DANCE},
-	},
-
-	[MOVE_STEEL_WING] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MEAN_LOOK] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_MEAN_LOOK,
-		.comboMoves = {COMBO_STARTER_CURSE},
-	},
-
-	[MOVE_ATTRACT] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SLEEP_TALK] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_REST},
-	},
-
-	[MOVE_HEAL_BELL] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_RETURN] =
-	{
-		.effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PRESENT] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FRUSTRATION] =
-	{
-		.effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SAFEGUARD] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PAIN_SPLIT] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ENDURE},
-	},
-
-	[MOVE_SACRED_FIRE] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_MAGNITUDE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DYNAMIC_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER},
-	},
-
-	[MOVE_MEGAHORN] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DRAGON_BREATH] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_DRAGON_BREATH,
-		.comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE},
-	},
-
-	[MOVE_BATON_PASS] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ENCORE] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PURSUIT] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_RAPID_SPIN] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SWEET_SCENT] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_SWEET_SCENT,
-		.comboMoves = {0},
-	},
-
-	[MOVE_IRON_TAIL] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_METAL_CLAW] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_METAL_SOUND},
-	},
-
-	[MOVE_VITAL_THROW] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FAKE_OUT},
-	},
-
-	[MOVE_MORNING_SUN] =
-	{
-		.effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_SYNTHESIS] =
-	{
-		.effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_MOONLIGHT] =
-	{
-		.effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_HIDDEN_POWER] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CROSS_CHOP] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_TWISTER] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_RAIN_DANCE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_RAIN_DANCE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SUNNY_DAY] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_SUNNY_DAY,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CRUNCH] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SCARY_FACE},
-	},
-
-	[MOVE_MIRROR_COAT] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_TAUNT},
-	},
-
-	[MOVE_PSYCH_UP] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_EXTREME_SPEED] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ANCIENT_POWER] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SHADOW_BALL] =
-	{
-		.effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FUTURE_SIGHT] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_ROCK_SMASH] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WHIRLPOOL] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_BEAT_UP] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FAKE_OUT] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_FAKE_OUT,
-		.comboMoves = {0},
-	},
-
-	[MOVE_UPROAR] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_STOCKPILE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = COMBO_STARTER_STOCKPILE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SPIT_UP] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_STOCKPILE},
-	},
-
-	[MOVE_SWALLOW] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_STOCKPILE},
-	},
-
-	[MOVE_HEAT_WAVE] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_HAIL] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_HAIL,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TORMENT] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FLATTER] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARM},
-	},
-
-	[MOVE_WILL_O_WISP] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_MEMENTO] =
-	{
-		.effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FACADE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FOCUS_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_SMELLING_SALT] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FOLLOW_ME] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_NATURE_POWER] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CHARGE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_CHARGE,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TAUNT] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_TAUNT,
-		.comboMoves = {0},
-	},
-
-	[MOVE_HELPING_HAND] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TRICK] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ROLE_PLAY] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WISH] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ASSIST] =
-	{
-		.effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_INGRAIN] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SUPERPOWER] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_LOCK_ON},
-	},
-
-	[MOVE_MAGIC_COAT] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_RECYCLE] =
-	{
-		.effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_REVENGE] =
-	{
-		.effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BRICK_BREAK] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_YAWN] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_YAWN,
-		.comboMoves = {0},
-	},
-
-	[MOVE_KNOCK_OFF] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FAKE_OUT},
-	},
-
-	[MOVE_ENDEAVOR] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ENDURE},
-	},
-
-	[MOVE_ERUPTION] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_SKILL_SWAP] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_IMPRISON] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_REFRESH] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING},
-	},
-
-	[MOVE_GRUDGE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CURSE},
-	},
-
-	[MOVE_SNATCH] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SECRET_POWER] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DIVE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = COMBO_STARTER_DIVE,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF},
-	},
-
-	[MOVE_ARM_THRUST] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT},
-	},
-
-	[MOVE_CAMOUFLAGE] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TAIL_GLOW] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_LUSTER_PURGE] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_MIST_BALL] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
-
-	[MOVE_FEATHER_DANCE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TEETER_DANCE] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BLAZE_KICK] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_MUD_SPORT] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_MUD_SPORT,
-		.comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT},
-	},
-
-	[MOVE_ICE_BALL] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_NEEDLE_ARM] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SLACK_OFF] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_YAWN},
-	},
-
-	[MOVE_HYPER_VOICE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_POISON_FANG] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_CRUSH_CLAW] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SWORDS_DANCE},
-	},
-
-	[MOVE_BLAST_BURN] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_HYDRO_CANNON] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_METEOR_MASH] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ASTONISH] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_PREV_MON,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WEATHER_BALL] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM},
-	},
-
-	[MOVE_AROMATHERAPY] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_FAKE_TEARS] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_LAST,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_AIR_CUTTER] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_OVERHEAT] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SUNNY_DAY},
-	},
-
-	[MOVE_ODOR_SLEUTH] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ROCK_TOMB] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_ROCK_THROW},
-	},
-
-	[MOVE_SILVER_WIND] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_METAL_SOUND] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_METAL_SOUND,
-		.comboMoves = {0},
-	},
-
-	[MOVE_GRASS_WHISTLE] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_TICKLE] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_COSMIC_POWER] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_WATER_SPOUT] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_SIGNAL_BEAM] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SHADOW_PUNCH] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_EXTRASENSORY] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SKY_UPPERCUT] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
-	},
-
-	[MOVE_SAND_TOMB] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_SANDSTORM},
-	},
-
-	[MOVE_SHEER_COLD] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MUDDY_WATER] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_BULLET_SEED] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_AERIAL_ACE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_ICICLE_SPEAR] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_IRON_DEFENSE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BLOCK] =
-	{
-		.effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_HOWL] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DRAGON_CLAW] =
-	{
-		.effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE},
-	},
-
-	[MOVE_FRENZY_PLANT] =
-	{
-		.effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_BULK_UP] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_BOUNCE] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_MUD_SHOT] =
-	{
-		.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_POISON_TAIL] =
-	{
-		.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_COVET] =
-	{
-		.effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_VOLT_TACKLE] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE},
-	},
-
-	[MOVE_MAGICAL_LEAF] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_GROWTH},
-	},
-
-	[MOVE_WATER_SPORT] =
-	{
-		.effect = CONTEST_EFFECT_HIGHLY_APPEALING,
-		.contestCategory = CONTEST_CATEGORY_CUTE,
-		.comboStarterId = COMBO_STARTER_WATER_SPORT,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT},
-	},
-
-	[MOVE_CALM_MIND] =
-	{
-		.effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = COMBO_STARTER_CALM_MIND,
-		.comboMoves = {0},
-	},
-
-	[MOVE_LEAF_BLADE] =
-	{
-		.effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_DRAGON_DANCE] =
-	{
-		.effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = COMBO_STARTER_DRAGON_DANCE,
-		.comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH},
-	},
-
-	[MOVE_ROCK_BLAST] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
-		.contestCategory = CONTEST_CATEGORY_TOUGH,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_SHOCK_WAVE] =
-	{
-		.effect = CONTEST_EFFECT_BETTER_IF_FIRST,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CHARGE},
-	},
-
-	[MOVE_WATER_PULSE] =
-	{
-		.effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
-		.contestCategory = CONTEST_CATEGORY_BEAUTY,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_RAIN_DANCE},
-	},
-
-	[MOVE_DOOM_DESIRE] =
-	{
-		.effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
-		.contestCategory = CONTEST_CATEGORY_COOL,
-		.comboStarterId = 0,
-		.comboMoves = {0},
-	},
-
-	[MOVE_PSYCHO_BOOST] =
-	{
-		.effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
-		.contestCategory = CONTEST_CATEGORY_SMART,
-		.comboStarterId = 0,
-		.comboMoves = {COMBO_STARTER_CALM_MIND},
-	},
+    [MOVE_NONE] = {0},
+
+    [MOVE_POUND] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_POUND,
+        .comboMoves = {0},
+    },
+
+    [MOVE_KARATE_CHOP] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_DOUBLE_SLAP] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_POUND},
+    },
+
+    [MOVE_COMET_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MEGA_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER},
+    },
+
+    [MOVE_PAY_DAY] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FIRE_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_FIRE_PUNCH,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH},
+    },
+
+    [MOVE_ICE_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_ICE_PUNCH,
+        .comboMoves = {COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH},
+    },
+
+    [MOVE_THUNDER_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_THUNDER_PUNCH,
+        .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH},
+    },
+
+    [MOVE_SCRATCH] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_SCRATCH,
+        .comboMoves = {COMBO_STARTER_LEER},
+    },
+
+    [MOVE_VICE_GRIP] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_VICE_GRIP,
+        .comboMoves = {0},
+    },
+
+    [MOVE_GUILLOTINE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_VICE_GRIP},
+    },
+
+    [MOVE_RAZOR_WIND] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SWORDS_DANCE] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_SWORDS_DANCE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CUT] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWORDS_DANCE},
+    },
+
+    [MOVE_GUST] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WING_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WHIRLWIND] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FLY] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BIND] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_VICE_GRIP},
+    },
+
+    [MOVE_SLAM] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_POUND},
+    },
+
+    [MOVE_VINE_WHIP] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_STOMP] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,{0, COMBO_STARTER_LEER},
+    },
+
+    [MOVE_DOUBLE_KICK] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MEGA_KICK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER},
+    },
+
+    [MOVE_JUMP_KICK] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_MIND_READER},
+    },
+
+    [MOVE_ROLLING_KICK] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SAND_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_SAND_ATTACK,
+        .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM},
+    },
+
+    [MOVE_HEADBUTT] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_HORN_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_HORN_ATTACK,
+        .comboMoves = {COMBO_STARTER_LEER},
+    },
+
+    [MOVE_FURY_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK},
+    },
+
+    [MOVE_HORN_DRILL] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_HORN_ATTACK},
+    },
+
+    [MOVE_TACKLE] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN},
+    },
+
+    [MOVE_BODY_SLAM] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WRAP] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TAKE_DOWN] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN},
+    },
+
+    [MOVE_THRASH] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAGE},
+    },
+
+    [MOVE_DOUBLE_EDGE] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN},
+    },
+
+    [MOVE_TAIL_WHIP] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARM},
+    },
+
+    [MOVE_POISON_STING] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TWINEEDLE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PIN_MISSILE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_LEER] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_LEER,
+        .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE},
+    },
+
+    [MOVE_BITE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE},
+    },
+
+    [MOVE_GROWL] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARM},
+    },
+
+    [MOVE_ROAR] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SING] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_SING,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SUPERSONIC] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SONIC_BOOM] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DISABLE] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ACID] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_EMBER] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_FLAMETHROWER] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_MIST] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WATER_GUN] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT},
+    },
+
+    [MOVE_HYDRO_PUMP] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_SURF] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_SURF,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE},
+    },
+
+    [MOVE_ICE_BEAM] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BLIZZARD] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL},
+    },
+
+    [MOVE_PSYBEAM] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_BUBBLE_BEAM] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_AURORA_BEAM] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_HYPER_BEAM] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PECK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_PECK,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DRILL_PECK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_PECK},
+    },
+
+    [MOVE_SUBMISSION] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_MIND_READER},
+    },
+
+    [MOVE_LOW_KICK] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_COUNTER] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_TAUNT},
+    },
+
+    [MOVE_SEISMIC_TOSS] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FAKE_OUT},
+    },
+
+    [MOVE_STRENGTH] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ABSORB] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_MEGA_DRAIN] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_LEECH_SEED] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_GROWTH] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_GROWTH,
+        .comboMoves = {0},
+    },
+
+    [MOVE_RAZOR_LEAF] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_SOLAR_BEAM] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_POISON_POWDER] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWEET_SCENT},
+    },
+
+    [MOVE_STUN_SPORE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWEET_SCENT},
+    },
+
+    [MOVE_SLEEP_POWDER] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWEET_SCENT},
+    },
+
+    [MOVE_PETAL_DANCE] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_STRING_SHOT] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_STRING_SHOT,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DRAGON_RAGE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_DRAGON_RAGE,
+        .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE},
+    },
+
+    [MOVE_FIRE_SPIN] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_THUNDER_SHOCK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE},
+    },
+
+    [MOVE_THUNDERBOLT] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE},
+    },
+
+    [MOVE_THUNDER_WAVE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE},
+    },
+
+    [MOVE_THUNDER] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON},
+    },
+
+    [MOVE_ROCK_THROW] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_ROCK_THROW,
+        .comboMoves = {0},
+    },
+
+    [MOVE_EARTHQUAKE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_EARTHQUAKE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FISSURE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_EARTHQUAKE},
+    },
+
+    [MOVE_DIG] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TOXIC] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CONFUSION] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_CONFUSION,
+        .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_PSYCHIC] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_PSYCHIC,
+        .comboMoves = {COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_HYPNOSIS] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_HYPNOSIS,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MEDITATE] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_AGILITY] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_DOUBLE_TEAM},
+    },
+
+    [MOVE_QUICK_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_DOUBLE_TEAM},
+    },
+
+    [MOVE_RAGE] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_RAGE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TELEPORT] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION},
+    },
+
+    [MOVE_NIGHT_SHADE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MIMIC] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SCREECH] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DOUBLE_TEAM] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_DOUBLE_TEAM,
+        .comboMoves = {0},
+    },
+
+    [MOVE_RECOVER] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_HARDEN] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_HARDEN,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MINIMIZE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SMOKESCREEN] =
+    {
+        .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SMOG},
+    },
+
+    [MOVE_CONFUSE_RAY] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WITHDRAW] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_DEFENSE_CURL] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_DEFENSE_CURL,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BARRIER] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_LIGHT_SCREEN] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_HAZE] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_REFLECT] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_FOCUS_ENERGY] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_FOCUS_ENERGY,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BIDE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_METRONOME] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MIRROR_MOVE] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SELF_DESTRUCT] =
+    {
+        .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_EGG_BOMB] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SOFT_BOILED},
+    },
+
+    [MOVE_LICK] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SMOG] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_SMOG,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SLUDGE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_SLUDGE,
+        .comboMoves = {COMBO_STARTER_SLUDGE_BOMB},
+    },
+
+    [MOVE_BONE_CLUB] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_BONE_CLUB,
+        .comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH},
+    },
+
+    [MOVE_FIRE_BLAST] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_WATERFALL] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_CLAMP] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_SWIFT] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SKULL_BASH] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SPIKE_CANNON] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CONSTRICT] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_AMNESIA] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_KINESIS] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_KINESIS,
+        .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION},
+    },
+
+    [MOVE_SOFT_BOILED] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_SOFT_BOILED,
+        .comboMoves = {0},
+    },
+
+    [MOVE_HI_JUMP_KICK] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_MIND_READER},
+    },
+
+    [MOVE_GLARE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_LEER},
+    },
+
+    [MOVE_DREAM_EATER] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_POISON_GAS] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BARRAGE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_LEECH_LIFE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_LOVELY_KISS] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SKY_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TRANSFORM] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BUBBLE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_DIZZY_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SPORE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FLASH] =
+    {
+        .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PSYWAVE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_SPLASH] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ACID_ARMOR] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CRABHAMMER] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE},
+    },
+
+    [MOVE_EXPLOSION] =
+    {
+        .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FURY_SWIPES] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SCRATCH},
+    },
+
+    [MOVE_BONEMERANG] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_BONEMERANG,
+        .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH},
+    },
+
+    [MOVE_REST] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_REST,
+        .comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN},
+    },
+
+    [MOVE_ROCK_SLIDE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ROCK_THROW},
+    },
+
+    [MOVE_HYPER_FANG] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SHARPEN] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CONVERSION] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TRI_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_LOCK_ON},
+    },
+
+    [MOVE_SUPER_FANG] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SCARY_FACE},
+    },
+
+    [MOVE_SLASH] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH},
+    },
+
+    [MOVE_SUBSTITUTE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_STRUGGLE] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SKETCH] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TRIPLE_KICK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_THIEF] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SPIDER_WEB] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_STRING_SHOT},
+    },
+
+    [MOVE_MIND_READER] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_MIND_READER,
+        .comboMoves = {0},
+    },
+
+    [MOVE_NIGHTMARE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_HYPNOSIS},
+    },
+
+    [MOVE_FLAME_WHEEL] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_SNORE] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_REST},
+    },
+
+    [MOVE_CURSE] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_CURSE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FLAIL] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ENDURE},
+    },
+
+    [MOVE_CONVERSION_2] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_AEROBLAST] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_COTTON_SPORE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_REVERSAL] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ENDURE},
+    },
+
+    [MOVE_SPITE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CURSE},
+    },
+
+    [MOVE_POWDER_SNOW] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_POWDER_SNOW,
+        .comboMoves = {COMBO_STARTER_HAIL},
+    },
+
+    [MOVE_PROTECT] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_HARDEN},
+    },
+
+    [MOVE_MACH_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SCARY_FACE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_SCARY_FACE,
+        .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_LEER},
+    },
+
+    [MOVE_FAINT_ATTACK] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND},
+    },
+
+    [MOVE_SWEET_KISS] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARM},
+    },
+
+    [MOVE_BELLY_DRUM] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_BELLY_DRUM,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SLUDGE_BOMB] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_SLUDGE_BOMB,
+        .comboMoves = {COMBO_STARTER_SLUDGE},
+    },
+
+    [MOVE_MUD_SLAP] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_MUD_SLAP,
+        .comboMoves = {COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM},
+    },
+
+    [MOVE_OCTAZOOKA] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON},
+    },
+
+    [MOVE_SPIKES] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ZAP_CANNON] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_LOCK_ON},
+    },
+
+    [MOVE_FORESIGHT] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DESTINY_BOND] =
+    {
+        .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE},
+    },
+
+    [MOVE_PERISH_SONG] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING},
+    },
+
+    [MOVE_ICY_WIND] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DETECT] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_TAUNT},
+    },
+
+    [MOVE_BONE_RUSH] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_BONE_RUSH,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG},
+    },
+
+    [MOVE_LOCK_ON] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_LOCK_ON,
+        .comboMoves = {0},
+    },
+
+    [MOVE_OUTRAGE] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SANDSTORM] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_SANDSTORM,
+        .comboMoves = {0},
+    },
+
+    [MOVE_GIGA_DRAIN] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_ENDURE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_ENDURE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CHARM] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_CHARM,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ROLLOUT] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN},
+    },
+
+    [MOVE_FALSE_SWIPE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWORDS_DANCE},
+    },
+
+    [MOVE_SWAGGER] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MILK_DRINK] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SPARK] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE},
+    },
+
+    [MOVE_FURY_CUTTER] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWORDS_DANCE},
+    },
+
+    [MOVE_STEEL_WING] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MEAN_LOOK] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_MEAN_LOOK,
+        .comboMoves = {COMBO_STARTER_CURSE},
+    },
+
+    [MOVE_ATTRACT] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SLEEP_TALK] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_REST},
+    },
+
+    [MOVE_HEAL_BELL] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_RETURN] =
+    {
+        .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PRESENT] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FRUSTRATION] =
+    {
+        .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SAFEGUARD] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PAIN_SPLIT] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ENDURE},
+    },
+
+    [MOVE_SACRED_FIRE] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_MAGNITUDE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DYNAMIC_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER},
+    },
+
+    [MOVE_MEGAHORN] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DRAGON_BREATH] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_DRAGON_BREATH,
+        .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE},
+    },
+
+    [MOVE_BATON_PASS] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ENCORE] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PURSUIT] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_RAPID_SPIN] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SWEET_SCENT] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_SWEET_SCENT,
+        .comboMoves = {0},
+    },
+
+    [MOVE_IRON_TAIL] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_METAL_CLAW] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_METAL_SOUND},
+    },
+
+    [MOVE_VITAL_THROW] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FAKE_OUT},
+    },
+
+    [MOVE_MORNING_SUN] =
+    {
+        .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_SYNTHESIS] =
+    {
+        .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_MOONLIGHT] =
+    {
+        .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_HIDDEN_POWER] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CROSS_CHOP] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_TWISTER] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_RAIN_DANCE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_RAIN_DANCE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SUNNY_DAY] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_SUNNY_DAY,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CRUNCH] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SCARY_FACE},
+    },
+
+    [MOVE_MIRROR_COAT] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_TAUNT},
+    },
+
+    [MOVE_PSYCH_UP] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_EXTREME_SPEED] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ANCIENT_POWER] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SHADOW_BALL] =
+    {
+        .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FUTURE_SIGHT] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_ROCK_SMASH] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WHIRLPOOL] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_BEAT_UP] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FAKE_OUT] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_FAKE_OUT,
+        .comboMoves = {0},
+    },
+
+    [MOVE_UPROAR] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_STOCKPILE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = COMBO_STARTER_STOCKPILE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SPIT_UP] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_STOCKPILE},
+    },
+
+    [MOVE_SWALLOW] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_STOCKPILE},
+    },
+
+    [MOVE_HEAT_WAVE] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_HAIL] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_HAIL,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TORMENT] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FLATTER] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARM},
+    },
+
+    [MOVE_WILL_O_WISP] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_MEMENTO] =
+    {
+        .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FACADE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FOCUS_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_SMELLING_SALT] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FOLLOW_ME] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_NATURE_POWER] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CHARGE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_CHARGE,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TAUNT] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_TAUNT,
+        .comboMoves = {0},
+    },
+
+    [MOVE_HELPING_HAND] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TRICK] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ROLE_PLAY] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WISH] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ASSIST] =
+    {
+        .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_INGRAIN] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SUPERPOWER] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_LOCK_ON},
+    },
+
+    [MOVE_MAGIC_COAT] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_RECYCLE] =
+    {
+        .effect = CONTEST_EFFECT_REPETITION_NOT_BORING,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_REVENGE] =
+    {
+        .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BRICK_BREAK] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_YAWN] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_YAWN,
+        .comboMoves = {0},
+    },
+
+    [MOVE_KNOCK_OFF] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FAKE_OUT},
+    },
+
+    [MOVE_ENDEAVOR] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ENDURE},
+    },
+
+    [MOVE_ERUPTION] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_SKILL_SWAP] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_IMPRISON] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_REFRESH] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING},
+    },
+
+    [MOVE_GRUDGE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CURSE},
+    },
+
+    [MOVE_SNATCH] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SECRET_POWER] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DIVE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = COMBO_STARTER_DIVE,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF},
+    },
+
+    [MOVE_ARM_THRUST] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT},
+    },
+
+    [MOVE_CAMOUFLAGE] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TAIL_GLOW] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_LUSTER_PURGE] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_MIST_BALL] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
+
+    [MOVE_FEATHER_DANCE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TEETER_DANCE] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BLAZE_KICK] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_MUD_SPORT] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_MUD_SPORT,
+        .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT},
+    },
+
+    [MOVE_ICE_BALL] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_NEEDLE_ARM] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SLACK_OFF] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_YAWN},
+    },
+
+    [MOVE_HYPER_VOICE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_POISON_FANG] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_CRUSH_CLAW] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SWORDS_DANCE},
+    },
+
+    [MOVE_BLAST_BURN] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_HYDRO_CANNON] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_METEOR_MASH] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ASTONISH] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_PREV_MON,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WEATHER_BALL] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM},
+    },
+
+    [MOVE_AROMATHERAPY] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_FAKE_TEARS] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_LAST,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_AIR_CUTTER] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_OVERHEAT] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SUNNY_DAY},
+    },
+
+    [MOVE_ODOR_SLEUTH] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ROCK_TOMB] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_ROCK_THROW},
+    },
+
+    [MOVE_SILVER_WIND] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_METAL_SOUND] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_METAL_SOUND,
+        .comboMoves = {0},
+    },
+
+    [MOVE_GRASS_WHISTLE] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_TICKLE] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_COSMIC_POWER] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_WATER_SPOUT] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_WHEN_LATER,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_SIGNAL_BEAM] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SHADOW_PUNCH] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_EXTRASENSORY] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SKY_UPPERCUT] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_FOCUS_ENERGY},
+    },
+
+    [MOVE_SAND_TOMB] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_SANDSTORM},
+    },
+
+    [MOVE_SHEER_COLD] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MUDDY_WATER] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_BULLET_SEED] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_AERIAL_ACE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_ICICLE_SPEAR] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_IRON_DEFENSE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BLOCK] =
+    {
+        .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_HOWL] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DRAGON_CLAW] =
+    {
+        .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE},
+    },
+
+    [MOVE_FRENZY_PLANT] =
+    {
+        .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_BULK_UP] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_BOUNCE] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_MUD_SHOT] =
+    {
+        .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_POISON_TAIL] =
+    {
+        .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_COVET] =
+    {
+        .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_VOLT_TACKLE] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE},
+    },
+
+    [MOVE_MAGICAL_LEAF] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_GROWTH},
+    },
+
+    [MOVE_WATER_SPORT] =
+    {
+        .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
+        .contestCategory = CONTEST_CATEGORY_CUTE,
+        .comboStarterId = COMBO_STARTER_WATER_SPORT,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT},
+    },
+
+    [MOVE_CALM_MIND] =
+    {
+        .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = COMBO_STARTER_CALM_MIND,
+        .comboMoves = {0},
+    },
+
+    [MOVE_LEAF_BLADE] =
+    {
+        .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_DRAGON_DANCE] =
+    {
+        .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = COMBO_STARTER_DRAGON_DANCE,
+        .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH},
+    },
+
+    [MOVE_ROCK_BLAST] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
+        .contestCategory = CONTEST_CATEGORY_TOUGH,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_SHOCK_WAVE] =
+    {
+        .effect = CONTEST_EFFECT_BETTER_IF_FIRST,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CHARGE},
+    },
+
+    [MOVE_WATER_PULSE] =
+    {
+        .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
+        .contestCategory = CONTEST_CATEGORY_BEAUTY,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_RAIN_DANCE},
+    },
+
+    [MOVE_DOOM_DESIRE] =
+    {
+        .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
+        .contestCategory = CONTEST_CATEGORY_COOL,
+        .comboStarterId = 0,
+        .comboMoves = {0},
+    },
+
+    [MOVE_PSYCHO_BOOST] =
+    {
+        .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
+        .contestCategory = CONTEST_CATEGORY_SMART,
+        .comboStarterId = 0,
+        .comboMoves = {COMBO_STARTER_CALM_MIND},
+    },
 };
 
 const struct ContestEffect gContestEffects[] =
 {
-    {0, 40,  0}, // CONTEST_EFFECT_HIGHLY_APPEALING
-    {0, 60,  0}, // CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-    {0, 80,  0}, // CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES
-    {0, 30,  0}, // CONTEST_EFFECT_REPETITION_NOT_BORING
-    {1, 20,  0}, // CONTEST_EFFECT_AVOID_STARTLE_ONCE
-    {1, 10,  0}, // CONTEST_EFFECT_AVOID_STARTLE
-    {1, 30,  0}, // CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY
-    {1, 30,  0}, // CONTEST_EFFECT_USER_LESS_EASILY_STARTLED
-    {2, 30, 20}, // CONTEST_EFFECT_STARTLE_FRONT_MON
-    {3, 30, 10}, // CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS
-    {2, 20, 30}, // CONTEST_EFFECT_STARTLE_PREV_MON
-    {3, 20, 20}, // CONTEST_EFFECT_STARTLE_PREV_MONS
-    {2, 10, 40}, // CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-    {3, 10, 30}, // CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-    {2, 30, 20}, // CONTEST_EFFECT_STARTLE_PREV_MON_2
-    {3, 30, 10}, // CONTEST_EFFECT_STARTLE_PREV_MONS_2
-    {4, 30,  0}, // CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-    {3, 40, 40}, // CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL
-    {4, 20,  0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS
-    {4, 20,  0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-    {4, 30,  0}, // CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-    {3, 30, 10}, // CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_FIRST
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_LAST
-    {5, 10,  0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES
-    {5, 10,  0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE
-    {5, 10,  0}, // CONTEST_EFFECT_BETTER_WHEN_LATER
-    {5, 10,  0}, // CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_DIFF_TYPE
-    {5, 30,  0}, // CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-    {5, 10,  0}, // CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-    {5, 10,  0}, // CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION
-    {6, 30,  0}, // CONTEST_EFFECT_NEXT_APPEAL_EARLIER
-    {6, 30,  0}, // CONTEST_EFFECT_NEXT_APPEAL_LATER
-    {6, 30,  0}, // CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER
-    {6, 30,  0}, // CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-    {5, 10,  0}, // CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST
-    {3, 20, 10}, // CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-    {5, 10,  0}, // CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-    {4, 30,  0}  // CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
+    [CONTEST_EFFECT_HIGHLY_APPEALING] =
+    {
+        .effectType = 0,
+        .appeal = 40,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED] =
+    {
+        .effectType = 0,
+        .appeal = 60,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES] =
+    {
+        .effectType = 0,
+        .appeal = 80,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_REPETITION_NOT_BORING] =
+    {
+        .effectType = 0,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AVOID_STARTLE_ONCE] =
+    {
+        .effectType = 1,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AVOID_STARTLE] =
+    {
+        .effectType = 1,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY] =
+    {
+        .effectType = 1,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED] =
+    {
+        .effectType = 1,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_STARTLE_FRONT_MON] =
+    {
+        .effectType = 2,
+        .appeal = 30,
+        .jam = 20,
+    },
+    [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS] =
+    {
+        .effectType = 3,
+        .appeal = 30,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MON] =
+    {
+        .effectType = 2,
+        .appeal = 20,
+        .jam = 30,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MONS] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 20,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON] =
+    {
+        .effectType = 2,
+        .appeal = 10,
+        .jam = 40,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS] =
+    {
+        .effectType = 3,
+        .appeal = 10,
+        .jam = 30,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MON_2] =
+    {
+        .effectType = 2,
+        .appeal = 30,
+        .jam = 20,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MONS_2] =
+    {
+        .effectType = 3,
+        .appeal = 30,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION] =
+    {
+        .effectType = 4,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN] =
+    {
+        .effectType = 3,
+        .appeal = 40,
+        .jam = 40,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS] =
+    {
+        .effectType = 4,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS] =
+    {
+        .effectType = 4,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS] =
+    {
+        .effectType = 4,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] =
+    {
+        .effectType = 3,
+        .appeal = 30,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_BETTER_IF_FIRST] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_IF_LAST] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_WHEN_LATER] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_IF_SAME_TYPE] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL] =
+    {
+        .effectType = 5,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_NEXT_APPEAL_EARLIER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_NEXT_APPEAL_LATER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE] =
+    {
+        .effectType = 4,
+        .appeal = 30,
+        .jam = 0,
+    },
 };
 
 // A lookup table with TRUE for each combo starter ID and FALSE for ID 0,
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h
index f57e294c3..2f504737a 100755
--- a/src/data/field_event_obj/event_object_graphics_info_pointers.h
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -247,253 +247,253 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldM
 
 
 const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = {
-	&gEventObjectGraphicsInfo_BrendanNormal,
-	&gEventObjectGraphicsInfo_BrendanMachBike,
-	&gEventObjectGraphicsInfo_BrendanSurfing,
-	&gEventObjectGraphicsInfo_BrendanFieldMove,
-	&gEventObjectGraphicsInfo_QuintyPlump,
-	&gEventObjectGraphicsInfo_NinjaBoy,
-	&gEventObjectGraphicsInfo_Twin,
-	&gEventObjectGraphicsInfo_Boy1,
-	&gEventObjectGraphicsInfo_Girl1,
-	&gEventObjectGraphicsInfo_Boy2,
-	&gEventObjectGraphicsInfo_Girl2,
-	&gEventObjectGraphicsInfo_LittleBoy,
-	&gEventObjectGraphicsInfo_LittleGirl,
-	&gEventObjectGraphicsInfo_Boy3,
-	&gEventObjectGraphicsInfo_Girl3,
-	&gEventObjectGraphicsInfo_RichBoy,
-	&gEventObjectGraphicsInfo_Woman1,
-	&gEventObjectGraphicsInfo_FatMan,
-	&gEventObjectGraphicsInfo_PokefanF,
-	&gEventObjectGraphicsInfo_Man1,
-	&gEventObjectGraphicsInfo_Woman2,
-	&gEventObjectGraphicsInfo_ExpertM,
-	&gEventObjectGraphicsInfo_ExpertF,
-	&gEventObjectGraphicsInfo_Man2,
-	&gEventObjectGraphicsInfo_Woman3,
-	&gEventObjectGraphicsInfo_PokefanM,
-	&gEventObjectGraphicsInfo_Woman4,
-	&gEventObjectGraphicsInfo_Cook,
-	&gEventObjectGraphicsInfo_LinkReceptionist,
-	&gEventObjectGraphicsInfo_OldMan,
-	&gEventObjectGraphicsInfo_OldWoman,
-	&gEventObjectGraphicsInfo_Camper,
-	&gEventObjectGraphicsInfo_Picnicker,
-	&gEventObjectGraphicsInfo_Man3,
-	&gEventObjectGraphicsInfo_Woman5,
-	&gEventObjectGraphicsInfo_Youngster,
-	&gEventObjectGraphicsInfo_BugCatcher,
-	&gEventObjectGraphicsInfo_PsychicM,
-	&gEventObjectGraphicsInfo_SchoolKidM,
-	&gEventObjectGraphicsInfo_Maniac,
-	&gEventObjectGraphicsInfo_HexManiac,
-	&gEventObjectGraphicsInfo_Rayquaza1,
-	&gEventObjectGraphicsInfo_SwimmerM,
-	&gEventObjectGraphicsInfo_SwimmerF,
-	&gEventObjectGraphicsInfo_BlackBelt,
-	&gEventObjectGraphicsInfo_Beauty,
-	&gEventObjectGraphicsInfo_Scientist1,
-	&gEventObjectGraphicsInfo_Lass,
-	&gEventObjectGraphicsInfo_Gentleman,
-	&gEventObjectGraphicsInfo_Sailor,
-	&gEventObjectGraphicsInfo_Fisherman,
-	&gEventObjectGraphicsInfo_RunningTriathleteM,
-	&gEventObjectGraphicsInfo_RunningTriathleteF,
-	&gEventObjectGraphicsInfo_TuberF,
-	&gEventObjectGraphicsInfo_TuberM,
-	&gEventObjectGraphicsInfo_Hiker,
-	&gEventObjectGraphicsInfo_CyclingTriathleteM,
-	&gEventObjectGraphicsInfo_CyclingTriathleteF,
-	&gEventObjectGraphicsInfo_Nurse,
-	&gEventObjectGraphicsInfo_ItemBall,
-	&gEventObjectGraphicsInfo_BerryTree,
-	&gEventObjectGraphicsInfo_BerryTreeEarlyStages,
-	&gEventObjectGraphicsInfo_BerryTreeLateStages,
-	&gEventObjectGraphicsInfo_BrendanAcroBike,
-	&gEventObjectGraphicsInfo_ProfBirch,
-	&gEventObjectGraphicsInfo_Man4,
-	&gEventObjectGraphicsInfo_Man5,
-	&gEventObjectGraphicsInfo_ReporterM,
-	&gEventObjectGraphicsInfo_ReporterF,
-	&gEventObjectGraphicsInfo_Bard,
-	&gEventObjectGraphicsInfo_Anabel,
-	&gEventObjectGraphicsInfo_Tucker,
-	&gEventObjectGraphicsInfo_Greta,
-	&gEventObjectGraphicsInfo_Spenser,
-	&gEventObjectGraphicsInfo_Noland,
-	&gEventObjectGraphicsInfo_Lucy,
-	&gEventObjectGraphicsInfo_UnusedNatuDoll,
-	&gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
-	&gEventObjectGraphicsInfo_UnusedSquirtleDoll,
-	&gEventObjectGraphicsInfo_UnusedWooperDoll,
-	&gEventObjectGraphicsInfo_UnusedPikachuDoll,
-	&gEventObjectGraphicsInfo_UnusedPorygon2Doll,
-	&gEventObjectGraphicsInfo_CuttableTree,
-	&gEventObjectGraphicsInfo_MartEmployee,
-	&gEventObjectGraphicsInfo_RooftopSaleWoman,
-	&gEventObjectGraphicsInfo_Teala,
-	&gEventObjectGraphicsInfo_BreakableRock,
-	&gEventObjectGraphicsInfo_PushableBoulder,
-	&gEventObjectGraphicsInfo_MrBrineysBoat,
-	&gEventObjectGraphicsInfo_MayNormal,
-	&gEventObjectGraphicsInfo_MayMachBike,
-	&gEventObjectGraphicsInfo_MayAcroBike,
-	&gEventObjectGraphicsInfo_MaySurfing,
-	&gEventObjectGraphicsInfo_MayFieldMove,
-	&gEventObjectGraphicsInfo_Truck,
-	&gEventObjectGraphicsInfo_VigorothCarryingBox,
-	&gEventObjectGraphicsInfo_VigorothFacingAway,
-	&gEventObjectGraphicsInfo_BirchsBag,
-	&gEventObjectGraphicsInfo_EnemyZigzagoon,
-	&gEventObjectGraphicsInfo_Artist,
-	&gEventObjectGraphicsInfo_RivalBrendanNormal,
-	&gEventObjectGraphicsInfo_RivalBrendanMachBike,
-	&gEventObjectGraphicsInfo_RivalBrendanAcroBike,
-	&gEventObjectGraphicsInfo_RivalBrendanSurfing,
-	&gEventObjectGraphicsInfo_RivalBrendanFieldMove,
-	&gEventObjectGraphicsInfo_RivalMayNormal,
-	&gEventObjectGraphicsInfo_RivalMayMachBike,
-	&gEventObjectGraphicsInfo_RivalMayAcroBike,
-	&gEventObjectGraphicsInfo_RivalMaySurfing,
-	&gEventObjectGraphicsInfo_RivalMayFieldMove,
-	&gEventObjectGraphicsInfo_Cameraman,
-	&gEventObjectGraphicsInfo_BrendanUnderwater,
-	&gEventObjectGraphicsInfo_MayUnderwater,
-	&gEventObjectGraphicsInfo_MovingBox,
-	&gEventObjectGraphicsInfo_CableCar,
-	&gEventObjectGraphicsInfo_Scientist2,
-	&gEventObjectGraphicsInfo_DevonEmployee,
-	&gEventObjectGraphicsInfo_AquaMemberM,
-	&gEventObjectGraphicsInfo_AquaMemberF,
-	&gEventObjectGraphicsInfo_MagmaMemberM,
-	&gEventObjectGraphicsInfo_MagmaMemberF,
-	&gEventObjectGraphicsInfo_Sidney,
-	&gEventObjectGraphicsInfo_Phoebe,
-	&gEventObjectGraphicsInfo_Glacia,
-	&gEventObjectGraphicsInfo_Drake,
-	&gEventObjectGraphicsInfo_Roxanne,
-	&gEventObjectGraphicsInfo_Brawly,
-	&gEventObjectGraphicsInfo_Wattson,
-	&gEventObjectGraphicsInfo_Flannery,
-	&gEventObjectGraphicsInfo_Norman,
-	&gEventObjectGraphicsInfo_Winona,
-	&gEventObjectGraphicsInfo_Liza,
-	&gEventObjectGraphicsInfo_Tate,
-	&gEventObjectGraphicsInfo_Wallace,
-	&gEventObjectGraphicsInfo_Steven,
-	&gEventObjectGraphicsInfo_Wally,
-	&gEventObjectGraphicsInfo_RubySapphireLittleBoy,
-	&gEventObjectGraphicsInfo_BrendanFishing,
-	&gEventObjectGraphicsInfo_MayFishing,
-	&gEventObjectGraphicsInfo_HotSpringsOldWoman,
-	&gEventObjectGraphicsInfo_SSTidal,
-	&gEventObjectGraphicsInfo_SubmarineShadow,
-	&gEventObjectGraphicsInfo_PichuDoll,
-	&gEventObjectGraphicsInfo_PikachuDoll,
-	&gEventObjectGraphicsInfo_MarillDoll,
-	&gEventObjectGraphicsInfo_TogepiDoll,
-	&gEventObjectGraphicsInfo_CyndaquilDoll,
-	&gEventObjectGraphicsInfo_ChikoritaDoll,
-	&gEventObjectGraphicsInfo_TotodileDoll,
-	&gEventObjectGraphicsInfo_JigglypuffDoll,
-	&gEventObjectGraphicsInfo_MeowthDoll,
-	&gEventObjectGraphicsInfo_ClefairyDoll,
-	&gEventObjectGraphicsInfo_DittoDoll,
-	&gEventObjectGraphicsInfo_SmoochumDoll,
-	&gEventObjectGraphicsInfo_TreeckoDoll,
-	&gEventObjectGraphicsInfo_TorchicDoll,
-	&gEventObjectGraphicsInfo_MudkipDoll,
-	&gEventObjectGraphicsInfo_DuskullDoll,
-	&gEventObjectGraphicsInfo_WynautDoll,
-	&gEventObjectGraphicsInfo_BaltoyDoll,
-	&gEventObjectGraphicsInfo_KecleonDoll,
-	&gEventObjectGraphicsInfo_AzurillDoll,
-	&gEventObjectGraphicsInfo_SkittyDoll,
-	&gEventObjectGraphicsInfo_SwabluDoll,
-	&gEventObjectGraphicsInfo_GulpinDoll,
-	&gEventObjectGraphicsInfo_LotadDoll,
-	&gEventObjectGraphicsInfo_SeedotDoll,
-	&gEventObjectGraphicsInfo_PikaCushion,
-	&gEventObjectGraphicsInfo_RoundCushion,
-	&gEventObjectGraphicsInfo_KissCushion,
-	&gEventObjectGraphicsInfo_ZigzagCushion,
-	&gEventObjectGraphicsInfo_SpinCushion,
-	&gEventObjectGraphicsInfo_DiamondCushion,
-	&gEventObjectGraphicsInfo_BallCushion,
-	&gEventObjectGraphicsInfo_GrassCushion,
-	&gEventObjectGraphicsInfo_FireCushion,
-	&gEventObjectGraphicsInfo_WaterCushion,
-	&gEventObjectGraphicsInfo_BigSnorlaxDoll,
-	&gEventObjectGraphicsInfo_BigRhydonDoll,
-	&gEventObjectGraphicsInfo_BigLaprasDoll,
-	&gEventObjectGraphicsInfo_BigVenusaurDoll,
-	&gEventObjectGraphicsInfo_BigCharizardDoll,
-	&gEventObjectGraphicsInfo_BigBlastoiseDoll,
-	&gEventObjectGraphicsInfo_BigWailmerDoll,
-	&gEventObjectGraphicsInfo_BigRegirockDoll,
-	&gEventObjectGraphicsInfo_BigRegiceDoll,
-	&gEventObjectGraphicsInfo_BigRegisteelDoll,
-	&gEventObjectGraphicsInfo_Latias,
-	&gEventObjectGraphicsInfo_Latios,
-	&gEventObjectGraphicsInfo_GameboyKid,
-	&gEventObjectGraphicsInfo_ContestJudge,
-	&gEventObjectGraphicsInfo_BrendanWatering,
-	&gEventObjectGraphicsInfo_MayWatering,
-	&gEventObjectGraphicsInfo_BrendanDecorating,
-	&gEventObjectGraphicsInfo_MayDecorating,
-	&gEventObjectGraphicsInfo_Archie,
-	&gEventObjectGraphicsInfo_Maxie,
-	&gEventObjectGraphicsInfo_Kyogre1,
-	&gEventObjectGraphicsInfo_Groudon1,
-	&gEventObjectGraphicsInfo_Fossil,
-	&gEventObjectGraphicsInfo_Regirock,
-	&gEventObjectGraphicsInfo_Regice,
-	&gEventObjectGraphicsInfo_Registeel,
-	&gEventObjectGraphicsInfo_Skitty,
-	&gEventObjectGraphicsInfo_Kecleon1,
-	&gEventObjectGraphicsInfo_Kyogre2,
-	&gEventObjectGraphicsInfo_Groudon2,
-	&gEventObjectGraphicsInfo_Rayquaza2,
-	&gEventObjectGraphicsInfo_Zigzagoon,
-	&gEventObjectGraphicsInfo_Pikachu,
-	&gEventObjectGraphicsInfo_Azumarill,
-	&gEventObjectGraphicsInfo_Wingull,
-	&gEventObjectGraphicsInfo_Kecleon2,
-	&gEventObjectGraphicsInfo_TuberMSwimming,
-	&gEventObjectGraphicsInfo_Azurill,
-	&gEventObjectGraphicsInfo_Mom,
-	&gEventObjectGraphicsInfo_LinkBrendan,
-	&gEventObjectGraphicsInfo_LinkMay,
-	&gEventObjectGraphicsInfo_Juan,
-	&gEventObjectGraphicsInfo_Scott,
-	&gEventObjectGraphicsInfo_Poochyena,
-	&gEventObjectGraphicsInfo_Kyogre3,
-	&gEventObjectGraphicsInfo_Groudon3,
-	&gEventObjectGraphicsInfo_MysteryEventDeliveryman,
-	&gEventObjectGraphicsInfo_Statue,
-	&gEventObjectGraphicsInfo_Kirlia,
-	&gEventObjectGraphicsInfo_Dusclops,
-	&gEventObjectGraphicsInfo_UnionRoomAttendant,
-	&gEventObjectGraphicsInfo_Sudowoodo,
-	&gEventObjectGraphicsInfo_Mew,
-	&gEventObjectGraphicsInfo_Red,
-	&gEventObjectGraphicsInfo_Leaf,
-	&gEventObjectGraphicsInfo_Deoxys,
-	&gEventObjectGraphicsInfo_BirthIslandStone,
-	&gEventObjectGraphicsInfo_Brandon,
-	&gEventObjectGraphicsInfo_RubySapphireBrendan,
-	&gEventObjectGraphicsInfo_RubySapphireMay,
-	&gEventObjectGraphicsInfo_Lugia,
-	&gEventObjectGraphicsInfo_HoOh,
+    &gEventObjectGraphicsInfo_BrendanNormal,
+    &gEventObjectGraphicsInfo_BrendanMachBike,
+    &gEventObjectGraphicsInfo_BrendanSurfing,
+    &gEventObjectGraphicsInfo_BrendanFieldMove,
+    &gEventObjectGraphicsInfo_QuintyPlump,
+    &gEventObjectGraphicsInfo_NinjaBoy,
+    &gEventObjectGraphicsInfo_Twin,
+    &gEventObjectGraphicsInfo_Boy1,
+    &gEventObjectGraphicsInfo_Girl1,
+    &gEventObjectGraphicsInfo_Boy2,
+    &gEventObjectGraphicsInfo_Girl2,
+    &gEventObjectGraphicsInfo_LittleBoy,
+    &gEventObjectGraphicsInfo_LittleGirl,
+    &gEventObjectGraphicsInfo_Boy3,
+    &gEventObjectGraphicsInfo_Girl3,
+    &gEventObjectGraphicsInfo_RichBoy,
+    &gEventObjectGraphicsInfo_Woman1,
+    &gEventObjectGraphicsInfo_FatMan,
+    &gEventObjectGraphicsInfo_PokefanF,
+    &gEventObjectGraphicsInfo_Man1,
+    &gEventObjectGraphicsInfo_Woman2,
+    &gEventObjectGraphicsInfo_ExpertM,
+    &gEventObjectGraphicsInfo_ExpertF,
+    &gEventObjectGraphicsInfo_Man2,
+    &gEventObjectGraphicsInfo_Woman3,
+    &gEventObjectGraphicsInfo_PokefanM,
+    &gEventObjectGraphicsInfo_Woman4,
+    &gEventObjectGraphicsInfo_Cook,
+    &gEventObjectGraphicsInfo_LinkReceptionist,
+    &gEventObjectGraphicsInfo_OldMan,
+    &gEventObjectGraphicsInfo_OldWoman,
+    &gEventObjectGraphicsInfo_Camper,
+    &gEventObjectGraphicsInfo_Picnicker,
+    &gEventObjectGraphicsInfo_Man3,
+    &gEventObjectGraphicsInfo_Woman5,
+    &gEventObjectGraphicsInfo_Youngster,
+    &gEventObjectGraphicsInfo_BugCatcher,
+    &gEventObjectGraphicsInfo_PsychicM,
+    &gEventObjectGraphicsInfo_SchoolKidM,
+    &gEventObjectGraphicsInfo_Maniac,
+    &gEventObjectGraphicsInfo_HexManiac,
+    &gEventObjectGraphicsInfo_Rayquaza1,
+    &gEventObjectGraphicsInfo_SwimmerM,
+    &gEventObjectGraphicsInfo_SwimmerF,
+    &gEventObjectGraphicsInfo_BlackBelt,
+    &gEventObjectGraphicsInfo_Beauty,
+    &gEventObjectGraphicsInfo_Scientist1,
+    &gEventObjectGraphicsInfo_Lass,
+    &gEventObjectGraphicsInfo_Gentleman,
+    &gEventObjectGraphicsInfo_Sailor,
+    &gEventObjectGraphicsInfo_Fisherman,
+    &gEventObjectGraphicsInfo_RunningTriathleteM,
+    &gEventObjectGraphicsInfo_RunningTriathleteF,
+    &gEventObjectGraphicsInfo_TuberF,
+    &gEventObjectGraphicsInfo_TuberM,
+    &gEventObjectGraphicsInfo_Hiker,
+    &gEventObjectGraphicsInfo_CyclingTriathleteM,
+    &gEventObjectGraphicsInfo_CyclingTriathleteF,
+    &gEventObjectGraphicsInfo_Nurse,
+    &gEventObjectGraphicsInfo_ItemBall,
+    &gEventObjectGraphicsInfo_BerryTree,
+    &gEventObjectGraphicsInfo_BerryTreeEarlyStages,
+    &gEventObjectGraphicsInfo_BerryTreeLateStages,
+    &gEventObjectGraphicsInfo_BrendanAcroBike,
+    &gEventObjectGraphicsInfo_ProfBirch,
+    &gEventObjectGraphicsInfo_Man4,
+    &gEventObjectGraphicsInfo_Man5,
+    &gEventObjectGraphicsInfo_ReporterM,
+    &gEventObjectGraphicsInfo_ReporterF,
+    &gEventObjectGraphicsInfo_Bard,
+    &gEventObjectGraphicsInfo_Anabel,
+    &gEventObjectGraphicsInfo_Tucker,
+    &gEventObjectGraphicsInfo_Greta,
+    &gEventObjectGraphicsInfo_Spenser,
+    &gEventObjectGraphicsInfo_Noland,
+    &gEventObjectGraphicsInfo_Lucy,
+    &gEventObjectGraphicsInfo_UnusedNatuDoll,
+    &gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
+    &gEventObjectGraphicsInfo_UnusedSquirtleDoll,
+    &gEventObjectGraphicsInfo_UnusedWooperDoll,
+    &gEventObjectGraphicsInfo_UnusedPikachuDoll,
+    &gEventObjectGraphicsInfo_UnusedPorygon2Doll,
+    &gEventObjectGraphicsInfo_CuttableTree,
+    &gEventObjectGraphicsInfo_MartEmployee,
+    &gEventObjectGraphicsInfo_RooftopSaleWoman,
+    &gEventObjectGraphicsInfo_Teala,
+    &gEventObjectGraphicsInfo_BreakableRock,
+    &gEventObjectGraphicsInfo_PushableBoulder,
+    &gEventObjectGraphicsInfo_MrBrineysBoat,
+    &gEventObjectGraphicsInfo_MayNormal,
+    &gEventObjectGraphicsInfo_MayMachBike,
+    &gEventObjectGraphicsInfo_MayAcroBike,
+    &gEventObjectGraphicsInfo_MaySurfing,
+    &gEventObjectGraphicsInfo_MayFieldMove,
+    &gEventObjectGraphicsInfo_Truck,
+    &gEventObjectGraphicsInfo_VigorothCarryingBox,
+    &gEventObjectGraphicsInfo_VigorothFacingAway,
+    &gEventObjectGraphicsInfo_BirchsBag,
+    &gEventObjectGraphicsInfo_EnemyZigzagoon,
+    &gEventObjectGraphicsInfo_Artist,
+    &gEventObjectGraphicsInfo_RivalBrendanNormal,
+    &gEventObjectGraphicsInfo_RivalBrendanMachBike,
+    &gEventObjectGraphicsInfo_RivalBrendanAcroBike,
+    &gEventObjectGraphicsInfo_RivalBrendanSurfing,
+    &gEventObjectGraphicsInfo_RivalBrendanFieldMove,
+    &gEventObjectGraphicsInfo_RivalMayNormal,
+    &gEventObjectGraphicsInfo_RivalMayMachBike,
+    &gEventObjectGraphicsInfo_RivalMayAcroBike,
+    &gEventObjectGraphicsInfo_RivalMaySurfing,
+    &gEventObjectGraphicsInfo_RivalMayFieldMove,
+    &gEventObjectGraphicsInfo_Cameraman,
+    &gEventObjectGraphicsInfo_BrendanUnderwater,
+    &gEventObjectGraphicsInfo_MayUnderwater,
+    &gEventObjectGraphicsInfo_MovingBox,
+    &gEventObjectGraphicsInfo_CableCar,
+    &gEventObjectGraphicsInfo_Scientist2,
+    &gEventObjectGraphicsInfo_DevonEmployee,
+    &gEventObjectGraphicsInfo_AquaMemberM,
+    &gEventObjectGraphicsInfo_AquaMemberF,
+    &gEventObjectGraphicsInfo_MagmaMemberM,
+    &gEventObjectGraphicsInfo_MagmaMemberF,
+    &gEventObjectGraphicsInfo_Sidney,
+    &gEventObjectGraphicsInfo_Phoebe,
+    &gEventObjectGraphicsInfo_Glacia,
+    &gEventObjectGraphicsInfo_Drake,
+    &gEventObjectGraphicsInfo_Roxanne,
+    &gEventObjectGraphicsInfo_Brawly,
+    &gEventObjectGraphicsInfo_Wattson,
+    &gEventObjectGraphicsInfo_Flannery,
+    &gEventObjectGraphicsInfo_Norman,
+    &gEventObjectGraphicsInfo_Winona,
+    &gEventObjectGraphicsInfo_Liza,
+    &gEventObjectGraphicsInfo_Tate,
+    &gEventObjectGraphicsInfo_Wallace,
+    &gEventObjectGraphicsInfo_Steven,
+    &gEventObjectGraphicsInfo_Wally,
+    &gEventObjectGraphicsInfo_RubySapphireLittleBoy,
+    &gEventObjectGraphicsInfo_BrendanFishing,
+    &gEventObjectGraphicsInfo_MayFishing,
+    &gEventObjectGraphicsInfo_HotSpringsOldWoman,
+    &gEventObjectGraphicsInfo_SSTidal,
+    &gEventObjectGraphicsInfo_SubmarineShadow,
+    &gEventObjectGraphicsInfo_PichuDoll,
+    &gEventObjectGraphicsInfo_PikachuDoll,
+    &gEventObjectGraphicsInfo_MarillDoll,
+    &gEventObjectGraphicsInfo_TogepiDoll,
+    &gEventObjectGraphicsInfo_CyndaquilDoll,
+    &gEventObjectGraphicsInfo_ChikoritaDoll,
+    &gEventObjectGraphicsInfo_TotodileDoll,
+    &gEventObjectGraphicsInfo_JigglypuffDoll,
+    &gEventObjectGraphicsInfo_MeowthDoll,
+    &gEventObjectGraphicsInfo_ClefairyDoll,
+    &gEventObjectGraphicsInfo_DittoDoll,
+    &gEventObjectGraphicsInfo_SmoochumDoll,
+    &gEventObjectGraphicsInfo_TreeckoDoll,
+    &gEventObjectGraphicsInfo_TorchicDoll,
+    &gEventObjectGraphicsInfo_MudkipDoll,
+    &gEventObjectGraphicsInfo_DuskullDoll,
+    &gEventObjectGraphicsInfo_WynautDoll,
+    &gEventObjectGraphicsInfo_BaltoyDoll,
+    &gEventObjectGraphicsInfo_KecleonDoll,
+    &gEventObjectGraphicsInfo_AzurillDoll,
+    &gEventObjectGraphicsInfo_SkittyDoll,
+    &gEventObjectGraphicsInfo_SwabluDoll,
+    &gEventObjectGraphicsInfo_GulpinDoll,
+    &gEventObjectGraphicsInfo_LotadDoll,
+    &gEventObjectGraphicsInfo_SeedotDoll,
+    &gEventObjectGraphicsInfo_PikaCushion,
+    &gEventObjectGraphicsInfo_RoundCushion,
+    &gEventObjectGraphicsInfo_KissCushion,
+    &gEventObjectGraphicsInfo_ZigzagCushion,
+    &gEventObjectGraphicsInfo_SpinCushion,
+    &gEventObjectGraphicsInfo_DiamondCushion,
+    &gEventObjectGraphicsInfo_BallCushion,
+    &gEventObjectGraphicsInfo_GrassCushion,
+    &gEventObjectGraphicsInfo_FireCushion,
+    &gEventObjectGraphicsInfo_WaterCushion,
+    &gEventObjectGraphicsInfo_BigSnorlaxDoll,
+    &gEventObjectGraphicsInfo_BigRhydonDoll,
+    &gEventObjectGraphicsInfo_BigLaprasDoll,
+    &gEventObjectGraphicsInfo_BigVenusaurDoll,
+    &gEventObjectGraphicsInfo_BigCharizardDoll,
+    &gEventObjectGraphicsInfo_BigBlastoiseDoll,
+    &gEventObjectGraphicsInfo_BigWailmerDoll,
+    &gEventObjectGraphicsInfo_BigRegirockDoll,
+    &gEventObjectGraphicsInfo_BigRegiceDoll,
+    &gEventObjectGraphicsInfo_BigRegisteelDoll,
+    &gEventObjectGraphicsInfo_Latias,
+    &gEventObjectGraphicsInfo_Latios,
+    &gEventObjectGraphicsInfo_GameboyKid,
+    &gEventObjectGraphicsInfo_ContestJudge,
+    &gEventObjectGraphicsInfo_BrendanWatering,
+    &gEventObjectGraphicsInfo_MayWatering,
+    &gEventObjectGraphicsInfo_BrendanDecorating,
+    &gEventObjectGraphicsInfo_MayDecorating,
+    &gEventObjectGraphicsInfo_Archie,
+    &gEventObjectGraphicsInfo_Maxie,
+    &gEventObjectGraphicsInfo_Kyogre1,
+    &gEventObjectGraphicsInfo_Groudon1,
+    &gEventObjectGraphicsInfo_Fossil,
+    &gEventObjectGraphicsInfo_Regirock,
+    &gEventObjectGraphicsInfo_Regice,
+    &gEventObjectGraphicsInfo_Registeel,
+    &gEventObjectGraphicsInfo_Skitty,
+    &gEventObjectGraphicsInfo_Kecleon1,
+    &gEventObjectGraphicsInfo_Kyogre2,
+    &gEventObjectGraphicsInfo_Groudon2,
+    &gEventObjectGraphicsInfo_Rayquaza2,
+    &gEventObjectGraphicsInfo_Zigzagoon,
+    &gEventObjectGraphicsInfo_Pikachu,
+    &gEventObjectGraphicsInfo_Azumarill,
+    &gEventObjectGraphicsInfo_Wingull,
+    &gEventObjectGraphicsInfo_Kecleon2,
+    &gEventObjectGraphicsInfo_TuberMSwimming,
+    &gEventObjectGraphicsInfo_Azurill,
+    &gEventObjectGraphicsInfo_Mom,
+    &gEventObjectGraphicsInfo_LinkBrendan,
+    &gEventObjectGraphicsInfo_LinkMay,
+    &gEventObjectGraphicsInfo_Juan,
+    &gEventObjectGraphicsInfo_Scott,
+    &gEventObjectGraphicsInfo_Poochyena,
+    &gEventObjectGraphicsInfo_Kyogre3,
+    &gEventObjectGraphicsInfo_Groudon3,
+    &gEventObjectGraphicsInfo_MysteryEventDeliveryman,
+    &gEventObjectGraphicsInfo_Statue,
+    &gEventObjectGraphicsInfo_Kirlia,
+    &gEventObjectGraphicsInfo_Dusclops,
+    &gEventObjectGraphicsInfo_UnionRoomAttendant,
+    &gEventObjectGraphicsInfo_Sudowoodo,
+    &gEventObjectGraphicsInfo_Mew,
+    &gEventObjectGraphicsInfo_Red,
+    &gEventObjectGraphicsInfo_Leaf,
+    &gEventObjectGraphicsInfo_Deoxys,
+    &gEventObjectGraphicsInfo_BirthIslandStone,
+    &gEventObjectGraphicsInfo_Brandon,
+    &gEventObjectGraphicsInfo_RubySapphireBrendan,
+    &gEventObjectGraphicsInfo_RubySapphireMay,
+    &gEventObjectGraphicsInfo_Lugia,
+    &gEventObjectGraphicsInfo_HoOh,
 };
 
 const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
-	&gEventObjectGraphicsInfo_Bard,
-	&gEventObjectGraphicsInfo_Hipster,
-	&gEventObjectGraphicsInfo_Trader,
-	&gEventObjectGraphicsInfo_Storyteller,
-	&gEventObjectGraphicsInfo_Giddy,
-	&gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
-	&gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+    &gEventObjectGraphicsInfo_Bard,
+    &gEventObjectGraphicsInfo_Hipster,
+    &gEventObjectGraphicsInfo_Trader,
+    &gEventObjectGraphicsInfo_Storyteller,
+    &gEventObjectGraphicsInfo_Giddy,
+    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
 };
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
index fb9f4b2cd..712988f5e 100755
--- a/src/data/field_event_obj/movement_action_func_tables.h
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -422,1092 +422,1092 @@ u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *);
 
 u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = {
-	gMovementActionFuncs_FaceDown,                // MOVEMENT_ACTION_FACE_DOWN
-	gMovementActionFuncs_FaceUp,                  // MOVEMENT_ACTION_FACE_UP
-	gMovementActionFuncs_FaceLeft,                // MOVEMENT_ACTION_FACE_LEFT
-	gMovementActionFuncs_FaceRight,               // MOVEMENT_ACTION_FACE_RIGHT
-	gMovementActionFuncs_WalkSlowDown,            // MOVEMENT_ACTION_WALK_SLOW_DOWN
-	gMovementActionFuncs_WalkSlowUp,              // MOVEMENT_ACTION_WALK_SLOW_UP
-	gMovementActionFuncs_WalkSlowLeft,            // MOVEMENT_ACTION_WALK_SLOW_LEFT
-	gMovementActionFuncs_WalkSlowRight,           // MOVEMENT_ACTION_WALK_SLOW_RIGHT
-	gMovementActionFuncs_WalkNormalDown,          // MOVEMENT_ACTION_WALK_NORMAL_DOWN
-	gMovementActionFuncs_WalkNormalUp,            // MOVEMENT_ACTION_WALK_NORMAL_UP
-	gMovementActionFuncs_WalkNormalLeft,          // MOVEMENT_ACTION_WALK_NORMAL_LEFT
-	gMovementActionFuncs_WalkNormalRight,         // MOVEMENT_ACTION_WALK_NORMAL_RIGHT
-	gMovementActionFuncs_Jump2Down,               // MOVEMENT_ACTION_JUMP_2_DOWN
-	gMovementActionFuncs_Jump2Up,                 // MOVEMENT_ACTION_JUMP_2_UP
-	gMovementActionFuncs_Jump2Left,               // MOVEMENT_ACTION_JUMP_2_LEFT
-	gMovementActionFuncs_Jump2Right,              // MOVEMENT_ACTION_JUMP_2_RIGHT
-	gMovementActionFuncs_Delay1,                  // MOVEMENT_ACTION_DELAY_1
-	gMovementActionFuncs_Delay2,                  // MOVEMENT_ACTION_DELAY_2
-	gMovementActionFuncs_Delay4,                  // MOVEMENT_ACTION_DELAY_4
-	gMovementActionFuncs_Delay8,                  // MOVEMENT_ACTION_DELAY_8
-	gMovementActionFuncs_Delay16,                 // MOVEMENT_ACTION_DELAY_16
-	gMovementActionFuncs_WalkFastDown,            // MOVEMENT_ACTION_WALK_FAST_DOWN
-	gMovementActionFuncs_WalkFastUp,              // MOVEMENT_ACTION_WALK_FAST_UP
-	gMovementActionFuncs_WalkFastLeft,            // MOVEMENT_ACTION_WALK_FAST_LEFT
-	gMovementActionFuncs_WalkFastRight,           // MOVEMENT_ACTION_WALK_FAST_RIGHT
-	gMovementActionFuncs_WalkInPlaceSlowDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
-	gMovementActionFuncs_WalkInPlaceSlowUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
-	gMovementActionFuncs_WalkInPlaceSlowLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
-	gMovementActionFuncs_WalkInPlaceSlowRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
-	gMovementActionFuncs_WalkInPlaceNormalDown,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
-	gMovementActionFuncs_WalkInPlaceNormalUp,     // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
-	gMovementActionFuncs_WalkInPlaceNormalLeft,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
-	gMovementActionFuncs_WalkInPlaceNormalRight,  // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
-	gMovementActionFuncs_WalkInPlaceFastDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
-	gMovementActionFuncs_WalkInPlaceFastUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
-	gMovementActionFuncs_WalkInPlaceFastLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
-	gMovementActionFuncs_WalkInPlaceFastRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
-	gMovementActionFuncs_WalkInPlaceFastestDown,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN
-	gMovementActionFuncs_WalkInPlaceFastestUp,    // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP
-	gMovementActionFuncs_WalkInPlaceFastestLeft,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT
-	gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT
-	gMovementActionFuncs_RideWaterCurrentDown,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
-	gMovementActionFuncs_RideWaterCurrentUp,      // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
-	gMovementActionFuncs_RideWaterCurrentLeft,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
-	gMovementActionFuncs_RideWaterCurrentRight,   // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
-	gMovementActionFuncs_WalkFastestDown,         // MOVEMENT_ACTION_WALK_FASTEST_DOWN
-	gMovementActionFuncs_WalkFastestUp,           // MOVEMENT_ACTION_WALK_FASTEST_UP
-	gMovementActionFuncs_WalkFastestLeft,         // MOVEMENT_ACTION_WALK_FASTEST_LEFT
-	gMovementActionFuncs_WalkFastestRight,        // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
-	gMovementActionFuncs_SlideDown,               // MOVEMENT_ACTION_SLIDE_DOWN
-	gMovementActionFuncs_SlideUp,                 // MOVEMENT_ACTION_SLIDE_UP
-	gMovementActionFuncs_SlideLeft,               // MOVEMENT_ACTION_SLIDE_LEFT
-	gMovementActionFuncs_SlideRight,              // MOVEMENT_ACTION_SLIDE_RIGHT
-	gMovementActionFuncs_PlayerRunDown,           // MOVEMENT_ACTION_PLAYER_RUN_DOWN
-	gMovementActionFuncs_PlayerRunUp,             // MOVEMENT_ACTION_PLAYER_RUN_UP
-	gMovementActionFuncs_PlayerRunLeft,           // MOVEMENT_ACTION_PLAYER_RUN_LEFT
-	gMovementActionFuncs_PlayerRunRight,          // MOVEMENT_ACTION_PLAYER_RUN_RIGHT
-	gMovementActionFuncs_StartAnimInDirection,    // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION
-	gMovementActionFuncs_JumpSpecialDown,         // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
-	gMovementActionFuncs_JumpSpecialUp,           // MOVEMENT_ACTION_JUMP_SPECIAL_UP
-	gMovementActionFuncs_JumpSpecialLeft,         // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
-	gMovementActionFuncs_JumpSpecialRight,        // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
-	gMovementActionFuncs_FacePlayer,              // MOVEMENT_ACTION_FACE_PLAYER
-	gMovementActionFuncs_FaceAwayPlayer,          // MOVEMENT_ACTION_FACE_AWAY_PLAYER
-	gMovementActionFuncs_LockFacingDirection,     // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
-	gMovementActionFuncs_UnlockFacingDirection,   // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
-	gMovementActionFuncs_JumpDown,                // MOVEMENT_ACTION_JUMP_DOWN
-	gMovementActionFuncs_JumpUp,                  // MOVEMENT_ACTION_JUMP_UP
-	gMovementActionFuncs_JumpLeft,                // MOVEMENT_ACTION_JUMP_LEFT
-	gMovementActionFuncs_JumpRight,               // MOVEMENT_ACTION_JUMP_RIGHT
-	gMovementActionFuncs_JumpInPlaceDown,         // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
-	gMovementActionFuncs_JumpInPlaceUp,           // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
-	gMovementActionFuncs_JumpInPlaceLeft,         // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
-	gMovementActionFuncs_JumpInPlaceRight,        // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
-	gMovementActionFuncs_JumpInPlaceDownUp,       // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
-	gMovementActionFuncs_JumpInPlaceUpDown,       // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
-	gMovementActionFuncs_JumpInPlaceLeftRight,    // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
-	gMovementActionFuncs_JumpInPlaceRightLeft,    // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
-	gMovementActionFuncs_FaceOriginalDirection,   // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
-	gMovementActionFuncs_NurseJoyBowDown,         // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
-	gMovementActionFuncs_EnableJumpLandingGroundEffect,  // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
-	gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
-	gMovementActionFuncs_DisableAnimation,        // MOVEMENT_ACTION_DISABLE_ANIMATION
-	gMovementActionFuncs_RestoreAnimation,        // MOVEMENT_ACTION_RESTORE_ANIMATION
-	gMovementActionFuncs_SetInvisible,            // MOVEMENT_ACTION_SET_INVISIBLE
-	gMovementActionFuncs_SetVisible,              // MOVEMENT_ACTION_SET_VISIBLE
-	gMovementActionFuncs_EmoteExclamationMark,    // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
-	gMovementActionFuncs_EmoteQuestionMark,       // MOVEMENT_ACTION_EMOTE_QUESTION_MARK
-	gMovementActionFuncs_EmoteHeart,              // MOVEMENT_ACTION_EMOTE_HEART
-	gMovementActionFuncs_RevealTrainer,           // MOVEMENT_ACTION_REVEAL_TRAINER
-	gMovementActionFuncs_RockSmashBreak,          // MOVEMENT_ACTION_ROCK_SMASH_BREAK
-	gMovementActionFuncs_CutTree,                 // MOVEMENT_ACTION_CUT_TREE
-	gMovementActionFuncs_SetFixedPriority,        // MOVEMENT_ACTION_SET_FIXED_PRIORITY
-	gMovementActionFuncs_ClearFixedPriority,      // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
-	gMovementActionFuncs_InitAffineAnim,          // MOVEMENT_ACTION_INIT_AFFINE_ANIM
-	gMovementActionFuncs_ClearAffineAnim,         // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
-	gMovementActionFuncs_Unknown1,                // MOVEMENT_ACTION_UNKNOWN1
-	gMovementActionFuncs_Unknown2,                // MOVEMENT_ACTION_UNKNOWN2
-	gMovementActionFuncs_WalkDownStartAffine,     // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
-	gMovementActionFuncs_WalkDownAffine,          // MOVEMENT_ACTION_WALK_DOWN_AFFINE
-	gMovementActionFuncs_AcroWheelieFaceDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
-	gMovementActionFuncs_AcroWheelieFaceUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
-	gMovementActionFuncs_AcroWheelieFaceLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
-	gMovementActionFuncs_AcroWheelieFaceRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
-	gMovementActionFuncs_AcroPopWheelieDown,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
-	gMovementActionFuncs_AcroPopWheelieUp,        // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
-	gMovementActionFuncs_AcroPopWheelieLeft,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
-	gMovementActionFuncs_AcroPopWheelieRight,     // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT
-	gMovementActionFuncs_AcroEndWheelieFaceDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN
-	gMovementActionFuncs_AcroEndWheelieFaceUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP
-	gMovementActionFuncs_AcroEndWheelieFaceLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT
-	gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT
-	gMovementActionFuncs_AcroWheelieHopFaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
-	gMovementActionFuncs_AcroWheelieHopFaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP
-	gMovementActionFuncs_AcroWheelieHopFaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT
-	gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
-	gMovementActionFuncs_AcroWheelieHopDown,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN
-	gMovementActionFuncs_AcroWheelieHopUp,        // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP
-	gMovementActionFuncs_AcroWheelieHopLeft,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT
-	gMovementActionFuncs_AcroWheelieHopRight,     // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT
-	gMovementActionFuncs_AcroWheelieJumpDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN
-	gMovementActionFuncs_AcroWheelieJumpUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP
-	gMovementActionFuncs_AcroWheelieJumpLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT
-	gMovementActionFuncs_AcroWheelieJumpRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT
-	gMovementActionFuncs_AcroWheelieInPlaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN
-	gMovementActionFuncs_AcroWheelieInPlaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP
-	gMovementActionFuncs_AcroWheelieInPlaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT
-	gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT
-	gMovementActionFuncs_AcroPopWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN
-	gMovementActionFuncs_AcroPopWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP
-	gMovementActionFuncs_AcroPopWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT
-	gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT
-	gMovementActionFuncs_AcroWheelieMoveDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN
-	gMovementActionFuncs_AcroWheelieMoveUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP
-	gMovementActionFuncs_AcroWheelieMoveLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT
-	gMovementActionFuncs_AcroWheelieMoveRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT
-	gMovementActionFuncs_AcroEndWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN
-	gMovementActionFuncs_AcroEndWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP
-	gMovementActionFuncs_AcroEndWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT
-	gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT
-	gMovementActionFuncs_WalkNormalDiagonalUpLeft,    // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT
-	gMovementActionFuncs_WalkNormalDiagonalUpRight,   // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT
-	gMovementActionFuncs_WalkNormalDiagonalDownLeft,  // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT
-	gMovementActionFuncs_WalkNormalDiagonalDownRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT
-	gMovementActionFuncs_WalkSlowDiagonalUpLeft,      // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT
-	gMovementActionFuncs_WalkSlowDiagonalUpRight,     // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
-	gMovementActionFuncs_WalkSlowDiagonalDownLeft,    // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
-	gMovementActionFuncs_WalkSlowDiagonalDownRight,   // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
-	gMovementActionFuncs_StoreAndLockAnim,            // MOVEMENT_ACTION_STORE_AND_LOCK_ANIM
-	gMovementActionFuncs_FreeAndUnlockAnim,           // MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM
-	gMovementActionFuncs_WalkLeftAffine,              // MOVEMENT_ACTION_WALK_LEFT_AFFINE
-	gMovementActionFuncs_WalkRightAffine,             // MOVEMENT_ACTION_WALK_RIGHT_AFFINE
-	gMovementActionFuncs_Levitate,                    // MOVEMENT_ACTION_LEVITATE
-	gMovementActionFuncs_StopLevitate,                // MOVEMENT_ACTION_STOP_LEVITATE
-	gMovementActionFuncs_DestroyExtraTaskIfAtTop,     // MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP
-	gMovementActionFuncs_Figure8,                     // MOVEMENT_ACTION_FIGURE_8
-	gMovementActionFuncs_FlyUp,                       // MOVEMENT_ACTION_FLY_UP
-	gMovementActionFuncs_FlyDown,                     // MOVEMENT_ACTION_FLY_DOWN
+    [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown,
+    [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp,
+    [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft,
+    [MOVEMENT_ACTION_FACE_RIGHT] = gMovementActionFuncs_FaceRight,
+    [MOVEMENT_ACTION_WALK_SLOW_DOWN] = gMovementActionFuncs_WalkSlowDown,
+    [MOVEMENT_ACTION_WALK_SLOW_UP] = gMovementActionFuncs_WalkSlowUp,
+    [MOVEMENT_ACTION_WALK_SLOW_LEFT] = gMovementActionFuncs_WalkSlowLeft,
+    [MOVEMENT_ACTION_WALK_SLOW_RIGHT] = gMovementActionFuncs_WalkSlowRight,
+    [MOVEMENT_ACTION_WALK_NORMAL_DOWN] = gMovementActionFuncs_WalkNormalDown,
+    [MOVEMENT_ACTION_WALK_NORMAL_UP] = gMovementActionFuncs_WalkNormalUp,
+    [MOVEMENT_ACTION_WALK_NORMAL_LEFT] = gMovementActionFuncs_WalkNormalLeft,
+    [MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = gMovementActionFuncs_WalkNormalRight,
+    [MOVEMENT_ACTION_JUMP_2_DOWN] = gMovementActionFuncs_Jump2Down,
+    [MOVEMENT_ACTION_JUMP_2_UP] = gMovementActionFuncs_Jump2Up,
+    [MOVEMENT_ACTION_JUMP_2_LEFT] = gMovementActionFuncs_Jump2Left,
+    [MOVEMENT_ACTION_JUMP_2_RIGHT] = gMovementActionFuncs_Jump2Right,
+    [MOVEMENT_ACTION_DELAY_1] = gMovementActionFuncs_Delay1,
+    [MOVEMENT_ACTION_DELAY_2] = gMovementActionFuncs_Delay2,
+    [MOVEMENT_ACTION_DELAY_4] = gMovementActionFuncs_Delay4,
+    [MOVEMENT_ACTION_DELAY_8] = gMovementActionFuncs_Delay8,
+    [MOVEMENT_ACTION_DELAY_16] = gMovementActionFuncs_Delay16,
+    [MOVEMENT_ACTION_WALK_FAST_DOWN] = gMovementActionFuncs_WalkFastDown,
+    [MOVEMENT_ACTION_WALK_FAST_UP] = gMovementActionFuncs_WalkFastUp,
+    [MOVEMENT_ACTION_WALK_FAST_LEFT] = gMovementActionFuncs_WalkFastLeft,
+    [MOVEMENT_ACTION_WALK_FAST_RIGHT] = gMovementActionFuncs_WalkFastRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = gMovementActionFuncs_WalkInPlaceSlowDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = gMovementActionFuncs_WalkInPlaceSlowUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = gMovementActionFuncs_WalkInPlaceSlowLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = gMovementActionFuncs_WalkInPlaceSlowRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = gMovementActionFuncs_WalkInPlaceNormalDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = gMovementActionFuncs_WalkInPlaceNormalUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = gMovementActionFuncs_WalkInPlaceNormalLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = gMovementActionFuncs_WalkInPlaceNormalRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = gMovementActionFuncs_WalkInPlaceFastDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = gMovementActionFuncs_WalkInPlaceFastUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = gMovementActionFuncs_WalkInPlaceFastLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = gMovementActionFuncs_WalkInPlaceFastestDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = gMovementActionFuncs_WalkInPlaceFastestUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = gMovementActionFuncs_WalkInPlaceFastestLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastestRight,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = gMovementActionFuncs_RideWaterCurrentDown,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = gMovementActionFuncs_RideWaterCurrentUp,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = gMovementActionFuncs_RideWaterCurrentLeft,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = gMovementActionFuncs_RideWaterCurrentRight,
+    [MOVEMENT_ACTION_WALK_FASTEST_DOWN] = gMovementActionFuncs_WalkFastestDown,
+    [MOVEMENT_ACTION_WALK_FASTEST_UP] = gMovementActionFuncs_WalkFastestUp,
+    [MOVEMENT_ACTION_WALK_FASTEST_LEFT] = gMovementActionFuncs_WalkFastestLeft,
+    [MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = gMovementActionFuncs_WalkFastestRight,
+    [MOVEMENT_ACTION_SLIDE_DOWN] = gMovementActionFuncs_SlideDown,
+    [MOVEMENT_ACTION_SLIDE_UP] = gMovementActionFuncs_SlideUp,
+    [MOVEMENT_ACTION_SLIDE_LEFT] = gMovementActionFuncs_SlideLeft,
+    [MOVEMENT_ACTION_SLIDE_RIGHT] = gMovementActionFuncs_SlideRight,
+    [MOVEMENT_ACTION_PLAYER_RUN_DOWN] = gMovementActionFuncs_PlayerRunDown,
+    [MOVEMENT_ACTION_PLAYER_RUN_UP] = gMovementActionFuncs_PlayerRunUp,
+    [MOVEMENT_ACTION_PLAYER_RUN_LEFT] = gMovementActionFuncs_PlayerRunLeft,
+    [MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = gMovementActionFuncs_PlayerRunRight,
+    [MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = gMovementActionFuncs_StartAnimInDirection,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = gMovementActionFuncs_JumpSpecialDown,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_UP] = gMovementActionFuncs_JumpSpecialUp,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = gMovementActionFuncs_JumpSpecialLeft,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = gMovementActionFuncs_JumpSpecialRight,
+    [MOVEMENT_ACTION_FACE_PLAYER] = gMovementActionFuncs_FacePlayer,
+    [MOVEMENT_ACTION_FACE_AWAY_PLAYER] = gMovementActionFuncs_FaceAwayPlayer,
+    [MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = gMovementActionFuncs_LockFacingDirection,
+    [MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = gMovementActionFuncs_UnlockFacingDirection,
+    [MOVEMENT_ACTION_JUMP_DOWN] = gMovementActionFuncs_JumpDown,
+    [MOVEMENT_ACTION_JUMP_UP] = gMovementActionFuncs_JumpUp,
+    [MOVEMENT_ACTION_JUMP_LEFT] = gMovementActionFuncs_JumpLeft,
+    [MOVEMENT_ACTION_JUMP_RIGHT] = gMovementActionFuncs_JumpRight,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = gMovementActionFuncs_JumpInPlaceDown,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = gMovementActionFuncs_JumpInPlaceUp,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = gMovementActionFuncs_JumpInPlaceLeft,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = gMovementActionFuncs_JumpInPlaceRight,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = gMovementActionFuncs_JumpInPlaceDownUp,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = gMovementActionFuncs_JumpInPlaceUpDown,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = gMovementActionFuncs_JumpInPlaceLeftRight,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = gMovementActionFuncs_JumpInPlaceRightLeft,
+    [MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = gMovementActionFuncs_FaceOriginalDirection,
+    [MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = gMovementActionFuncs_NurseJoyBowDown,
+    [MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_EnableJumpLandingGroundEffect,
+    [MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_DisableJumpLandingGroundEffect,
+    [MOVEMENT_ACTION_DISABLE_ANIMATION] = gMovementActionFuncs_DisableAnimation,
+    [MOVEMENT_ACTION_RESTORE_ANIMATION] = gMovementActionFuncs_RestoreAnimation,
+    [MOVEMENT_ACTION_SET_INVISIBLE] = gMovementActionFuncs_SetInvisible,
+    [MOVEMENT_ACTION_SET_VISIBLE] = gMovementActionFuncs_SetVisible,
+    [MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = gMovementActionFuncs_EmoteExclamationMark,
+    [MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = gMovementActionFuncs_EmoteQuestionMark,
+    [MOVEMENT_ACTION_EMOTE_HEART] = gMovementActionFuncs_EmoteHeart,
+    [MOVEMENT_ACTION_REVEAL_TRAINER] = gMovementActionFuncs_RevealTrainer,
+    [MOVEMENT_ACTION_ROCK_SMASH_BREAK] = gMovementActionFuncs_RockSmashBreak,
+    [MOVEMENT_ACTION_CUT_TREE] = gMovementActionFuncs_CutTree,
+    [MOVEMENT_ACTION_SET_FIXED_PRIORITY] = gMovementActionFuncs_SetFixedPriority,
+    [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = gMovementActionFuncs_ClearFixedPriority,
+    [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = gMovementActionFuncs_InitAffineAnim,
+    [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = gMovementActionFuncs_ClearAffineAnim,
+    [MOVEMENT_ACTION_UNKNOWN1] = gMovementActionFuncs_Unknown1,
+    [MOVEMENT_ACTION_UNKNOWN2] = gMovementActionFuncs_Unknown2,
+    [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = gMovementActionFuncs_WalkDownStartAffine,
+    [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = gMovementActionFuncs_WalkDownAffine,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroWheelieFaceDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroWheelieFaceUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroWheelieFaceLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieFaceRight,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = gMovementActionFuncs_AcroPopWheelieDown,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = gMovementActionFuncs_AcroPopWheelieUp,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = gMovementActionFuncs_AcroPopWheelieLeft,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = gMovementActionFuncs_AcroPopWheelieRight,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroEndWheelieFaceDown,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroEndWheelieFaceUp,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroEndWheelieFaceLeft,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroEndWheelieFaceRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = gMovementActionFuncs_AcroWheelieHopFaceDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = gMovementActionFuncs_AcroWheelieHopFaceUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = gMovementActionFuncs_AcroWheelieHopFaceLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieHopFaceRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = gMovementActionFuncs_AcroWheelieHopDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = gMovementActionFuncs_AcroWheelieHopUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = gMovementActionFuncs_AcroWheelieHopLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = gMovementActionFuncs_AcroWheelieHopRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = gMovementActionFuncs_AcroWheelieJumpDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = gMovementActionFuncs_AcroWheelieJumpUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = gMovementActionFuncs_AcroWheelieJumpLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = gMovementActionFuncs_AcroWheelieJumpRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = gMovementActionFuncs_AcroWheelieInPlaceDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = gMovementActionFuncs_AcroWheelieInPlaceUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = gMovementActionFuncs_AcroWheelieInPlaceLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = gMovementActionFuncs_AcroWheelieInPlaceRight,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroPopWheelieMoveDown,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroPopWheelieMoveUp,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroPopWheelieMoveLeft,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroPopWheelieMoveRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroWheelieMoveDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroWheelieMoveUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroWheelieMoveLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroWheelieMoveRight,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroEndWheelieMoveDown,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroEndWheelieMoveUp,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroEndWheelieMoveLeft,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroEndWheelieMoveRight,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkNormalDiagonalUpLeft,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalUpRight,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkNormalDiagonalDownLeft,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalDownRight,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkSlowDiagonalUpLeft,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalUpRight,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkSlowDiagonalDownLeft,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalDownRight,
+    [MOVEMENT_ACTION_STORE_AND_LOCK_ANIM] = gMovementActionFuncs_StoreAndLockAnim,
+    [MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM] = gMovementActionFuncs_FreeAndUnlockAnim,
+    [MOVEMENT_ACTION_WALK_LEFT_AFFINE] = gMovementActionFuncs_WalkLeftAffine,
+    [MOVEMENT_ACTION_WALK_RIGHT_AFFINE] = gMovementActionFuncs_WalkRightAffine,
+    [MOVEMENT_ACTION_LEVITATE] = gMovementActionFuncs_Levitate,
+    [MOVEMENT_ACTION_STOP_LEVITATE] = gMovementActionFuncs_StopLevitate,
+    [MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP] = gMovementActionFuncs_DestroyExtraTaskIfAtTop,
+    [MOVEMENT_ACTION_FIGURE_8] = gMovementActionFuncs_Figure8,
+    [MOVEMENT_ACTION_FLY_UP] = gMovementActionFuncs_FlyUp,
+    [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown,
 };
 
 u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FaceDown_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FaceDown_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FaceUp_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FaceUp_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FaceLeft_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FaceLeft_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FaceRight_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FaceRight_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gUnknown_0850DEE8[])(u8) = {
-	GetMoveDirectionAnimNum,
-	GetMoveDirectionFastAnimNum,
-	GetMoveDirectionFastAnimNum,
-	GetMoveDirectionFasterAnimNum,
-	GetMoveDirectionFastestAnimNum,
+    GetMoveDirectionAnimNum,
+    GetMoveDirectionFastAnimNum,
+    GetMoveDirectionFastAnimNum,
+    GetMoveDirectionFasterAnimNum,
+    GetMoveDirectionFastestAnimNum,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowDiagonalUpLeft_Step0,
-	MovementAction_WalkSlowDiagonalUpLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowDiagonalUpLeft_Step0,
+    MovementAction_WalkSlowDiagonalUpLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowDiagonalUpRight_Step0,
-	MovementAction_WalkSlowDiagonalUpRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowDiagonalUpRight_Step0,
+    MovementAction_WalkSlowDiagonalUpRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowDiagonalDownLeft_Step0,
-	MovementAction_WalkSlowDiagonalDownLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowDiagonalDownLeft_Step0,
+    MovementAction_WalkSlowDiagonalDownLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowDiagonalDownRight_Step0,
-	MovementAction_WalkSlowDiagonalDownRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowDiagonalDownRight_Step0,
+    MovementAction_WalkSlowDiagonalDownRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowDown_Step0,
-	MovementAction_WalkSlowDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowDown_Step0,
+    MovementAction_WalkSlowDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowUp_Step0,
-	MovementAction_WalkSlowUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowUp_Step0,
+    MovementAction_WalkSlowUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowLeft_Step0,
-	MovementAction_WalkSlowLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowLeft_Step0,
+    MovementAction_WalkSlowLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkSlowRight_Step0,
-	MovementAction_WalkSlowRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkSlowRight_Step0,
+    MovementAction_WalkSlowRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalDiagonalUpLeft_Step0,
-	MovementAction_WalkNormalDiagonalUpLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalDiagonalUpLeft_Step0,
+    MovementAction_WalkNormalDiagonalUpLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalDiagonalUpRight_Step0,
-	MovementAction_WalkNormalDiagonalUpRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalDiagonalUpRight_Step0,
+    MovementAction_WalkNormalDiagonalUpRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalDiagonalDownLeft_Step0,
-	MovementAction_WalkNormalDiagonalDownLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalDiagonalDownLeft_Step0,
+    MovementAction_WalkNormalDiagonalDownLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalDiagonalDownRight_Step0,
-	MovementAction_WalkNormalDiagonalDownRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalDiagonalDownRight_Step0,
+    MovementAction_WalkNormalDiagonalDownRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalDown_Step0,
-	MovementAction_WalkNormalDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalDown_Step0,
+    MovementAction_WalkNormalDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalUp_Step0,
-	MovementAction_WalkNormalUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalUp_Step0,
+    MovementAction_WalkNormalUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalLeft_Step0,
-	MovementAction_WalkNormalLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalLeft_Step0,
+    MovementAction_WalkNormalLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkNormalRight_Step0,
-	MovementAction_WalkNormalRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkNormalRight_Step0,
+    MovementAction_WalkNormalRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 const s16 gUnknown_0850DFBC[] = {0, 1, 1};
 const s16 gUnknown_0850DFC2[] = {0, 0, 1};
 
 u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Jump2Down_Step0,
-	MovementAction_Jump2Down_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_Jump2Down_Step0,
+    MovementAction_Jump2Down_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Jump2Up_Step0,
-	MovementAction_Jump2Up_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_Jump2Up_Step0,
+    MovementAction_Jump2Up_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Jump2Left_Step0,
-	MovementAction_Jump2Left_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_Jump2Left_Step0,
+    MovementAction_Jump2Left_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Jump2Right_Step0,
-	MovementAction_Jump2Right_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_Jump2Right_Step0,
+    MovementAction_Jump2Right_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Delay1_Step0,
-	MovementAction_Delay_Step1,
-	MovementAction_Finish,
+    MovementAction_Delay1_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Delay2_Step0,
-	MovementAction_Delay_Step1,
-	MovementAction_Finish,
+    MovementAction_Delay2_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Delay4_Step0,
-	MovementAction_Delay_Step1,
-	MovementAction_Finish,
+    MovementAction_Delay4_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Delay8_Step0,
-	MovementAction_Delay_Step1,
-	MovementAction_Finish,
+    MovementAction_Delay8_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Delay16_Step0,
-	MovementAction_Delay_Step1,
-	MovementAction_Finish,
+    MovementAction_Delay16_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastDown_Step0,
-	MovementAction_WalkFastDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastDown_Step0,
+    MovementAction_WalkFastDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastUp_Step0,
-	MovementAction_WalkFastUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastUp_Step0,
+    MovementAction_WalkFastUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastLeft_Step0,
-	MovementAction_WalkFastLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastLeft_Step0,
+    MovementAction_WalkFastLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastRight_Step0,
-	MovementAction_WalkFastRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastRight_Step0,
+    MovementAction_WalkFastRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceSlowDown_Step0,
-	MovementAction_WalkInPlaceSlow_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceSlowDown_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceSlowUp_Step0,
-	MovementAction_WalkInPlaceSlow_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceSlowUp_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceSlowLeft_Step0,
-	MovementAction_WalkInPlaceSlow_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceSlowLeft_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceSlowRight_Step0,
-	MovementAction_WalkInPlaceSlow_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceSlowRight_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceNormalDown_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceNormalDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceNormalUp_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceNormalUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceNormalLeft_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceNormalLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceNormalRight_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceNormalRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastDown_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastUp_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastLeft_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastRight_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastestDown_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastestDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastestUp_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastestUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastestLeft_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastestLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkInPlaceFastestRight_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkInPlaceFastestRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RideWaterCurrentDown_Step0,
-	MovementAction_RideWaterCurrentDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_RideWaterCurrentDown_Step0,
+    MovementAction_RideWaterCurrentDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RideWaterCurrentUp_Step0,
-	MovementAction_RideWaterCurrentUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_RideWaterCurrentUp_Step0,
+    MovementAction_RideWaterCurrentUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RideWaterCurrentLeft_Step0,
-	MovementAction_RideWaterCurrentLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_RideWaterCurrentLeft_Step0,
+    MovementAction_RideWaterCurrentLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RideWaterCurrentRight_Step0,
-	MovementAction_RideWaterCurrentRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_RideWaterCurrentRight_Step0,
+    MovementAction_RideWaterCurrentRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastestDown_Step0,
-	MovementAction_WalkFastestDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastestDown_Step0,
+    MovementAction_WalkFastestDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastestUp_Step0,
-	MovementAction_WalkFastestUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastestUp_Step0,
+    MovementAction_WalkFastestUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastestLeft_Step0,
-	MovementAction_WalkFastestLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastestLeft_Step0,
+    MovementAction_WalkFastestLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkFastestRight_Step0,
-	MovementAction_WalkFastestRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkFastestRight_Step0,
+    MovementAction_WalkFastestRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SlideDown_Step0,
-	MovementAction_SlideDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_SlideDown_Step0,
+    MovementAction_SlideDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SlideUp_Step0,
-	MovementAction_SlideUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_SlideUp_Step0,
+    MovementAction_SlideUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SlideLeft_Step0,
-	MovementAction_SlideLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_SlideLeft_Step0,
+    MovementAction_SlideLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SlideRight_Step0,
-	MovementAction_SlideRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_SlideRight_Step0,
+    MovementAction_SlideRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_PlayerRunDown_Step0,
-	MovementAction_PlayerRunDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_PlayerRunDown_Step0,
+    MovementAction_PlayerRunDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_PlayerRunUp_Step0,
-	MovementAction_PlayerRunUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_PlayerRunUp_Step0,
+    MovementAction_PlayerRunUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_PlayerRunLeft_Step0,
-	MovementAction_PlayerRunLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_PlayerRunLeft_Step0,
+    MovementAction_PlayerRunLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_PlayerRunRight_Step0,
-	MovementAction_PlayerRunRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_PlayerRunRight_Step0,
+    MovementAction_PlayerRunRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_StartAnimInDirection_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_StartAnimInDirection_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpSpecialDown_Step0,
-	MovementAction_JumpSpecialDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpSpecialDown_Step0,
+    MovementAction_JumpSpecialDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpSpecialUp_Step0,
-	MovementAction_JumpSpecialUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpSpecialUp_Step0,
+    MovementAction_JumpSpecialUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpSpecialLeft_Step0,
-	MovementAction_JumpSpecialLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpSpecialLeft_Step0,
+    MovementAction_JumpSpecialLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpSpecialRight_Step0,
-	MovementAction_JumpSpecialRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpSpecialRight_Step0,
+    MovementAction_JumpSpecialRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FacePlayer_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FacePlayer_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FaceAwayPlayer_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FaceAwayPlayer_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_LockFacingDirection_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_LockFacingDirection_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_UnlockFacingDirection_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_UnlockFacingDirection_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpDown_Step0,
-	MovementAction_JumpDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpDown_Step0,
+    MovementAction_JumpDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpUp_Step0,
-	MovementAction_JumpUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpUp_Step0,
+    MovementAction_JumpUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpLeft_Step0,
-	MovementAction_JumpLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpLeft_Step0,
+    MovementAction_JumpLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpRight_Step0,
-	MovementAction_JumpRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpRight_Step0,
+    MovementAction_JumpRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceDown_Step0,
-	MovementAction_JumpInPlaceDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceDown_Step0,
+    MovementAction_JumpInPlaceDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceUp_Step0,
-	MovementAction_JumpInPlaceUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceUp_Step0,
+    MovementAction_JumpInPlaceUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceLeft_Step0,
-	MovementAction_JumpInPlaceLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceLeft_Step0,
+    MovementAction_JumpInPlaceLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceRight_Step0,
-	MovementAction_JumpInPlaceRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceRight_Step0,
+    MovementAction_JumpInPlaceRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceDownUp_Step0,
-	MovementAction_JumpInPlaceDownUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceDownUp_Step0,
+    MovementAction_JumpInPlaceDownUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceUpDown_Step0,
-	MovementAction_JumpInPlaceUpDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceUpDown_Step0,
+    MovementAction_JumpInPlaceUpDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceLeftRight_Step0,
-	MovementAction_JumpInPlaceLeftRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceLeftRight_Step0,
+    MovementAction_JumpInPlaceLeftRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_JumpInPlaceRightLeft_Step0,
-	MovementAction_JumpInPlaceRightLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_JumpInPlaceRightLeft_Step0,
+    MovementAction_JumpInPlaceRightLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_FaceOriginalDirection_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_FaceOriginalDirection_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_NurseJoyBowDown_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_NurseJoyBowDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_EnableJumpLandingGroundEffect_Step0,
-	MovementAction_Finish,
+    MovementAction_EnableJumpLandingGroundEffect_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_DisableJumpLandingGroundEffect_Step0,
-	MovementAction_Finish,
+    MovementAction_DisableJumpLandingGroundEffect_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_DisableAnimation_Step0,
-	MovementAction_Finish,
+    MovementAction_DisableAnimation_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RestoreAnimation_Step0,
-	MovementAction_Finish,
+    MovementAction_RestoreAnimation_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SetInvisible_Step0,
-	MovementAction_Finish,
+    MovementAction_SetInvisible_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SetVisible_Step0,
-	MovementAction_Finish,
+    MovementAction_SetVisible_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_EmoteExclamationMark_Step0,
-	MovementAction_Finish,
+    MovementAction_EmoteExclamationMark_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_EmoteQuestionMark_Step0,
-	MovementAction_Finish,
+    MovementAction_EmoteQuestionMark_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_EmoteHeart_Step0,
-	MovementAction_Finish,
+    MovementAction_EmoteHeart_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RevealTrainer_Step0,
-	MovementAction_RevealTrainer_Step1,
-	MovementAction_Finish,
+    MovementAction_RevealTrainer_Step0,
+    MovementAction_RevealTrainer_Step1,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_RockSmashBreak_Step0,
-	MovementAction_RockSmashBreak_Step1,
-	MovementAction_RockSmashBreak_Step2,
-	MovementAction_Finish,
+    MovementAction_RockSmashBreak_Step0,
+    MovementAction_RockSmashBreak_Step1,
+    MovementAction_RockSmashBreak_Step2,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_CutTree_Step0,
-	MovementAction_CutTree_Step1,
-	MovementAction_CutTree_Step2,
-	MovementAction_Finish,
+    MovementAction_CutTree_Step0,
+    MovementAction_CutTree_Step1,
+    MovementAction_CutTree_Step2,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_SetFixedPriority_Step0,
-	MovementAction_Finish,
+    MovementAction_SetFixedPriority_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_ClearFixedPriority_Step0,
-	MovementAction_Finish,
+    MovementAction_ClearFixedPriority_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_InitAffineAnim_Step0,
-	MovementAction_Finish,
+    MovementAction_InitAffineAnim_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_ClearAffineAnim_Step0,
-	MovementAction_Finish,
+    MovementAction_ClearAffineAnim_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Unknown1_Step0,
-	MovementAction_Finish,
+    MovementAction_Unknown1_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Unknown2_Step0,
-	MovementAction_Finish,
+    MovementAction_Unknown2_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkDownStartAffine_Step0,
-	MovementAction_WalkDownStartAffine_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkDownStartAffine_Step0,
+    MovementAction_WalkDownStartAffine_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkDownAffine_Step0,
-	MovementAction_WalkDownAffine_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkDownAffine_Step0,
+    MovementAction_WalkDownAffine_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkLeftAffine_Step0,
-	MovementAction_WalkLeftAffine_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkLeftAffine_Step0,
+    MovementAction_WalkLeftAffine_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_WalkRightAffine_Step0,
-	MovementAction_WalkRightAffine_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_WalkRightAffine_Step0,
+    MovementAction_WalkRightAffine_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieFaceDown_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieFaceDown_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieFaceUp_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieFaceUp_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieFaceLeft_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieFaceLeft_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieFaceRight_Step0,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieFaceRight_Step0,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieDown_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieUp_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieUp_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieLeft_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieLeft_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieRight_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieRight_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieFaceDown_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieFaceDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieFaceUp_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieFaceUp_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieFaceLeft_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieFaceLeft_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieFaceRight_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieFaceRight_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_UnusedAcroActionDown_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_UnusedAcroActionDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_UnusedAcroActionUp_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_UnusedAcroActionUp_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_UnusedAcroActionLeft_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_UnusedAcroActionLeft_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_UnusedAcroActionRight_Step0,
-	MovementAction_WaitSpriteAnim,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_UnusedAcroActionRight_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Figure8_Step0,
-	MovementAction_Figure8_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_Figure8_Step0,
+    MovementAction_Figure8_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopFaceDown_Step0,
-	MovementAction_AcroWheelieHopFaceDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopFaceDown_Step0,
+    MovementAction_AcroWheelieHopFaceDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopFaceUp_Step0,
-	MovementAction_AcroWheelieHopFaceUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopFaceUp_Step0,
+    MovementAction_AcroWheelieHopFaceUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopFaceLeft_Step0,
-	MovementAction_AcroWheelieHopFaceLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopFaceLeft_Step0,
+    MovementAction_AcroWheelieHopFaceLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopFaceRight_Step0,
-	MovementAction_AcroWheelieHopFaceRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopFaceRight_Step0,
+    MovementAction_AcroWheelieHopFaceRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopDown_Step0,
-	MovementAction_AcroWheelieHopDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopDown_Step0,
+    MovementAction_AcroWheelieHopDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopUp_Step0,
-	MovementAction_AcroWheelieHopUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopUp_Step0,
+    MovementAction_AcroWheelieHopUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopLeft_Step0,
-	MovementAction_AcroWheelieHopLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopLeft_Step0,
+    MovementAction_AcroWheelieHopLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieHopRight_Step0,
-	MovementAction_AcroWheelieHopRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieHopRight_Step0,
+    MovementAction_AcroWheelieHopRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieJumpDown_Step0,
-	MovementAction_AcroWheelieJumpDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieJumpDown_Step0,
+    MovementAction_AcroWheelieJumpDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieJumpUp_Step0,
-	MovementAction_AcroWheelieJumpUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieJumpUp_Step0,
+    MovementAction_AcroWheelieJumpUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieJumpLeft_Step0,
-	MovementAction_AcroWheelieJumpLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieJumpLeft_Step0,
+    MovementAction_AcroWheelieJumpLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieJumpRight_Step0,
-	MovementAction_AcroWheelieJumpRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieJumpRight_Step0,
+    MovementAction_AcroWheelieJumpRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieInPlaceDown_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieInPlaceDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieInPlaceUp_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieInPlaceUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieInPlaceLeft_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieInPlaceLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieInPlaceRight_Step0,
-	MovementAction_WalkInPlace_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieInPlaceRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieMoveDown_Step0,
-	MovementAction_AcroPopWheelieMoveDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieMoveDown_Step0,
+    MovementAction_AcroPopWheelieMoveDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieMoveUp_Step0,
-	MovementAction_AcroPopWheelieMoveUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieMoveUp_Step0,
+    MovementAction_AcroPopWheelieMoveUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieMoveLeft_Step0,
-	MovementAction_AcroPopWheelieMoveLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieMoveLeft_Step0,
+    MovementAction_AcroPopWheelieMoveLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroPopWheelieMoveRight_Step0,
-	MovementAction_AcroPopWheelieMoveRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroPopWheelieMoveRight_Step0,
+    MovementAction_AcroPopWheelieMoveRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieMoveDown_Step0,
-	MovementAction_AcroWheelieMoveDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieMoveDown_Step0,
+    MovementAction_AcroWheelieMoveDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieMoveUp_Step0,
-	MovementAction_AcroWheelieMoveUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieMoveUp_Step0,
+    MovementAction_AcroWheelieMoveUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieMoveLeft_Step0,
-	MovementAction_AcroWheelieMoveLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieMoveLeft_Step0,
+    MovementAction_AcroWheelieMoveLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroWheelieMoveRight_Step0,
-	MovementAction_AcroWheelieMoveRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroWheelieMoveRight_Step0,
+    MovementAction_AcroWheelieMoveRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieMoveDown_Step0,
-	MovementAction_AcroEndWheelieMoveDown_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieMoveDown_Step0,
+    MovementAction_AcroEndWheelieMoveDown_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieMoveUp_Step0,
-	MovementAction_AcroEndWheelieMoveUp_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieMoveUp_Step0,
+    MovementAction_AcroEndWheelieMoveUp_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieMoveLeft_Step0,
-	MovementAction_AcroEndWheelieMoveLeft_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieMoveLeft_Step0,
+    MovementAction_AcroEndWheelieMoveLeft_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_AcroEndWheelieMoveRight_Step0,
-	MovementAction_AcroEndWheelieMoveRight_Step1,
-	MovementAction_PauseSpriteAnim,
+    MovementAction_AcroEndWheelieMoveRight_Step0,
+    MovementAction_AcroEndWheelieMoveRight_Step1,
+    MovementAction_PauseSpriteAnim,
 };
 
 u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_Levitate_Step0,
-	MovementAction_Finish,
+    MovementAction_Levitate_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_StopLevitate_Step0,
-	MovementAction_Finish,
+    MovementAction_StopLevitate_Step0,
+    MovementAction_Finish,
 };
 
 u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = {
-	MovementAction_DestroyExtraTaskIfAtTop_Step0,
-	MovementAction_Finish,
+    MovementAction_DestroyExtraTaskIfAtTop_Step0,
+    MovementAction_Finish,
 };
diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h
index 0f91c2250..0c4a6e21b 100644
--- a/src/data/graphics/items.h
+++ b/src/data/graphics/items.h
@@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett
 const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz");
 const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz");
 
-const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz");	
+const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz");    
 const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz");
 const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz");
 const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz");
diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h
index ab64c6f20..cdb28f8c3 100644
--- a/src/data/pokemon_graphics/back_pic_coordinates.h
+++ b/src/data/pokemon_graphics/back_pic_coordinates.h
@@ -1,444 +1,2206 @@
+#include "constants/species.h"
+
 const struct MonCoords gMonBackPicCoords[] =
 {
-    [SPECIES_NONE] = {0x88, 0x00},
-    [SPECIES_BULBASAUR] = {0x64, 0x10},
-    [SPECIES_IVYSAUR] = {0x66, 0x09},
-    [SPECIES_VENUSAUR] = {0x87, 0x07},
-    [SPECIES_CHARMANDER] = {0x65, 0x0e},
-    [SPECIES_CHARMELEON] = {0x66, 0x09},
-    [SPECIES_CHARIZARD] = {0x87, 0x04},
-    [SPECIES_SQUIRTLE] = {0x65, 0x0e},
-    [SPECIES_WARTORTLE] = {0x76, 0x0a},
-    [SPECIES_BLASTOISE] = {0x86, 0x08},
-    [SPECIES_CATERPIE] = {0x55, 0x0f},
-    [SPECIES_METAPOD] = {0x65, 0x0c},
-    [SPECIES_BUTTERFREE] = {0x87, 0x06},
-    [SPECIES_WEEDLE] = {0x56, 0x0b},
-    [SPECIES_KAKUNA] = {0x46, 0x0a},
-    [SPECIES_BEEDRILL] = {0x86, 0x09},
-    [SPECIES_PIDGEY] = {0x66, 0x08},
-    [SPECIES_PIDGEOTTO] = {0x85, 0x0c},
-    [SPECIES_PIDGEOT] = {0x78, 0x02},
-    [SPECIES_RATTATA] = {0x65, 0x0d},
-    [SPECIES_RATICATE] = {0x75, 0x0d},
-    [SPECIES_SPEAROW] = {0x65, 0x0c},
-    [SPECIES_FEAROW] = {0x87, 0x05},
-    [SPECIES_EKANS] = {0x66, 0x09},
-    [SPECIES_ARBOK] = {0x77, 0x04},
-    [SPECIES_PIKACHU] = {0x77, 0x07},
-    [SPECIES_RAICHU] = {0x66, 0x08},
-    [SPECIES_SANDSHREW] = {0x65, 0x0d},
-    [SPECIES_SANDSLASH] = {0x86, 0x09},
-    [SPECIES_NIDORAN_F] = {0x55, 0x0c},
-    [SPECIES_NIDORINA] = {0x86, 0x0a},
-    [SPECIES_NIDOQUEEN] = {0x77, 0x06},
-    [SPECIES_NIDORAN_M] = {0x56, 0x08},
-    [SPECIES_NIDORINO] = {0x86, 0x09},
-    [SPECIES_NIDOKING] = {0x88, 0x03},
-    [SPECIES_CLEFAIRY] = {0x65, 0x0d},
-    [SPECIES_CLEFABLE] = {0x76, 0x0a},
-    [SPECIES_VULPIX] = {0x76, 0x09},
-    [SPECIES_NINETALES] = {0x77, 0x05},
-    [SPECIES_JIGGLYPUFF] = {0x65, 0x0d},
-    [SPECIES_WIGGLYTUFF] = {0x66, 0x08},
-    [SPECIES_ZUBAT] = {0x76, 0x0b},
-    [SPECIES_GOLBAT] = {0x87, 0x06},
-    [SPECIES_ODDISH] = {0x56, 0x0b},
-    [SPECIES_GLOOM] = {0x66, 0x0a},
-    [SPECIES_VILEPLUME] = {0x87, 0x07},
-    [SPECIES_PARAS] = {0x63, 0x14},
-    [SPECIES_PARASECT] = {0x87, 0x07},
-    [SPECIES_VENONAT] = {0x77, 0x06},
-    [SPECIES_VENOMOTH] = {0x77, 0x04},
-    [SPECIES_DIGLETT] = {0x54, 0x10},
-    [SPECIES_DUGTRIO] = {0x66, 0x0b},
-    [SPECIES_MEOWTH] = {0x65, 0x0c},
-    [SPECIES_PERSIAN] = {0x87, 0x07},
-    [SPECIES_PSYDUCK] = {0x67, 0x07},
-    [SPECIES_GOLDUCK] = {0x77, 0x05},
-    [SPECIES_MANKEY] = {0x76, 0x0b},
-    [SPECIES_PRIMEAPE] = {0x77, 0x07},
-    [SPECIES_GROWLITHE] = {0x66, 0x08},
-    [SPECIES_ARCANINE] = {0x87, 0x06},
-    [SPECIES_POLIWAG] = {0x74, 0x10},
-    [SPECIES_POLIWHIRL] = {0x65, 0x0c},
-    [SPECIES_POLIWRATH] = {0x86, 0x0b},
-    [SPECIES_ABRA] = {0x66, 0x0b},
-    [SPECIES_KADABRA] = {0x76, 0x08},
-    [SPECIES_ALAKAZAM] = {0x67, 0x05},
-    [SPECIES_MACHOP] = {0x65, 0x0c},
-    [SPECIES_MACHOKE] = {0x76, 0x09},
-    [SPECIES_MACHAMP] = {0x67, 0x04},
-    [SPECIES_BELLSPROUT] = {0x66, 0x0a},
-    [SPECIES_WEEPINBELL] = {0x66, 0x09},
-    [SPECIES_VICTREEBEL] = {0x87, 0x06},
-    [SPECIES_TENTACOOL] = {0x56, 0x0a},
-    [SPECIES_TENTACRUEL] = {0x86, 0x0b},
-    [SPECIES_GEODUDE] = {0x66, 0x0b},
-    [SPECIES_GRAVELER] = {0x75, 0x0c},
-    [SPECIES_GOLEM] = {0x84, 0x10},
-    [SPECIES_PONYTA] = {0x66, 0x09},
-    [SPECIES_RAPIDASH] = {0x87, 0x05},
-    [SPECIES_SLOWPOKE] = {0x85, 0x0e},
-    [SPECIES_SLOWBRO] = {0x86, 0x0a},
-    [SPECIES_MAGNEMITE] = {0x43, 0x14},
-    [SPECIES_MAGNETON] = {0x66, 0x0a},
-    [SPECIES_FARFETCHD] = {0x66, 0x0a},
-    [SPECIES_DODUO] = {0x66, 0x08},
-    [SPECIES_DODRIO] = {0x88, 0x01},
-    [SPECIES_SEEL] = {0x66, 0x0a},
-    [SPECIES_DEWGONG] = {0x77, 0x05},
-    [SPECIES_GRIMER] = {0x75, 0x0c},
-    [SPECIES_MUK] = {0x87, 0x05},
-    [SPECIES_SHELLDER] = {0x76, 0x0b},
-    [SPECIES_CLOYSTER] = {0x87, 0x06},
-    [SPECIES_GASTLY] = {0x85, 0x0e},
-    [SPECIES_HAUNTER] = {0x76, 0x08},
-    [SPECIES_GENGAR] = {0x76, 0x09},
-    [SPECIES_ONIX] = {0x78, 0x00},
-    [SPECIES_DROWZEE] = {0x65, 0x0d},
-    [SPECIES_HYPNO] = {0x66, 0x09},
-    [SPECIES_KRABBY] = {0x66, 0x0a},
-    [SPECIES_KINGLER] = {0x77, 0x04},
-    [SPECIES_VOLTORB] = {0x55, 0x0e},
-    [SPECIES_ELECTRODE] = {0x65, 0x0d},
-    [SPECIES_EXEGGCUTE] = {0x65, 0x0d},
-    [SPECIES_EXEGGUTOR] = {0x87, 0x04},
-    [SPECIES_CUBONE] = {0x66, 0x0a},
-    [SPECIES_MAROWAK] = {0x66, 0x08},
-    [SPECIES_HITMONLEE] = {0x65, 0x0c},
-    [SPECIES_HITMONCHAN] = {0x65, 0x0c},
-    [SPECIES_LICKITUNG] = {0x65, 0x0e},
-    [SPECIES_KOFFING] = {0x66, 0x09},
-    [SPECIES_WEEZING] = {0x77, 0x06},
-    [SPECIES_RHYHORN] = {0x85, 0x0c},
-    [SPECIES_RHYDON] = {0x88, 0x03},
-    [SPECIES_CHANSEY] = {0x86, 0x0b},
-    [SPECIES_TANGELA] = {0x85, 0x0e},
-    [SPECIES_KANGASKHAN] = {0x77, 0x05},
-    [SPECIES_HORSEA] = {0x66, 0x09},
-    [SPECIES_SEADRA] = {0x66, 0x08},
-    [SPECIES_GOLDEEN] = {0x66, 0x08},
-    [SPECIES_SEAKING] = {0x76, 0x0b},
-    [SPECIES_STARYU] = {0x65, 0x0d},
-    [SPECIES_STARMIE] = {0x85, 0x0e},
-    [SPECIES_MR_MIME] = {0x85, 0x0d},
-    [SPECIES_SCYTHER] = {0x77, 0x07},
-    [SPECIES_JYNX] = {0x86, 0x0a},
-    [SPECIES_ELECTABUZZ] = {0x66, 0x08},
-    [SPECIES_MAGMAR] = {0x66, 0x08},
-    [SPECIES_PINSIR] = {0x66, 0x09},
-    [SPECIES_TAUROS] = {0x85, 0x0d},
-    [SPECIES_MAGIKARP] = {0x76, 0x09},
-    [SPECIES_GYARADOS] = {0x78, 0x00},
-    [SPECIES_LAPRAS] = {0x77, 0x04},
-    [SPECIES_DITTO] = {0x54, 0x11},
-    [SPECIES_EEVEE] = {0x66, 0x0a},
-    [SPECIES_VAPOREON] = {0x66, 0x0a},
-    [SPECIES_JOLTEON] = {0x87, 0x06},
-    [SPECIES_FLAREON] = {0x67, 0x05},
-    [SPECIES_PORYGON] = {0x65, 0x0d},
-    [SPECIES_OMANYTE] = {0x66, 0x0a},
-    [SPECIES_OMASTAR] = {0x66, 0x08},
-    [SPECIES_KABUTO] = {0x65, 0x0d},
-    [SPECIES_KABUTOPS] = {0x77, 0x05},
-    [SPECIES_AERODACTYL] = {0x86, 0x08},
-    [SPECIES_SNORLAX] = {0x86, 0x0b},
-    [SPECIES_ARTICUNO] = {0x65, 0x0c},
-    [SPECIES_ZAPDOS] = {0x76, 0x0b},
-    [SPECIES_MOLTRES] = {0x87, 0x04},
-    [SPECIES_DRATINI] = {0x66, 0x09},
-    [SPECIES_DRAGONAIR] = {0x78, 0x00},
-    [SPECIES_DRAGONITE] = {0x87, 0x06},
-    [SPECIES_MEWTWO] = {0x78, 0x01},
-    [SPECIES_MEW] = {0x66, 0x08},
-    [SPECIES_CHIKORITA] = {0x56, 0x0a},
-    [SPECIES_BAYLEEF] = {0x66, 0x08},
-    [SPECIES_MEGANIUM] = {0x78, 0x00},
-    [SPECIES_CYNDAQUIL] = {0x76, 0x09},
-    [SPECIES_QUILAVA] = {0x87, 0x04},
-    [SPECIES_TYPHLOSION] = {0x87, 0x04},
-    [SPECIES_TOTODILE] = {0x66, 0x0b},
-    [SPECIES_CROCONAW] = {0x67, 0x07},
-    [SPECIES_FERALIGATR] = {0x88, 0x01},
-    [SPECIES_SENTRET] = {0x67, 0x05},
-    [SPECIES_FURRET] = {0x66, 0x08},
-    [SPECIES_HOOTHOOT] = {0x66, 0x08},
-    [SPECIES_NOCTOWL] = {0x68, 0x03},
-    [SPECIES_LEDYBA] = {0x76, 0x0b},
-    [SPECIES_LEDIAN] = {0x77, 0x07},
-    [SPECIES_SPINARAK] = {0x73, 0x15},
-    [SPECIES_ARIADOS] = {0x86, 0x0b},
-    [SPECIES_CROBAT] = {0x87, 0x05},
-    [SPECIES_CHINCHOU] = {0x86, 0x08},
-    [SPECIES_LANTURN] = {0x86, 0x08},
-    [SPECIES_PICHU] = {0x66, 0x0b},
-    [SPECIES_CLEFFA] = {0x65, 0x0f},
-    [SPECIES_IGGLYBUFF] = {0x66, 0x0b},
-    [SPECIES_TOGEPI] = {0x54, 0x10},
-    [SPECIES_TOGETIC] = {0x66, 0x08},
-    [SPECIES_NATU] = {0x54, 0x11},
-    [SPECIES_XATU] = {0x76, 0x08},
-    [SPECIES_MAREEP] = {0x66, 0x09},
-    [SPECIES_FLAAFFY] = {0x66, 0x09},
-    [SPECIES_AMPHAROS] = {0x88, 0x01},
-    [SPECIES_BELLOSSOM] = {0x66, 0x0b},
-    [SPECIES_MARILL] = {0x75, 0x0c},
-    [SPECIES_AZUMARILL] = {0x86, 0x08},
-    [SPECIES_SUDOWOODO] = {0x66, 0x08},
-    [SPECIES_POLITOED] = {0x66, 0x09},
-    [SPECIES_HOPPIP] = {0x66, 0x0b},
-    [SPECIES_SKIPLOOM] = {0x65, 0x0d},
-    [SPECIES_JUMPLUFF] = {0x87, 0x04},
-    [SPECIES_AIPOM] = {0x66, 0x09},
-    [SPECIES_SUNKERN] = {0x56, 0x0a},
-    [SPECIES_SUNFLORA] = {0x66, 0x08},
-    [SPECIES_YANMA] = {0x77, 0x04},
-    [SPECIES_WOOPER] = {0x85, 0x0f},
-    [SPECIES_QUAGSIRE] = {0x76, 0x08},
-    [SPECIES_ESPEON] = {0x76, 0x0b},
-    [SPECIES_UMBREON] = {0x87, 0x04},
-    [SPECIES_MURKROW] = {0x66, 0x09},
-    [SPECIES_SLOWKING] = {0x66, 0x08},
-    [SPECIES_MISDREAVUS] = {0x66, 0x0a},
-    [SPECIES_UNOWN] = {0x36, 0x08},
-    [SPECIES_WOBBUFFET] = {0x75, 0x0c},
-    [SPECIES_GIRAFARIG] = {0x87, 0x05},
-    [SPECIES_PINECO] = {0x65, 0x0f},
-    [SPECIES_FORRETRESS] = {0x84, 0x10},
-    [SPECIES_DUNSPARCE] = {0x85, 0x0f},
-    [SPECIES_GLIGAR] = {0x87, 0x05},
-    [SPECIES_STEELIX] = {0x88, 0x00},
-    [SPECIES_SNUBBULL] = {0x76, 0x0a},
-    [SPECIES_GRANBULL] = {0x87, 0x05},
-    [SPECIES_QWILFISH] = {0x77, 0x07},
-    [SPECIES_SCIZOR] = {0x77, 0x04},
-    [SPECIES_SHUCKLE] = {0x56, 0x0b},
-    [SPECIES_HERACROSS] = {0x77, 0x04},
-    [SPECIES_SNEASEL] = {0x66, 0x08},
-    [SPECIES_TEDDIURSA] = {0x66, 0x08},
-    [SPECIES_URSARING] = {0x88, 0x03},
-    [SPECIES_SLUGMA] = {0x66, 0x08},
-    [SPECIES_MAGCARGO] = {0x76, 0x09},
-    [SPECIES_SWINUB] = {0x63, 0x15},
-    [SPECIES_PILOSWINE] = {0x75, 0x0d},
-    [SPECIES_CORSOLA] = {0x65, 0x0c},
-    [SPECIES_REMORAID] = {0x75, 0x0d},
-    [SPECIES_OCTILLERY] = {0x66, 0x0a},
-    [SPECIES_DELIBIRD] = {0x67, 0x06},
-    [SPECIES_MANTINE] = {0x87, 0x07},
-    [SPECIES_SKARMORY] = {0x87, 0x04},
-    [SPECIES_HOUNDOUR] = {0x55, 0x0c},
-    [SPECIES_HOUNDOOM] = {0x87, 0x07},
-    [SPECIES_KINGDRA] = {0x87, 0x06},
-    [SPECIES_PHANPY] = {0x65, 0x0e},
-    [SPECIES_DONPHAN] = {0x85, 0x0d},
-    [SPECIES_PORYGON2] = {0x76, 0x0a},
-    [SPECIES_STANTLER] = {0x78, 0x03},
-    [SPECIES_SMEARGLE] = {0x76, 0x0a},
-    [SPECIES_TYROGUE] = {0x66, 0x08},
-    [SPECIES_HITMONTOP] = {0x87, 0x05},
-    [SPECIES_SMOOCHUM] = {0x56, 0x09},
-    [SPECIES_ELEKID] = {0x66, 0x08},
-    [SPECIES_MAGBY] = {0x66, 0x0b},
-    [SPECIES_MILTANK] = {0x87, 0x07},
-    [SPECIES_BLISSEY] = {0x85, 0x0d},
-    [SPECIES_RAIKOU] = {0x86, 0x0a},
-    [SPECIES_ENTEI] = {0x87, 0x06},
-    [SPECIES_SUICUNE] = {0x88, 0x03},
-    [SPECIES_LARVITAR] = {0x66, 0x08},
-    [SPECIES_PUPITAR] = {0x67, 0x05},
-    [SPECIES_TYRANITAR] = {0x88, 0x00},
-    [SPECIES_LUGIA] = {0x88, 0x01},
-    [SPECIES_HO_OH] = {0x88, 0x01},
-    [SPECIES_CELEBI] = {0x66, 0x08},
-    [SPECIES_OLD_UNOWN_B] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_C] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_D] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_E] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_F] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_G] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_H] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_I] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_J] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_K] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_L] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_M] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_N] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_O] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_P] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_Q] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_R] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_S] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_T] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_U] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_V] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_W] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_X] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_Y] = {0x88, 0x02},
-    [SPECIES_OLD_UNOWN_Z] = {0x88, 0x02},
-    [SPECIES_TREECKO] = {0x87, 0x06},
-    [SPECIES_GROVYLE] = {0x86, 0x08},
-    [SPECIES_SCEPTILE] = {0x88, 0x01},
-    [SPECIES_TORCHIC] = {0x67, 0x05},
-    [SPECIES_COMBUSKEN] = {0x88, 0x00},
-    [SPECIES_BLAZIKEN] = {0x88, 0x00},
-    [SPECIES_MUDKIP] = {0x77, 0x05},
-    [SPECIES_MARSHTOMP] = {0x87, 0x04},
-    [SPECIES_SWAMPERT] = {0x87, 0x05},
-    [SPECIES_POOCHYENA] = {0x76, 0x09},
-    [SPECIES_MIGHTYENA] = {0x87, 0x04},
-    [SPECIES_ZIGZAGOON] = {0x76, 0x0b},
-    [SPECIES_LINOONE] = {0x85, 0x0f},
-    [SPECIES_WURMPLE] = {0x76, 0x0b},
-    [SPECIES_SILCOON] = {0x83, 0x15},
-    [SPECIES_BEAUTIFLY] = {0x88, 0x00},
-    [SPECIES_CASCOON] = {0x73, 0x14},
-    [SPECIES_DUSTOX] = {0x83, 0x14},
-    [SPECIES_LOTAD] = {0x75, 0x0f},
-    [SPECIES_LOMBRE] = {0x86, 0x08},
-    [SPECIES_LUDICOLO] = {0x86, 0x0a},
-    [SPECIES_SEEDOT] = {0x86, 0x09},
-    [SPECIES_NUZLEAF] = {0x76, 0x0a},
-    [SPECIES_SHIFTRY] = {0x86, 0x08},
-    [SPECIES_NINCADA] = {0x83, 0x14},
-    [SPECIES_NINJASK] = {0x86, 0x08},
-    [SPECIES_SHEDINJA] = {0x77, 0x06},
-    [SPECIES_TAILLOW] = {0x64, 0x11},
-    [SPECIES_SWELLOW] = {0x86, 0x08},
-    [SPECIES_SHROOMISH] = {0x85, 0x0d},
-    [SPECIES_BRELOOM] = {0x87, 0x04},
-    [SPECIES_SPINDA] = {0x77, 0x04},
-    [SPECIES_WINGULL] = {0x85, 0x0e},
-    [SPECIES_PELIPPER] = {0x87, 0x06},
-    [SPECIES_SURSKIT] = {0x86, 0x0b},
-    [SPECIES_MASQUERAIN] = {0x88, 0x00},
-    [SPECIES_WAILMER] = {0x83, 0x15},
-    [SPECIES_WAILORD] = {0x83, 0x16},
-    [SPECIES_SKITTY] = {0x86, 0x0a},
-    [SPECIES_DELCATTY] = {0x86, 0x08},
-    [SPECIES_KECLEON] = {0x87, 0x06},
-    [SPECIES_BALTOY] = {0x86, 0x08},
-    [SPECIES_CLAYDOL] = {0x87, 0x07},
-    [SPECIES_NOSEPASS] = {0x85, 0x0c},
-    [SPECIES_TORKOAL] = {0x86, 0x0a},
-    [SPECIES_SABLEYE] = {0x76, 0x08},
-    [SPECIES_BARBOACH] = {0x66, 0x0a},
-    [SPECIES_WHISCASH] = {0x86, 0x0a},
-    [SPECIES_LUVDISC] = {0x46, 0x0a},
-    [SPECIES_CORPHISH] = {0x77, 0x07},
-    [SPECIES_CRAWDAUNT] = {0x87, 0x05},
-    [SPECIES_FEEBAS] = {0x67, 0x07},
-    [SPECIES_MILOTIC] = {0x68, 0x02},
-    [SPECIES_CARVANHA] = {0x87, 0x07},
-    [SPECIES_SHARPEDO] = {0x88, 0x02},
-    [SPECIES_TRAPINCH] = {0x75, 0x0e},
-    [SPECIES_VIBRAVA] = {0x74, 0x11},
-    [SPECIES_FLYGON] = {0x88, 0x02},
-    [SPECIES_MAKUHITA] = {0x76, 0x0b},
-    [SPECIES_HARIYAMA] = {0x87, 0x07},
-    [SPECIES_ELECTRIKE] = {0x84, 0x10},
-    [SPECIES_MANECTRIC] = {0x87, 0x04},
-    [SPECIES_NUMEL] = {0x86, 0x0b},
-    [SPECIES_CAMERUPT] = {0x84, 0x13},
-    [SPECIES_SPHEAL] = {0x64, 0x12},
-    [SPECIES_SEALEO] = {0x86, 0x0a},
-    [SPECIES_WALREIN] = {0x87, 0x06},
-    [SPECIES_CACNEA] = {0x85, 0x0f},
-    [SPECIES_CACTURNE] = {0x87, 0x07},
-    [SPECIES_SNORUNT] = {0x76, 0x0a},
-    [SPECIES_GLALIE] = {0x85, 0x0c},
-    [SPECIES_LUNATONE] = {0x87, 0x05},
-    [SPECIES_SOLROCK] = {0x87, 0x05},
-    [SPECIES_AZURILL] = {0x86, 0x0a},
-    [SPECIES_SPOINK] = {0x56, 0x0b},
-    [SPECIES_GRUMPIG] = {0x87, 0x04},
-    [SPECIES_PLUSLE] = {0x76, 0x08},
-    [SPECIES_MINUN] = {0x76, 0x08},
-    [SPECIES_MAWILE] = {0x87, 0x04},
-    [SPECIES_MEDITITE] = {0x76, 0x0b},
-    [SPECIES_MEDICHAM] = {0x68, 0x03},
-    [SPECIES_SWABLU] = {0x86, 0x09},
-    [SPECIES_ALTARIA] = {0x87, 0x06},
-    [SPECIES_WYNAUT] = {0x77, 0x07},
-    [SPECIES_DUSKULL] = {0x66, 0x0b},
-    [SPECIES_DUSCLOPS] = {0x86, 0x08},
-    [SPECIES_ROSELIA] = {0x86, 0x08},
-    [SPECIES_SLAKOTH] = {0x85, 0x0f},
-    [SPECIES_VIGOROTH] = {0x86, 0x0a},
-    [SPECIES_SLAKING] = {0x86, 0x08},
-    [SPECIES_GULPIN] = {0x66, 0x0b},
-    [SPECIES_SWALOT] = {0x77, 0x06},
-    [SPECIES_TROPIUS] = {0x87, 0x07},
-    [SPECIES_WHISMUR] = {0x85, 0x0d},
-    [SPECIES_LOUDRED] = {0x86, 0x09},
-    [SPECIES_EXPLOUD] = {0x88, 0x03},
-    [SPECIES_CLAMPERL] = {0x85, 0x0d},
-    [SPECIES_HUNTAIL] = {0x68, 0x02},
-    [SPECIES_GOREBYSS] = {0x77, 0x05},
-    [SPECIES_ABSOL] = {0x78, 0x03},
-    [SPECIES_SHUPPET] = {0x77, 0x06},
-    [SPECIES_BANETTE] = {0x65, 0x0c},
-    [SPECIES_SEVIPER] = {0x88, 0x03},
-    [SPECIES_ZANGOOSE] = {0x88, 0x01},
-    [SPECIES_RELICANTH] = {0x86, 0x0a},
-    [SPECIES_ARON] = {0x54, 0x11},
-    [SPECIES_LAIRON] = {0x84, 0x11},
-    [SPECIES_AGGRON] = {0x87, 0x07},
-    [SPECIES_CASTFORM] = {0x45, 0x0d},
-    [SPECIES_VOLBEAT] = {0x76, 0x08},
-    [SPECIES_ILLUMISE] = {0x67, 0x06},
-    [SPECIES_LILEEP] = {0x86, 0x09},
-    [SPECIES_CRADILY] = {0x77, 0x04},
-    [SPECIES_ANORITH] = {0x83, 0x17},
-    [SPECIES_ARMALDO] = {0x77, 0x05},
-    [SPECIES_RALTS] = {0x45, 0x0d},
-    [SPECIES_KIRLIA] = {0x57, 0x06},
-    [SPECIES_GARDEVOIR] = {0x77, 0x04},
-    [SPECIES_BAGON] = {0x66, 0x08},
-    [SPECIES_SHELGON] = {0x85, 0x0d},
-    [SPECIES_SALAMENCE] = {0x77, 0x06},
-    [SPECIES_BELDUM] = {0x66, 0x0a},
-    [SPECIES_METANG] = {0x84, 0x10},
-    [SPECIES_METAGROSS] = {0x83, 0x14},
-    [SPECIES_REGIROCK] = {0x86, 0x0a},
-    [SPECIES_REGICE] = {0x85, 0x0e},
-    [SPECIES_REGISTEEL] = {0x85, 0x0e},
-    [SPECIES_KYOGRE] = {0x84, 0x13},
-    [SPECIES_GROUDON] = {0x87, 0x07},
-    [SPECIES_RAYQUAZA] = {0x78, 0x00},
-    [SPECIES_LATIAS] = {0x88, 0x02},
-    [SPECIES_LATIOS] = {0x88, 0x03},
-    [SPECIES_JIRACHI] = {0x87, 0x05},
-    [SPECIES_DEOXYS] = {0x86, 0x09},
-    [SPECIES_CHIMECHO] = {0x47, 0x07},
-    [SPECIES_EGG] = {0x36, 0x0a},
-    [SPECIES_UNOWN_B] = {0x56, 0x09},
-    [SPECIES_UNOWN_C] = {0x67, 0x06},
-    [SPECIES_UNOWN_D] = {0x56, 0x08},
-    [SPECIES_UNOWN_E] = {0x56, 0x0a},
-    [SPECIES_UNOWN_F] = {0x66, 0x0a},
-    [SPECIES_UNOWN_G] = {0x57, 0x05},
-    [SPECIES_UNOWN_H] = {0x66, 0x08},
-    [SPECIES_UNOWN_I] = {0x37, 0x07},
-    [SPECIES_UNOWN_J] = {0x46, 0x09},
-    [SPECIES_UNOWN_K] = {0x57, 0x07},
-    [SPECIES_UNOWN_L] = {0x46, 0x0a},
-    [SPECIES_UNOWN_M] = {0x65, 0x0d},
-    [SPECIES_UNOWN_N] = {0x65, 0x0d},
-    [SPECIES_UNOWN_O] = {0x66, 0x08},
-    [SPECIES_UNOWN_P] = {0x46, 0x0a},
-    [SPECIES_UNOWN_Q] = {0x55, 0x0f},
-    [SPECIES_UNOWN_R] = {0x45, 0x0c},
-    [SPECIES_UNOWN_S] = {0x57, 0x04},
-    [SPECIES_UNOWN_T] = {0x45, 0x0d},
-    [SPECIES_UNOWN_U] = {0x65, 0x0d},
-    [SPECIES_UNOWN_V] = {0x56, 0x0b},
-    [SPECIES_UNOWN_W] = {0x55, 0x0d},
-    [SPECIES_UNOWN_X] = {0x55, 0x0f},
-    [SPECIES_UNOWN_Y] = {0x46, 0x0a},
-    [SPECIES_UNOWN_Z] = {0x46, 0x0a},
-    [SPECIES_UNOWN_EMARK] = {0x37, 0x06},
-    [SPECIES_UNOWN_QMARK] = {0x47, 0x06},
+    [SPECIES_NONE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_BULBASAUR] =
+    {
+        .coords = 0x64,
+        .y_offset = 0x10,
+    },
+    [SPECIES_IVYSAUR] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_VENUSAUR] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_CHARMANDER] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_CHARMELEON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_CHARIZARD] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SQUIRTLE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_WARTORTLE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_BLASTOISE] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_CATERPIE] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_METAPOD] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_BUTTERFREE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_WEEDLE] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_KAKUNA] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_BEEDRILL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_PIDGEY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_PIDGEOTTO] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_PIDGEOT] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x02,
+    },
+    [SPECIES_RATTATA] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_RATICATE] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_SPEAROW] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_FEAROW] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_EKANS] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_ARBOK] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_PIKACHU] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_RAICHU] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SANDSHREW] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_SANDSLASH] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NIDORAN_F] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_NIDORINA] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_NIDOQUEEN] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_NIDORAN_M] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_NIDORINO] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NIDOKING] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_CLEFAIRY] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_CLEFABLE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_VULPIX] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NINETALES] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_JIGGLYPUFF] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_WIGGLYTUFF] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ZUBAT] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_GOLBAT] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_ODDISH] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_GLOOM] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_VILEPLUME] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_PARAS] =
+    {
+        .coords = 0x63,
+        .y_offset = 0x14,
+    },
+    [SPECIES_PARASECT] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_VENONAT] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_VENOMOTH] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_DIGLETT] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x10,
+    },
+    [SPECIES_DUGTRIO] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MEOWTH] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_PERSIAN] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_PSYDUCK] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_GOLDUCK] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_MANKEY] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_PRIMEAPE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_GROWLITHE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ARCANINE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_POLIWAG] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x10,
+    },
+    [SPECIES_POLIWHIRL] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_POLIWRATH] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_ABRA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_KADABRA] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ALAKAZAM] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_MACHOP] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MACHOKE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_MACHAMP] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x04,
+    },
+    [SPECIES_BELLSPROUT] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_WEEPINBELL] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_VICTREEBEL] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_TENTACOOL] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_TENTACRUEL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_GEODUDE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_GRAVELER] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_GOLEM] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x10,
+    },
+    [SPECIES_PONYTA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_RAPIDASH] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_SLOWPOKE] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_SLOWBRO] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_MAGNEMITE] =
+    {
+        .coords = 0x43,
+        .y_offset = 0x14,
+    },
+    [SPECIES_MAGNETON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_FARFETCHD] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DODUO] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_DODRIO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SEEL] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DEWGONG] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_GRIMER] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MUK] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_SHELLDER] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_CLOYSTER] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GASTLY] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_HAUNTER] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_GENGAR] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_ONIX] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_DROWZEE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_HYPNO] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_KRABBY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_KINGLER] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_VOLTORB] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_ELECTRODE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_EXEGGCUTE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_EXEGGUTOR] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_CUBONE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_MAROWAK] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_HITMONLEE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_HITMONCHAN] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_LICKITUNG] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_KOFFING] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_WEEZING] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_RHYHORN] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_RHYDON] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_CHANSEY] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_TANGELA] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_KANGASKHAN] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_HORSEA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SEADRA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_GOLDEEN] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SEAKING] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_STARYU] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_STARMIE] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_MR_MIME] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_SCYTHER] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_JYNX] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_ELECTABUZZ] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MAGMAR] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_PINSIR] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_TAUROS] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_MAGIKARP] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_GYARADOS] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LAPRAS] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_DITTO] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x11,
+    },
+    [SPECIES_EEVEE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_VAPOREON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_JOLTEON] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_FLAREON] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_PORYGON] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_OMANYTE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_OMASTAR] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_KABUTO] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_KABUTOPS] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_AERODACTYL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SNORLAX] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_ARTICUNO] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_ZAPDOS] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MOLTRES] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_DRATINI] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_DRAGONAIR] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_DRAGONITE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_MEWTWO] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x01,
+    },
+    [SPECIES_MEW] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_CHIKORITA] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_BAYLEEF] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MEGANIUM] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CYNDAQUIL] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_QUILAVA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_TYPHLOSION] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_TOTODILE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_CROCONAW] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_FERALIGATR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SENTRET] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_FURRET] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_HOOTHOOT] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_NOCTOWL] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x03,
+    },
+    [SPECIES_LEDYBA] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_LEDIAN] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_SPINARAK] =
+    {
+        .coords = 0x73,
+        .y_offset = 0x15,
+    },
+    [SPECIES_ARIADOS] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_CROBAT] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_CHINCHOU] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_LANTURN] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_PICHU] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_CLEFFA] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_IGGLYBUFF] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_TOGEPI] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x10,
+    },
+    [SPECIES_TOGETIC] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_NATU] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x11,
+    },
+    [SPECIES_XATU] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MAREEP] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_FLAAFFY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_AMPHAROS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_BELLOSSOM] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MARILL] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_AZUMARILL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SUDOWOODO] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_POLITOED] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_HOPPIP] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SKIPLOOM] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_JUMPLUFF] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_AIPOM] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SUNKERN] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SUNFLORA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_YANMA] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_WOOPER] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_QUAGSIRE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ESPEON] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_UMBREON] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_MURKROW] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SLOWKING] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MISDREAVUS] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN] =
+    {
+        .coords = 0x36,
+        .y_offset = 0x08,
+    },
+    [SPECIES_WOBBUFFET] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_GIRAFARIG] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_PINECO] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_FORRETRESS] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x10,
+    },
+    [SPECIES_DUNSPARCE] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_GLIGAR] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_STEELIX] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SNUBBULL] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_GRANBULL] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_QWILFISH] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_SCIZOR] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SHUCKLE] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_HERACROSS] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SNEASEL] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_TEDDIURSA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_URSARING] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_SLUGMA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MAGCARGO] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SWINUB] =
+    {
+        .coords = 0x63,
+        .y_offset = 0x15,
+    },
+    [SPECIES_PILOSWINE] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_CORSOLA] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_REMORAID] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_OCTILLERY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DELIBIRD] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_MANTINE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_SKARMORY] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_HOUNDOUR] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_HOUNDOOM] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_KINGDRA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_PHANPY] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_DONPHAN] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_PORYGON2] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_STANTLER] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_SMEARGLE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_TYROGUE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_HITMONTOP] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_SMOOCHUM] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x09,
+    },
+    [SPECIES_ELEKID] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MAGBY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MILTANK] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_BLISSEY] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_RAIKOU] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_ENTEI] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_SUICUNE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_LARVITAR] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_PUPITAR] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_TYRANITAR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LUGIA] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_HO_OH] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_CELEBI] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_OLD_UNOWN_B] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_C] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_D] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_E] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_F] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_G] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_H] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_I] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_J] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_K] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_L] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_M] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_N] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_O] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_P] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_Q] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_R] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_S] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_T] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_U] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_V] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_W] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_X] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_Y] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_OLD_UNOWN_Z] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_TREECKO] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GROVYLE] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SCEPTILE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_TORCHIC] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_COMBUSKEN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_BLAZIKEN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_MUDKIP] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_MARSHTOMP] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SWAMPERT] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_POOCHYENA] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_MIGHTYENA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_ZIGZAGOON] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_LINOONE] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_WURMPLE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SILCOON] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x15,
+    },
+    [SPECIES_BEAUTIFLY] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CASCOON] =
+    {
+        .coords = 0x73,
+        .y_offset = 0x14,
+    },
+    [SPECIES_DUSTOX] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x14,
+    },
+    [SPECIES_LOTAD] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_LOMBRE] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_LUDICOLO] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SEEDOT] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NUZLEAF] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SHIFTRY] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_NINCADA] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x14,
+    },
+    [SPECIES_NINJASK] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SHEDINJA] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_TAILLOW] =
+    {
+        .coords = 0x64,
+        .y_offset = 0x11,
+    },
+    [SPECIES_SWELLOW] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SHROOMISH] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_BRELOOM] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SPINDA] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_WINGULL] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_PELIPPER] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_SURSKIT] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MASQUERAIN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_WAILMER] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x15,
+    },
+    [SPECIES_WAILORD] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x16,
+    },
+    [SPECIES_SKITTY] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DELCATTY] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_KECLEON] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_BALTOY] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_CLAYDOL] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_NOSEPASS] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_TORKOAL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SABLEYE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_BARBOACH] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_WHISCASH] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_LUVDISC] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_CORPHISH] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_CRAWDAUNT] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_FEEBAS] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_MILOTIC] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x02,
+    },
+    [SPECIES_CARVANHA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_SHARPEDO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_TRAPINCH] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_VIBRAVA] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x11,
+    },
+    [SPECIES_FLYGON] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_MAKUHITA] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_HARIYAMA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_ELECTRIKE] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x10,
+    },
+    [SPECIES_MANECTRIC] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_NUMEL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_CAMERUPT] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x13,
+    },
+    [SPECIES_SPHEAL] =
+    {
+        .coords = 0x64,
+        .y_offset = 0x12,
+    },
+    [SPECIES_SEALEO] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_WALREIN] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_CACNEA] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_CACTURNE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_SNORUNT] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_GLALIE] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_LUNATONE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_SOLROCK] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_AZURILL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SPOINK] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_GRUMPIG] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_PLUSLE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MINUN] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MAWILE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_MEDITITE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MEDICHAM] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x03,
+    },
+    [SPECIES_SWABLU] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_ALTARIA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_WYNAUT] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_DUSKULL] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_DUSCLOPS] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ROSELIA] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SLAKOTH] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_VIGOROTH] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SLAKING] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_GULPIN] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SWALOT] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_TROPIUS] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_WHISMUR] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_LOUDRED] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_EXPLOUD] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_CLAMPERL] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_HUNTAIL] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x02,
+    },
+    [SPECIES_GOREBYSS] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_ABSOL] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_SHUPPET] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_BANETTE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_SEVIPER] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_ZANGOOSE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_RELICANTH] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_ARON] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x11,
+    },
+    [SPECIES_LAIRON] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x11,
+    },
+    [SPECIES_AGGRON] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_CASTFORM] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_VOLBEAT] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ILLUMISE] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_LILEEP] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_CRADILY] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_ANORITH] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x17,
+    },
+    [SPECIES_ARMALDO] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_RALTS] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_KIRLIA] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GARDEVOIR] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_BAGON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SHELGON] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_SALAMENCE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_BELDUM] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_METANG] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x10,
+    },
+    [SPECIES_METAGROSS] =
+    {
+        .coords = 0x83,
+        .y_offset = 0x14,
+    },
+    [SPECIES_REGIROCK] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_REGICE] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_REGISTEEL] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_KYOGRE] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x13,
+    },
+    [SPECIES_GROUDON] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_RAYQUAZA] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LATIAS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_LATIOS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_JIRACHI] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_DEOXYS] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_CHIMECHO] =
+    {
+        .coords = 0x47,
+        .y_offset = 0x07,
+    },
+    [SPECIES_EGG] =
+    {
+        .coords = 0x36,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_B] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x09,
+    },
+    [SPECIES_UNOWN_C] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_UNOWN_D] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_UNOWN_E] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_F] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_G] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x05,
+    },
+    [SPECIES_UNOWN_H] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_UNOWN_I] =
+    {
+        .coords = 0x37,
+        .y_offset = 0x07,
+    },
+    [SPECIES_UNOWN_J] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x09,
+    },
+    [SPECIES_UNOWN_K] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x07,
+    },
+    [SPECIES_UNOWN_L] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_M] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_UNOWN_N] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_UNOWN_O] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_UNOWN_P] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_Q] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_UNOWN_R] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_UNOWN_S] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x04,
+    },
+    [SPECIES_UNOWN_T] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_UNOWN_U] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_UNOWN_V] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_UNOWN_W] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_UNOWN_X] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_UNOWN_Y] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_Z] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_UNOWN_EMARK] =
+    {
+        .coords = 0x37,
+        .y_offset = 0x06,
+    },
+    [SPECIES_UNOWN_QMARK] =
+    {
+        .coords = 0x47,
+        .y_offset = 0x06,
+    },
 };
 
diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index 80e2a415a..61fd943a2 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -1,417 +1,419 @@
+#include "constants/species.h"
+
 // This determines how much higher above the usual position the enemy Pokémon
 // is during battle. Species that float or fly have nonzero values.
 const u8 gEnemyMonElevation[] =
 {
-    0, // 0
-    0, // SPECIES_BULBASAUR
-    0, // SPECIES_IVYSAUR
-    0, // SPECIES_VENUSAUR
-    0, // SPECIES_CHARMANDER
-    0, // SPECIES_CHARMELEON
-    0, // SPECIES_CHARIZARD
-    0, // SPECIES_SQUIRTLE
-    0, // SPECIES_WARTORTLE
-    0, // SPECIES_BLASTOISE
-    0, // SPECIES_CATERPIE
-    0, // SPECIES_METAPOD
-    8, // SPECIES_BUTTERFREE
-    0, // SPECIES_WEEDLE
-    0, // SPECIES_KAKUNA
-    8, // SPECIES_BEEDRILL
-    16, // SPECIES_PIDGEY
-    0, // SPECIES_PIDGEOTTO
-    4, // SPECIES_PIDGEOT
-    0, // SPECIES_RATTATA
-    0, // SPECIES_RATICATE
-    0, // SPECIES_SPEAROW
-    6, // SPECIES_FEAROW
-    0, // SPECIES_EKANS
-    0, // SPECIES_ARBOK
-    0, // SPECIES_PIKACHU
-    0, // SPECIES_RAICHU
-    0, // SPECIES_SANDSHREW
-    0, // SPECIES_SANDSLASH
-    0, // SPECIES_NIDORAN_F
-    0, // SPECIES_NIDORINA
-    0, // SPECIES_NIDOQUEEN
-    0, // SPECIES_NIDORAN_M
-    0, // SPECIES_NIDORINO
-    0, // SPECIES_NIDOKING
-    0, // SPECIES_CLEFAIRY
-    0, // SPECIES_CLEFABLE
-    0, // SPECIES_VULPIX
-    0, // SPECIES_NINETALES
-    0, // SPECIES_JIGGLYPUFF
-    0, // SPECIES_WIGGLYTUFF
-    8, // SPECIES_ZUBAT
-    8, // SPECIES_GOLBAT
-    0, // SPECIES_ODDISH
-    0, // SPECIES_GLOOM
-    0, // SPECIES_VILEPLUME
-    0, // SPECIES_PARAS
-    0, // SPECIES_PARASECT
-    0, // SPECIES_VENONAT
-    8, // SPECIES_VENOMOTH
-    0, // SPECIES_DIGLETT
-    0, // SPECIES_DUGTRIO
-    0, // SPECIES_MEOWTH
-    0, // SPECIES_PERSIAN
-    0, // SPECIES_PSYDUCK
-    0, // SPECIES_GOLDUCK
-    0, // SPECIES_MANKEY
-    0, // SPECIES_PRIMEAPE
-    0, // SPECIES_GROWLITHE
-    0, // SPECIES_ARCANINE
-    0, // SPECIES_POLIWAG
-    0, // SPECIES_POLIWHIRL
-    0, // SPECIES_POLIWRATH
-    0, // SPECIES_ABRA
-    0, // SPECIES_KADABRA
-    0, // SPECIES_ALAKAZAM
-    0, // SPECIES_MACHOP
-    0, // SPECIES_MACHOKE
-    0, // SPECIES_MACHAMP
-    0, // SPECIES_BELLSPROUT
-    0, // SPECIES_WEEPINBELL
-    0, // SPECIES_VICTREEBEL
-    0, // SPECIES_TENTACOOL
-    0, // SPECIES_TENTACRUEL
-    16, // SPECIES_GEODUDE
-    0, // SPECIES_GRAVELER
-    0, // SPECIES_GOLEM
-    0, // SPECIES_PONYTA
-    0, // SPECIES_RAPIDASH
-    0, // SPECIES_SLOWPOKE
-    0, // SPECIES_SLOWBRO
-    16, // SPECIES_MAGNEMITE
-    8, // SPECIES_MAGNETON
-    0, // SPECIES_FARFETCHD
-    0, // SPECIES_DODUO
-    0, // SPECIES_DODRIO
-    0, // SPECIES_SEEL
-    0, // SPECIES_DEWGONG
-    0, // SPECIES_GRIMER
-    0, // SPECIES_MUK
-    0, // SPECIES_SHELLDER
-    0, // SPECIES_CLOYSTER
-    4, // SPECIES_GASTLY
-    4, // SPECIES_HAUNTER
-    0, // SPECIES_GENGAR
-    0, // SPECIES_ONIX
-    0, // SPECIES_DROWZEE
-    0, // SPECIES_HYPNO
-    0, // SPECIES_KRABBY
-    0, // SPECIES_KINGLER
-    10, // SPECIES_VOLTORB
-    12, // SPECIES_ELECTRODE
-    0, // SPECIES_EXEGGCUTE
-    0, // SPECIES_EXEGGUTOR
-    0, // SPECIES_CUBONE
-    0, // SPECIES_MAROWAK
-    0, // SPECIES_HITMONLEE
-    0, // SPECIES_HITMONCHAN
-    0, // SPECIES_LICKITUNG
-    8, // SPECIES_KOFFING
-    6, // SPECIES_WEEZING
-    0, // SPECIES_RHYHORN
-    0, // SPECIES_RHYDON
-    0, // SPECIES_CHANSEY
-    0, // SPECIES_TANGELA
-    0, // SPECIES_KANGASKHAN
-    0, // SPECIES_HORSEA
-    0, // SPECIES_SEADRA
-    0, // SPECIES_GOLDEEN
-    0, // SPECIES_SEAKING
-    0, // SPECIES_STARYU
-    0, // SPECIES_STARMIE
-    0, // SPECIES_MR_MIME
-    0, // SPECIES_SCYTHER
-    0, // SPECIES_JYNX
-    0, // SPECIES_ELECTABUZZ
-    0, // SPECIES_MAGMAR
-    0, // SPECIES_PINSIR
-    0, // SPECIES_TAUROS
-    0, // SPECIES_MAGIKARP
-    0, // SPECIES_GYARADOS
-    0, // SPECIES_LAPRAS
-    0, // SPECIES_DITTO
-    0, // SPECIES_EEVEE
-    0, // SPECIES_VAPOREON
-    0, // SPECIES_JOLTEON
-    0, // SPECIES_FLAREON
-    0, // SPECIES_PORYGON
-    0, // SPECIES_OMANYTE
-    0, // SPECIES_OMASTAR
-    0, // SPECIES_KABUTO
-    0, // SPECIES_KABUTOPS
-    7, // SPECIES_AERODACTYL
-    0, // SPECIES_SNORLAX
-    6, // SPECIES_ARTICUNO
-    8, // SPECIES_ZAPDOS
-    5, // SPECIES_MOLTRES
-    0, // SPECIES_DRATINI
-    0, // SPECIES_DRAGONAIR
-    6, // SPECIES_DRAGONITE
-    0, // SPECIES_MEWTWO
-    8, // SPECIES_MEW
-    0, // SPECIES_CHIKORITA
-    0, // SPECIES_BAYLEEF
-    0, // SPECIES_MEGANIUM
-    0, // SPECIES_CYNDAQUIL
-    0, // SPECIES_QUILAVA
-    0, // SPECIES_TYPHLOSION
-    0, // SPECIES_TOTODILE
-    0, // SPECIES_CROCONAW
-    0, // SPECIES_FERALIGATR
-    0, // SPECIES_SENTRET
-    0, // SPECIES_FURRET
-    0, // SPECIES_HOOTHOOT
-    0, // SPECIES_NOCTOWL
-    0, // SPECIES_LEDYBA
-    8, // SPECIES_LEDIAN
-    0, // SPECIES_SPINARAK
-    0, // SPECIES_ARIADOS
-    6, // SPECIES_CROBAT
-    0, // SPECIES_CHINCHOU
-    0, // SPECIES_LANTURN
-    0, // SPECIES_PICHU
-    0, // SPECIES_CLEFFA
-    0, // SPECIES_IGGLYBUFF
-    0, // SPECIES_TOGEPI
-    0, // SPECIES_TOGETIC
-    0, // SPECIES_NATU
-    0, // SPECIES_XATU
-    0, // SPECIES_MAREEP
-    0, // SPECIES_FLAAFFY
-    0, // SPECIES_AMPHAROS
-    0, // SPECIES_BELLOSSOM
-    0, // SPECIES_MARILL
-    0, // SPECIES_AZUMARILL
-    0, // SPECIES_SUDOWOODO
-    0, // SPECIES_POLITOED
-    11, // SPECIES_HOPPIP
-    12, // SPECIES_SKIPLOOM
-    9, // SPECIES_JUMPLUFF
-    0, // SPECIES_AIPOM
-    0, // SPECIES_SUNKERN
-    0, // SPECIES_SUNFLORA
-    8, // SPECIES_YANMA
-    0, // SPECIES_WOOPER
-    0, // SPECIES_QUAGSIRE
-    0, // SPECIES_ESPEON
-    0, // SPECIES_UMBREON
-    0, // SPECIES_MURKROW
-    0, // SPECIES_SLOWKING
-    8, // SPECIES_MISDREAVUS
-    8, // SPECIES_UNOWN
-    0, // SPECIES_WOBBUFFET
-    0, // SPECIES_GIRAFARIG
-    0, // SPECIES_PINECO
-    0, // SPECIES_FORRETRESS
-    0, // SPECIES_DUNSPARCE
-    6, // SPECIES_GLIGAR
-    0, // SPECIES_STEELIX
-    0, // SPECIES_SNUBBULL
-    0, // SPECIES_GRANBULL
-    0, // SPECIES_QWILFISH
-    0, // SPECIES_SCIZOR
-    0, // SPECIES_SHUCKLE
-    0, // SPECIES_HERACROSS
-    0, // SPECIES_SNEASEL
-    0, // SPECIES_TEDDIURSA
-    0, // SPECIES_URSARING
-    0, // SPECIES_SLUGMA
-    0, // SPECIES_MAGCARGO
-    0, // SPECIES_SWINUB
-    0, // SPECIES_PILOSWINE
-    0, // SPECIES_CORSOLA
-    0, // SPECIES_REMORAID
-    0, // SPECIES_OCTILLERY
-    0, // SPECIES_DELIBIRD
-    0, // SPECIES_MANTINE
-    0, // SPECIES_SKARMORY
-    0, // SPECIES_HOUNDOUR
-    0, // SPECIES_HOUNDOOM
-    0, // SPECIES_KINGDRA
-    0, // SPECIES_PHANPY
-    0, // SPECIES_DONPHAN
-    0, // SPECIES_PORYGON2
-    0, // SPECIES_STANTLER
-    0, // SPECIES_SMEARGLE
-    0, // SPECIES_TYROGUE
-    0, // SPECIES_HITMONTOP
-    0, // SPECIES_SMOOCHUM
-    0, // SPECIES_ELEKID
-    0, // SPECIES_MAGBY
-    0, // SPECIES_MILTANK
-    0, // SPECIES_BLISSEY
-    0, // SPECIES_RAIKOU
-    0, // SPECIES_ENTEI
-    0, // SPECIES_SUICUNE
-    0, // SPECIES_LARVITAR
-    0, // SPECIES_PUPITAR
-    0, // SPECIES_TYRANITAR
-    6, // SPECIES_LUGIA
-    6, // SPECIES_HO_OH
-    15, // SPECIES_CELEBI
-    0, // 252
-    0, // 253
-    0, // 254
-    0, // 255
-    0, // 256
-    0, // 257
-    0, // 258
-    0, // 259
-    0, // 260
-    0, // 261
-    0, // 262
-    0, // 263
-    0, // 264
-    0, // 265
-    0, // 266
-    0, // 267
-    0, // 268
-    0, // 269
-    0, // 270
-    0, // 271
-    0, // 272
-    0, // 273
-    0, // 274
-    0, // 275
-    0, // 276
-    0, // SPECIES_TREECKO
-    0, // SPECIES_GROVYLE
-    0, // SPECIES_SCEPTILE
-    0, // SPECIES_TORCHIC
-    0, // SPECIES_COMBUSKEN
-    0, // SPECIES_BLAZIKEN
-    0, // SPECIES_MUDKIP
-    0, // SPECIES_MARSHTOMP
-    0, // SPECIES_SWAMPERT
-    0, // SPECIES_POOCHYENA
-    0, // SPECIES_MIGHTYENA
-    0, // SPECIES_ZIGZAGOON
-    0, // SPECIES_LINOONE
-    0, // SPECIES_WURMPLE
-    0, // SPECIES_SILCOON
-    8, // SPECIES_BEAUTIFLY
-    0, // SPECIES_CASCOON
-    10, // SPECIES_DUSTOX
-    0, // SPECIES_LOTAD
-    0, // SPECIES_LOMBRE
-    0, // SPECIES_LUDICOLO
-    0, // SPECIES_SEEDOT
-    0, // SPECIES_NUZLEAF
-    0, // SPECIES_SHIFTRY
-    0, // SPECIES_NINCADA
-    10, // SPECIES_NINJASK
-    8, // SPECIES_SHEDINJA
-    0, // SPECIES_TAILLOW
-    0, // SPECIES_SWELLOW
-    0, // SPECIES_SHROOMISH
-    0, // SPECIES_BRELOOM
-    0, // SPECIES_SPINDA
-    16, // SPECIES_WINGULL
-    8, // SPECIES_PELIPPER
-    0, // SPECIES_SURSKIT
-    10, // SPECIES_MASQUERAIN
-    0, // SPECIES_WAILMER
-    0, // SPECIES_WAILORD
-    0, // SPECIES_SKITTY
-    0, // SPECIES_DELCATTY
-    0, // SPECIES_KECLEON
-    4, // SPECIES_BALTOY
-    10, // SPECIES_CLAYDOL
-    0, // SPECIES_NOSEPASS
-    0, // SPECIES_TORKOAL
-    0, // SPECIES_SABLEYE
-    0, // SPECIES_BARBOACH
-    0, // SPECIES_WHISCASH
-    0, // SPECIES_LUVDISC
-    0, // SPECIES_CORPHISH
-    0, // SPECIES_CRAWDAUNT
-    0, // SPECIES_FEEBAS
-    0, // SPECIES_MILOTIC
-    0, // SPECIES_CARVANHA
-    0, // SPECIES_SHARPEDO
-    0, // SPECIES_TRAPINCH
-    0, // SPECIES_VIBRAVA
-    7, // SPECIES_FLYGON
-    0, // SPECIES_MAKUHITA
-    0, // SPECIES_HARIYAMA
-    0, // SPECIES_ELECTRIKE
-    0, // SPECIES_MANECTRIC
-    0, // SPECIES_NUMEL
-    0, // SPECIES_CAMERUPT
-    0, // SPECIES_SPHEAL
-    0, // SPECIES_SEALEO
-    0, // SPECIES_WALREIN
-    0, // SPECIES_CACNEA
-    0, // SPECIES_CACTURNE
-    0, // SPECIES_SNORUNT
-    12, // SPECIES_GLALIE
-    13, // SPECIES_LUNATONE
-    4, // SPECIES_SOLROCK
-    0, // SPECIES_AZURILL
-    0, // SPECIES_SPOINK
-    0, // SPECIES_GRUMPIG
-    0, // SPECIES_PLUSLE
-    0, // SPECIES_MINUN
-    0, // SPECIES_MAWILE
-    0, // SPECIES_MEDITITE
-    0, // SPECIES_MEDICHAM
-    12, // SPECIES_SWABLU
-    8, // SPECIES_ALTARIA
-    0, // SPECIES_WYNAUT
-    9, // SPECIES_DUSKULL
-    0, // SPECIES_DUSCLOPS
-    0, // SPECIES_ROSELIA
-    0, // SPECIES_SLAKOTH
-    0, // SPECIES_VIGOROTH
-    0, // SPECIES_SLAKING
-    0, // SPECIES_GULPIN
-    0, // SPECIES_SWALOT
-    0, // SPECIES_TROPIUS
-    0, // SPECIES_WHISMUR
-    0, // SPECIES_LOUDRED
-    0, // SPECIES_EXPLOUD
-    0, // SPECIES_CLAMPERL
-    0, // SPECIES_HUNTAIL
-    0, // SPECIES_GOREBYSS
-    0, // SPECIES_ABSOL
-    12, // SPECIES_SHUPPET
-    8, // SPECIES_BANETTE
-    0, // SPECIES_SEVIPER
-    0, // SPECIES_ZANGOOSE
-    0, // SPECIES_RELICANTH
-    0, // SPECIES_ARON
-    0, // SPECIES_LAIRON
-    0, // SPECIES_AGGRON
-    16, // SPECIES_CASTFORM
-    0, // SPECIES_VOLBEAT
-    0, // SPECIES_ILLUMISE
-    0, // SPECIES_LILEEP
-    0, // SPECIES_CRADILY
-    0, // SPECIES_ANORITH
-    0, // SPECIES_ARMALDO
-    0, // SPECIES_RALTS
-    0, // SPECIES_KIRLIA
-    0, // SPECIES_GARDEVOIR
-    0, // SPECIES_BAGON
-    0, // SPECIES_SHELGON
-    0, // SPECIES_SALAMENCE
-    8, // SPECIES_BELDUM
-    0, // SPECIES_METANG
-    0, // SPECIES_METAGROSS
-    0, // SPECIES_REGIROCK
-    0, // SPECIES_REGICE
-    0, // SPECIES_REGISTEEL
-    0, // SPECIES_KYOGRE
-    0, // SPECIES_GROUDON
-    6, // SPECIES_RAYQUAZA
-    6, // SPECIES_LATIAS
-    6, // SPECIES_LATIOS
-    12, // SPECIES_JIRACHI
-    8, // SPECIES_DEOXYS
-    12, // SPECIES_CHIMECHO
+    [SPECIES_NONE] = 0,
+    [SPECIES_BULBASAUR] = 0,
+    [SPECIES_IVYSAUR] = 0,
+    [SPECIES_VENUSAUR] = 0,
+    [SPECIES_CHARMANDER] = 0,
+    [SPECIES_CHARMELEON] = 0,
+    [SPECIES_CHARIZARD] = 0,
+    [SPECIES_SQUIRTLE] = 0,
+    [SPECIES_WARTORTLE] = 0,
+    [SPECIES_BLASTOISE] = 0,
+    [SPECIES_CATERPIE] = 0,
+    [SPECIES_METAPOD] = 0,
+    [SPECIES_BUTTERFREE] = 8,
+    [SPECIES_WEEDLE] = 0,
+    [SPECIES_KAKUNA] = 0,
+    [SPECIES_BEEDRILL] = 8,
+    [SPECIES_PIDGEY] = 16,
+    [SPECIES_PIDGEOTTO] = 0,
+    [SPECIES_PIDGEOT] = 4,
+    [SPECIES_RATTATA] = 0,
+    [SPECIES_RATICATE] = 0,
+    [SPECIES_SPEAROW] = 0,
+    [SPECIES_FEAROW] = 6,
+    [SPECIES_EKANS] = 0,
+    [SPECIES_ARBOK] = 0,
+    [SPECIES_PIKACHU] = 0,
+    [SPECIES_RAICHU] = 0,
+    [SPECIES_SANDSHREW] = 0,
+    [SPECIES_SANDSLASH] = 0,
+    [SPECIES_NIDORAN_F] = 0,
+    [SPECIES_NIDORINA] = 0,
+    [SPECIES_NIDOQUEEN] = 0,
+    [SPECIES_NIDORAN_M] = 0,
+    [SPECIES_NIDORINO] = 0,
+    [SPECIES_NIDOKING] = 0,
+    [SPECIES_CLEFAIRY] = 0,
+    [SPECIES_CLEFABLE] = 0,
+    [SPECIES_VULPIX] = 0,
+    [SPECIES_NINETALES] = 0,
+    [SPECIES_JIGGLYPUFF] = 0,
+    [SPECIES_WIGGLYTUFF] = 0,
+    [SPECIES_ZUBAT] = 8,
+    [SPECIES_GOLBAT] = 8,
+    [SPECIES_ODDISH] = 0,
+    [SPECIES_GLOOM] = 0,
+    [SPECIES_VILEPLUME] = 0,
+    [SPECIES_PARAS] = 0,
+    [SPECIES_PARASECT] = 0,
+    [SPECIES_VENONAT] = 0,
+    [SPECIES_VENOMOTH] = 8,
+    [SPECIES_DIGLETT] = 0,
+    [SPECIES_DUGTRIO] = 0,
+    [SPECIES_MEOWTH] = 0,
+    [SPECIES_PERSIAN] = 0,
+    [SPECIES_PSYDUCK] = 0,
+    [SPECIES_GOLDUCK] = 0,
+    [SPECIES_MANKEY] = 0,
+    [SPECIES_PRIMEAPE] = 0,
+    [SPECIES_GROWLITHE] = 0,
+    [SPECIES_ARCANINE] = 0,
+    [SPECIES_POLIWAG] = 0,
+    [SPECIES_POLIWHIRL] = 0,
+    [SPECIES_POLIWRATH] = 0,
+    [SPECIES_ABRA] = 0,
+    [SPECIES_KADABRA] = 0,
+    [SPECIES_ALAKAZAM] = 0,
+    [SPECIES_MACHOP] = 0,
+    [SPECIES_MACHOKE] = 0,
+    [SPECIES_MACHAMP] = 0,
+    [SPECIES_BELLSPROUT] = 0,
+    [SPECIES_WEEPINBELL] = 0,
+    [SPECIES_VICTREEBEL] = 0,
+    [SPECIES_TENTACOOL] = 0,
+    [SPECIES_TENTACRUEL] = 0,
+    [SPECIES_GEODUDE] = 16,
+    [SPECIES_GRAVELER] = 0,
+    [SPECIES_GOLEM] = 0,
+    [SPECIES_PONYTA] = 0,
+    [SPECIES_RAPIDASH] = 0,
+    [SPECIES_SLOWPOKE] = 0,
+    [SPECIES_SLOWBRO] = 0,
+    [SPECIES_MAGNEMITE] = 16,
+    [SPECIES_MAGNETON] = 8,
+    [SPECIES_FARFETCHD] = 0,
+    [SPECIES_DODUO] = 0,
+    [SPECIES_DODRIO] = 0,
+    [SPECIES_SEEL] = 0,
+    [SPECIES_DEWGONG] = 0,
+    [SPECIES_GRIMER] = 0,
+    [SPECIES_MUK] = 0,
+    [SPECIES_SHELLDER] = 0,
+    [SPECIES_CLOYSTER] = 0,
+    [SPECIES_GASTLY] = 4,
+    [SPECIES_HAUNTER] = 4,
+    [SPECIES_GENGAR] = 0,
+    [SPECIES_ONIX] = 0,
+    [SPECIES_DROWZEE] = 0,
+    [SPECIES_HYPNO] = 0,
+    [SPECIES_KRABBY] = 0,
+    [SPECIES_KINGLER] = 0,
+    [SPECIES_VOLTORB] = 10,
+    [SPECIES_ELECTRODE] = 12,
+    [SPECIES_EXEGGCUTE] = 0,
+    [SPECIES_EXEGGUTOR] = 0,
+    [SPECIES_CUBONE] = 0,
+    [SPECIES_MAROWAK] = 0,
+    [SPECIES_HITMONLEE] = 0,
+    [SPECIES_HITMONCHAN] = 0,
+    [SPECIES_LICKITUNG] = 0,
+    [SPECIES_KOFFING] = 8,
+    [SPECIES_WEEZING] = 6,
+    [SPECIES_RHYHORN] = 0,
+    [SPECIES_RHYDON] = 0,
+    [SPECIES_CHANSEY] = 0,
+    [SPECIES_TANGELA] = 0,
+    [SPECIES_KANGASKHAN] = 0,
+    [SPECIES_HORSEA] = 0,
+    [SPECIES_SEADRA] = 0,
+    [SPECIES_GOLDEEN] = 0,
+    [SPECIES_SEAKING] = 0,
+    [SPECIES_STARYU] = 0,
+    [SPECIES_STARMIE] = 0,
+    [SPECIES_MR_MIME] = 0,
+    [SPECIES_SCYTHER] = 0,
+    [SPECIES_JYNX] = 0,
+    [SPECIES_ELECTABUZZ] = 0,
+    [SPECIES_MAGMAR] = 0,
+    [SPECIES_PINSIR] = 0,
+    [SPECIES_TAUROS] = 0,
+    [SPECIES_MAGIKARP] = 0,
+    [SPECIES_GYARADOS] = 0,
+    [SPECIES_LAPRAS] = 0,
+    [SPECIES_DITTO] = 0,
+    [SPECIES_EEVEE] = 0,
+    [SPECIES_VAPOREON] = 0,
+    [SPECIES_JOLTEON] = 0,
+    [SPECIES_FLAREON] = 0,
+    [SPECIES_PORYGON] = 0,
+    [SPECIES_OMANYTE] = 0,
+    [SPECIES_OMASTAR] = 0,
+    [SPECIES_KABUTO] = 0,
+    [SPECIES_KABUTOPS] = 0,
+    [SPECIES_AERODACTYL] = 7,
+    [SPECIES_SNORLAX] = 0,
+    [SPECIES_ARTICUNO] = 6,
+    [SPECIES_ZAPDOS] = 8,
+    [SPECIES_MOLTRES] = 5,
+    [SPECIES_DRATINI] = 0,
+    [SPECIES_DRAGONAIR] = 0,
+    [SPECIES_DRAGONITE] = 6,
+    [SPECIES_MEWTWO] = 0,
+    [SPECIES_MEW] = 8,
+    [SPECIES_CHIKORITA] = 0,
+    [SPECIES_BAYLEEF] = 0,
+    [SPECIES_MEGANIUM] = 0,
+    [SPECIES_CYNDAQUIL] = 0,
+    [SPECIES_QUILAVA] = 0,
+    [SPECIES_TYPHLOSION] = 0,
+    [SPECIES_TOTODILE] = 0,
+    [SPECIES_CROCONAW] = 0,
+    [SPECIES_FERALIGATR] = 0,
+    [SPECIES_SENTRET] = 0,
+    [SPECIES_FURRET] = 0,
+    [SPECIES_HOOTHOOT] = 0,
+    [SPECIES_NOCTOWL] = 0,
+    [SPECIES_LEDYBA] = 0,
+    [SPECIES_LEDIAN] = 8,
+    [SPECIES_SPINARAK] = 0,
+    [SPECIES_ARIADOS] = 0,
+    [SPECIES_CROBAT] = 6,
+    [SPECIES_CHINCHOU] = 0,
+    [SPECIES_LANTURN] = 0,
+    [SPECIES_PICHU] = 0,
+    [SPECIES_CLEFFA] = 0,
+    [SPECIES_IGGLYBUFF] = 0,
+    [SPECIES_TOGEPI] = 0,
+    [SPECIES_TOGETIC] = 0,
+    [SPECIES_NATU] = 0,
+    [SPECIES_XATU] = 0,
+    [SPECIES_MAREEP] = 0,
+    [SPECIES_FLAAFFY] = 0,
+    [SPECIES_AMPHAROS] = 0,
+    [SPECIES_BELLOSSOM] = 0,
+    [SPECIES_MARILL] = 0,
+    [SPECIES_AZUMARILL] = 0,
+    [SPECIES_SUDOWOODO] = 0,
+    [SPECIES_POLITOED] = 0,
+    [SPECIES_HOPPIP] = 11,
+    [SPECIES_SKIPLOOM] = 12,
+    [SPECIES_JUMPLUFF] = 9,
+    [SPECIES_AIPOM] = 0,
+    [SPECIES_SUNKERN] = 0,
+    [SPECIES_SUNFLORA] = 0,
+    [SPECIES_YANMA] = 8,
+    [SPECIES_WOOPER] = 0,
+    [SPECIES_QUAGSIRE] = 0,
+    [SPECIES_ESPEON] = 0,
+    [SPECIES_UMBREON] = 0,
+    [SPECIES_MURKROW] = 0,
+    [SPECIES_SLOWKING] = 0,
+    [SPECIES_MISDREAVUS] = 8,
+    [SPECIES_UNOWN] = 8,
+    [SPECIES_WOBBUFFET] = 0,
+    [SPECIES_GIRAFARIG] = 0,
+    [SPECIES_PINECO] = 0,
+    [SPECIES_FORRETRESS] = 0,
+    [SPECIES_DUNSPARCE] = 0,
+    [SPECIES_GLIGAR] = 6,
+    [SPECIES_STEELIX] = 0,
+    [SPECIES_SNUBBULL] = 0,
+    [SPECIES_GRANBULL] = 0,
+    [SPECIES_QWILFISH] = 0,
+    [SPECIES_SCIZOR] = 0,
+    [SPECIES_SHUCKLE] = 0,
+    [SPECIES_HERACROSS] = 0,
+    [SPECIES_SNEASEL] = 0,
+    [SPECIES_TEDDIURSA] = 0,
+    [SPECIES_URSARING] = 0,
+    [SPECIES_SLUGMA] = 0,
+    [SPECIES_MAGCARGO] = 0,
+    [SPECIES_SWINUB] = 0,
+    [SPECIES_PILOSWINE] = 0,
+    [SPECIES_CORSOLA] = 0,
+    [SPECIES_REMORAID] = 0,
+    [SPECIES_OCTILLERY] = 0,
+    [SPECIES_DELIBIRD] = 0,
+    [SPECIES_MANTINE] = 0,
+    [SPECIES_SKARMORY] = 0,
+    [SPECIES_HOUNDOUR] = 0,
+    [SPECIES_HOUNDOOM] = 0,
+    [SPECIES_KINGDRA] = 0,
+    [SPECIES_PHANPY] = 0,
+    [SPECIES_DONPHAN] = 0,
+    [SPECIES_PORYGON2] = 0,
+    [SPECIES_STANTLER] = 0,
+    [SPECIES_SMEARGLE] = 0,
+    [SPECIES_TYROGUE] = 0,
+    [SPECIES_HITMONTOP] = 0,
+    [SPECIES_SMOOCHUM] = 0,
+    [SPECIES_ELEKID] = 0,
+    [SPECIES_MAGBY] = 0,
+    [SPECIES_MILTANK] = 0,
+    [SPECIES_BLISSEY] = 0,
+    [SPECIES_RAIKOU] = 0,
+    [SPECIES_ENTEI] = 0,
+    [SPECIES_SUICUNE] = 0,
+    [SPECIES_LARVITAR] = 0,
+    [SPECIES_PUPITAR] = 0,
+    [SPECIES_TYRANITAR] = 0,
+    [SPECIES_LUGIA] = 6,
+    [SPECIES_HO_OH] = 6,
+    [SPECIES_CELEBI] = 15,
+    [252] = 0,
+    [253] = 0,
+    [254] = 0,
+    [255] = 0,
+    [256] = 0,
+    [257] = 0,
+    [258] = 0,
+    [259] = 0,
+    [260] = 0,
+    [261] = 0,
+    [262] = 0,
+    [263] = 0,
+    [264] = 0,
+    [265] = 0,
+    [266] = 0,
+    [267] = 0,
+    [268] = 0,
+    [269] = 0,
+    [270] = 0,
+    [271] = 0,
+    [272] = 0,
+    [273] = 0,
+    [274] = 0,
+    [275] = 0,
+    [276] = 0,
+    [SPECIES_TREECKO] = 0,
+    [SPECIES_GROVYLE] = 0,
+    [SPECIES_SCEPTILE] = 0,
+    [SPECIES_TORCHIC] = 0,
+    [SPECIES_COMBUSKEN] = 0,
+    [SPECIES_BLAZIKEN] = 0,
+    [SPECIES_MUDKIP] = 0,
+    [SPECIES_MARSHTOMP] = 0,
+    [SPECIES_SWAMPERT] = 0,
+    [SPECIES_POOCHYENA] = 0,
+    [SPECIES_MIGHTYENA] = 0,
+    [SPECIES_ZIGZAGOON] = 0,
+    [SPECIES_LINOONE] = 0,
+    [SPECIES_WURMPLE] = 0,
+    [SPECIES_SILCOON] = 0,
+    [SPECIES_BEAUTIFLY] = 8,
+    [SPECIES_CASCOON] = 0,
+    [SPECIES_DUSTOX] = 10,
+    [SPECIES_LOTAD] = 0,
+    [SPECIES_LOMBRE] = 0,
+    [SPECIES_LUDICOLO] = 0,
+    [SPECIES_SEEDOT] = 0,
+    [SPECIES_NUZLEAF] = 0,
+    [SPECIES_SHIFTRY] = 0,
+    [SPECIES_NINCADA] = 0,
+    [SPECIES_NINJASK] = 10,
+    [SPECIES_SHEDINJA] = 8,
+    [SPECIES_TAILLOW] = 0,
+    [SPECIES_SWELLOW] = 0,
+    [SPECIES_SHROOMISH] = 0,
+    [SPECIES_BRELOOM] = 0,
+    [SPECIES_SPINDA] = 0,
+    [SPECIES_WINGULL] = 16,
+    [SPECIES_PELIPPER] = 8,
+    [SPECIES_SURSKIT] = 0,
+    [SPECIES_MASQUERAIN] = 10,
+    [SPECIES_WAILMER] = 0,
+    [SPECIES_WAILORD] = 0,
+    [SPECIES_SKITTY] = 0,
+    [SPECIES_DELCATTY] = 0,
+    [SPECIES_KECLEON] = 0,
+    [SPECIES_BALTOY] = 4,
+    [SPECIES_CLAYDOL] = 10,
+    [SPECIES_NOSEPASS] = 0,
+    [SPECIES_TORKOAL] = 0,
+    [SPECIES_SABLEYE] = 0,
+    [SPECIES_BARBOACH] = 0,
+    [SPECIES_WHISCASH] = 0,
+    [SPECIES_LUVDISC] = 0,
+    [SPECIES_CORPHISH] = 0,
+    [SPECIES_CRAWDAUNT] = 0,
+    [SPECIES_FEEBAS] = 0,
+    [SPECIES_MILOTIC] = 0,
+    [SPECIES_CARVANHA] = 0,
+    [SPECIES_SHARPEDO] = 0,
+    [SPECIES_TRAPINCH] = 0,
+    [SPECIES_VIBRAVA] = 0,
+    [SPECIES_FLYGON] = 7,
+    [SPECIES_MAKUHITA] = 0,
+    [SPECIES_HARIYAMA] = 0,
+    [SPECIES_ELECTRIKE] = 0,
+    [SPECIES_MANECTRIC] = 0,
+    [SPECIES_NUMEL] = 0,
+    [SPECIES_CAMERUPT] = 0,
+    [SPECIES_SPHEAL] = 0,
+    [SPECIES_SEALEO] = 0,
+    [SPECIES_WALREIN] = 0,
+    [SPECIES_CACNEA] = 0,
+    [SPECIES_CACTURNE] = 0,
+    [SPECIES_SNORUNT] = 0,
+    [SPECIES_GLALIE] = 12,
+    [SPECIES_LUNATONE] = 13,
+    [SPECIES_SOLROCK] = 4,
+    [SPECIES_AZURILL] = 0,
+    [SPECIES_SPOINK] = 0,
+    [SPECIES_GRUMPIG] = 0,
+    [SPECIES_PLUSLE] = 0,
+    [SPECIES_MINUN] = 0,
+    [SPECIES_MAWILE] = 0,
+    [SPECIES_MEDITITE] = 0,
+    [SPECIES_MEDICHAM] = 0,
+    [SPECIES_SWABLU] = 12,
+    [SPECIES_ALTARIA] = 8,
+    [SPECIES_WYNAUT] = 0,
+    [SPECIES_DUSKULL] = 9,
+    [SPECIES_DUSCLOPS] = 0,
+    [SPECIES_ROSELIA] = 0,
+    [SPECIES_SLAKOTH] = 0,
+    [SPECIES_VIGOROTH] = 0,
+    [SPECIES_SLAKING] = 0,
+    [SPECIES_GULPIN] = 0,
+    [SPECIES_SWALOT] = 0,
+    [SPECIES_TROPIUS] = 0,
+    [SPECIES_WHISMUR] = 0,
+    [SPECIES_LOUDRED] = 0,
+    [SPECIES_EXPLOUD] = 0,
+    [SPECIES_CLAMPERL] = 0,
+    [SPECIES_HUNTAIL] = 0,
+    [SPECIES_GOREBYSS] = 0,
+    [SPECIES_ABSOL] = 0,
+    [SPECIES_SHUPPET] = 12,
+    [SPECIES_BANETTE] = 8,
+    [SPECIES_SEVIPER] = 0,
+    [SPECIES_ZANGOOSE] = 0,
+    [SPECIES_RELICANTH] = 0,
+    [SPECIES_ARON] = 0,
+    [SPECIES_LAIRON] = 0,
+    [SPECIES_AGGRON] = 0,
+    [SPECIES_CASTFORM] = 16,
+    [SPECIES_VOLBEAT] = 0,
+    [SPECIES_ILLUMISE] = 0,
+    [SPECIES_LILEEP] = 0,
+    [SPECIES_CRADILY] = 0,
+    [SPECIES_ANORITH] = 0,
+    [SPECIES_ARMALDO] = 0,
+    [SPECIES_RALTS] = 0,
+    [SPECIES_KIRLIA] = 0,
+    [SPECIES_GARDEVOIR] = 0,
+    [SPECIES_BAGON] = 0,
+    [SPECIES_SHELGON] = 0,
+    [SPECIES_SALAMENCE] = 0,
+    [SPECIES_BELDUM] = 8,
+    [SPECIES_METANG] = 0,
+    [SPECIES_METAGROSS] = 0,
+    [SPECIES_REGIROCK] = 0,
+    [SPECIES_REGICE] = 0,
+    [SPECIES_REGISTEEL] = 0,
+    [SPECIES_KYOGRE] = 0,
+    [SPECIES_GROUDON] = 0,
+    [SPECIES_RAYQUAZA] = 6,
+    [SPECIES_LATIAS] = 6,
+    [SPECIES_LATIOS] = 6,
+    [SPECIES_JIRACHI] = 12,
+    [SPECIES_DEOXYS] = 8,
+    [SPECIES_CHIMECHO] = 12,
 };
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index 923df2cde..a01f0360f 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -1,443 +1,2205 @@
+#include "constants/species.h"
+
 const struct MonCoords gMonFrontPicCoords[] =
 {
-    {0x88, 0x00}, // SPECIES_NONE
-    {0x45, 0x0e}, // SPECIES_BULBASAUR
-    {0x56, 0x0a}, // SPECIES_IVYSAUR
-    {0x88, 0x03}, // SPECIES_VENUSAUR
-    {0x55, 0x0c}, // SPECIES_CHARMANDER
-    {0x66, 0x09}, // SPECIES_CHARMELEON
-    {0x88, 0x01}, // SPECIES_CHARIZARD
-    {0x65, 0x0d}, // SPECIES_SQUIRTLE
-    {0x66, 0x08}, // SPECIES_WARTORTLE
-    {0x88, 0x00}, // SPECIES_BLASTOISE
-    {0x45, 0x10}, // SPECIES_CATERPIE
-    {0x54, 0x14}, // SPECIES_METAPOD
-    {0x76, 0x09}, // SPECIES_BUTTERFREE
-    {0x54, 0x12}, // SPECIES_WEEDLE
-    {0x45, 0x0e}, // SPECIES_KAKUNA
-    {0x86, 0x09}, // SPECIES_BEEDRILL
-    {0x65, 0x0d}, // SPECIES_PIDGEY
-    {0x67, 0x0b}, // SPECIES_PIDGEOTTO
-    {0x88, 0x01}, // SPECIES_PIDGEOT
-    {0x44, 0x10}, // SPECIES_RATTATA
-    {0x66, 0x0b}, // SPECIES_RATICATE
-    {0x45, 0x0f}, // SPECIES_SPEAROW
-    {0x78, 0x00}, // SPECIES_FEAROW
-    {0x65, 0x0c}, // SPECIES_EKANS
-    {0x88, 0x02}, // SPECIES_ARBOK
-    {0x67, 0x09}, // SPECIES_PIKACHU
-    {0x67, 0x04}, // SPECIES_RAICHU
-    {0x55, 0x0e}, // SPECIES_SANDSHREW
-    {0x76, 0x09}, // SPECIES_SANDSLASH
-    {0x45, 0x0f}, // SPECIES_NIDORAN_F
-    {0x66, 0x0b}, // SPECIES_NIDORINA
-    {0x78, 0x03}, // SPECIES_NIDOQUEEN
-    {0x55, 0x0c}, // SPECIES_NIDORAN_M
-    {0x66, 0x09}, // SPECIES_NIDORINO
-    {0x78, 0x02}, // SPECIES_NIDOKING
-    {0x55, 0x10}, // SPECIES_CLEFAIRY
-    {0x66, 0x08}, // SPECIES_CLEFABLE
-    {0x65, 0x0c}, // SPECIES_VULPIX
-    {0x88, 0x03}, // SPECIES_NINETALES
-    {0x45, 0x10}, // SPECIES_JIGGLYPUFF
-    {0x67, 0x08}, // SPECIES_WIGGLYTUFF
-    {0x67, 0x06}, // SPECIES_ZUBAT
-    {0x88, 0x03}, // SPECIES_GOLBAT
-    {0x45, 0x0f}, // SPECIES_ODDISH
-    {0x66, 0x0a}, // SPECIES_GLOOM
-    {0x77, 0x06}, // SPECIES_VILEPLUME
-    {0x55, 0x0f}, // SPECIES_PARAS
-    {0x86, 0x08}, // SPECIES_PARASECT
-    {0x66, 0x08}, // SPECIES_VENONAT
-    {0x88, 0x02}, // SPECIES_VENOMOTH
-    {0x54, 0x12}, // SPECIES_DIGLETT
-    {0x75, 0x0d}, // SPECIES_DUGTRIO
-    {0x55, 0x0c}, // SPECIES_MEOWTH
-    {0x77, 0x07}, // SPECIES_PERSIAN
-    {0x56, 0x09}, // SPECIES_PSYDUCK
-    {0x78, 0x02}, // SPECIES_GOLDUCK
-    {0x65, 0x0e}, // SPECIES_MANKEY
-    {0x77, 0x07}, // SPECIES_PRIMEAPE
-    {0x66, 0x0b}, // SPECIES_GROWLITHE
-    {0x88, 0x02}, // SPECIES_ARCANINE
-    {0x74, 0x13}, // SPECIES_POLIWAG
-    {0x76, 0x0a}, // SPECIES_POLIWHIRL
-    {0x76, 0x08}, // SPECIES_POLIWRATH
-    {0x66, 0x0b}, // SPECIES_ABRA
-    {0x77, 0x05}, // SPECIES_KADABRA
-    {0x87, 0x04}, // SPECIES_ALAKAZAM
-    {0x56, 0x0b}, // SPECIES_MACHOP
-    {0x67, 0x06}, // SPECIES_MACHOKE
-    {0x88, 0x01}, // SPECIES_MACHAMP
-    {0x65, 0x0f}, // SPECIES_BELLSPROUT
-    {0x66, 0x0b}, // SPECIES_WEEPINBELL
-    {0x77, 0x05}, // SPECIES_VICTREEBEL
-    {0x46, 0x09}, // SPECIES_TENTACOOL
-    {0x87, 0x04}, // SPECIES_TENTACRUEL
-    {0x54, 0x12}, // SPECIES_GEODUDE
-    {0x87, 0x04}, // SPECIES_GRAVELER
-    {0x77, 0x05}, // SPECIES_GOLEM
-    {0x66, 0x08}, // SPECIES_PONYTA
-    {0x88, 0x01}, // SPECIES_RAPIDASH
-    {0x66, 0x0b}, // SPECIES_SLOWPOKE
-    {0x86, 0x08}, // SPECIES_SLOWBRO
-    {0x43, 0x15}, // SPECIES_MAGNEMITE
-    {0x76, 0x08}, // SPECIES_MAGNETON
-    {0x66, 0x09}, // SPECIES_FARFETCHD
-    {0x57, 0x05}, // SPECIES_DODUO
-    {0x88, 0x00}, // SPECIES_DODRIO
-    {0x76, 0x0a}, // SPECIES_SEEL
-    {0x87, 0x07}, // SPECIES_DEWGONG
-    {0x65, 0x0c}, // SPECIES_GRIMER
-    {0x87, 0x04}, // SPECIES_MUK
-    {0x55, 0x10}, // SPECIES_SHELLDER
-    {0x87, 0x05}, // SPECIES_CLOYSTER
-    {0x77, 0x06}, // SPECIES_GASTLY
-    {0x77, 0x05}, // SPECIES_HAUNTER
-    {0x77, 0x05}, // SPECIES_GENGAR
-    {0x78, 0x02}, // SPECIES_ONIX
-    {0x77, 0x07}, // SPECIES_DROWZEE
-    {0x77, 0x04}, // SPECIES_HYPNO
-    {0x65, 0x0d}, // SPECIES_KRABBY
-    {0x88, 0x03}, // SPECIES_KINGLER
-    {0x44, 0x13}, // SPECIES_VOLTORB
-    {0x55, 0x0e}, // SPECIES_ELECTRODE
-    {0x87, 0x07}, // SPECIES_EXEGGCUTE
-    {0x88, 0x00}, // SPECIES_EXEGGUTOR
-    {0x55, 0x0f}, // SPECIES_CUBONE
-    {0x76, 0x0b}, // SPECIES_MAROWAK
-    {0x87, 0x04}, // SPECIES_HITMONLEE
-    {0x67, 0x04}, // SPECIES_HITMONCHAN
-    {0x86, 0x08}, // SPECIES_LICKITUNG
-    {0x66, 0x08}, // SPECIES_KOFFING
-    {0x88, 0x02}, // SPECIES_WEEZING
-    {0x76, 0x09}, // SPECIES_RHYHORN
-    {0x88, 0x02}, // SPECIES_RHYDON
-    {0x76, 0x09}, // SPECIES_CHANSEY
-    {0x67, 0x07}, // SPECIES_TANGELA
-    {0x88, 0x00}, // SPECIES_KANGASKHAN
-    {0x45, 0x0f}, // SPECIES_HORSEA
-    {0x67, 0x07}, // SPECIES_SEADRA
-    {0x66, 0x0a}, // SPECIES_GOLDEEN
-    {0x77, 0x04}, // SPECIES_SEAKING
-    {0x66, 0x0a}, // SPECIES_STARYU
-    {0x77, 0x06}, // SPECIES_STARMIE
-    {0x66, 0x08}, // SPECIES_MR_MIME
-    {0x88, 0x00}, // SPECIES_SCYTHER
-    {0x77, 0x04}, // SPECIES_JYNX
-    {0x78, 0x02}, // SPECIES_ELECTABUZZ
-    {0x77, 0x04}, // SPECIES_MAGMAR
-    {0x77, 0x04}, // SPECIES_PINSIR
-    {0x78, 0x00}, // SPECIES_TAUROS
-    {0x67, 0x06}, // SPECIES_MAGIKARP
-    {0x88, 0x08}, // SPECIES_GYARADOS
-    {0x85, 0x0d}, // SPECIES_LAPRAS
-    {0x54, 0x11}, // SPECIES_DITTO
-    {0x56, 0x09}, // SPECIES_EEVEE
-    {0x67, 0x06}, // SPECIES_VAPOREON
-    {0x76, 0x09}, // SPECIES_JOLTEON
-    {0x66, 0x0a}, // SPECIES_FLAREON
-    {0x55, 0x0d}, // SPECIES_PORYGON
-    {0x45, 0x0f}, // SPECIES_OMANYTE
-    {0x67, 0x07}, // SPECIES_OMASTAR
-    {0x54, 0x11}, // SPECIES_KABUTO
-    {0x88, 0x03}, // SPECIES_KABUTOPS
-    {0x88, 0x01}, // SPECIES_AERODACTYL
-    {0x87, 0x05}, // SPECIES_SNORLAX
-    {0x88, 0x03}, // SPECIES_ARTICUNO
-    {0x87, 0x04}, // SPECIES_ZAPDOS
-    {0x88, 0x00}, // SPECIES_MOLTRES
-    {0x75, 0x0e}, // SPECIES_DRATINI
-    {0x87, 0x06}, // SPECIES_DRAGONAIR
-    {0x88, 0x00}, // SPECIES_DRAGONITE
-    {0x88, 0x00}, // SPECIES_MEWTWO
-    {0x55, 0x0d}, // SPECIES_MEW
-    {0x75, 0x0d}, // SPECIES_CHIKORITA
-    {0x77, 0x04}, // SPECIES_BAYLEEF
-    {0x88, 0x00}, // SPECIES_MEGANIUM
-    {0x55, 0x0e}, // SPECIES_CYNDAQUIL
-    {0x76, 0x08}, // SPECIES_QUILAVA
-    {0x78, 0x00}, // SPECIES_TYPHLOSION
-    {0x55, 0x0f}, // SPECIES_TOTODILE
-    {0x67, 0x06}, // SPECIES_CROCONAW
-    {0x88, 0x00}, // SPECIES_FERALIGATR
-    {0x47, 0x04}, // SPECIES_SENTRET
-    {0x67, 0x07}, // SPECIES_FURRET
-    {0x55, 0x0d}, // SPECIES_HOOTHOOT
-    {0x58, 0x03}, // SPECIES_NOCTOWL
-    {0x56, 0x0c}, // SPECIES_LEDYBA
-    {0x67, 0x04}, // SPECIES_LEDIAN
-    {0x54, 0x13}, // SPECIES_SPINARAK
-    {0x87, 0x05}, // SPECIES_ARIADOS
-    {0x88, 0x00}, // SPECIES_CROBAT
-    {0x75, 0x10}, // SPECIES_CHINCHOU
-    {0x87, 0x0b}, // SPECIES_LANTURN
-    {0x45, 0x0c}, // SPECIES_PICHU
-    {0x44, 0x14}, // SPECIES_CLEFFA
-    {0x44, 0x12}, // SPECIES_IGGLYBUFF
-    {0x34, 0x14}, // SPECIES_TOGEPI
-    {0x46, 0x09}, // SPECIES_TOGETIC
-    {0x44, 0x14}, // SPECIES_NATU
-    {0x47, 0x07}, // SPECIES_XATU
-    {0x55, 0x10}, // SPECIES_MAREEP
-    {0x56, 0x0a}, // SPECIES_FLAAFFY
-    {0x77, 0x05}, // SPECIES_AMPHAROS
-    {0x45, 0x0e}, // SPECIES_BELLOSSOM
-    {0x65, 0x0e}, // SPECIES_MARILL
-    {0x76, 0x09}, // SPECIES_AZUMARILL
-    {0x67, 0x06}, // SPECIES_SUDOWOODO
-    {0x67, 0x06}, // SPECIES_POLITOED
-    {0x66, 0x0a}, // SPECIES_HOPPIP
-    {0x55, 0x0f}, // SPECIES_SKIPLOOM
-    {0x77, 0x07}, // SPECIES_JUMPLUFF
-    {0x58, 0x03}, // SPECIES_AIPOM
-    {0x44, 0x10}, // SPECIES_SUNKERN
-    {0x56, 0x08}, // SPECIES_SUNFLORA
-    {0x86, 0x0a}, // SPECIES_YANMA
-    {0x54, 0x10}, // SPECIES_WOOPER
-    {0x77, 0x07}, // SPECIES_QUAGSIRE
-    {0x66, 0x08}, // SPECIES_ESPEON
-    {0x67, 0x08}, // SPECIES_UMBREON
-    {0x66, 0x0b}, // SPECIES_MURKROW
-    {0x58, 0x01}, // SPECIES_SLOWKING
-    {0x55, 0x0c}, // SPECIES_MISDREAVUS
-    {0x35, 0x0f}, // SPECIES_UNOWN
-    {0x77, 0x06}, // SPECIES_WOBBUFFET
-    {0x88, 0x03}, // SPECIES_GIRAFARIG
-    {0x56, 0x0a}, // SPECIES_PINECO
-    {0x76, 0x09}, // SPECIES_FORRETRESS
-    {0x74, 0x11}, // SPECIES_DUNSPARCE
-    {0x78, 0x03}, // SPECIES_GLIGAR
-    {0x88, 0x00}, // SPECIES_STEELIX
-    {0x55, 0x0d}, // SPECIES_SNUBBULL
-    {0x57, 0x06}, // SPECIES_GRANBULL
-    {0x56, 0x0a}, // SPECIES_QWILFISH
-    {0x88, 0x00}, // SPECIES_SCIZOR
-    {0x66, 0x09}, // SPECIES_SHUCKLE
-    {0x88, 0x03}, // SPECIES_HERACROSS
-    {0x67, 0x05}, // SPECIES_SNEASEL
-    {0x45, 0x0d}, // SPECIES_TEDDIURSA
-    {0x78, 0x01}, // SPECIES_URSARING
-    {0x45, 0x0d}, // SPECIES_SLUGMA
-    {0x57, 0x0d}, // SPECIES_MAGCARGO
-    {0x43, 0x14}, // SPECIES_SWINUB
-    {0x66, 0x08}, // SPECIES_PILOSWINE
-    {0x65, 0x0c}, // SPECIES_CORSOLA
-    {0x55, 0x0e}, // SPECIES_REMORAID
-    {0x66, 0x0a}, // SPECIES_OCTILLERY
-    {0x56, 0x08}, // SPECIES_DELIBIRD
-    {0x88, 0x01}, // SPECIES_MANTINE
-    {0x88, 0x00}, // SPECIES_SKARMORY
-    {0x56, 0x0b}, // SPECIES_HOUNDOUR
-    {0x77, 0x05}, // SPECIES_HOUNDOOM
-    {0x78, 0x04}, // SPECIES_KINGDRA
-    {0x54, 0x10}, // SPECIES_PHANPY
-    {0x86, 0x08}, // SPECIES_DONPHAN
-    {0x55, 0x0f}, // SPECIES_PORYGON2
-    {0x88, 0x00}, // SPECIES_STANTLER
-    {0x77, 0x06}, // SPECIES_SMEARGLE
-    {0x46, 0x09}, // SPECIES_TYROGUE
-    {0x67, 0x05}, // SPECIES_HITMONTOP
-    {0x35, 0x0f}, // SPECIES_SMOOCHUM
-    {0x76, 0x0a}, // SPECIES_ELEKID
-    {0x45, 0x0d}, // SPECIES_MAGBY
-    {0x77, 0x04}, // SPECIES_MILTANK
-    {0x77, 0x06}, // SPECIES_BLISSEY
-    {0x88, 0x00}, // SPECIES_RAIKOU
-    {0x88, 0x00}, // SPECIES_ENTEI
-    {0x88, 0x00}, // SPECIES_SUICUNE
-    {0x46, 0x09}, // SPECIES_LARVITAR
-    {0x56, 0x09}, // SPECIES_PUPITAR
-    {0x88, 0x00}, // SPECIES_TYRANITAR
-    {0x88, 0x00}, // SPECIES_LUGIA
-    {0x88, 0x00}, // SPECIES_HO_OH
-    {0x55, 0x0e}, // SPECIES_CELEBI
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_B
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_C
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_D
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_E
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_F
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_G
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_H
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_I
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_J
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_K
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_L
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_M
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_N
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_O
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_P
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_Q
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_R
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_S
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_T
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_U
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_V
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_W
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_X
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_Y
-    {0x87, 0x04}, // SPECIES_OLD_UNOWN_Z
-    {0x66, 0x08}, // SPECIES_TREECKO
-    {0x87, 0x04}, // SPECIES_GROVYLE
-    {0x88, 0x00}, // SPECIES_SCEPTILE
-    {0x56, 0x08}, // SPECIES_TORCHIC
-    {0x88, 0x01}, // SPECIES_COMBUSKEN
-    {0x88, 0x00}, // SPECIES_BLAZIKEN
-    {0x56, 0x0c}, // SPECIES_MUDKIP
-    {0x67, 0x06}, // SPECIES_MARSHTOMP
-    {0x88, 0x00}, // SPECIES_SWAMPERT
-    {0x55, 0x0c}, // SPECIES_POOCHYENA
-    {0x87, 0x04}, // SPECIES_MIGHTYENA
-    {0x85, 0x0f}, // SPECIES_ZIGZAGOON
-    {0x78, 0x03}, // SPECIES_LINOONE
-    {0x45, 0x0e}, // SPECIES_WURMPLE
-    {0x75, 0x11}, // SPECIES_SILCOON
-    {0x86, 0x09}, // SPECIES_BEAUTIFLY
-    {0x74, 0x10}, // SPECIES_CASCOON
-    {0x86, 0x0f}, // SPECIES_DUSTOX
-    {0x65, 0x0e}, // SPECIES_LOTAD
-    {0x66, 0x09}, // SPECIES_LOMBRE
-    {0x88, 0x00}, // SPECIES_LUDICOLO
-    {0x46, 0x10}, // SPECIES_SEEDOT
-    {0x56, 0x08}, // SPECIES_NUZLEAF
-    {0x88, 0x02}, // SPECIES_SHIFTRY
-    {0x74, 0x12}, // SPECIES_NINCADA
-    {0x86, 0x0a}, // SPECIES_NINJASK
-    {0x66, 0x0a}, // SPECIES_SHEDINJA
-    {0x64, 0x10}, // SPECIES_TAILLOW
-    {0x87, 0x06}, // SPECIES_SWELLOW
-    {0x54, 0x10}, // SPECIES_SHROOMISH
-    {0x77, 0x04}, // SPECIES_BRELOOM
-    {0x68, 0x08}, // SPECIES_SPINDA
-    {0x84, 0x18}, // SPECIES_WINGULL
-    {0x77, 0x04}, // SPECIES_PELIPPER
-    {0x65, 0x0f}, // SPECIES_SURSKIT
-    {0x88, 0x01}, // SPECIES_MASQUERAIN
-    {0x75, 0x0f}, // SPECIES_WAILMER
-    {0x87, 0x0a}, // SPECIES_WAILORD
-    {0x66, 0x0b}, // SPECIES_SKITTY
-    {0x66, 0x08}, // SPECIES_DELCATTY
-    {0x67, 0x07}, // SPECIES_KECLEON
-    {0x55, 0x10}, // SPECIES_BALTOY
-    {0x78, 0x06}, // SPECIES_CLAYDOL
-    {0x56, 0x0c}, // SPECIES_NOSEPASS
-    {0x88, 0x02}, // SPECIES_TORKOAL
-    {0x66, 0x09}, // SPECIES_SABLEYE
-    {0x46, 0x0b}, // SPECIES_BARBOACH
-    {0x76, 0x09}, // SPECIES_WHISCASH
-    {0x46, 0x18}, // SPECIES_LUVDISC
-    {0x66, 0x0c}, // SPECIES_CORPHISH
-    {0x88, 0x01}, // SPECIES_CRAWDAUNT
-    {0x46, 0x0d}, // SPECIES_FEEBAS
-    {0x88, 0x00}, // SPECIES_MILOTIC
-    {0x67, 0x06}, // SPECIES_CARVANHA
-    {0x78, 0x03}, // SPECIES_SHARPEDO
-    {0x54, 0x10}, // SPECIES_TRAPINCH
-    {0x86, 0x0c}, // SPECIES_VIBRAVA
-    {0x88, 0x01}, // SPECIES_FLYGON
-    {0x65, 0x0c}, // SPECIES_MAKUHITA
-    {0x88, 0x01}, // SPECIES_HARIYAMA
-    {0x64, 0x12}, // SPECIES_ELECTRIKE
-    {0x67, 0x04}, // SPECIES_MANECTRIC
-    {0x65, 0x0f}, // SPECIES_NUMEL
-    {0x87, 0x09}, // SPECIES_CAMERUPT
-    {0x65, 0x10}, // SPECIES_SPHEAL
-    {0x86, 0x0a}, // SPECIES_SEALEO
-    {0x88, 0x01}, // SPECIES_WALREIN
-    {0x74, 0x10}, // SPECIES_CACNEA
-    {0x88, 0x00}, // SPECIES_CACTURNE
-    {0x56, 0x0b}, // SPECIES_SNORUNT
-    {0x76, 0x0a}, // SPECIES_GLALIE
-    {0x66, 0x09}, // SPECIES_LUNATONE
-    {0x88, 0x01}, // SPECIES_SOLROCK
-    {0x55, 0x0f}, // SPECIES_AZURILL
-    {0x46, 0x09}, // SPECIES_SPOINK
-    {0x77, 0x05}, // SPECIES_GRUMPIG
-    {0x56, 0x0e}, // SPECIES_PLUSLE
-    {0x66, 0x0c}, // SPECIES_MINUN
-    {0x76, 0x08}, // SPECIES_MAWILE
-    {0x65, 0x0c}, // SPECIES_MEDITITE
-    {0x68, 0x01}, // SPECIES_MEDICHAM
-    {0x76, 0x11}, // SPECIES_SWABLU
-    {0x88, 0x02}, // SPECIES_ALTARIA
-    {0x55, 0x0c}, // SPECIES_WYNAUT
-    {0x66, 0x0a}, // SPECIES_DUSKULL
-    {0x77, 0x05}, // SPECIES_DUSCLOPS
-    {0x76, 0x08}, // SPECIES_ROSELIA
-    {0x74, 0x12}, // SPECIES_SLAKOTH
-    {0x78, 0x00}, // SPECIES_VIGOROTH
-    {0x86, 0x08}, // SPECIES_SLAKING
-    {0x55, 0x12}, // SPECIES_GULPIN
-    {0x66, 0x08}, // SPECIES_SWALOT
-    {0x88, 0x00}, // SPECIES_TROPIUS
-    {0x55, 0x0e}, // SPECIES_WHISMUR
-    {0x78, 0x03}, // SPECIES_LOUDRED
-    {0x88, 0x01}, // SPECIES_EXPLOUD
-    {0x55, 0x0e}, // SPECIES_CLAMPERL
-    {0x78, 0x03}, // SPECIES_HUNTAIL
-    {0x86, 0x0b}, // SPECIES_GOREBYSS
-    {0x68, 0x00}, // SPECIES_ABSOL
-    {0x56, 0x0e}, // SPECIES_SHUPPET
-    {0x55, 0x0c}, // SPECIES_BANETTE
-    {0x77, 0x08}, // SPECIES_SEVIPER
-    {0x87, 0x05}, // SPECIES_ZANGOOSE
-    {0x77, 0x0b}, // SPECIES_RELICANTH
-    {0x43, 0x14}, // SPECIES_ARON
-    {0x75, 0x0d}, // SPECIES_LAIRON
-    {0x88, 0x00}, // SPECIES_AGGRON
-    {0x34, 0x11}, // SPECIES_CASTFORM
-    {0x66, 0x08}, // SPECIES_VOLBEAT
-    {0x56, 0x08}, // SPECIES_ILLUMISE
-    {0x67, 0x07}, // SPECIES_LILEEP
-    {0x78, 0x00}, // SPECIES_CRADILY
-    {0x66, 0x08}, // SPECIES_ANORITH
-    {0x88, 0x00}, // SPECIES_ARMALDO
-    {0x35, 0x0f}, // SPECIES_RALTS
-    {0x47, 0x06}, // SPECIES_KIRLIA
-    {0x78, 0x01}, // SPECIES_GARDEVOIR
-    {0x56, 0x0b}, // SPECIES_BAGON
-    {0x66, 0x09}, // SPECIES_SHELGON
-    {0x87, 0x04}, // SPECIES_SALAMENCE
-    {0x55, 0x0f}, // SPECIES_BELDUM
-    {0x87, 0x07}, // SPECIES_METANG
-    {0x87, 0x06}, // SPECIES_METAGROSS
-    {0x78, 0x04}, // SPECIES_REGIROCK
-    {0x88, 0x02}, // SPECIES_REGICE
-    {0x88, 0x03}, // SPECIES_REGISTEEL
-    {0x87, 0x04}, // SPECIES_KYOGRE
-    {0x88, 0x01}, // SPECIES_GROUDON
-    {0x88, 0x00}, // SPECIES_RAYQUAZA
-    {0x88, 0x01}, // SPECIES_LATIAS
-    {0x88, 0x02}, // SPECIES_LATIOS
-    {0x66, 0x0d}, // SPECIES_JIRACHI
-    {0x88, 0x01}, // SPECIES_DEOXYS
-    {0x37, 0x06}, // SPECIES_CHIMECHO
-    {0x33, 0x14}, // SPECIES_EGG
-    {0x34, 0x10}, // SPECIES_UNOWN_B
-    {0x44, 0x10}, // SPECIES_UNOWN_C
-    {0x44, 0x10}, // SPECIES_UNOWN_D
-    {0x44, 0x11}, // SPECIES_UNOWN_E
-    {0x44, 0x11}, // SPECIES_UNOWN_F
-    {0x35, 0x0e}, // SPECIES_UNOWN_G
-    {0x44, 0x10}, // SPECIES_UNOWN_H
-    {0x34, 0x10}, // SPECIES_UNOWN_I
-    {0x34, 0x11}, // SPECIES_UNOWN_J
-    {0x44, 0x11}, // SPECIES_UNOWN_K
-    {0x34, 0x13}, // SPECIES_UNOWN_L
-    {0x44, 0x13}, // SPECIES_UNOWN_M
-    {0x43, 0x14}, // SPECIES_UNOWN_N
-    {0x44, 0x10}, // SPECIES_UNOWN_O
-    {0x34, 0x13}, // SPECIES_UNOWN_P
-    {0x43, 0x15}, // SPECIES_UNOWN_Q
-    {0x34, 0x13}, // SPECIES_UNOWN_R
-    {0x45, 0x0c}, // SPECIES_UNOWN_S
-    {0x34, 0x12}, // SPECIES_UNOWN_T
-    {0x44, 0x12}, // SPECIES_UNOWN_U
-    {0x44, 0x12}, // SPECIES_UNOWN_V
-    {0x44, 0x13}, // SPECIES_UNOWN_W
-    {0x33, 0x15}, // SPECIES_UNOWN_X
-    {0x34, 0x11}, // SPECIES_UNOWN_Y
-    {0x34, 0x10}, // SPECIES_UNOWN_Z
-    {0x35, 0x0f}, // SPECIES_UNOWN_EMARK
-    {0x35, 0x0d}, // SPECIES_UNOWN_QMARK
+    [SPECIES_NONE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_BULBASAUR] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_IVYSAUR] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_VENUSAUR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_CHARMANDER] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_CHARMELEON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_CHARIZARD] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SQUIRTLE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_WARTORTLE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_BLASTOISE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CATERPIE] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x10,
+    },
+    [SPECIES_METAPOD] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x14,
+    },
+    [SPECIES_BUTTERFREE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_WEEDLE] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x12,
+    },
+    [SPECIES_KAKUNA] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_BEEDRILL] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_PIDGEY] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_PIDGEOTTO] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_PIDGEOT] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_RATTATA] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x10,
+    },
+    [SPECIES_RATICATE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SPEAROW] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_FEAROW] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_EKANS] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_ARBOK] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_PIKACHU] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x09,
+    },
+    [SPECIES_RAICHU] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SANDSHREW] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_SANDSLASH] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NIDORAN_F] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_NIDORINA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_NIDOQUEEN] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_NIDORAN_M] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_NIDORINO] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NIDOKING] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x02,
+    },
+    [SPECIES_CLEFAIRY] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x10,
+    },
+    [SPECIES_CLEFABLE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_VULPIX] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_NINETALES] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_JIGGLYPUFF] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x10,
+    },
+    [SPECIES_WIGGLYTUFF] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ZUBAT] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GOLBAT] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_ODDISH] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_GLOOM] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_VILEPLUME] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_PARAS] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_PARASECT] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_VENONAT] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_VENOMOTH] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_DIGLETT] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x12,
+    },
+    [SPECIES_DUGTRIO] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_MEOWTH] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_PERSIAN] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_PSYDUCK] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x09,
+    },
+    [SPECIES_GOLDUCK] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x02,
+    },
+    [SPECIES_MANKEY] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_PRIMEAPE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_GROWLITHE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_ARCANINE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_POLIWAG] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x13,
+    },
+    [SPECIES_POLIWHIRL] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_POLIWRATH] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ABRA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_KADABRA] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_ALAKAZAM] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_MACHOP] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_MACHOKE] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_MACHAMP] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_BELLSPROUT] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_WEEPINBELL] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_VICTREEBEL] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_TENTACOOL] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x09,
+    },
+    [SPECIES_TENTACRUEL] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_GEODUDE] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x12,
+    },
+    [SPECIES_GRAVELER] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_GOLEM] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_PONYTA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_RAPIDASH] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SLOWPOKE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SLOWBRO] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MAGNEMITE] =
+    {
+        .coords = 0x43,
+        .y_offset = 0x15,
+    },
+    [SPECIES_MAGNETON] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_FARFETCHD] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_DODUO] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x05,
+    },
+    [SPECIES_DODRIO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SEEL] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DEWGONG] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_GRIMER] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MUK] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SHELLDER] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x10,
+    },
+    [SPECIES_CLOYSTER] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_GASTLY] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_HAUNTER] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_GENGAR] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_ONIX] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x02,
+    },
+    [SPECIES_DROWZEE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_HYPNO] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_KRABBY] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_KINGLER] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_VOLTORB] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x13,
+    },
+    [SPECIES_ELECTRODE] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_EXEGGCUTE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_EXEGGUTOR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CUBONE] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_MAROWAK] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_HITMONLEE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_HITMONCHAN] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x04,
+    },
+    [SPECIES_LICKITUNG] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_KOFFING] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_WEEZING] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_RHYHORN] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_RHYDON] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_CHANSEY] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_TANGELA] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_KANGASKHAN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_HORSEA] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_SEADRA] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_GOLDEEN] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SEAKING] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_STARYU] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_STARMIE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_MR_MIME] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SCYTHER] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_JYNX] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_ELECTABUZZ] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x02,
+    },
+    [SPECIES_MAGMAR] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_PINSIR] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_TAUROS] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_MAGIKARP] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GYARADOS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x08,
+    },
+    [SPECIES_LAPRAS] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_DITTO] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x11,
+    },
+    [SPECIES_EEVEE] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x09,
+    },
+    [SPECIES_VAPOREON] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_JOLTEON] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_FLAREON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_PORYGON] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_OMANYTE] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_OMASTAR] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_KABUTO] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x11,
+    },
+    [SPECIES_KABUTOPS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_AERODACTYL] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SNORLAX] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_ARTICUNO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_ZAPDOS] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_MOLTRES] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_DRATINI] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_DRAGONAIR] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_DRAGONITE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_MEWTWO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_MEW] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_CHIKORITA] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_BAYLEEF] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_MEGANIUM] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CYNDAQUIL] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_QUILAVA] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_TYPHLOSION] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_TOTODILE] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_CROCONAW] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_FERALIGATR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SENTRET] =
+    {
+        .coords = 0x47,
+        .y_offset = 0x04,
+    },
+    [SPECIES_FURRET] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_HOOTHOOT] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_NOCTOWL] =
+    {
+        .coords = 0x58,
+        .y_offset = 0x03,
+    },
+    [SPECIES_LEDYBA] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_LEDIAN] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SPINARAK] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x13,
+    },
+    [SPECIES_ARIADOS] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_CROBAT] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CHINCHOU] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x10,
+    },
+    [SPECIES_LANTURN] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_PICHU] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_CLEFFA] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x14,
+    },
+    [SPECIES_IGGLYBUFF] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x12,
+    },
+    [SPECIES_TOGEPI] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x14,
+    },
+    [SPECIES_TOGETIC] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x09,
+    },
+    [SPECIES_NATU] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x14,
+    },
+    [SPECIES_XATU] =
+    {
+        .coords = 0x47,
+        .y_offset = 0x07,
+    },
+    [SPECIES_MAREEP] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x10,
+    },
+    [SPECIES_FLAAFFY] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_AMPHAROS] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_BELLOSSOM] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_MARILL] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_AZUMARILL] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SUDOWOODO] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_POLITOED] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_HOPPIP] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SKIPLOOM] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_JUMPLUFF] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_AIPOM] =
+    {
+        .coords = 0x58,
+        .y_offset = 0x03,
+    },
+    [SPECIES_SUNKERN] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x10,
+    },
+    [SPECIES_SUNFLORA] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_YANMA] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_WOOPER] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x10,
+    },
+    [SPECIES_QUAGSIRE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x07,
+    },
+    [SPECIES_ESPEON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_UMBREON] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MURKROW] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SLOWKING] =
+    {
+        .coords = 0x58,
+        .y_offset = 0x01,
+    },
+    [SPECIES_MISDREAVUS] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_UNOWN] =
+    {
+        .coords = 0x35,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_WOBBUFFET] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GIRAFARIG] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_PINECO] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_FORRETRESS] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_DUNSPARCE] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x11,
+    },
+    [SPECIES_GLIGAR] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_STEELIX] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SNUBBULL] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_GRANBULL] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x06,
+    },
+    [SPECIES_QWILFISH] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SCIZOR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SHUCKLE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_HERACROSS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_SNEASEL] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_TEDDIURSA] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_URSARING] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SLUGMA] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_MAGCARGO] =
+    {
+        .coords = 0x57,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_SWINUB] =
+    {
+        .coords = 0x43,
+        .y_offset = 0x14,
+    },
+    [SPECIES_PILOSWINE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_CORSOLA] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_REMORAID] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_OCTILLERY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DELIBIRD] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MANTINE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SKARMORY] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_HOUNDOUR] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_HOUNDOOM] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_KINGDRA] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x04,
+    },
+    [SPECIES_PHANPY] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x10,
+    },
+    [SPECIES_DONPHAN] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_PORYGON2] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_STANTLER] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SMEARGLE] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_TYROGUE] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x09,
+    },
+    [SPECIES_HITMONTOP] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x05,
+    },
+    [SPECIES_SMOOCHUM] =
+    {
+        .coords = 0x35,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_ELEKID] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_MAGBY] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_MILTANK] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_BLISSEY] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x06,
+    },
+    [SPECIES_RAIKOU] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_ENTEI] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SUICUNE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LARVITAR] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x09,
+    },
+    [SPECIES_PUPITAR] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x09,
+    },
+    [SPECIES_TYRANITAR] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LUGIA] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_HO_OH] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CELEBI] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_OLD_UNOWN_B] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_C] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_D] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_E] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_F] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_G] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_H] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_I] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_J] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_K] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_L] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_M] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_N] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_O] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_P] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_Q] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_R] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_S] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_T] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_U] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_V] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_W] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_X] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_Y] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_OLD_UNOWN_Z] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_TREECKO] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_GROVYLE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SCEPTILE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_TORCHIC] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_COMBUSKEN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_BLAZIKEN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_MUDKIP] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MARSHTOMP] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_SWAMPERT] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_POOCHYENA] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MIGHTYENA] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_ZIGZAGOON] =
+    {
+        .coords = 0x85,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_LINOONE] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_WURMPLE] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_SILCOON] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x11,
+    },
+    [SPECIES_BEAUTIFLY] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x09,
+    },
+    [SPECIES_CASCOON] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x10,
+    },
+    [SPECIES_DUSTOX] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_LOTAD] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_LOMBRE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_LUDICOLO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SEEDOT] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x10,
+    },
+    [SPECIES_NUZLEAF] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SHIFTRY] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_NINCADA] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x12,
+    },
+    [SPECIES_NINJASK] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SHEDINJA] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_TAILLOW] =
+    {
+        .coords = 0x64,
+        .y_offset = 0x10,
+    },
+    [SPECIES_SWELLOW] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_SHROOMISH] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x10,
+    },
+    [SPECIES_BRELOOM] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SPINDA] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x08,
+    },
+    [SPECIES_WINGULL] =
+    {
+        .coords = 0x84,
+        .y_offset = 0x18,
+    },
+    [SPECIES_PELIPPER] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x04,
+    },
+    [SPECIES_SURSKIT] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_MASQUERAIN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_WAILMER] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_WAILORD] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_SKITTY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_DELCATTY] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_KECLEON] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_BALTOY] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x10,
+    },
+    [SPECIES_CLAYDOL] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x06,
+    },
+    [SPECIES_NOSEPASS] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_TORKOAL] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_SABLEYE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_BARBOACH] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_WHISCASH] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x09,
+    },
+    [SPECIES_LUVDISC] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x18,
+    },
+    [SPECIES_CORPHISH] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_CRAWDAUNT] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_FEEBAS] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_MILOTIC] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CARVANHA] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x06,
+    },
+    [SPECIES_SHARPEDO] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_TRAPINCH] =
+    {
+        .coords = 0x54,
+        .y_offset = 0x10,
+    },
+    [SPECIES_VIBRAVA] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_FLYGON] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_MAKUHITA] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_HARIYAMA] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_ELECTRIKE] =
+    {
+        .coords = 0x64,
+        .y_offset = 0x12,
+    },
+    [SPECIES_MANECTRIC] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x04,
+    },
+    [SPECIES_NUMEL] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_CAMERUPT] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SPHEAL] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x10,
+    },
+    [SPECIES_SEALEO] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_WALREIN] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_CACNEA] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x10,
+    },
+    [SPECIES_CACTURNE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SNORUNT] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_GLALIE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_LUNATONE] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SOLROCK] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_AZURILL] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_SPOINK] =
+    {
+        .coords = 0x46,
+        .y_offset = 0x09,
+    },
+    [SPECIES_GRUMPIG] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_PLUSLE] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_MINUN] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MAWILE] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_MEDITITE] =
+    {
+        .coords = 0x65,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_MEDICHAM] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x01,
+    },
+    [SPECIES_SWABLU] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x11,
+    },
+    [SPECIES_ALTARIA] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_WYNAUT] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_DUSKULL] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0a,
+    },
+    [SPECIES_DUSCLOPS] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x05,
+    },
+    [SPECIES_ROSELIA] =
+    {
+        .coords = 0x76,
+        .y_offset = 0x08,
+    },
+    [SPECIES_SLAKOTH] =
+    {
+        .coords = 0x74,
+        .y_offset = 0x12,
+    },
+    [SPECIES_VIGOROTH] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SLAKING] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x08,
+    },
+    [SPECIES_GULPIN] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x12,
+    },
+    [SPECIES_SWALOT] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_TROPIUS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_WHISMUR] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_LOUDRED] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_EXPLOUD] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_CLAMPERL] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_HUNTAIL] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x03,
+    },
+    [SPECIES_GOREBYSS] =
+    {
+        .coords = 0x86,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_ABSOL] =
+    {
+        .coords = 0x68,
+        .y_offset = 0x00,
+    },
+    [SPECIES_SHUPPET] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_BANETTE] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_SEVIPER] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ZANGOOSE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x05,
+    },
+    [SPECIES_RELICANTH] =
+    {
+        .coords = 0x77,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_ARON] =
+    {
+        .coords = 0x43,
+        .y_offset = 0x14,
+    },
+    [SPECIES_LAIRON] =
+    {
+        .coords = 0x75,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_AGGRON] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_CASTFORM] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x11,
+    },
+    [SPECIES_VOLBEAT] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ILLUMISE] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x08,
+    },
+    [SPECIES_LILEEP] =
+    {
+        .coords = 0x67,
+        .y_offset = 0x07,
+    },
+    [SPECIES_CRADILY] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x00,
+    },
+    [SPECIES_ANORITH] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x08,
+    },
+    [SPECIES_ARMALDO] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_RALTS] =
+    {
+        .coords = 0x35,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_KIRLIA] =
+    {
+        .coords = 0x47,
+        .y_offset = 0x06,
+    },
+    [SPECIES_GARDEVOIR] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x01,
+    },
+    [SPECIES_BAGON] =
+    {
+        .coords = 0x56,
+        .y_offset = 0x0b,
+    },
+    [SPECIES_SHELGON] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x09,
+    },
+    [SPECIES_SALAMENCE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_BELDUM] =
+    {
+        .coords = 0x55,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_METANG] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x07,
+    },
+    [SPECIES_METAGROSS] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x06,
+    },
+    [SPECIES_REGIROCK] =
+    {
+        .coords = 0x78,
+        .y_offset = 0x04,
+    },
+    [SPECIES_REGICE] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_REGISTEEL] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x03,
+    },
+    [SPECIES_KYOGRE] =
+    {
+        .coords = 0x87,
+        .y_offset = 0x04,
+    },
+    [SPECIES_GROUDON] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_RAYQUAZA] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x00,
+    },
+    [SPECIES_LATIAS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_LATIOS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x02,
+    },
+    [SPECIES_JIRACHI] =
+    {
+        .coords = 0x66,
+        .y_offset = 0x0d,
+    },
+    [SPECIES_DEOXYS] =
+    {
+        .coords = 0x88,
+        .y_offset = 0x01,
+    },
+    [SPECIES_CHIMECHO] =
+    {
+        .coords = 0x37,
+        .y_offset = 0x06,
+    },
+    [SPECIES_EGG] =
+    {
+        .coords = 0x33,
+        .y_offset = 0x14,
+    },
+    [SPECIES_UNOWN_B] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_C] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_D] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_E] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x11,
+    },
+    [SPECIES_UNOWN_F] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x11,
+    },
+    [SPECIES_UNOWN_G] =
+    {
+        .coords = 0x35,
+        .y_offset = 0x0e,
+    },
+    [SPECIES_UNOWN_H] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_I] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_J] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x11,
+    },
+    [SPECIES_UNOWN_K] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x11,
+    },
+    [SPECIES_UNOWN_L] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x13,
+    },
+    [SPECIES_UNOWN_M] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x13,
+    },
+    [SPECIES_UNOWN_N] =
+    {
+        .coords = 0x43,
+        .y_offset = 0x14,
+    },
+    [SPECIES_UNOWN_O] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_P] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x13,
+    },
+    [SPECIES_UNOWN_Q] =
+    {
+        .coords = 0x43,
+        .y_offset = 0x15,
+    },
+    [SPECIES_UNOWN_R] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x13,
+    },
+    [SPECIES_UNOWN_S] =
+    {
+        .coords = 0x45,
+        .y_offset = 0x0c,
+    },
+    [SPECIES_UNOWN_T] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x12,
+    },
+    [SPECIES_UNOWN_U] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x12,
+    },
+    [SPECIES_UNOWN_V] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x12,
+    },
+    [SPECIES_UNOWN_W] =
+    {
+        .coords = 0x44,
+        .y_offset = 0x13,
+    },
+    [SPECIES_UNOWN_X] =
+    {
+        .coords = 0x33,
+        .y_offset = 0x15,
+    },
+    [SPECIES_UNOWN_Y] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x11,
+    },
+    [SPECIES_UNOWN_Z] =
+    {
+        .coords = 0x34,
+        .y_offset = 0x10,
+    },
+    [SPECIES_UNOWN_EMARK] =
+    {
+        .coords = 0x35,
+        .y_offset = 0x0f,
+    },
+    [SPECIES_UNOWN_QMARK] =
+    {
+        .coords = 0x35,
+        .y_offset = 0x0d,
+    },
 };
diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h
index ff0b680dd..8de5183ec 100644
--- a/src/data/text/item_descriptions.h
+++ b/src/data/text/item_descriptions.h
@@ -7,7 +7,7 @@ const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMO
 const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE.");
 const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON.");
 const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor.");
-const u8 gNestBallItemDescription[] =	_("A BALL that works\nbetter on weaker\nPOKéMON.");
+const u8 gNestBallItemDescription[] =    _("A BALL that works\nbetter on weaker\nPOKéMON.");
 const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before.");
 const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns.");
 const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly.");
diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h
index 3642f66b1..5818186fe 100644
--- a/src/data/text/move_descriptions.h
+++ b/src/data/text/move_descriptions.h
@@ -1,1421 +1,1421 @@
 static const u8 sNullDescription[] = _(
-	"");
+    "");
 
 static const u8 sPoundDescription[] = _(
-	"Pounds the foe with\n"
-	"forelegs or tail.");
+    "Pounds the foe with\n"
+    "forelegs or tail.");
 
 static const u8 sKarateChopDescription[] = _(
-	"A chopping attack with a\n"
-	"high critical-hit ratio.");
+    "A chopping attack with a\n"
+    "high critical-hit ratio.");
 
 static const u8 sDoubleSlapDescription[] = _(
-	"Repeatedly slaps the foe\n"
-	"2 to 5 times.");
+    "Repeatedly slaps the foe\n"
+    "2 to 5 times.");
 
 static const u8 sCometPunchDescription[] = _(
-	"Repeatedly punches the foe\n"
-	"2 to 5 times.");
+    "Repeatedly punches the foe\n"
+    "2 to 5 times.");
 
 static const u8 sMegaPunchDescription[] = _(
-	"A strong punch thrown with\n"
-	"incredible power.");
+    "A strong punch thrown with\n"
+    "incredible power.");
 
 static const u8 sPayDayDescription[] = _(
-	"Throws coins at the foe.\n"
-	"Money is recovered after.");
+    "Throws coins at the foe.\n"
+    "Money is recovered after.");
 
 static const u8 sFirePunchDescription[] = _(
-	"A fiery punch that may burn\n"
-	"the foe.");
+    "A fiery punch that may burn\n"
+    "the foe.");
 
 static const u8 sIcePunchDescription[] = _(
-	"An icy punch that may\n"
-	"freeze the foe.");
+    "An icy punch that may\n"
+    "freeze the foe.");
 
 static const u8 sThunderPunchDescription[] = _(
-	"An electrified punch that\n"
-	"may paralyze the foe.");
+    "An electrified punch that\n"
+    "may paralyze the foe.");
 
 static const u8 sScratchDescription[] = _(
-	"Scratches the foe with\n"
-	"sharp claws.");
+    "Scratches the foe with\n"
+    "sharp claws.");
 
 static const u8 sViceGripDescription[] = _(
-	"Grips the foe with large and\n"
-	"powerful pincers.");
+    "Grips the foe with large and\n"
+    "powerful pincers.");
 
 static const u8 sGuillotineDescription[] = _(
-	"A powerful pincer attack\n"
-	"that may cause fainting.");
+    "A powerful pincer attack\n"
+    "that may cause fainting.");
 
 static const u8 sRazorWindDescription[] = _(
-	"A 2-turn move that strikes\n"
-	"the foe on the 2nd turn.");
+    "A 2-turn move that strikes\n"
+    "the foe on the 2nd turn.");
 
 static const u8 sSwordsDanceDescription[] = _(
-	"A fighting dance that\n"
-	"sharply raises ATTACK.");
+    "A fighting dance that\n"
+    "sharply raises ATTACK.");
 
 static const u8 sCutDescription[] = _(
-	"Cuts the foe with sharp\n"
-	"scythes, claws, etc.");
+    "Cuts the foe with sharp\n"
+    "scythes, claws, etc.");
 
 static const u8 sGustDescription[] = _(
-	"Strikes the foe with a gust\n"
-	"of wind whipped up by wings.");
+    "Strikes the foe with a gust\n"
+    "of wind whipped up by wings.");
 
 static const u8 sWingAttackDescription[] = _(
-	"Strikes the foe with wings\n"
-	"spread wide.");
+    "Strikes the foe with wings\n"
+    "spread wide.");
 
 static const u8 sWhirlwindDescription[] = _(
-	"Blows away the foe with\n"
-	"wind and ends the battle.");
+    "Blows away the foe with\n"
+    "wind and ends the battle.");
 
 static const u8 sFlyDescription[] = _(
-	"Flies up on the first turn,\n"
-	"then strikes the next turn.");
+    "Flies up on the first turn,\n"
+    "then strikes the next turn.");
 
 static const u8 sBindDescription[] = _(
-	"Binds and squeezes the foe\n"
-	"for 2 to 5 turns.");
+    "Binds and squeezes the foe\n"
+    "for 2 to 5 turns.");
 
 static const u8 sSlamDescription[] = _(
-	"Slams the foe with a long\n"
-	"tail, vine, etc.");
+    "Slams the foe with a long\n"
+    "tail, vine, etc.");
 
 static const u8 sVineWhipDescription[] = _(
-	"Strikes the foe with\n"
-	"slender, whiplike vines.");
+    "Strikes the foe with\n"
+    "slender, whiplike vines.");
 
 static const u8 sStompDescription[] = _(
-	"Stomps the enemy with a big\n"
-	"foot. May cause flinching.");
+    "Stomps the enemy with a big\n"
+    "foot. May cause flinching.");
 
 static const u8 sDoubleKickDescription[] = _(
-	"A double-kicking attack\n"
-	"that strikes the foe twice.");
+    "A double-kicking attack\n"
+    "that strikes the foe twice.");
 
 static const u8 sMegaKickDescription[] = _(
-	"An extremely powerful kick\n"
-	"with intense force.");
+    "An extremely powerful kick\n"
+    "with intense force.");
 
 static const u8 sJumpKickDescription[] = _(
-	"A strong jumping kick. May\n"
-	"miss and hurt the kicker.");
+    "A strong jumping kick. May\n"
+    "miss and hurt the kicker.");
 
 static const u8 sRollingKickDescription[] = _(
-	"A fast kick delivered from\n"
-	"a rapid spin.");
+    "A fast kick delivered from\n"
+    "a rapid spin.");
 
 static const u8 sSandAttackDescription[] = _(
-	"Reduces the foe’s accuracy\n"
-	"by hurling sand in its face.");
+    "Reduces the foe’s accuracy\n"
+    "by hurling sand in its face.");
 
 static const u8 sHeadbuttDescription[] = _(
-	"A ramming attack that may\n"
-	"cause flinching.");
+    "A ramming attack that may\n"
+    "cause flinching.");
 
 static const u8 sHornAttackDescription[] = _(
-	"Jabs the foe with sharp\n"
-	"horns.");
+    "Jabs the foe with sharp\n"
+    "horns.");
 
 static const u8 sFuryAttackDescription[] = _(
-	"Jabs the foe 2 to 5 times\n"
-	"with sharp horns, etc.");
+    "Jabs the foe 2 to 5 times\n"
+    "with sharp horns, etc.");
 
 static const u8 sHornDrillDescription[] = _(
-	"A one-hit KO attack that\n"
-	"uses a horn like a drill.");
+    "A one-hit KO attack that\n"
+    "uses a horn like a drill.");
 
 static const u8 sTackleDescription[] = _(
-	"Charges the foe with a full-\n"
-	"body tackle.");
+    "Charges the foe with a full-\n"
+    "body tackle.");
 
 static const u8 sBodySlamDescription[] = _(
-	"A full-body slam that may\n"
-	"cause paralysis.");
+    "A full-body slam that may\n"
+    "cause paralysis.");
 
 static const u8 sWrapDescription[] = _(
-	"Wraps and squeezes the foe\n"
-	"2 to 5 times with vines, etc.");
+    "Wraps and squeezes the foe\n"
+    "2 to 5 times with vines, etc.");
 
 static const u8 sTakeDownDescription[] = _(
-	"A reckless charge attack\n"
-	"that also hurts the user.");
+    "A reckless charge attack\n"
+    "that also hurts the user.");
 
 static const u8 sThrashDescription[] = _(
-	"A rampage of 2 to 3 turns\n"
-	"that confuses the user.");
+    "A rampage of 2 to 3 turns\n"
+    "that confuses the user.");
 
 static const u8 sDoubleEdgeDescription[] = _(
-	"A life-risking tackle that\n"
-	"also hurts the user.");
+    "A life-risking tackle that\n"
+    "also hurts the user.");
 
 static const u8 sTailWhipDescription[] = _(
-	"Wags the tail to lower the\n"
-	"foe’s DEFENSE.");
+    "Wags the tail to lower the\n"
+    "foe’s DEFENSE.");
 
 static const u8 sPoisonStingDescription[] = _(
-	"A toxic attack with barbs,\n"
-	"etc., that may poison.");
+    "A toxic attack with barbs,\n"
+    "etc., that may poison.");
 
 static const u8 sTwineedleDescription[] = _(
-	"Stingers on the forelegs\n"
-	"jab the foe twice.");
+    "Stingers on the forelegs\n"
+    "jab the foe twice.");
 
 static const u8 sPinMissileDescription[] = _(
-	"Sharp pins are fired to\n"
-	"strike 2 to 5 times.");
+    "Sharp pins are fired to\n"
+    "strike 2 to 5 times.");
 
 static const u8 sLeerDescription[] = _(
-	"Frightens the foe with a\n"
-	"leer to lower DEFENSE.");
+    "Frightens the foe with a\n"
+    "leer to lower DEFENSE.");
 
 static const u8 sBiteDescription[] = _(
-	"Bites with vicious fangs.\n"
-	"May cause flinching.");
+    "Bites with vicious fangs.\n"
+    "May cause flinching.");
 
 static const u8 sGrowlDescription[] = _(
-	"Growls cutely to reduce the\n"
-	"foe’s ATTACK.");
+    "Growls cutely to reduce the\n"
+    "foe’s ATTACK.");
 
 static const u8 sRoarDescription[] = _(
-	"Makes the foe flee to end\n"
-	"the battle.");
+    "Makes the foe flee to end\n"
+    "the battle.");
 
 static const u8 sSingDescription[] = _(
-	"A soothing song lulls the\n"
-	"foe into a deep slumber.");
+    "A soothing song lulls the\n"
+    "foe into a deep slumber.");
 
 static const u8 sSupersonicDescription[] = _(
-	"Emits bizarre sound waves\n"
-	"that may confuse the foe.");
+    "Emits bizarre sound waves\n"
+    "that may confuse the foe.");
 
 static const u8 sSonicBoomDescription[] = _(
-	"Launches shock waves that\n"
-	"always inflict 20 HP damage.");
+    "Launches shock waves that\n"
+    "always inflict 20 HP damage.");
 
 static const u8 sDisableDescription[] = _(
-	"Psychically disables one of\n"
-	"the foe’s moves.");
+    "Psychically disables one of\n"
+    "the foe’s moves.");
 
 static const u8 sAcidDescription[] = _(
-	"Sprays a hide-melting acid.\n"
-	"May lower DEFENSE.");
+    "Sprays a hide-melting acid.\n"
+    "May lower DEFENSE.");
 
 static const u8 sEmberDescription[] = _(
-	"A weak fire attack that may\n"
-	"inflict a burn.");
+    "A weak fire attack that may\n"
+    "inflict a burn.");
 
 static const u8 sFlamethrowerDescription[] = _(
-	"A powerful fire attack that\n"
-	"may inflict a burn.");
+    "A powerful fire attack that\n"
+    "may inflict a burn.");
 
 static const u8 sMistDescription[] = _(
-	"Creates a mist that stops\n"
-	"reduction of abilities.");
+    "Creates a mist that stops\n"
+    "reduction of abilities.");
 
 static const u8 sWaterGunDescription[] = _(
-	"Squirts water to attack\n"
-	"the foe.");
+    "Squirts water to attack\n"
+    "the foe.");
 
 static const u8 sHydroPumpDescription[] = _(
-	"Blasts water at high power\n"
-	"to strike the foe.");
+    "Blasts water at high power\n"
+    "to strike the foe.");
 
 static const u8 sSurfDescription[] = _(
-	"Creates a huge wave, then\n"
-	"crashes it down on the foe.");
+    "Creates a huge wave, then\n"
+    "crashes it down on the foe.");
 
 static const u8 sIceBeamDescription[] = _(
-	"Blasts the foe with an icy\n"
-	"beam that may freeze it.");
+    "Blasts the foe with an icy\n"
+    "beam that may freeze it.");
 
 static const u8 sBlizzardDescription[] = _(
-	"Hits the foe with an icy\n"
-	"storm that may freeze it.");
+    "Hits the foe with an icy\n"
+    "storm that may freeze it.");
 
 static const u8 sPsybeamDescription[] = _(
-	"Fires a peculiar ray that\n"
-	"may confuse the foe.");
+    "Fires a peculiar ray that\n"
+    "may confuse the foe.");
 
 static const u8 sBubbleBeamDescription[] = _(
-	"Forcefully sprays bubbles\n"
-	"that may lower SPEED.");
+    "Forcefully sprays bubbles\n"
+    "that may lower SPEED.");
 
 static const u8 sAuroraBeamDescription[] = _(
-	"Fires a rainbow-colored\n"
-	"beam that may lower ATTACK.");
+    "Fires a rainbow-colored\n"
+    "beam that may lower ATTACK.");
 
 static const u8 sHyperBeamDescription[] = _(
-	"Powerful, but leaves the\n"
-	"user immobile the next turn.");
+    "Powerful, but leaves the\n"
+    "user immobile the next turn.");
 
 static const u8 sPeckDescription[] = _(
-	"Attacks the foe with a\n"
-	"jabbing beak, etc.");
+    "Attacks the foe with a\n"
+    "jabbing beak, etc.");
 
 static const u8 sDrillPeckDescription[] = _(
-	"A corkscrewing attack with\n"
-	"the beak acting as a drill.");
+    "A corkscrewing attack with\n"
+    "the beak acting as a drill.");
 
 static const u8 sSubmissionDescription[] = _(
-	"A reckless body slam that\n"
-	"also hurts the user.");
+    "A reckless body slam that\n"
+    "also hurts the user.");
 
 static const u8 sLowKickDescription[] = _(
-	"A kick that inflicts more\n"
-	"damage on heavier foes.");
+    "A kick that inflicts more\n"
+    "damage on heavier foes.");
 
 static const u8 sCounterDescription[] = _(
-	"Retaliates any physical hit\n"
-	"with double the power.");
+    "Retaliates any physical hit\n"
+    "with double the power.");
 
 static const u8 sSeismicTossDescription[] = _(
-	"Inflicts damage identical\n"
-	"to the user’s level.");
+    "Inflicts damage identical\n"
+    "to the user’s level.");
 
 static const u8 sStrengthDescription[] = _(
-	"Builds enormous power,\n"
-	"then slams the foe.");
+    "Builds enormous power,\n"
+    "then slams the foe.");
 
 static const u8 sAbsorbDescription[] = _(
-	"An attack that absorbs\n"
-	"half the damage inflicted.");
+    "An attack that absorbs\n"
+    "half the damage inflicted.");
 
 static const u8 sMegaDrainDescription[] = _(
-	"An attack that absorbs\n"
-	"half the damage inflicted.");
+    "An attack that absorbs\n"
+    "half the damage inflicted.");
 
 static const u8 sLeechSeedDescription[] = _(
-	"Plants a seed on the foe to\n"
-	"steal HP on every turn.");
+    "Plants a seed on the foe to\n"
+    "steal HP on every turn.");
 
 static const u8 sGrowthDescription[] = _(
-	"Forces the body to grow\n"
-	"and heightens SP. ATK.");
+    "Forces the body to grow\n"
+    "and heightens SP. ATK.");
 
 static const u8 sRazorLeafDescription[] = _(
-	"Cuts the enemy with leaves.\n"
-	"High critical-hit ratio.");
+    "Cuts the enemy with leaves.\n"
+    "High critical-hit ratio.");
 
 static const u8 sSolarBeamDescription[] = _(
-	"Absorbs light in one turn,\n"
-	"then attacks next turn.");
+    "Absorbs light in one turn,\n"
+    "then attacks next turn.");
 
 static const u8 sPoisonPowderDescription[] = _(
-	"Scatters a toxic powder\n"
-	"that may poison the foe.");
+    "Scatters a toxic powder\n"
+    "that may poison the foe.");
 
 static const u8 sStunSporeDescription[] = _(
-	"Scatters a powder that may\n"
-	"paralyze the foe.");
+    "Scatters a powder that may\n"
+    "paralyze the foe.");
 
 static const u8 sSleepPowderDescription[] = _(
-	"Scatters a powder that may\n"
-	"cause the foe to sleep.");
+    "Scatters a powder that may\n"
+    "cause the foe to sleep.");
 
 static const u8 sPetalDanceDescription[] = _(
-	"A rampage of 2 to 3 turns\n"
-	"that confuses the user.");
+    "A rampage of 2 to 3 turns\n"
+    "that confuses the user.");
 
 static const u8 sStringShotDescription[] = _(
-	"Binds the foe with string\n"
-	"to reduce its SPEED.");
+    "Binds the foe with string\n"
+    "to reduce its SPEED.");
 
 static const u8 sDragonRageDescription[] = _(
-	"Launches shock waves that\n"
-	"always inflict 40 HP damage.");
+    "Launches shock waves that\n"
+    "always inflict 40 HP damage.");
 
 static const u8 sFireSpinDescription[] = _(
-	"Traps the foe in a ring of\n"
-	"fire for 2 to 5 turns.");
+    "Traps the foe in a ring of\n"
+    "fire for 2 to 5 turns.");
 
 static const u8 sThunderShockDescription[] = _(
-	"An electrical attack that\n"
-	"may paralyze the foe.");
+    "An electrical attack that\n"
+    "may paralyze the foe.");
 
 static const u8 sThunderboltDescription[] = _(
-	"A strong electrical attack\n"
-	"that may paralyze the foe.");
+    "A strong electrical attack\n"
+    "that may paralyze the foe.");
 
 static const u8 sThunderWaveDescription[] = _(
-	"A weak jolt of electricity\n"
-	"that paralyzes the foe.");
+    "A weak jolt of electricity\n"
+    "that paralyzes the foe.");
 
 static const u8 sThunderDescription[] = _(
-	"A lightning attack that may\n"
-	"cause paralysis.");
+    "A lightning attack that may\n"
+    "cause paralysis.");
 
 static const u8 sRockThrowDescription[] = _(
-	"Throws small rocks to\n"
-	"strike the foe.");
+    "Throws small rocks to\n"
+    "strike the foe.");
 
 static const u8 sEarthquakeDescription[] = _(
-	"A powerful quake, but has\n"
-	"no effect on flying foes.");
+    "A powerful quake, but has\n"
+    "no effect on flying foes.");
 
 static const u8 sFissureDescription[] = _(
-	"A one-hit KO move that\n"
-	"drops the foe in a fissure.");
+    "A one-hit KO move that\n"
+    "drops the foe in a fissure.");
 
 static const u8 sDigDescription[] = _(
-	"Digs underground the first\n"
-	"turn and strikes next turn.");
+    "Digs underground the first\n"
+    "turn and strikes next turn.");
 
 static const u8 sToxicDescription[] = _(
-	"Poisons the foe with an\n"
-	"intensifying toxin.");
+    "Poisons the foe with an\n"
+    "intensifying toxin.");
 
 static const u8 sConfusionDescription[] = _(
-	"A psychic attack that may\n"
-	"cause confusion.");
+    "A psychic attack that may\n"
+    "cause confusion.");
 
 static const u8 sPsychicDescription[] = _(
-	"A powerful psychic attack\n"
-	"that may lower SP. DEF.");
+    "A powerful psychic attack\n"
+    "that may lower SP. DEF.");
 
 static const u8 sHypnosisDescription[] = _(
-	"A hypnotizing move that\n"
-	"may induce sleep.");
+    "A hypnotizing move that\n"
+    "may induce sleep.");
 
 static const u8 sMeditateDescription[] = _(
-	"Meditates in a peaceful\n"
-	"fashion to raise ATTACK.");
+    "Meditates in a peaceful\n"
+    "fashion to raise ATTACK.");
 
 static const u8 sAgilityDescription[] = _(
-	"Relaxes the body to sharply\n"
-	"boost SPEED.");
+    "Relaxes the body to sharply\n"
+    "boost SPEED.");
 
 static const u8 sQuickAttackDescription[] = _(
-	"An extremely fast attack\n"
-	"that always strikes first.");
+    "An extremely fast attack\n"
+    "that always strikes first.");
 
 static const u8 sRageDescription[] = _(
-	"Raises the user’s ATTACK\n"
-	"every time it is hit.");
+    "Raises the user’s ATTACK\n"
+    "every time it is hit.");
 
 static const u8 sTeleportDescription[] = _(
-	"A psychic move for fleeing\n"
-	"from battle instantly.");
+    "A psychic move for fleeing\n"
+    "from battle instantly.");
 
 static const u8 sNightShadeDescription[] = _(
-	"Inflicts damage identical\n"
-	"to the user’s level.");
+    "Inflicts damage identical\n"
+    "to the user’s level.");
 
 static const u8 sMimicDescription[] = _(
-	"Copies a move used by the\n"
-	"foe during one battle.");
+    "Copies a move used by the\n"
+    "foe during one battle.");
 
 static const u8 sScreechDescription[] = _(
-	"Emits a screech to sharply\n"
-	"reduce the foe’s DEFENSE.");
+    "Emits a screech to sharply\n"
+    "reduce the foe’s DEFENSE.");
 
 static const u8 sDoubleTeamDescription[] = _(
-	"Creates illusory copies to\n"
-	"raise evasiveness.");
+    "Creates illusory copies to\n"
+    "raise evasiveness.");
 
 static const u8 sRecoverDescription[] = _(
-	"Recovers up to half the\n"
-	"user’s maximum HP.");
+    "Recovers up to half the\n"
+    "user’s maximum HP.");
 
 static const u8 sHardenDescription[] = _(
-	"Stiffens the body’s \n"
-	"muscles to raise DEFENSE.");
+    "Stiffens the body’s \n"
+    "muscles to raise DEFENSE.");
 
 static const u8 sMinimizeDescription[] = _(
-	"Minimizes the user’s size\n"
-	"to raise evasiveness.");
+    "Minimizes the user’s size\n"
+    "to raise evasiveness.");
 
 static const u8 sSmokescreenDescription[] = _(
-	"Lowers the foe’s accuracy\n"
-	"using smoke, ink, etc.");
+    "Lowers the foe’s accuracy\n"
+    "using smoke, ink, etc.");
 
 static const u8 sConfuseRayDescription[] = _(
-	"A sinister ray that\n"
-	"confuses the foe.");
+    "A sinister ray that\n"
+    "confuses the foe.");
 
 static const u8 sWithdrawDescription[] = _(
-	"Withdraws the body into its\n"
-	"hard shell to raise DEFENSE.");
+    "Withdraws the body into its\n"
+    "hard shell to raise DEFENSE.");
 
 static const u8 sDefenseCurlDescription[] = _(
-	"Curls up to conceal weak\n"
-	"spots and raise DEFENSE.");
+    "Curls up to conceal weak\n"
+    "spots and raise DEFENSE.");
 
 static const u8 sBarrierDescription[] = _(
-	"Creates a barrier that\n"
-	"sharply raises DEFENSE.");
+    "Creates a barrier that\n"
+    "sharply raises DEFENSE.");
 
 static const u8 sLightScreenDescription[] = _(
-	"Creates a wall of light that\n"
-	"lowers SP. ATK damage.");
+    "Creates a wall of light that\n"
+    "lowers SP. ATK damage.");
 
 static const u8 sHazeDescription[] = _(
-	"Creates a black haze that\n"
-	"eliminates all stat changes.");
+    "Creates a black haze that\n"
+    "eliminates all stat changes.");
 
 static const u8 sReflectDescription[] = _(
-	"Creates a wall of light that\n"
-	"weakens physical attacks.");
+    "Creates a wall of light that\n"
+    "weakens physical attacks.");
 
 static const u8 sFocusEnergyDescription[] = _(
-	"Focuses power to raise the\n"
-	"critical-hit ratio.");
+    "Focuses power to raise the\n"
+    "critical-hit ratio.");
 
 static const u8 sBideDescription[] = _(
-	"Endures attack for 2\n"
-	"turns to retaliate double.");
+    "Endures attack for 2\n"
+    "turns to retaliate double.");
 
 static const u8 sMetronomeDescription[] = _(
-	"Waggles a finger to use any\n"
-	"POKéMON move at random.");
+    "Waggles a finger to use any\n"
+    "POKéMON move at random.");
 
 static const u8 sMirrorMoveDescription[] = _(
-	"Counters the foe’s attack\n"
-	"with the same move.");
+    "Counters the foe’s attack\n"
+    "with the same move.");
 
 static const u8 sSelfDestructDescription[] = _(
-	"Inflicts severe damage but\n"
-	"makes the user faint.");
+    "Inflicts severe damage but\n"
+    "makes the user faint.");
 
 static const u8 sEggBombDescription[] = _(
-	"An egg is forcibly hurled at\n"
-	"the foe.");
+    "An egg is forcibly hurled at\n"
+    "the foe.");
 
 static const u8 sLickDescription[] = _(
-	"Licks with a long tongue to\n"
-	"injure. May also paralyze.");
+    "Licks with a long tongue to\n"
+    "injure. May also paralyze.");
 
 static const u8 sSmogDescription[] = _(
-	"An exhaust-gas attack\n"
-	"that may also poison.");
+    "An exhaust-gas attack\n"
+    "that may also poison.");
 
 static const u8 sSludgeDescription[] = _(
-	"Sludge is hurled to inflict\n"
-	"damage. May also poison.");
+    "Sludge is hurled to inflict\n"
+    "damage. May also poison.");
 
 static const u8 sBoneClubDescription[] = _(
-	"Clubs the foe with a bone.\n"
-	"May cause flinching.");
+    "Clubs the foe with a bone.\n"
+    "May cause flinching.");
 
 static const u8 sFireBlastDescription[] = _(
-	"Incinerates everything it\n"
-	"strikes. May cause a burn.");
+    "Incinerates everything it\n"
+    "strikes. May cause a burn.");
 
 static const u8 sWaterfallDescription[] = _(
-	"Charges the foe with speed\n"
-	"to climb waterfalls.");
+    "Charges the foe with speed\n"
+    "to climb waterfalls.");
 
 static const u8 sClampDescription[] = _(
-	"Traps and squeezes the\n"
-	"foe for 2 to 5 turns.");
+    "Traps and squeezes the\n"
+    "foe for 2 to 5 turns.");
 
 static const u8 sSwiftDescription[] = _(
-	"Sprays star-shaped rays\n"
-	"that never miss.");
+    "Sprays star-shaped rays\n"
+    "that never miss.");
 
 static const u8 sSkullBashDescription[] = _(
-	"Tucks in the head, then\n"
-	"attacks on the next turn.");
+    "Tucks in the head, then\n"
+    "attacks on the next turn.");
 
 static const u8 sSpikeCannonDescription[] = _(
-	"Launches sharp spikes that\n"
-	"strike 2 to 5 times.");
+    "Launches sharp spikes that\n"
+    "strike 2 to 5 times.");
 
 static const u8 sConstrictDescription[] = _(
-	"Constricts to inflict pain.\n"
-	"May lower SPEED.");
+    "Constricts to inflict pain.\n"
+    "May lower SPEED.");
 
 static const u8 sAmnesiaDescription[] = _(
-	"Forgets about something\n"
-	"and sharply raises SP. DEF.");
+    "Forgets about something\n"
+    "and sharply raises SP. DEF.");
 
 static const u8 sKinesisDescription[] = _(
-	"Distracts the foe.\n"
-	"May lower accuracy.");
+    "Distracts the foe.\n"
+    "May lower accuracy.");
 
 static const u8 sSoftBoiledDescription[] = _(
-	"Recovers up to half the\n"
-	"user’s maximum HP.");
+    "Recovers up to half the\n"
+    "user’s maximum HP.");
 
 static const u8 sHiJumpKickDescription[] = _(
-	"A jumping knee kick. If it\n"
-	"misses, the user is hurt.");
+    "A jumping knee kick. If it\n"
+    "misses, the user is hurt.");
 
 static const u8 sGlareDescription[] = _(
-	"Intimidates and frightens\n"
-	"the foe into paralysis.");
+    "Intimidates and frightens\n"
+    "the foe into paralysis.");
 
 static const u8 sDreamEaterDescription[] = _(
-	"Takes one half the damage\n"
-	"inflicted on a sleeping foe.");
+    "Takes one half the damage\n"
+    "inflicted on a sleeping foe.");
 
 static const u8 sPoisonGasDescription[] = _(
-	"Envelops the foe in a toxic\n"
-	"gas that may poison.");
+    "Envelops the foe in a toxic\n"
+    "gas that may poison.");
 
 static const u8 sBarrageDescription[] = _(
-	"Hurls round objects at the\n"
-	"foe 2 to 5 times.");
+    "Hurls round objects at the\n"
+    "foe 2 to 5 times.");
 
 static const u8 sLeechLifeDescription[] = _(
-	"An attack that steals half\n"
-	"the damage inflicted.");
+    "An attack that steals half\n"
+    "the damage inflicted.");
 
 static const u8 sLovelyKissDescription[] = _(
-	"Demands a kiss with a scary\n"
-	"face that induces sleep.");
+    "Demands a kiss with a scary\n"
+    "face that induces sleep.");
 
 static const u8 sSkyAttackDescription[] = _(
-	"Searches out weak spots,\n"
-	"then strikes the next turn.");
+    "Searches out weak spots,\n"
+    "then strikes the next turn.");
 
 static const u8 sTransformDescription[] = _(
-	"Alters the user’s cells to\n"
-	"become a copy of the foe.");
+    "Alters the user’s cells to\n"
+    "become a copy of the foe.");
 
 static const u8 sBubbleDescription[] = _(
-	"An attack using bubbles.\n"
-	"May lower the foe’s SPEED.");
+    "An attack using bubbles.\n"
+    "May lower the foe’s SPEED.");
 
 static const u8 sDizzyPunchDescription[] = _(
-	"A rhythmic punch that may\n"
-	"confuse the foe.");
+    "A rhythmic punch that may\n"
+    "confuse the foe.");
 
 static const u8 sSporeDescription[] = _(
-	"Scatters a cloud of spores\n"
-	"that always induce sleep.");
+    "Scatters a cloud of spores\n"
+    "that always induce sleep.");
 
 static const u8 sFlashDescription[] = _(
-	"Looses a powerful blast of\n"
-	"light that cuts accuracy.");
+    "Looses a powerful blast of\n"
+    "light that cuts accuracy.");
 
 static const u8 sPsywaveDescription[] = _(
-	"Attacks with a psychic\n"
-	"wave of varying intensity.");
+    "Attacks with a psychic\n"
+    "wave of varying intensity.");
 
 static const u8 sSplashDescription[] = _(
-	"It’s just a splash...\n"
-	"Has no effect whatsoever.");
+    "It’s just a splash...\n"
+    "Has no effect whatsoever.");
 
 static const u8 sAcidArmorDescription[] = _(
-	"Liquifies the user’s body\n"
-	"to sharply raise DEFENSE.");
+    "Liquifies the user’s body\n"
+    "to sharply raise DEFENSE.");
 
 static const u8 sCrabhammerDescription[] = _(
-	"Hammers with a pincer. Has a\n"
-	"high critical-hit ratio.");
+    "Hammers with a pincer. Has a\n"
+    "high critical-hit ratio.");
 
 static const u8 sExplosionDescription[] = _(
-	"Inflicts severe damage but\n"
-	"makes the user faint.");
+    "Inflicts severe damage but\n"
+    "makes the user faint.");
 
 static const u8 sFurySwipesDescription[] = _(
-	"Rakes the foe with sharp\n"
-	"claws, etc., 2 to 5 times.");
+    "Rakes the foe with sharp\n"
+    "claws, etc., 2 to 5 times.");
 
 static const u8 sBonemerangDescription[] = _(
-	"Throws a bone boomerang\n"
-	"that strikes twice.");
+    "Throws a bone boomerang\n"
+    "that strikes twice.");
 
 static const u8 sRestDescription[] = _(
-	"The user sleeps for 2 turns,\n"
-	"restoring HP and status.");
+    "The user sleeps for 2 turns,\n"
+    "restoring HP and status.");
 
 static const u8 sRockSlideDescription[] = _(
-	"Large boulders are hurled.\n"
-	"May cause flinching.");
+    "Large boulders are hurled.\n"
+    "May cause flinching.");
 
 static const u8 sHyperFangDescription[] = _(
-	"Attacks with sharp fangs.\n"
-	"May cause flinching.");
+    "Attacks with sharp fangs.\n"
+    "May cause flinching.");
 
 static const u8 sSharpenDescription[] = _(
-	"Reduces the polygon count\n"
-	"and raises ATTACK.");
+    "Reduces the polygon count\n"
+    "and raises ATTACK.");
 
 static const u8 sConversionDescription[] = _(
-	"Changes the user’s type\n"
-	"into a known move’s type.");
+    "Changes the user’s type\n"
+    "into a known move’s type.");
 
 static const u8 sTriAttackDescription[] = _(
-	"Fires three types of beams\n"
-	"at the same time.");
+    "Fires three types of beams\n"
+    "at the same time.");
 
 static const u8 sSuperFangDescription[] = _(
-	"Attacks with sharp fangs\n"
-	"and cuts half the foe’s HP.");
+    "Attacks with sharp fangs\n"
+    "and cuts half the foe’s HP.");
 
 static const u8 sSlashDescription[] = _(
-	"Slashes with claws, etc. Has\n"
-	"a high critical-hit ratio.");
+    "Slashes with claws, etc. Has\n"
+    "a high critical-hit ratio.");
 
 static const u8 sSubstituteDescription[] = _(
-	"Creates a decoy using 1/4\n"
-	"of the user’s maximum HP.");
+    "Creates a decoy using 1/4\n"
+    "of the user’s maximum HP.");
 
 static const u8 sStruggleDescription[] = _(
-	"Used only if all PP are gone.\n"
-	"Also hurts the user a little.");
+    "Used only if all PP are gone.\n"
+    "Also hurts the user a little.");
 
 static const u8 sSketchDescription[] = _(
-	"Copies the foe’s last move\n"
-	"permanently.");
+    "Copies the foe’s last move\n"
+    "permanently.");
 
 static const u8 sTripleKickDescription[] = _(
-	"Kicks the foe 3 times in a\n"
-	"row with rising intensity.");
+    "Kicks the foe 3 times in a\n"
+    "row with rising intensity.");
 
 static const u8 sThiefDescription[] = _(
-	"While attacking, it may\n"
-	"steal the foe’s held item.");
+    "While attacking, it may\n"
+    "steal the foe’s held item.");
 
 static const u8 sSpiderWebDescription[] = _(
-	"Ensnares the foe to stop it\n"
-	"from fleeing or switching.");
+    "Ensnares the foe to stop it\n"
+    "from fleeing or switching.");
 
 static const u8 sMindReaderDescription[] = _(
-	"Senses the foe’s action to\n"
-	"ensure the next move’s hit.");
+    "Senses the foe’s action to\n"
+    "ensure the next move’s hit.");
 
 static const u8 sNightmareDescription[] = _(
-	"Inflicts 1/4 damage on a\n"
-	"sleeping foe every turn.");
+    "Inflicts 1/4 damage on a\n"
+    "sleeping foe every turn.");
 
 static const u8 sFlameWheelDescription[] = _(
-	"A fiery charge attack that\n"
-	"may inflict a burn.");
+    "A fiery charge attack that\n"
+    "may inflict a burn.");
 
 static const u8 sSnoreDescription[] = _(
-	"A loud attack that can be\n"
-	"used only while asleep.");
+    "A loud attack that can be\n"
+    "used only while asleep.");
 
 static const u8 sCurseDescription[] = _(
-	"A move that functions\n"
-	"differently for GHOSTS.");
+    "A move that functions\n"
+    "differently for GHOSTS.");
 
 static const u8 sFlailDescription[] = _(
-	"Inflicts more damage when\n"
-	"the user’s HP is down.");
+    "Inflicts more damage when\n"
+    "the user’s HP is down.");
 
 static const u8 sConversion2Description[] = _(
-	"Makes the user resistant\n"
-	"to the last attack’s type.");
+    "Makes the user resistant\n"
+    "to the last attack’s type.");
 
 static const u8 sAeroblastDescription[] = _(
-	"Launches a vacuumed blast.\n"
-	"High critical-hit ratio.");
+    "Launches a vacuumed blast.\n"
+    "High critical-hit ratio.");
 
 static const u8 sCottonSporeDescription[] = _(
-	"Spores cling to the foe,\n"
-	"sharply reducing SPEED.");
+    "Spores cling to the foe,\n"
+    "sharply reducing SPEED.");
 
 static const u8 sReversalDescription[] = _(
-	"Inflicts more damage when\n"
-	"the user’s HP is down.");
+    "Inflicts more damage when\n"
+    "the user’s HP is down.");
 
 static const u8 sSpiteDescription[] = _(
-	"Spitefully cuts the PP\n"
-	"of the foe’s last move.");
+    "Spitefully cuts the PP\n"
+    "of the foe’s last move.");
 
 static const u8 sPowderSnowDescription[] = _(
-	"Blasts the foe with a snowy\n"
-	"gust. May cause freezing.");
+    "Blasts the foe with a snowy\n"
+    "gust. May cause freezing.");
 
 static const u8 sProtectDescription[] = _(
-	"Evades attack, but may fail\n"
-	"if used in succession.");
+    "Evades attack, but may fail\n"
+    "if used in succession.");
 
 static const u8 sMachPunchDescription[] = _(
-	"A punch is thrown at wicked\n"
-	"speed to strike first.");
+    "A punch is thrown at wicked\n"
+    "speed to strike first.");
 
 static const u8 sScaryFaceDescription[] = _(
-	"Frightens with a scary face\n"
-	"to sharply reduce SPEED.");
+    "Frightens with a scary face\n"
+    "to sharply reduce SPEED.");
 
 static const u8 sFaintAttackDescription[] = _(
-	"Draws the foe close, then\n"
-	"strikes without fail.");
+    "Draws the foe close, then\n"
+    "strikes without fail.");
 
 static const u8 sSweetKissDescription[] = _(
-	"Demands a kiss with a cute\n"
-	"look. May cause confusion.");
+    "Demands a kiss with a cute\n"
+    "look. May cause confusion.");
 
 static const u8 sBellyDrumDescription[] = _(
-	"Maximizes ATTACK while\n"
-	"sacrificing HP.");
+    "Maximizes ATTACK while\n"
+    "sacrificing HP.");
 
 static const u8 sSludgeBombDescription[] = _(
-	"Sludge is hurled to inflict\n"
-	"damage. May also poison.");
+    "Sludge is hurled to inflict\n"
+    "damage. May also poison.");
 
 static const u8 sMudSlapDescription[] = _(
-	"Hurls mud in the foe’s face\n"
-	"to reduce its accuracy.");
+    "Hurls mud in the foe’s face\n"
+    "to reduce its accuracy.");
 
 static const u8 sOctazookaDescription[] = _(
-	"Fires a lump of ink to\n"
-	"damage and cut accuracy.");
+    "Fires a lump of ink to\n"
+    "damage and cut accuracy.");
 
 static const u8 sSpikesDescription[] = _(
-	"Sets spikes that hurt a \n"
-	"foe switching in.");
+    "Sets spikes that hurt a \n"
+    "foe switching in.");
 
 static const u8 sZapCannonDescription[] = _(
-	"Powerful and sure to cause\n"
-	"paralysis, but inaccurate.");
+    "Powerful and sure to cause\n"
+    "paralysis, but inaccurate.");
 
 static const u8 sForesightDescription[] = _(
-	"Negates the foe’s efforts\n"
-	"to heighten evasiveness.");
+    "Negates the foe’s efforts\n"
+    "to heighten evasiveness.");
 
 static const u8 sDestinyBondDescription[] = _(
-	"If the user faints, the foe\n"
-	"is also made to faint.");
+    "If the user faints, the foe\n"
+    "is also made to faint.");
 
 static const u8 sPerishSongDescription[] = _(
-	"Any POKéMON hearing this\n"
-	"song faints in 3 turns.");
+    "Any POKéMON hearing this\n"
+    "song faints in 3 turns.");
 
 static const u8 sIcyWindDescription[] = _(
-	"A chilling attack that\n"
-	"lowers the foe’s SPEED.");
+    "A chilling attack that\n"
+    "lowers the foe’s SPEED.");
 
 static const u8 sDetectDescription[] = _(
-	"Evades attack, but may fail\n"
-	"if used in succession.");
+    "Evades attack, but may fail\n"
+    "if used in succession.");
 
 static const u8 sBoneRushDescription[] = _(
-	"Strikes the foe with a bone\n"
-	"in hand 2 to 5 times.");
+    "Strikes the foe with a bone\n"
+    "in hand 2 to 5 times.");
 
 static const u8 sLockOnDescription[] = _(
-	"Locks on to the foe to\n"
-	"ensure the next move hits.");
+    "Locks on to the foe to\n"
+    "ensure the next move hits.");
 
 static const u8 sOutrageDescription[] = _(
-	"A rampage of 2 to 3 turns\n"
-	"that confuses the user.");
+    "A rampage of 2 to 3 turns\n"
+    "that confuses the user.");
 
 static const u8 sSandstormDescription[] = _(
-	"Causes a sandstorm that\n"
-	"rages for several turns.");
+    "Causes a sandstorm that\n"
+    "rages for several turns.");
 
 static const u8 sGigaDrainDescription[] = _(
-	"An attack that steals half\n"
-	"the damage inflicted.");
+    "An attack that steals half\n"
+    "the damage inflicted.");
 
 static const u8 sEndureDescription[] = _(
-	"Endures any attack for\n"
-	"1 turn, leaving at least 1HP.");
+    "Endures any attack for\n"
+    "1 turn, leaving at least 1HP.");
 
 static const u8 sCharmDescription[] = _(
-	"Charms the foe and sharply\n"
-	"reduces its ATTACK.");
+    "Charms the foe and sharply\n"
+    "reduces its ATTACK.");
 
 static const u8 sRolloutDescription[] = _(
-	"An attack lasting 5 turns\n"
-	"with rising intensity.");
+    "An attack lasting 5 turns\n"
+    "with rising intensity.");
 
 static const u8 sFalseSwipeDescription[] = _(
-	"An attack that leaves the\n"
-	"foe with at least 1 HP.");
+    "An attack that leaves the\n"
+    "foe with at least 1 HP.");
 
 static const u8 sSwaggerDescription[] = _(
-	"Confuses the foe, but also\n"
-	"sharply raises ATTACK.");
+    "Confuses the foe, but also\n"
+    "sharply raises ATTACK.");
 
 static const u8 sMilkDrinkDescription[] = _(
-	"Recovers up to half the\n"
-	"user’s maximum HP.");
+    "Recovers up to half the\n"
+    "user’s maximum HP.");
 
 static const u8 sSparkDescription[] = _(
-	"An electrified tackle that\n"
-	"may paralyze the foe.");
+    "An electrified tackle that\n"
+    "may paralyze the foe.");
 
 static const u8 sFuryCutterDescription[] = _(
-	"An attack that intensifies\n"
-	"on each successive hit.");
+    "An attack that intensifies\n"
+    "on each successive hit.");
 
 static const u8 sSteelWingDescription[] = _(
-	"Strikes the foe with hard\n"
-	"wings spread wide.");
+    "Strikes the foe with hard\n"
+    "wings spread wide.");
 
 static const u8 sMeanLookDescription[] = _(
-	"Fixes the foe with a mean\n"
-	"look that prevents escape.");
+    "Fixes the foe with a mean\n"
+    "look that prevents escape.");
 
 static const u8 sAttractDescription[] = _(
-	"Makes the opposite gender\n"
-	"less likely to attack.");
+    "Makes the opposite gender\n"
+    "less likely to attack.");
 
 static const u8 sSleepTalkDescription[] = _(
-	"Uses an available move\n"
-	"randomly while asleep.");
+    "Uses an available move\n"
+    "randomly while asleep.");
 
 static const u8 sHealBellDescription[] = _(
-	"Chimes soothingly to heal\n"
-	"all status abnormalities.");
+    "Chimes soothingly to heal\n"
+    "all status abnormalities.");
 
 static const u8 sReturnDescription[] = _(
-	"An attack that increases\n"
-	"in power with friendship.");
+    "An attack that increases\n"
+    "in power with friendship.");
 
 static const u8 sPresentDescription[] = _(
-	"A gift in the form of a\n"
-	"bomb. May restore HP.");
+    "A gift in the form of a\n"
+    "bomb. May restore HP.");
 
 static const u8 sFrustrationDescription[] = _(
-	"An attack that is stronger\n"
-	"if the TRAINER is disliked.");
+    "An attack that is stronger\n"
+    "if the TRAINER is disliked.");
 
 static const u8 sSafeguardDescription[] = _(
-	"A mystical force prevents\n"
-	"all status problems.");
+    "A mystical force prevents\n"
+    "all status problems.");
 
 static const u8 sPainSplitDescription[] = _(
-	"Adds the user and foe’s HP,\n"
-	"then shares them equally.");
+    "Adds the user and foe’s HP,\n"
+    "then shares them equally.");
 
 static const u8 sSacredFireDescription[] = _(
-	"A mystical fire attack that\n"
-	"may inflict a burn.");
+    "A mystical fire attack that\n"
+    "may inflict a burn.");
 
 static const u8 sMagnitudeDescription[] = _(
-	"A ground-shaking attack\n"
-	"of random intensity.");
+    "A ground-shaking attack\n"
+    "of random intensity.");
 
 static const u8 sDynamicPunchDescription[] = _(
-	"Powerful and sure to cause\n"
-	"confusion, but inaccurate.");
+    "Powerful and sure to cause\n"
+    "confusion, but inaccurate.");
 
 static const u8 sMegahornDescription[] = _(
-	"A brutal ramming attack\n"
-	"using out-thrust horns.");
+    "A brutal ramming attack\n"
+    "using out-thrust horns.");
 
 static const u8 sDragonBreathDescription[] = _(
-	"Strikes the foe with an\n"
-	"incredible blast of breath.");
+    "Strikes the foe with an\n"
+    "incredible blast of breath.");
 
 static const u8 sBatonPassDescription[] = _(
-	"Switches out the user while\n"
-	"keeping effects in play.");
+    "Switches out the user while\n"
+    "keeping effects in play.");
 
 static const u8 sEncoreDescription[] = _(
-	"Makes the foe repeat its\n"
-	"last move over 2 to 6 turns.");
+    "Makes the foe repeat its\n"
+    "last move over 2 to 6 turns.");
 
 static const u8 sPursuitDescription[] = _(
-	"Inflicts bad damage if used\n"
-	"on a foe switching out.");
+    "Inflicts bad damage if used\n"
+    "on a foe switching out.");
 
 static const u8 sRapidSpinDescription[] = _(
-	"Spins the body at high\n"
-	"speed to strike the foe.");
+    "Spins the body at high\n"
+    "speed to strike the foe.");
 
 static const u8 sSweetScentDescription[] = _(
-	"Allures the foe to reduce\n"
-	"evasiveness.");
+    "Allures the foe to reduce\n"
+    "evasiveness.");
 
 static const u8 sIronTailDescription[] = _(
-	"Attacks with a rock-hard\n"
-	"tail. May lower DEFENSE.");
+    "Attacks with a rock-hard\n"
+    "tail. May lower DEFENSE.");
 
 static const u8 sMetalClawDescription[] = _(
-	"A claw attack that may\n"
-	"raise the user’s ATTACK.");
+    "A claw attack that may\n"
+    "raise the user’s ATTACK.");
 
 static const u8 sVitalThrowDescription[] = _(
-	"Makes the user’s move last,\n"
-	"but it never misses.");
+    "Makes the user’s move last,\n"
+    "but it never misses.");
 
 static const u8 sMorningSunDescription[] = _(
-	"Restores HP. The amount\n"
-	"varies with the weather.");
+    "Restores HP. The amount\n"
+    "varies with the weather.");
 
 static const u8 sSynthesisDescription[] = _(
-	"Restores HP. The amount\n"
-	"varies with the weather.");
+    "Restores HP. The amount\n"
+    "varies with the weather.");
 
 static const u8 sMoonlightDescription[] = _(
-	"Restores HP. The amount\n"
-	"varies with the weather.");
+    "Restores HP. The amount\n"
+    "varies with the weather.");
 
 static const u8 sHiddenPowerDescription[] = _(
-	"The effectiveness varies\n"
-	"with the user.");
+    "The effectiveness varies\n"
+    "with the user.");
 
 static const u8 sCrossChopDescription[] = _(
-	"A double-chopping attack.\n"
-	"High critical-hit ratio.");
+    "A double-chopping attack.\n"
+    "High critical-hit ratio.");
 
 static const u8 sTwisterDescription[] = _(
-	"Whips up a vicious twister\n"
-	"to tear at the foe.");
+    "Whips up a vicious twister\n"
+    "to tear at the foe.");
 
 static const u8 sRainDanceDescription[] = _(
-	"Boosts the power of WATER-\n"
-	"type moves for 5 turns.");
+    "Boosts the power of WATER-\n"
+    "type moves for 5 turns.");
 
 static const u8 sSunnyDayDescription[] = _(
-	"Boosts the power of FIRE-\n"
-	"type moves for 5 turns.");
+    "Boosts the power of FIRE-\n"
+    "type moves for 5 turns.");
 
 static const u8 sCrunchDescription[] = _(
-	"Crunches with sharp fangs.\n"
-	"May lower SP. DEF.");
+    "Crunches with sharp fangs.\n"
+    "May lower SP. DEF.");
 
 static const u8 sMirrorCoatDescription[] = _(
-	"Counters the foe’s special\n"
-	"attack at double the power.");
+    "Counters the foe’s special\n"
+    "attack at double the power.");
 
 static const u8 sPsychUpDescription[] = _(
-	"Copies the foe’s effect(s)\n"
-	"and gives to the user.");
+    "Copies the foe’s effect(s)\n"
+    "and gives to the user.");
 
 static const u8 sExtremeSpeedDescription[] = _(
-	"An extremely fast and\n"
-	"powerful attack.");
+    "An extremely fast and\n"
+    "powerful attack.");
 
 static const u8 sAncientPowerDescription[] = _(
-	"An attack that may raise\n"
-	"all stats.");
+    "An attack that may raise\n"
+    "all stats.");
 
 static const u8 sShadowBallDescription[] = _(
-	"Hurls a black blob that may\n"
-	"lower the foe’s SP. DEF.");
+    "Hurls a black blob that may\n"
+    "lower the foe’s SP. DEF.");
 
 static const u8 sFutureSightDescription[] = _(
-	"Heightens inner power to\n"
-	"strike 2 turns later.");
+    "Heightens inner power to\n"
+    "strike 2 turns later.");
 
 static const u8 sRockSmashDescription[] = _(
-	"A rock-crushing attack\n"
-	"that may lower DEFENSE.");
+    "A rock-crushing attack\n"
+    "that may lower DEFENSE.");
 
 static const u8 sWhirlpoolDescription[] = _(
-	"Traps and hurts the foe in\n"
-	"a whirlpool for 2 to 5 turns.");
+    "Traps and hurts the foe in\n"
+    "a whirlpool for 2 to 5 turns.");
 
 static const u8 sBeatUpDescription[] = _(
-	"Summons party POKéMON to\n"
-	"join in the attack.");
+    "Summons party POKéMON to\n"
+    "join in the attack.");
 
 static const u8 sFakeOutDescription[] = _(
-	"A 1st-turn, 1st-strike move\n"
-	"that causes flinching.");
+    "A 1st-turn, 1st-strike move\n"
+    "that causes flinching.");
 
 static const u8 sUproarDescription[] = _(
-	"Causes an uproar for 2 to 5\n"
-	"turns and prevents sleep.");
+    "Causes an uproar for 2 to 5\n"
+    "turns and prevents sleep.");
 
 static const u8 sStockpileDescription[] = _(
-	"Charges up power for up to\n"
-	"3 turns.");
+    "Charges up power for up to\n"
+    "3 turns.");
 
 static const u8 sSpitUpDescription[] = _(
-	"Releases stockpiled power\n"
-	"(the more the better).");
+    "Releases stockpiled power\n"
+    "(the more the better).");
 
 static const u8 sSwallowDescription[] = _(
-	"Absorbs stockpiled power\n"
-	"and restores HP.");
+    "Absorbs stockpiled power\n"
+    "and restores HP.");
 
 static const u8 sHeatWaveDescription[] = _(
-	"Exhales a hot breath on the\n"
-	"foe. May inflict a burn.");
+    "Exhales a hot breath on the\n"
+    "foe. May inflict a burn.");
 
 static const u8 sHailDescription[] = _(
-	"Summons a hailstorm that\n"
-	"strikes every turn.");
+    "Summons a hailstorm that\n"
+    "strikes every turn.");
 
 static const u8 sTormentDescription[] = _(
-	"Torments the foe and stops\n"
-	"successive use of a move.");
+    "Torments the foe and stops\n"
+    "successive use of a move.");
 
 static const u8 sFlatterDescription[] = _(
-	"Confuses the foe, but\n"
-	"raises its SP. ATK.");
+    "Confuses the foe, but\n"
+    "raises its SP. ATK.");
 
 static const u8 sWillOWispDescription[] = _(
-	"Inflicts a burn on the foe\n"
-	"with intense fire.");
+    "Inflicts a burn on the foe\n"
+    "with intense fire.");
 
 static const u8 sMementoDescription[] = _(
-	"The user faints and lowers\n"
-	"the foe’s abilities.");
+    "The user faints and lowers\n"
+    "the foe’s abilities.");
 
 static const u8 sFacadeDescription[] = _(
-	"Boosts ATTACK when burned,\n"
-	"paralyzed, or poisoned.");
+    "Boosts ATTACK when burned,\n"
+    "paralyzed, or poisoned.");
 
 static const u8 sFocusPunchDescription[] = _(
-	"A powerful loyalty attack.\n"
-	"The user flinches if hit.");
+    "A powerful loyalty attack.\n"
+    "The user flinches if hit.");
 
 static const u8 sSmellingSaltDescription[] = _(
-	"Powerful against paralyzed\n"
-	"foes, but also heals them.");
+    "Powerful against paralyzed\n"
+    "foes, but also heals them.");
 
 static const u8 sFollowMeDescription[] = _(
-	"Draws attention to make\n"
-	"foes attack only the user.");
+    "Draws attention to make\n"
+    "foes attack only the user.");
 
 static const u8 sNaturePowerDescription[] = _(
-	"The type of attack varies\n"
-	"depending on the location.");
+    "The type of attack varies\n"
+    "depending on the location.");
 
 static const u8 sChargeDescription[] = _(
-	"Charges power to boost the\n"
-	"electric move used next.");
+    "Charges power to boost the\n"
+    "electric move used next.");
 
 static const u8 sTauntDescription[] = _(
-	"Taunts the foe into only\n"
-	"using attack moves.");
+    "Taunts the foe into only\n"
+    "using attack moves.");
 
 static const u8 sHelpingHandDescription[] = _(
-	"Boosts the power of the\n"
-	"recipient’s moves.");
+    "Boosts the power of the\n"
+    "recipient’s moves.");
 
 static const u8 sTrickDescription[] = _(
-	"Tricks the foe into trading\n"
-	"held items.");
+    "Tricks the foe into trading\n"
+    "held items.");
 
 static const u8 sRolePlayDescription[] = _(
-	"Mimics the target and\n"
-	"copies its special ability.");
+    "Mimics the target and\n"
+    "copies its special ability.");
 
 static const u8 sWishDescription[] = _(
-	"A wish that restores HP.\n"
-	"It takes time to work.");
+    "A wish that restores HP.\n"
+    "It takes time to work.");
 
 static const u8 sAssistDescription[] = _(
-	"Attacks randomly with one\n"
-	"of the partner’s moves.");
+    "Attacks randomly with one\n"
+    "of the partner’s moves.");
 
 static const u8 sIngrainDescription[] = _(
-	"Lays roots that restore HP.\n"
-	"The user can’t switch out.");
+    "Lays roots that restore HP.\n"
+    "The user can’t switch out.");
 
 static const u8 sSuperpowerDescription[] = _(
-	"Boosts strength sharply,\n"
-	"but lowers abilities.");
+    "Boosts strength sharply,\n"
+    "but lowers abilities.");
 
 static const u8 sMagicCoatDescription[] = _(
-	"Reflects special effects\n"
-	"back to the attacker.");
+    "Reflects special effects\n"
+    "back to the attacker.");
 
 static const u8 sRecycleDescription[] = _(
-	"Recycles a used item for\n"
-	"one more use.");
+    "Recycles a used item for\n"
+    "one more use.");
 
 static const u8 sRevengeDescription[] = _(
-	"An attack that gains power\n"
-	"if injured by the foe.");
+    "An attack that gains power\n"
+    "if injured by the foe.");
 
 static const u8 sBrickBreakDescription[] = _(
-	"Destroys barriers such as\n"
-	"REFLECT and causes damage.");
+    "Destroys barriers such as\n"
+    "REFLECT and causes damage.");
 
 static const u8 sYawnDescription[] = _(
-	"Lulls the foe into yawning,\n"
-	"then sleeping next turn.");
+    "Lulls the foe into yawning,\n"
+    "then sleeping next turn.");
 
 static const u8 sKnockOffDescription[] = _(
-	"Knocks down the foe’s held\n"
-	"item to prevent its use.");
+    "Knocks down the foe’s held\n"
+    "item to prevent its use.");
 
 static const u8 sEndeavorDescription[] = _(
-	"Gains power if the user’s HP\n"
-	"is lower than the foe’s HP.");
+    "Gains power if the user’s HP\n"
+    "is lower than the foe’s HP.");
 
 static const u8 sEruptionDescription[] = _(
-	"The higher the user’s HP,\n"
-	"the more damage caused.");
+    "The higher the user’s HP,\n"
+    "the more damage caused.");
 
 static const u8 sSkillSwapDescription[] = _(
-	"The user swaps special\n"
-	"abilities with the target.");
+    "The user swaps special\n"
+    "abilities with the target.");
 
 static const u8 sImprisonDescription[] = _(
-	"Prevents foes from using\n"
-	"moves known by the user.");
+    "Prevents foes from using\n"
+    "moves known by the user.");
 
 static const u8 sRefreshDescription[] = _(
-	"Heals poisoning, paralysis,\n"
-	"or a burn.");
+    "Heals poisoning, paralysis,\n"
+    "or a burn.");
 
 static const u8 sGrudgeDescription[] = _(
-	"If the user faints, deletes\n"
-	"all PP of foe’s last move.");
+    "If the user faints, deletes\n"
+    "all PP of foe’s last move.");
 
 static const u8 sSnatchDescription[] = _(
-	"Steals the effects of the\n"
-	"move the target uses next.");
+    "Steals the effects of the\n"
+    "move the target uses next.");
 
 static const u8 sSecretPowerDescription[] = _(
-	"An attack with effects\n"
-	"that vary by location.");
+    "An attack with effects\n"
+    "that vary by location.");
 
 static const u8 sDiveDescription[] = _(
-	"Dives underwater the first\n"
-	"turn and strikes next turn.");
+    "Dives underwater the first\n"
+    "turn and strikes next turn.");
 
 static const u8 sArmThrustDescription[] = _(
-	"Straight-arm punches that\n"
-	"strike the foe 2 to 5 times.");
+    "Straight-arm punches that\n"
+    "strike the foe 2 to 5 times.");
 
 static const u8 sCamouflageDescription[] = _(
-	"Alters the POKéMON’s type\n"
-	"depending on the location.");
+    "Alters the POKéMON’s type\n"
+    "depending on the location.");
 
 static const u8 sTailGlowDescription[] = _(
-	"Flashes a light that sharply\n"
-	"raises SP. ATK.");
+    "Flashes a light that sharply\n"
+    "raises SP. ATK.");
 
 static const u8 sLusterPurgeDescription[] = _(
-	"Attacks with a burst of\n"
-	"light. May lower SP. DEF.");
+    "Attacks with a burst of\n"
+    "light. May lower SP. DEF.");
 
 static const u8 sMistBallDescription[] = _(
-	"Attacks with a flurry of\n"
-	"down. May lower SP. ATK.");
+    "Attacks with a flurry of\n"
+    "down. May lower SP. ATK.");
 
 static const u8 sFeatherDanceDescription[] = _(
-	"Envelops the foe with down\n"
-	"to sharply reduce ATTACK.");
+    "Envelops the foe with down\n"
+    "to sharply reduce ATTACK.");
 
 static const u8 sTeeterDanceDescription[] = _(
-	"Confuses all POKéMON on\n"
-	"the scene.");
+    "Confuses all POKéMON on\n"
+    "the scene.");
 
 static const u8 sBlazeKickDescription[] = _(
-	"A kick with a high critical-\n"
-	"hit ratio. May cause a burn.");
+    "A kick with a high critical-\n"
+    "hit ratio. May cause a burn.");
 
 static const u8 sMudSportDescription[] = _(
-	"Covers the user in mud to\n"
-	"raise electrical resistance.");
+    "Covers the user in mud to\n"
+    "raise electrical resistance.");
 
 static const u8 sIceBallDescription[] = _(
-	"A 5-turn attack that gains\n"
-	"power on successive hits.");
+    "A 5-turn attack that gains\n"
+    "power on successive hits.");
 
 static const u8 sNeedleArmDescription[] = _(
-	"Attacks with thorny arms.\n"
-	"May cause flinching.");
+    "Attacks with thorny arms.\n"
+    "May cause flinching.");
 
 static const u8 sSlackOffDescription[] = _(
-	"Slacks off and restores\n"
-	"half the maximum HP.");
+    "Slacks off and restores\n"
+    "half the maximum HP.");
 
 static const u8 sHyperVoiceDescription[] = _(
-	"A loud attack that uses\n"
-	"sound waves to injure.");
+    "A loud attack that uses\n"
+    "sound waves to injure.");
 
 static const u8 sPoisonFangDescription[] = _(
-	"A sharp-fanged attack.\n"
-	"May badly poison the foe.");
+    "A sharp-fanged attack.\n"
+    "May badly poison the foe.");
 
 static const u8 sCrushClawDescription[] = _(
-	"Tears at the foe with sharp\n"
-	"claws. May lower DEFENSE.");
+    "Tears at the foe with sharp\n"
+    "claws. May lower DEFENSE.");
 
 static const u8 sBlastBurnDescription[] = _(
-	"Powerful, but leaves the\n"
-	"user immobile the next turn.");
+    "Powerful, but leaves the\n"
+    "user immobile the next turn.");
 
 static const u8 sHydroCannonDescription[] = _(
-	"Powerful, but leaves the\n"
-	"user immobile the next turn.");
+    "Powerful, but leaves the\n"
+    "user immobile the next turn.");
 
 static const u8 sMeteorMashDescription[] = _(
-	"Fires a meteor-like punch.\n"
-	"May raise ATTACK.");
+    "Fires a meteor-like punch.\n"
+    "May raise ATTACK.");
 
 static const u8 sAstonishDescription[] = _(
-	"An attack that may shock\n"
-	"the foe into flinching.");
+    "An attack that may shock\n"
+    "the foe into flinching.");
 
 static const u8 sWeatherBallDescription[] = _(
-	"The move’s type and power\n"
-	"change with the weather.");
+    "The move’s type and power\n"
+    "change with the weather.");
 
 static const u8 sAromatherapyDescription[] = _(
-	"Heals all status problems\n"
-	"with a soothing scent.");
+    "Heals all status problems\n"
+    "with a soothing scent.");
 
 static const u8 sFakeTearsDescription[] = _(
-	"Feigns crying to sharply\n"
-	"lower the foe’s SP. DEF.");
+    "Feigns crying to sharply\n"
+    "lower the foe’s SP. DEF.");
 
 static const u8 sAirCutterDescription[] = _(
-	"Hacks with razorlike wind.\n"
-	"High critical-hit ratio.");
+    "Hacks with razorlike wind.\n"
+    "High critical-hit ratio.");
 
 static const u8 sOverheatDescription[] = _(
-	"Allows a full-power attack,\n"
-	"but sharply lowers SP. ATK.");
+    "Allows a full-power attack,\n"
+    "but sharply lowers SP. ATK.");
 
 static const u8 sOdorSleuthDescription[] = _(
-	"Negates the foe’s efforts\n"
-	"to heighten evasiveness.");
+    "Negates the foe’s efforts\n"
+    "to heighten evasiveness.");
 
 static const u8 sRockTombDescription[] = _(
-	"Stops the foe from moving\n"
-	"with rocks and cuts SPEED.");
+    "Stops the foe from moving\n"
+    "with rocks and cuts SPEED.");
 
 static const u8 sSilverWindDescription[] = _(
-	"A powdery attack that may\n"
-	"raise abilities.");
+    "A powdery attack that may\n"
+    "raise abilities.");
 
 static const u8 sMetalSoundDescription[] = _(
-	"Emits a horrible screech\n"
-	"that sharply lowers SP. DEF.");
+    "Emits a horrible screech\n"
+    "that sharply lowers SP. DEF.");
 
 static const u8 sGrassWhistleDescription[] = _(
-	"Lulls the foe into sleep\n"
-	"with a pleasant melody.");
+    "Lulls the foe into sleep\n"
+    "with a pleasant melody.");
 
 static const u8 sTickleDescription[] = _(
-	"Makes the foe laugh to\n"
-	"lower ATTACK and DEFENSE.");
+    "Makes the foe laugh to\n"
+    "lower ATTACK and DEFENSE.");
 
 static const u8 sCosmicPowerDescription[] = _(
-	"Raises DEFENSE and SP. DEF\n"
-	"with a mystic power.");
+    "Raises DEFENSE and SP. DEF\n"
+    "with a mystic power.");
 
 static const u8 sWaterSpoutDescription[] = _(
-	"Inflicts more damage if the\n"
-	"user’s HP is high.");
+    "Inflicts more damage if the\n"
+    "user’s HP is high.");
 
 static const u8 sSignalBeamDescription[] = _(
-	"A strange beam attack that\n"
-	"may confuse the foe.");
+    "A strange beam attack that\n"
+    "may confuse the foe.");
 
 static const u8 sShadowPunchDescription[] = _(
-	"An unavoidable punch that\n"
-	"is thrown from shadows.");
+    "An unavoidable punch that\n"
+    "is thrown from shadows.");
 
 static const u8 sExtrasensoryDescription[] = _(
-	"Attacks with a peculiar\n"
-	"power. May cause flinching.");
+    "Attacks with a peculiar\n"
+    "power. May cause flinching.");
 
 static const u8 sSkyUppercutDescription[] = _(
-	"An uppercut thrown as if\n"
-	"leaping into the sky.");
+    "An uppercut thrown as if\n"
+    "leaping into the sky.");
 
 static const u8 sSandTombDescription[] = _(
-	"Traps and hurts the foe in\n"
-	"quicksand for 2 to 5 turns.");
+    "Traps and hurts the foe in\n"
+    "quicksand for 2 to 5 turns.");
 
 static const u8 sSheerColdDescription[] = _(
-	"A chilling attack that\n"
-	"causes fainting if it hits.");
+    "A chilling attack that\n"
+    "causes fainting if it hits.");
 
 static const u8 sMuddyWaterDescription[] = _(
-	"Attacks with muddy water.\n"
-	"May lower accuracy.");
+    "Attacks with muddy water.\n"
+    "May lower accuracy.");
 
 static const u8 sBulletSeedDescription[] = _(
-	"Shoots 2 to 5 seeds in a row\n"
-	"to strike the foe.");
+    "Shoots 2 to 5 seeds in a row\n"
+    "to strike the foe.");
 
 static const u8 sAerialAceDescription[] = _(
-	"An extremely speedy and\n"
-	"unavoidable attack.");
+    "An extremely speedy and\n"
+    "unavoidable attack.");
 
 static const u8 sIcicleSpearDescription[] = _(
-	"Attacks the foe by firing\n"
-	"2 to 5 icicles in a row.");
+    "Attacks the foe by firing\n"
+    "2 to 5 icicles in a row.");
 
 static const u8 sIronDefenseDescription[] = _(
-	"Hardens the body’s surface\n"
-	"to sharply raise DEFENSE.");
+    "Hardens the body’s surface\n"
+    "to sharply raise DEFENSE.");
 
 static const u8 sBlockDescription[] = _(
-	"Blocks the foe’s way to\n"
-	"prevent escape.");
+    "Blocks the foe’s way to\n"
+    "prevent escape.");
 
 static const u8 sHowlDescription[] = _(
-	"Howls to raise the spirit\n"
-	"and boosts ATTACK.");
+    "Howls to raise the spirit\n"
+    "and boosts ATTACK.");
 
 static const u8 sDragonClawDescription[] = _(
-	"Slashes the foe with sharp\n"
-	"claws.");
+    "Slashes the foe with sharp\n"
+    "claws.");
 
 static const u8 sFrenzyPlantDescription[] = _(
-	"Powerful, but leaves the\n"
-	"user immobile the next turn.");
+    "Powerful, but leaves the\n"
+    "user immobile the next turn.");
 
 static const u8 sBulkUpDescription[] = _(
-	"Bulks up the body to boost\n"
-	"both ATTACK and DEFENSE.");
+    "Bulks up the body to boost\n"
+    "both ATTACK and DEFENSE.");
 
 static const u8 sBounceDescription[] = _(
-	"Bounces up, then down the\n"
-	"next turn. May paralyze.");
+    "Bounces up, then down the\n"
+    "next turn. May paralyze.");
 
 static const u8 sMudShotDescription[] = _(
-	"Hurls mud at the foe and\n"
-	"reduces SPEED.");
+    "Hurls mud at the foe and\n"
+    "reduces SPEED.");
 
 static const u8 sPoisonTailDescription[] = _(
-	"Has a high critical-hit\n"
-	"ratio. May also poison.");
+    "Has a high critical-hit\n"
+    "ratio. May also poison.");
 
 static const u8 sCovetDescription[] = _(
-	"Cutely begs to obtain an\n"
-	"item held by the foe.");
+    "Cutely begs to obtain an\n"
+    "item held by the foe.");
 
 static const u8 sVoltTackleDescription[] = _(
-	"A life-risking tackle that\n"
-	"slightly hurts the user.");
+    "A life-risking tackle that\n"
+    "slightly hurts the user.");
 
 static const u8 sMagicalLeafDescription[] = _(
-	"Attacks with a strange leaf\n"
-	"that cannot be evaded.");
+    "Attacks with a strange leaf\n"
+    "that cannot be evaded.");
 
 static const u8 sWaterSportDescription[] = _(
-	"The user becomes soaked to\n"
-	"raise resistance to fire.");
+    "The user becomes soaked to\n"
+    "raise resistance to fire.");
 
 static const u8 sCalmMindDescription[] = _(
-	"Raises SP. ATK and SP. DEF\n"
-	"by focusing the mind.");
+    "Raises SP. ATK and SP. DEF\n"
+    "by focusing the mind.");
 
 static const u8 sLeafBladeDescription[] = _(
-	"Slashes with a sharp leaf.\n"
-	"High critical-hit ratio.");
+    "Slashes with a sharp leaf.\n"
+    "High critical-hit ratio.");
 
 static const u8 sDragonDanceDescription[] = _(
-	"A mystical dance that ups\n"
-	"ATTACK and SPEED.");
+    "A mystical dance that ups\n"
+    "ATTACK and SPEED.");
 
 static const u8 sRockBlastDescription[] = _(
-	"Hurls boulders at the foe\n"
-	"2 to 5 times in a row.");
+    "Hurls boulders at the foe\n"
+    "2 to 5 times in a row.");
 
 static const u8 sShockWaveDescription[] = _(
-	"A fast and unavoidable\n"
-	"electric attack.");
+    "A fast and unavoidable\n"
+    "electric attack.");
 
 static const u8 sWaterPulseDescription[] = _(
-	"Attacks with ultrasonic\n"
-	"waves. May confuse the foe.");
+    "Attacks with ultrasonic\n"
+    "waves. May confuse the foe.");
 
 static const u8 sDoomDesireDescription[] = _(
-	"Summons strong sunlight to\n"
-	"attack 2 turns later.");
+    "Summons strong sunlight to\n"
+    "attack 2 turns later.");
 
 static const u8 sPsychoBoostDescription[] = _(
-	"Allows a full-power attack,\n"
-	"but sharply lowers SP. ATK.");
+    "Allows a full-power attack,\n"
+    "but sharply lowers SP. ATK.");
 
 // MOVE_NONE is ignored in this table. Make sure to always subtract 1 before getting the right pointer.
 const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] =
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 20a6ec75d..b4438e5b3 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,12436 +1,12436 @@
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer1[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_GEODUDE,
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_GEODUDE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle1[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_LOTAD,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_SEEDOT,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_TAILLOW,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_LOTAD,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_SEEDOT,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_TAILLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = {
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcel[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_SHIFTRY,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_SHIFTRY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alberto[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ed[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_ZANGOOSE,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_SEVIPER,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_ZANGOOSE,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_SEVIPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Declan[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = {
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fredrick[] = {
-	{
-	.iv = 100,
-	.lvl = 30,
-	.species = SPECIES_MAKUHITA,
-	},
-	{
-	.iv = 100,
-	.lvl = 30,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 100,
+    .lvl = 30,
+    .species = SPECIES_MAKUHITA,
+    },
+    {
+    .iv = 100,
+    .lvl = 30,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt[] = {
-	{
-	.iv = 50,
-	.lvl = 34,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 50,
-	.lvl = 34,
-	.species = SPECIES_GOLBAT,
-	}
+    {
+    .iv = 50,
+    .lvl = 34,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 50,
+    .lvl = 34,
+    .species = SPECIES_GOLBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Zander[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = {
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_CARVANHA,
-	},
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_CARVANHA,
+    },
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = {
-	{
-	.iv = 100,
-	.lvl = 37,
-	.species = SPECIES_SHARPEDO,
-	},
-	{
-	.iv = 100,
-	.lvl = 37,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 100,
+    .lvl = 37,
+    .species = SPECIES_SHARPEDO,
+    },
+    {
+    .iv = 100,
+    .lvl = 37,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie[] = {
-	{
-	.iv = 150,
-	.lvl = 41,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 150,
-	.lvl = 41,
-	.species = SPECIES_CROBAT,
-	},
-	{
-	.iv = 150,
-	.lvl = 43,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 150,
+    .lvl = 41,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 150,
+    .lvl = 41,
+    .species = SPECIES_CROBAT,
+    },
+    {
+    .iv = 150,
+    .lvl = 43,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leah[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_SPOINK,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_SPOINK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Felix[] = {
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_MEDICHAM,
-	.moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_CLAYDOL,
-	.moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_MEDICHAM,
+    .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_CLAYDOL,
+    .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_GLOOM,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_GLOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = {
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = {
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = {
-	{
-	.iv = 50,
-	.lvl = 23,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 50,
+    .lvl = 23,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = {
-	{
-	.iv = 50,
-	.lvl = 27,
-	.species = SPECIES_BALTOY,
-	.moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER
-	},
-	{
-	.iv = 50,
-	.lvl = 27,
-	.species = SPECIES_SANDSHREW,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	},
-	{
-	.iv = 50,
-	.lvl = 27,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 50,
+    .lvl = 27,
+    .species = SPECIES_BALTOY,
+    .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER
+    },
+    {
+    .iv = 50,
+    .lvl = 27,
+    .species = SPECIES_SANDSHREW,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    },
+    {
+    .iv = 50,
+    .lvl = 27,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = {
-	{
-	.iv = 100,
-	.lvl = 25,
-	.species = SPECIES_SANDSHREW,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	},
-	{
-	.iv = 100,
-	.lvl = 25,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 100,
+    .lvl = 25,
+    .species = SPECIES_SANDSHREW,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    },
+    {
+    .iv = 100,
+    .lvl = 25,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = {
-	{
-	.iv = 60,
-	.lvl = 27,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 60,
+    .lvl = 27,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = {
-	{
-	.iv = 70,
-	.lvl = 30,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 70,
+    .lvl = 30,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = {
-	{
-	.iv = 80,
-	.lvl = 33,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 80,
+    .lvl = 33,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = {
-	{
-	.iv = 90,
-	.lvl = 36,
-	.species = SPECIES_SANDSLASH,
-	.moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	}
+    {
+    .iv = 90,
+    .lvl = 36,
+    .species = SPECIES_SANDSLASH,
+    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = {
-	{
-	.iv = 50,
-	.lvl = 17,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 50,
-	.lvl = 17,
-	.species = SPECIES_WHISMUR,
-	}
+    {
+    .iv = 50,
+    .lvl = 17,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 50,
+    .lvl = 17,
+    .species = SPECIES_WHISMUR,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = {
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = {
-	{
-	.iv = 150,
-	.lvl = 30,
-	.species = SPECIES_MAGNETON,
-	},
-	{
-	.iv = 150,
-	.lvl = 30,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 150,
+    .lvl = 30,
+    .species = SPECIES_MAGNETON,
+    },
+    {
+    .iv = 150,
+    .lvl = 30,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = {
-	{
-	.iv = 200,
-	.lvl = 33,
-	.species = SPECIES_MAGNETON,
-	},
-	{
-	.iv = 200,
-	.lvl = 33,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 200,
+    .lvl = 33,
+    .species = SPECIES_MAGNETON,
+    },
+    {
+    .iv = 200,
+    .lvl = 33,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = {
-	{
-	.iv = 250,
-	.lvl = 36,
-	.species = SPECIES_MAGNETON,
-	},
-	{
-	.iv = 250,
-	.lvl = 36,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 250,
+    .lvl = 36,
+    .species = SPECIES_MAGNETON,
+    },
+    {
+    .iv = 250,
+    .lvl = 36,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = {
-	{
-	.iv = 250,
-	.lvl = 39,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT
-	},
-	{
-	.iv = 250,
-	.lvl = 39,
-	.species = SPECIES_EXPLOUD,
-	.moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE
-	}
+    {
+    .iv = 250,
+    .lvl = 39,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT
+    },
+    {
+    .iv = 250,
+    .lvl = 39,
+    .species = SPECIES_EXPLOUD,
+    .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = {
-	{
-	.iv = 10,
-	.lvl = 12,
-	.species = SPECIES_AZURILL,
-	},
-	{
-	.iv = 10,
-	.lvl = 12,
-	.species = SPECIES_AZURILL,
-	}
+    {
+    .iv = 10,
+    .lvl = 12,
+    .species = SPECIES_AZURILL,
+    },
+    {
+    .iv = 10,
+    .lvl = 12,
+    .species = SPECIES_AZURILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austina[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = {
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = {
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_AZUMARILL,
-	},
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_AZUMARILL,
-	}
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_AZUMARILL,
+    },
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_AZUMARILL,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = {
-	{
-	.iv = 10,
-	.lvl = 13,
-	.species = SPECIES_ZIGZAGOON,
-	.moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF
-	}
+    {
+    .iv = 10,
+    .lvl = 13,
+    .species = SPECIES_ZIGZAGOON,
+    .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = {
-	{
-	.iv = 0,
-	.lvl = 12,
-	.species = SPECIES_AZURILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 12,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 12,
+    .species = SPECIES_AZURILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 12,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = {
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	}
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = {
-	{
-	.iv = 20,
-	.lvl = 30,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	}
+    {
+    .iv = 20,
+    .lvl = 30,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = {
-	{
-	.iv = 30,
-	.lvl = 33,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	}
+    {
+    .iv = 30,
+    .lvl = 33,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = {
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	}
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Randall[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_SWELLOW,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_SWELLOW,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Parker[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_SPINDA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_SPINDA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_George[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_SLAKOTH,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_SLAKOTH,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Berke[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_VIGOROTH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_VIGOROTH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Braxton[] = {
-	{
-	.iv = 100,
-	.lvl = 28,
-	.species = SPECIES_SWELLOW,
-	.moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR
-	},
-	{
-	.iv = 100,
-	.lvl = 28,
-	.species = SPECIES_TRAPINCH,
-	.moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB
-	},
-	{
-	.iv = 100,
-	.lvl = 28,
-	.species = SPECIES_WAILMER,
-	.moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE
-	},
-	{
-	.iv = 100,
-	.lvl = 28,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
-	},
-	{
-	.iv = 100,
-	.lvl = 28,
-	.species = SPECIES_SHIFTRY,
-	.moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER
-	}
+    {
+    .iv = 100,
+    .lvl = 28,
+    .species = SPECIES_SWELLOW,
+    .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR
+    },
+    {
+    .iv = 100,
+    .lvl = 28,
+    .species = SPECIES_TRAPINCH,
+    .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB
+    },
+    {
+    .iv = 100,
+    .lvl = 28,
+    .species = SPECIES_WAILMER,
+    .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE
+    },
+    {
+    .iv = 100,
+    .lvl = 28,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
+    },
+    {
+    .iv = 100,
+    .lvl = 28,
+    .species = SPECIES_SHIFTRY,
+    .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = {
-	{
-	.iv = 100,
-	.lvl = 44,
-	.species = SPECIES_SABLEYE,
-	},
-	{
-	.iv = 100,
-	.lvl = 44,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 100,
-	.lvl = 44,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 100,
+    .lvl = 44,
+    .species = SPECIES_SABLEYE,
+    },
+    {
+    .iv = 100,
+    .lvl = 44,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 100,
+    .lvl = 44,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = {
-	{
-	.iv = 100,
-	.lvl = 46,
-	.species = SPECIES_MAWILE,
-	},
-	{
-	.iv = 100,
-	.lvl = 46,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 100,
+    .lvl = 46,
+    .species = SPECIES_MAWILE,
+    },
+    {
+    .iv = 100,
+    .lvl = 46,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = {
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = {
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_CACTURNE,
-	},
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_CACTURNE,
+    },
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = {
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_MAGNETON,
-	},
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_MUK,
-	}
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_MAGNETON,
+    },
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_MUK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = {
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_MAWILE,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_KADABRA,
-	}
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_MAWILE,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_KADABRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = {
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_DODRIO,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_ELECTRODE,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_SHIFTRY,
-	}
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_DODRIO,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_ELECTRODE,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_SHIFTRY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = {
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_KECLEON,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_WAILORD,
-	}
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_KECLEON,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_WAILORD,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = {
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = {
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = {
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = {
-	{
-	.iv = 140,
-	.lvl = 35,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 140,
-	.lvl = 35,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 140,
-	.lvl = 35,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 140,
+    .lvl = 35,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 140,
+    .lvl = 35,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 140,
+    .lvl = 35,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = {
-	{
-	.iv = 100,
-	.lvl = 33,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 100,
-	.lvl = 33,
-	.species = SPECIES_LUDICOLO,
-	}
+    {
+    .iv = 100,
+    .lvl = 33,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 100,
+    .lvl = 33,
+    .species = SPECIES_LUDICOLO,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Mary[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_DELCATTY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_DELCATTY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Alexia[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_WIGGLYTUFF,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_WIGGLYTUFF,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Jody[] = {
-	{
-	.iv = 255,
-	.lvl = 26,
-	.species = SPECIES_ZANGOOSE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 255,
+    .lvl = 26,
+    .species = SPECIES_ZANGOOSE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_MAWILE,
-	.moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	.moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_MAWILE,
+    .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keira[] = {
-	{
-	.iv = 100,
-	.lvl = 45,
-	.species = SPECIES_LAIRON,
-	},
-	{
-	.iv = 100,
-	.lvl = 45,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 100,
+    .lvl = 45,
+    .species = SPECIES_LAIRON,
+    },
+    {
+    .iv = 100,
+    .lvl = 45,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = {
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = {
-	{
-	.iv = 200,
-	.lvl = 30,
-	.species = SPECIES_SABLEYE,
-	}
+    {
+    .iv = 200,
+    .lvl = 30,
+    .species = SPECIES_SABLEYE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = {
-	{
-	.iv = 100,
-	.lvl = 45,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 100,
+    .lvl = 45,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = {
-	{
-	.iv = 100,
-	.lvl = 45,
-	.species = SPECIES_CLAYDOL,
-	}
+    {
+    .iv = 100,
+    .lvl = 45,
+    .species = SPECIES_CLAYDOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = {
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_TORKOAL,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_LUDICOLO,
-	}
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_TORKOAL,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_LUDICOLO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = {
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_SKARMORY,
-	},
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_SABLEYE,
-	}
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_SKARMORY,
+    },
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_SABLEYE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = {
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_SANDSLASH,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_NINETALES,
-	},
-	{
-	.iv = 100,
-	.lvl = 42,
-	.species = SPECIES_TROPIUS,
-	}
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_SANDSLASH,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_NINETALES,
+    },
+    {
+    .iv = 100,
+    .lvl = 42,
+    .species = SPECIES_TROPIUS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = {
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = {
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = {
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = {
-	{
-	.iv = 140,
-	.lvl = 34,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 140,
-	.lvl = 34,
-	.species = SPECIES_CAMERUPT,
-	},
-	{
-	.iv = 140,
-	.lvl = 34,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 140,
+    .lvl = 34,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 140,
+    .lvl = 34,
+    .species = SPECIES_CAMERUPT,
+    },
+    {
+    .iv = 140,
+    .lvl = 34,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_BANETTE,
-	},
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_LUNATONE,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_BANETTE,
+    },
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_LUNATONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_DUSKULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_SHUPPET,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_DUSKULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_SHUPPET,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_DUSKULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_SHUPPET,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_DUSKULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_SHUPPET,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SABLEYE,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SABLEYE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = {
-	{
-	.iv = 50,
-	.lvl = 32,
-	.species = SPECIES_SHUPPET,
-	}
+    {
+    .iv = 50,
+    .lvl = 32,
+    .species = SPECIES_SHUPPET,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = {
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SABLEYE,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SPOINK,
-	}
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SABLEYE,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SPOINK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = {
-	{
-	.iv = 20,
-	.lvl = 35,
-	.species = SPECIES_SPOINK,
-	},
-	{
-	.iv = 20,
-	.lvl = 35,
-	.species = SPECIES_SABLEYE,
-	}
+    {
+    .iv = 20,
+    .lvl = 35,
+    .species = SPECIES_SPOINK,
+    },
+    {
+    .iv = 20,
+    .lvl = 35,
+    .species = SPECIES_SABLEYE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = {
-	{
-	.iv = 30,
-	.lvl = 40,
-	.species = SPECIES_SPOINK,
-	},
-	{
-	.iv = 30,
-	.lvl = 40,
-	.species = SPECIES_SABLEYE,
-	}
+    {
+    .iv = 30,
+    .lvl = 40,
+    .species = SPECIES_SPOINK,
+    },
+    {
+    .iv = 30,
+    .lvl = 40,
+    .species = SPECIES_SABLEYE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = {
-	{
-	.iv = 40,
-	.lvl = 42,
-	.species = SPECIES_DUSKULL,
-	},
-	{
-	.iv = 40,
-	.lvl = 42,
-	.species = SPECIES_SABLEYE,
-	},
-	{
-	.iv = 40,
-	.lvl = 42,
-	.species = SPECIES_GRUMPIG,
-	}
+    {
+    .iv = 40,
+    .lvl = 42,
+    .species = SPECIES_DUSKULL,
+    },
+    {
+    .iv = 40,
+    .lvl = 42,
+    .species = SPECIES_SABLEYE,
+    },
+    {
+    .iv = 40,
+    .lvl = 42,
+    .species = SPECIES_GRUMPIG,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = {
-	{
-	.iv = 0,
-	.lvl = 7,
-	.species = SPECIES_ZIGZAGOON,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 7,
+    .species = SPECIES_ZIGZAGOON,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Daphne[] = {
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_LUVDISC,
-	.heldItem = ITEM_NUGGET,
-	.moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_LUVDISC,
-	.heldItem = ITEM_NUGGET,
-	.moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE
-	}
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_LUVDISC,
+    .heldItem = ITEM_NUGGET,
+    .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_LUVDISC,
+    .heldItem = ITEM_NUGGET,
+    .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Cindy2[] = {
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_ZIGZAGOON,
-	.heldItem = ITEM_NUGGET,
-	.moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_ZIGZAGOON,
+    .heldItem = ITEM_NUGGET,
+    .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna[] = {
-	{
-	.iv = 150,
-	.lvl = 40,
-	.species = SPECIES_SEAKING,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 150,
+    .lvl = 40,
+    .species = SPECIES_SEAKING,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Naomi[] = {
-	{
-	.iv = 100,
-	.lvl = 45,
-	.species = SPECIES_ROSELIA,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 100,
+    .lvl = 45,
+    .species = SPECIES_ROSELIA,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = {
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = {
-	{
-	.iv = 20,
-	.lvl = 30,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 20,
+    .lvl = 30,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = {
-	{
-	.iv = 30,
-	.lvl = 33,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 30,
+    .lvl = 33,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = {
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET,
-	.moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
-	}
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET,
+    .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_KECLEON,
-	.moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_SEVIPER,
-	.moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_KECLEON,
+    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_SEVIPER,
+    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = {
-	{
-	.iv = 100,
-	.lvl = 40,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 100,
+    .lvl = 40,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = {
-	{
-	.iv = 150,
-	.lvl = 40,
-	.species = SPECIES_AZUMARILL,
-	}
+    {
+    .iv = 150,
+    .lvl = 40,
+    .species = SPECIES_AZUMARILL,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = {
-	{
-	.iv = 100,
-	.lvl = 35,
-	.species = SPECIES_CLAMPERL,
-	.moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
-	},
-	{
-	.iv = 100,
-	.lvl = 37,
-	.species = SPECIES_CORPHISH,
-	.moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_LOMBRE,
-	.moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE
-	}
+    {
+    .iv = 100,
+    .lvl = 35,
+    .species = SPECIES_CLAMPERL,
+    .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
+    },
+    {
+    .iv = 100,
+    .lvl = 37,
+    .species = SPECIES_CORPHISH,
+    .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_LOMBRE,
+    .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = {
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_CARVANHA,
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_CARVANHA,
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = {
-	{
-	.iv = 10,
-	.lvl = 35,
-	.species = SPECIES_KECLEON,
-	.moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 10,
-	.lvl = 35,
-	.species = SPECIES_SEVIPER,
-	.moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	}
+    {
+    .iv = 10,
+    .lvl = 35,
+    .species = SPECIES_KECLEON,
+    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 10,
+    .lvl = 35,
+    .species = SPECIES_SEVIPER,
+    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = {
-	{
-	.iv = 20,
-	.lvl = 38,
-	.species = SPECIES_KECLEON,
-	.moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 20,
-	.lvl = 38,
-	.species = SPECIES_SEVIPER,
-	.moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	}
+    {
+    .iv = 20,
+    .lvl = 38,
+    .species = SPECIES_KECLEON,
+    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 20,
+    .lvl = 38,
+    .species = SPECIES_SEVIPER,
+    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = {
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_KECLEON,
-	.moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_SEVIPER,
-	.moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	}
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_KECLEON,
+    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_SEVIPER,
+    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = {
-	{
-	.iv = 40,
-	.lvl = 44,
-	.species = SPECIES_KECLEON,
-	.moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 40,
-	.lvl = 44,
-	.species = SPECIES_SEVIPER,
-	.moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	}
+    {
+    .iv = 40,
+    .lvl = 44,
+    .species = SPECIES_KECLEON,
+    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 40,
+    .lvl = 44,
+    .species = SPECIES_SEVIPER,
+    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = {
-	{
-	.iv = 0,
-	.lvl = 7,
-	.species = SPECIES_ZIGZAGOON,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 7,
+    .species = SPECIES_ZIGZAGOON,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mollie[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WHISCASH,
-	},
-	{
-	.iv = 200,
-	.lvl = 33,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WHISCASH,
+    },
+    {
+    .iv = 200,
+    .lvl = 33,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = {
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_AZUMARILL,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_AZUMARILL,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NUGGET,
-	.moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NUGGET,
+    .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_ARON,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_ARON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia1[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_HORSEA,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_HORSEA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_RHYHORN,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_RHYHORN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = {
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = {
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_LAIRON,
-	}
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_LAIRON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_LAIRON,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_RHYHORN,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_LAIRON,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_RHYHORN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = {
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_LAIRON,
-	},
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_RHYHORN,
-	}
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_LAIRON,
+    },
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_RHYHORN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = {
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_AGGRON,
-	},
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_RHYDON,
-	}
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_AGGRON,
+    },
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_RHYDON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dominik[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = {
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = {
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolen[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_HORSEA,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_HORSEA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_CARVANHA,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_CARVANHA,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Santiago[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TENTACRUEL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TENTACRUEL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SEALEO,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SEALEO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SPHEAL,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SPHEAL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = {
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = {
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_STARMIE,
-	},
-	{
-	.iv = 40,
-	.lvl = 39,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_STARMIE,
+    },
+    {
+    .iv = 40,
+    .lvl = 39,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takao[] = {
-	{
-	.iv = 127,
-	.lvl = 13,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 127,
+    .lvl = 13,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = {
-	{
-	.iv = 50,
-	.lvl = 32,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 200,
-	.lvl = 32,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 50,
+    .lvl = 32,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 200,
+    .lvl = 32,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = {
-	{
-	.iv = 100,
-	.lvl = 34,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 100,
+    .lvl = 34,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = {
-	{
-	.iv = 100,
-	.lvl = 24,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 150,
-	.lvl = 28,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 100,
+    .lvl = 24,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 150,
+    .lvl = 28,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = {
-	{
-	.iv = 100,
-	.lvl = 19,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 100,
+    .lvl = 19,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = {
-	{
-	.iv = 110,
-	.lvl = 27,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 110,
+    .lvl = 27,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = {
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = {
-	{
-	.iv = 130,
-	.lvl = 31,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 130,
-	.lvl = 31,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 130,
-	.lvl = 31,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 130,
+    .lvl = 31,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 130,
+    .lvl = 31,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 130,
+    .lvl = 31,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = {
-	{
-	.iv = 140,
-	.lvl = 33,
-	.species = SPECIES_MACHOP,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 140,
-	.lvl = 33,
-	.species = SPECIES_MACHOKE,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 140,
-	.lvl = 33,
-	.species = SPECIES_MACHOKE,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 140,
-	.lvl = 33,
-	.species = SPECIES_MACHAMP,
-	.heldItem = ITEM_BLACK_BELT
-	}
+    {
+    .iv = 140,
+    .lvl = 33,
+    .species = SPECIES_MACHOP,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 140,
+    .lvl = 33,
+    .species = SPECIES_MACHOKE,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 140,
+    .lvl = 33,
+    .species = SPECIES_MACHOKE,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 140,
+    .lvl = 33,
+    .species = SPECIES_MACHAMP,
+    .heldItem = ITEM_BLACK_BELT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = {
-	{
-	.iv = 100,
-	.lvl = 26,
-	.species = SPECIES_MAKUHITA,
-	},
-	{
-	.iv = 100,
-	.lvl = 26,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 100,
+    .lvl = 26,
+    .species = SPECIES_MAKUHITA,
+    },
+    {
+    .iv = 100,
+    .lvl = 26,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = {
-	{
-	.iv = 100,
-	.lvl = 19,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 100,
+    .lvl = 19,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = {
-	{
-	.iv = 100,
-	.lvl = 32,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 100,
+    .lvl = 32,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Kirk[] = {
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_ELECTRIKE,
-	.moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_VOLTORB,
-	.moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE
-	}
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_ELECTRIKE,
+    .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_VOLTORB,
+    .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = {
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_VOLTORB,
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_VOLTORB,
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando1[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_WHISMUR,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_WHISMUR,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = {
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_WHISMUR,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_WHISMUR,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = {
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_MAGNETON,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_MAGNETON,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_MAGNETON,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_MAGNETON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = {
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_MAGNETON,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_EXPLOUD,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_MAGNETON,
-	}
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_MAGNETON,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_EXPLOUD,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_MAGNETON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = {
-	{
-	.iv = 100,
-	.lvl = 23,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 100,
+    .lvl = 23,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = {
-	{
-	.iv = 100,
-	.lvl = 22,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 100,
-	.lvl = 22,
-	.species = SPECIES_SLUGMA,
-	}
+    {
+    .iv = 100,
+    .lvl = 22,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 100,
+    .lvl = 22,
+    .species = SPECIES_SLUGMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = {
-	{
-	.iv = 100,
-	.lvl = 23,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 100,
+    .lvl = 23,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jace[] = {
-	{
-	.iv = 100,
-	.lvl = 23,
-	.species = SPECIES_SLUGMA,
-	}
+    {
+    .iv = 100,
+    .lvl = 23,
+    .species = SPECIES_SLUGMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keegan[] = {
-	{
-	.iv = 120,
-	.lvl = 23,
-	.species = SPECIES_SLUGMA,
-	}
+    {
+    .iv = 120,
+    .lvl = 23,
+    .species = SPECIES_SLUGMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = {
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = {
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_MAGCARGO,
-	},
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_MAGCARGO,
+    },
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = {
-	{
-	.iv = 0,
-	.lvl = 23,
-	.species = SPECIES_SANDSHREW,
-	.moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
-	}
+    {
+    .iv = 0,
+    .lvl = 23,
+    .species = SPECIES_SANDSHREW,
+    .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Beau[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_BALTOY,
-	.moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	},
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_SANDSHREW,
-	.moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG
-	},
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_BALTOY,
-	.moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_BALTOY,
+    .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
+    },
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_SANDSHREW,
+    .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG
+    },
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_BALTOY,
+    .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = {
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_KECLEON,
-	}
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_KECLEON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = {
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_TAILLOW,
-	}
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_TAILLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Autumn[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_TAILLOW,
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_TAILLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_LINOONE,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_LINOONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = {
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_SANDSLASH,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_LINOONE,
-	}
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_SANDSLASH,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_LINOONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = {
-	{
-	.iv = 100,
-	.lvl = 26,
-	.species = SPECIES_SURSKIT,
-	}
+    {
+    .iv = 100,
+    .lvl = 26,
+    .species = SPECIES_SURSKIT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = {
-	{
-	.iv = 100,
-	.lvl = 24,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 100,
-	.lvl = 24,
-	.species = SPECIES_SILCOON,
-	},
-	{
-	.iv = 100,
-	.lvl = 24,
-	.species = SPECIES_BEAUTIFLY,
-	}
+    {
+    .iv = 100,
+    .lvl = 24,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 100,
+    .lvl = 24,
+    .species = SPECIES_SILCOON,
+    },
+    {
+    .iv = 100,
+    .lvl = 24,
+    .species = SPECIES_BEAUTIFLY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = {
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_CASCOON,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_DUSTOX,
-	}
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_CASCOON,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_DUSTOX,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey1[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_SURSKIT,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_SURSKIT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = {
-	{
-	.iv = 150,
-	.lvl = 16,
-	.species = SPECIES_DUSTOX,
-	},
-	{
-	.iv = 150,
-	.lvl = 16,
-	.species = SPECIES_BEAUTIFLY,
-	}
+    {
+    .iv = 150,
+    .lvl = 16,
+    .species = SPECIES_DUSTOX,
+    },
+    {
+    .iv = 150,
+    .lvl = 16,
+    .species = SPECIES_BEAUTIFLY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey2[] = {
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SURSKIT,
-	}
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SURSKIT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey3[] = {
-	{
-	.iv = 20,
-	.lvl = 34,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 20,
-	.lvl = 34,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 20,
-	.lvl = 34,
-	.species = SPECIES_MASQUERAIN,
-	}
+    {
+    .iv = 20,
+    .lvl = 34,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 20,
+    .lvl = 34,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 20,
+    .lvl = 34,
+    .species = SPECIES_MASQUERAIN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey4[] = {
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_MASQUERAIN,
-	}
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_MASQUERAIN,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Jeffrey5[] = {
-	{
-	.iv = 40,
-	.lvl = 38,
-	.species = SPECIES_SURSKIT,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 40,
-	.lvl = 38,
-	.species = SPECIES_DUSTOX,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 40,
-	.lvl = 38,
-	.species = SPECIES_SURSKIT,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 40,
-	.lvl = 38,
-	.species = SPECIES_MASQUERAIN,
-	.heldItem = ITEM_SILVER_POWDER
-	},
-	{
-	.iv = 40,
-	.lvl = 38,
-	.species = SPECIES_BEAUTIFLY,
-	.heldItem = ITEM_NONE
-	}
+    {
+    .iv = 40,
+    .lvl = 38,
+    .species = SPECIES_SURSKIT,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 40,
+    .lvl = 38,
+    .species = SPECIES_DUSTOX,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 40,
+    .lvl = 38,
+    .species = SPECIES_SURSKIT,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 40,
+    .lvl = 38,
+    .species = SPECIES_MASQUERAIN,
+    .heldItem = ITEM_SILVER_POWDER
+    },
+    {
+    .iv = 40,
+    .lvl = 38,
+    .species = SPECIES_BEAUTIFLY,
+    .heldItem = ITEM_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_ABRA,
-	.moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_ABRA,
+    .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_KIRLIA,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_KIRLIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_RALTS,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_RALTS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Blake[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_GIRAFARIG,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_GIRAFARIG,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_RALTS,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_RALTS,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_KIRLIA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_RALTS,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_RALTS,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_KIRLIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_SOLROCK,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_SOLROCK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_SOLROCK,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_SOLROCK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = {
-	{
-	.iv = 10,
-	.lvl = 33,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 10,
-	.lvl = 33,
-	.species = SPECIES_SOLROCK,
-	}
+    {
+    .iv = 10,
+    .lvl = 33,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 10,
+    .lvl = 33,
+    .species = SPECIES_SOLROCK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = {
-	{
-	.iv = 20,
-	.lvl = 38,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 20,
-	.lvl = 38,
-	.species = SPECIES_SOLROCK,
-	}
+    {
+    .iv = 20,
+    .lvl = 38,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 20,
+    .lvl = 38,
+    .species = SPECIES_SOLROCK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = {
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_SOLROCK,
-	}
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_SOLROCK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = {
-	{
-	.iv = 40,
-	.lvl = 45,
-	.species = SPECIES_SOLROCK,
-	},
-	{
-	.iv = 40,
-	.lvl = 45,
-	.species = SPECIES_ALAKAZAM,
-	}
+    {
+    .iv = 40,
+    .lvl = 45,
+    .species = SPECIES_SOLROCK,
+    },
+    {
+    .iv = 40,
+    .lvl = 45,
+    .species = SPECIES_ALAKAZAM,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_ABRA,
-	.moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_ABRA,
+    .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_KIRLIA,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_KIRLIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_KADABRA,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_KADABRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_WOBBUFFET,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_NATU,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_KADABRA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_WOBBUFFET,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_NATU,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_KADABRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_KIRLIA,
-	},
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_KIRLIA,
+    },
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_LUNATONE,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_LUNATONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = {
-	{
-	.iv = 10,
-	.lvl = 34,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 10,
-	.lvl = 34,
-	.species = SPECIES_LUNATONE,
-	}
+    {
+    .iv = 10,
+    .lvl = 34,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 10,
+    .lvl = 34,
+    .species = SPECIES_LUNATONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = {
-	{
-	.iv = 20,
-	.lvl = 37,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 20,
-	.lvl = 37,
-	.species = SPECIES_LUNATONE,
-	}
+    {
+    .iv = 20,
+    .lvl = 37,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 20,
+    .lvl = 37,
+    .species = SPECIES_LUNATONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = {
-	{
-	.iv = 30,
-	.lvl = 40,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 30,
-	.lvl = 40,
-	.species = SPECIES_LUNATONE,
-	}
+    {
+    .iv = 30,
+    .lvl = 40,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 30,
+    .lvl = 40,
+    .species = SPECIES_LUNATONE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = {
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_LUNATONE,
-	},
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_ALAKAZAM,
-	}
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_LUNATONE,
+    },
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_ALAKAZAM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Micah[] = {
-	{
-	.iv = 0,
-	.lvl = 44,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 0,
-	.lvl = 44,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 0,
+    .lvl = 44,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 0,
+    .lvl = 44,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = {
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_ZANGOOSE,
-	}
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_ZANGOOSE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = {
-	{
-	.iv = 10,
-	.lvl = 34,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 10,
+    .lvl = 34,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = {
-	{
-	.iv = 20,
-	.lvl = 36,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	},
-	{
-	.iv = 20,
-	.lvl = 36,
-	.species = SPECIES_MANECTRIC,
-	.moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
-	}
+    {
+    .iv = 20,
+    .lvl = 36,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
+    },
+    {
+    .iv = 20,
+    .lvl = 36,
+    .species = SPECIES_MANECTRIC,
+    .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = {
-	{
-	.iv = 30,
-	.lvl = 39,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	},
-	{
-	.iv = 30,
-	.lvl = 39,
-	.species = SPECIES_MANECTRIC,
-	.moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE
-	}
+    {
+    .iv = 30,
+    .lvl = 39,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
+    },
+    {
+    .iv = 30,
+    .lvl = 39,
+    .species = SPECIES_MANECTRIC,
+    .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = {
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	},
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_GOLDUCK,
-	.moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP
-	},
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_MANECTRIC,
-	.moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
-	}
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
+    },
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_GOLDUCK,
+    .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP
+    },
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_MANECTRIC,
+    .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = {
-	{
-	.iv = 250,
-	.lvl = 46,
-	.species = SPECIES_MIGHTYENA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH
-	},
-	{
-	.iv = 250,
-	.lvl = 48,
-	.species = SPECIES_SHIFTRY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY
-	},
-	{
-	.iv = 250,
-	.lvl = 46,
-	.species = SPECIES_CACTURNE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE
-	},
-	{
-	.iv = 250,
-	.lvl = 48,
-	.species = SPECIES_CRAWDAUNT,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE
-	},
-	{
-	.iv = 255,
-	.lvl = 49,
-	.species = SPECIES_ABSOL,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH
-	}
+    {
+    .iv = 250,
+    .lvl = 46,
+    .species = SPECIES_MIGHTYENA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH
+    },
+    {
+    .iv = 250,
+    .lvl = 48,
+    .species = SPECIES_SHIFTRY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY
+    },
+    {
+    .iv = 250,
+    .lvl = 46,
+    .species = SPECIES_CACTURNE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE
+    },
+    {
+    .iv = 250,
+    .lvl = 48,
+    .species = SPECIES_CRAWDAUNT,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE
+    },
+    {
+    .iv = 255,
+    .lvl = 49,
+    .species = SPECIES_ABSOL,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = {
-	{
-	.iv = 250,
-	.lvl = 48,
-	.species = SPECIES_DUSCLOPS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT
-	},
-	{
-	.iv = 250,
-	.lvl = 49,
-	.species = SPECIES_BANETTE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 250,
-	.lvl = 50,
-	.species = SPECIES_SABLEYE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 250,
-	.lvl = 49,
-	.species = SPECIES_BANETTE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_DUSCLOPS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 250,
+    .lvl = 48,
+    .species = SPECIES_DUSCLOPS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT
+    },
+    {
+    .iv = 250,
+    .lvl = 49,
+    .species = SPECIES_BANETTE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 250,
+    .lvl = 50,
+    .species = SPECIES_SABLEYE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 250,
+    .lvl = 49,
+    .species = SPECIES_BANETTE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_DUSCLOPS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = {
-	{
-	.iv = 250,
-	.lvl = 50,
-	.species = SPECIES_SEALEO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL
-	},
-	{
-	.iv = 250,
-	.lvl = 50,
-	.species = SPECIES_GLALIE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 250,
-	.lvl = 52,
-	.species = SPECIES_SEALEO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD
-	},
-	{
-	.iv = 250,
-	.lvl = 52,
-	.species = SPECIES_GLALIE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_WALREIN,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD
-	}
+    {
+    .iv = 250,
+    .lvl = 50,
+    .species = SPECIES_SEALEO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL
+    },
+    {
+    .iv = 250,
+    .lvl = 50,
+    .species = SPECIES_GLALIE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 250,
+    .lvl = 52,
+    .species = SPECIES_SEALEO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD
+    },
+    {
+    .iv = 250,
+    .lvl = 52,
+    .species = SPECIES_GLALIE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_WALREIN,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = {
-	{
-	.iv = 250,
-	.lvl = 52,
-	.species = SPECIES_SHELGON,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE
-	},
-	{
-	.iv = 250,
-	.lvl = 54,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 250,
-	.lvl = 53,
-	.species = SPECIES_KINGDRA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM
-	},
-	{
-	.iv = 250,
-	.lvl = 53,
-	.species = SPECIES_FLYGON,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_SALAMENCE,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH
-	}
+    {
+    .iv = 250,
+    .lvl = 52,
+    .species = SPECIES_SHELGON,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE
+    },
+    {
+    .iv = 250,
+    .lvl = 54,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 250,
+    .lvl = 53,
+    .species = SPECIES_KINGDRA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM
+    },
+    {
+    .iv = 250,
+    .lvl = 53,
+    .species = SPECIES_FLYGON,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_SALAMENCE,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne1[] = {
-	{
-	.iv = 100,
-	.lvl = 12,
-	.species = SPECIES_GEODUDE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
-	},
-	{
-	.iv = 100,
-	.lvl = 12,
-	.species = SPECIES_GEODUDE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
-	},
-	{
-	.iv = 200,
-	.lvl = 15,
-	.species = SPECIES_NOSEPASS,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB
-	}
+    {
+    .iv = 100,
+    .lvl = 12,
+    .species = SPECIES_GEODUDE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
+    },
+    {
+    .iv = 100,
+    .lvl = 12,
+    .species = SPECIES_GEODUDE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
+    },
+    {
+    .iv = 200,
+    .lvl = 15,
+    .species = SPECIES_NOSEPASS,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Brawly1[] = {
-	{
-	.iv = 100,
-	.lvl = 16,
-	.species = SPECIES_MACHOP,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP
-	},
-	{
-	.iv = 100,
-	.lvl = 16,
-	.species = SPECIES_MEDITITE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP
-	},
-	{
-	.iv = 200,
-	.lvl = 19,
-	.species = SPECIES_MAKUHITA,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP
-	}
+    {
+    .iv = 100,
+    .lvl = 16,
+    .species = SPECIES_MACHOP,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP
+    },
+    {
+    .iv = 100,
+    .lvl = 16,
+    .species = SPECIES_MEDITITE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP
+    },
+    {
+    .iv = 200,
+    .lvl = 19,
+    .species = SPECIES_MAKUHITA,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Wattson1[] = {
-	{
-	.iv = 200,
-	.lvl = 20,
-	.species = SPECIES_VOLTORB,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE
-	},
-	{
-	.iv = 200,
-	.lvl = 20,
-	.species = SPECIES_ELECTRIKE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL
-	},
-	{
-	.iv = 220,
-	.lvl = 22,
-	.species = SPECIES_MAGNETON,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
-	},
-	{
-	.iv = 250,
-	.lvl = 24,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL
-	}
+    {
+    .iv = 200,
+    .lvl = 20,
+    .species = SPECIES_VOLTORB,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE
+    },
+    {
+    .iv = 200,
+    .lvl = 20,
+    .species = SPECIES_ELECTRIKE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL
+    },
+    {
+    .iv = 220,
+    .lvl = 22,
+    .species = SPECIES_MAGNETON,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
+    },
+    {
+    .iv = 250,
+    .lvl = 24,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Flannery1[] = {
-	{
-	.iv = 200,
-	.lvl = 24,
-	.species = SPECIES_NUMEL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 200,
-	.lvl = 24,
-	.species = SPECIES_SLUGMA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 250,
-	.lvl = 26,
-	.species = SPECIES_CAMERUPT,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT
-	},
-	{
-	.iv = 250,
-	.lvl = 29,
-	.species = SPECIES_TORKOAL,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT
-	}
+    {
+    .iv = 200,
+    .lvl = 24,
+    .species = SPECIES_NUMEL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 200,
+    .lvl = 24,
+    .species = SPECIES_SLUGMA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 250,
+    .lvl = 26,
+    .species = SPECIES_CAMERUPT,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT
+    },
+    {
+    .iv = 250,
+    .lvl = 29,
+    .species = SPECIES_TORKOAL,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Norman1[] = {
-	{
-	.iv = 200,
-	.lvl = 27,
-	.species = SPECIES_SPINDA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE
-	},
-	{
-	.iv = 200,
-	.lvl = 27,
-	.species = SPECIES_VIGOROTH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 200,
-	.lvl = 29,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT
-	},
-	{
-	.iv = 250,
-	.lvl = 31,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK
-	}
+    {
+    .iv = 200,
+    .lvl = 27,
+    .species = SPECIES_SPINDA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE
+    },
+    {
+    .iv = 200,
+    .lvl = 27,
+    .species = SPECIES_VIGOROTH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 200,
+    .lvl = 29,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT
+    },
+    {
+    .iv = 250,
+    .lvl = 31,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Winona1[] = {
-	{
-	.iv = 210,
-	.lvl = 29,
-	.species = SPECIES_SWABLU,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 210,
-	.lvl = 29,
-	.species = SPECIES_TROPIUS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS
-	},
-	{
-	.iv = 210,
-	.lvl = 30,
-	.species = SPECIES_PELIPPER,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 220,
-	.lvl = 31,
-	.species = SPECIES_SKARMORY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 33,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
-	}
+    {
+    .iv = 210,
+    .lvl = 29,
+    .species = SPECIES_SWABLU,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 210,
+    .lvl = 29,
+    .species = SPECIES_TROPIUS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS
+    },
+    {
+    .iv = 210,
+    .lvl = 30,
+    .species = SPECIES_PELIPPER,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 220,
+    .lvl = 31,
+    .species = SPECIES_SKARMORY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 33,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza1[] = {
-	{
-	.iv = 250,
-	.lvl = 41,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 250,
-	.lvl = 41,
-	.species = SPECIES_XATU,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
-	},
-	{
-	.iv = 250,
-	.lvl = 42,
-	.species = SPECIES_LUNATONE,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND
-	},
-	{
-	.iv = 250,
-	.lvl = 42,
-	.species = SPECIES_SOLROCK,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
-	}
+    {
+    .iv = 250,
+    .lvl = 41,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 250,
+    .lvl = 41,
+    .species = SPECIES_XATU,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    },
+    {
+    .iv = 250,
+    .lvl = 42,
+    .species = SPECIES_LUNATONE,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND
+    },
+    {
+    .iv = 250,
+    .lvl = 42,
+    .species = SPECIES_SOLROCK,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Juan1[] = {
-	{
-	.iv = 200,
-	.lvl = 41,
-	.species = SPECIES_LUVDISC,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL
-	},
-	{
-	.iv = 200,
-	.lvl = 41,
-	.species = SPECIES_WHISCASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 200,
-	.lvl = 43,
-	.species = SPECIES_SEALEO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE
-	},
-	{
-	.iv = 200,
-	.lvl = 43,
-	.species = SPECIES_CRAWDAUNT,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER
-	},
-	{
-	.iv = 250,
-	.lvl = 46,
-	.species = SPECIES_KINGDRA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
-	}
+    {
+    .iv = 200,
+    .lvl = 41,
+    .species = SPECIES_LUVDISC,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL
+    },
+    {
+    .iv = 200,
+    .lvl = 41,
+    .species = SPECIES_WHISCASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 200,
+    .lvl = 43,
+    .species = SPECIES_SEALEO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE
+    },
+    {
+    .iv = 200,
+    .lvl = 43,
+    .species = SPECIES_CRAWDAUNT,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER
+    },
+    {
+    .iv = 250,
+    .lvl = 46,
+    .species = SPECIES_KINGDRA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = {
-	{
-	.iv = 10,
-	.lvl = 9,
-	.species = SPECIES_RALTS,
-	}
+    {
+    .iv = 10,
+    .lvl = 9,
+    .species = SPECIES_RALTS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = {
-	{
-	.iv = 10,
-	.lvl = 17,
-	.species = SPECIES_RALTS,
-	}
+    {
+    .iv = 10,
+    .lvl = 17,
+    .species = SPECIES_RALTS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = {
-	{
-	.iv = 10,
-	.lvl = 15,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 10,
-	.lvl = 15,
-	.species = SPECIES_ODDISH,
-	},
-	{
-	.iv = 10,
-	.lvl = 15,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 10,
+    .lvl = 15,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 10,
+    .lvl = 15,
+    .species = SPECIES_ODDISH,
+    },
+    {
+    .iv = 10,
+    .lvl = 15,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = {
-	{
-	.iv = 20,
-	.lvl = 26,
-	.species = SPECIES_RALTS,
-	},
-	{
-	.iv = 20,
-	.lvl = 26,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 20,
+    .lvl = 26,
+    .species = SPECIES_RALTS,
+    },
+    {
+    .iv = 20,
+    .lvl = 26,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = {
-	{
-	.iv = 30,
-	.lvl = 29,
-	.species = SPECIES_KIRLIA,
-	},
-	{
-	.iv = 30,
-	.lvl = 29,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 30,
+    .lvl = 29,
+    .species = SPECIES_KIRLIA,
+    },
+    {
+    .iv = 30,
+    .lvl = 29,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = {
-	{
-	.iv = 40,
-	.lvl = 32,
-	.species = SPECIES_KIRLIA,
-	},
-	{
-	.iv = 40,
-	.lvl = 32,
-	.species = SPECIES_MEDICHAM,
-	}
+    {
+    .iv = 40,
+    .lvl = 32,
+    .species = SPECIES_KIRLIA,
+    },
+    {
+    .iv = 40,
+    .lvl = 32,
+    .species = SPECIES_MEDICHAM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = {
-	{
-	.iv = 50,
-	.lvl = 34,
-	.species = SPECIES_KIRLIA,
-	},
-	{
-	.iv = 50,
-	.lvl = 34,
-	.species = SPECIES_BANETTE,
-	},
-	{
-	.iv = 50,
-	.lvl = 34,
-	.species = SPECIES_MEDICHAM,
-	}
+    {
+    .iv = 50,
+    .lvl = 34,
+    .species = SPECIES_KIRLIA,
+    },
+    {
+    .iv = 50,
+    .lvl = 34,
+    .species = SPECIES_BANETTE,
+    },
+    {
+    .iv = 50,
+    .lvl = 34,
+    .species = SPECIES_MEDICHAM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = {
-	{
-	.iv = 10,
-	.lvl = 9,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 10,
+    .lvl = 9,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = {
-	{
-	.iv = 10,
-	.lvl = 16,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 10,
-	.lvl = 16,
-	.species = SPECIES_BEAUTIFLY,
-	}
+    {
+    .iv = 10,
+    .lvl = 16,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 10,
+    .lvl = 16,
+    .species = SPECIES_BEAUTIFLY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = {
-	{
-	.iv = 20,
-	.lvl = 26,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 20,
-	.lvl = 26,
-	.species = SPECIES_WHISMUR,
-	}
+    {
+    .iv = 20,
+    .lvl = 26,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 20,
+    .lvl = 26,
+    .species = SPECIES_WHISMUR,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = {
-	{
-	.iv = 30,
-	.lvl = 29,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 30,
-	.lvl = 29,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 30,
+    .lvl = 29,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 30,
+    .lvl = 29,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = {
-	{
-	.iv = 40,
-	.lvl = 32,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 40,
-	.lvl = 32,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 40,
+    .lvl = 32,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 40,
+    .lvl = 32,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = {
-	{
-	.iv = 50,
-	.lvl = 35,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 50,
-	.lvl = 35,
-	.species = SPECIES_EXPLOUD,
-	}
+    {
+    .iv = 50,
+    .lvl = 35,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 50,
+    .lvl = 35,
+    .species = SPECIES_EXPLOUD,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_SPINDA,
-	.moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE
-	},
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SLAKING,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_SPINDA,
+    .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE
+    },
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SLAKING,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_ZIGZAGOON,
-	.moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_MAKUHITA,
-	.moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_ZIGZAGOON,
+    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_MAKUHITA,
+    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = {
-	{
-	.iv = 10,
-	.lvl = 28,
-	.species = SPECIES_ZIGZAGOON,
-	.moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	},
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_MAKUHITA,
-	.moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	}
+    {
+    .iv = 10,
+    .lvl = 28,
+    .species = SPECIES_ZIGZAGOON,
+    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    },
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_MAKUHITA,
+    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = {
-	{
-	.iv = 20,
-	.lvl = 31,
-	.species = SPECIES_ZIGZAGOON,
-	.moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_MAKUHITA,
-	.moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	}
+    {
+    .iv = 20,
+    .lvl = 31,
+    .species = SPECIES_ZIGZAGOON,
+    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_MAKUHITA,
+    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	},
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_MAKUHITA,
-	.moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    },
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_MAKUHITA,
+    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = {
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_LINOONE,
-	.moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	},
-	{
-	.iv = 40,
-	.lvl = 38,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	}
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_LINOONE,
+    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    },
+    {
+    .iv = 40,
+    .lvl = 38,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = {
-	{
-	.iv = 25,
-	.lvl = 16,
-	.species = SPECIES_TAILLOW,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 25,
-	.lvl = 16,
-	.species = SPECIES_ZIGZAGOON,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 25,
+    .lvl = 16,
+    .species = SPECIES_TAILLOW,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 25,
+    .lvl = 16,
+    .species = SPECIES_ZIGZAGOON,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-	},
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-	},
-	{
-	.iv = 0,
-	.lvl = 40,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-	},
-	{
-	.iv = 0,
-	.lvl = 12,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-	},
-	{
-	.iv = 0,
-	.lvl = 42,
-	.species = SPECIES_DELCATTY,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    },
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    },
+    {
+    .iv = 0,
+    .lvl = 40,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    },
+    {
+    .iv = 0,
+    .lvl = 12,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    },
+    {
+    .iv = 0,
+    .lvl = 42,
+    .species = SPECIES_DELCATTY,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SKITTY,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SKITTY,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_DELCATTY,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_DELCATTY,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = {
-	{
-	.iv = 0,
-	.lvl = 38,
-	.species = SPECIES_DELCATTY,
-	.heldItem = ITEM_SITRUS_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 38,
+    .species = SPECIES_DELCATTY,
+    .heldItem = ITEM_SITRUS_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = {
-	{
-	.iv = 50,
-	.lvl = 17,
-	.species = SPECIES_ROSELIA,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 50,
+    .lvl = 17,
+    .species = SPECIES_ROSELIA,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_PIKACHU,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_PIKACHU,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Bethany[] = {
-	{
-	.iv = 100,
-	.lvl = 35,
-	.species = SPECIES_AZURILL,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 100,
-	.lvl = 37,
-	.species = SPECIES_MARILL,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_AZUMARILL,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 100,
+    .lvl = 35,
+    .species = SPECIES_AZURILL,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 100,
+    .lvl = 37,
+    .species = SPECIES_MARILL,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_AZUMARILL,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_PLUSLE,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_MINUN,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_PLUSLE,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_MINUN,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_PLUSLE,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_MINUN,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_PLUSLE,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_MINUN,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_PLUSLE,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_MINUN,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_PLUSLE,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_MINUN,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = {
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_PLUSLE,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_MINUN,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_PLUSLE,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_MINUN,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = {
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_PLUSLE,
-	.heldItem = ITEM_SITRUS_BERRY
-	},
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_MINUN,
-	.heldItem = ITEM_SITRUS_BERRY
-	}
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_PLUSLE,
+    .heldItem = ITEM_SITRUS_BERRY
+    },
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_MINUN,
+    .heldItem = ITEM_SITRUS_BERRY
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = {
-	{
-	.iv = 200,
-	.lvl = 27,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 200,
+    .lvl = 27,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = {
-	{
-	.iv = 210,
-	.lvl = 33,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
-	}
+    {
+    .iv = 210,
+    .lvl = 33,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = {
-	{
-	.iv = 220,
-	.lvl = 36,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
-	}
+    {
+    .iv = 220,
+    .lvl = 36,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = {
-	{
-	.iv = 230,
-	.lvl = 39,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
-	}
+    {
+    .iv = 230,
+    .lvl = 39,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = {
-	{
-	.iv = 240,
-	.lvl = 42,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
-	}
+    {
+    .iv = 240,
+    .lvl = 42,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = {
-	{
-	.iv = 200,
-	.lvl = 18,
-	.species = SPECIES_MEDITITE,
-	.moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT
-	}
+    {
+    .iv = 200,
+    .lvl = 18,
+    .species = SPECIES_MEDITITE,
+    .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = {
-	{
-	.iv = 200,
-	.lvl = 21,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 200,
-	.lvl = 21,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 200,
+    .lvl = 21,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 200,
+    .lvl = 21,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = {
-	{
-	.iv = 210,
-	.lvl = 30,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 210,
-	.lvl = 30,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 210,
+    .lvl = 30,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 210,
+    .lvl = 30,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = {
-	{
-	.iv = 220,
-	.lvl = 33,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 220,
-	.lvl = 33,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 220,
+    .lvl = 33,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 220,
+    .lvl = 33,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = {
-	{
-	.iv = 230,
-	.lvl = 36,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 230,
-	.lvl = 36,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 230,
+    .lvl = 36,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 230,
+    .lvl = 36,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = {
-	{
-	.iv = 240,
-	.lvl = 39,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 240,
-	.lvl = 39,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 240,
+    .lvl = 39,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 240,
+    .lvl = 39,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 7,
-	.species = SPECIES_SEEDOT,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 7,
+    .species = SPECIES_SEEDOT,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = {
-	{
-	.iv = 100,
-	.lvl = 10,
-	.species = SPECIES_GEODUDE,
-	.moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 100,
+    .lvl = 10,
+    .species = SPECIES_GEODUDE,
+    .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = {
-	{
-	.iv = 110,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 120,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	}
+    {
+    .iv = 110,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 120,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = {
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = {
-	{
-	.iv = 150,
-	.lvl = 17,
-	.species = SPECIES_ZIGZAGOON,
-	.moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT
-	},
-	{
-	.iv = 150,
-	.lvl = 17,
-	.species = SPECIES_GULPIN,
-	.moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND
-	}
+    {
+    .iv = 150,
+    .lvl = 17,
+    .species = SPECIES_ZIGZAGOON,
+    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT
+    },
+    {
+    .iv = 150,
+    .lvl = 17,
+    .species = SPECIES_GULPIN,
+    .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Quincy[] = {
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_SLAKING,
-	.moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER
-	},
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_DUSCLOPS,
-	.moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC
-	}
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_SLAKING,
+    .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER
+    },
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_DUSCLOPS,
+    .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Katelynn[] = {
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_GARDEVOIR,
-	.moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND
-	},
-	{
-	.iv = 100,
-	.lvl = 43,
-	.species = SPECIES_SLAKING,
-	.moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK
-	}
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_GARDEVOIR,
+    .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND
+    },
+    {
+    .iv = 100,
+    .lvl = 43,
+    .species = SPECIES_SLAKING,
+    .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaylen[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_TRAPINCH,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_TRAPINCH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_ARON,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_ARON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = {
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = {
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 20,
-	.lvl = 30,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 20,
+    .lvl = 30,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 30,
-	.lvl = 29,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 30,
-	.lvl = 33,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 30,
+    .lvl = 29,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 30,
+    .lvl = 33,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = {
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 40,
-	.lvl = 32,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 40,
+    .lvl = 32,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_ZIGZAGOON,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_ZIGZAGOON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = {
-	{
-	.iv = 0,
-	.lvl = 4,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 3,
-	.species = SPECIES_TAILLOW,
-	}
+    {
+    .iv = 0,
+    .lvl = 4,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 3,
+    .species = SPECIES_TAILLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 0,
-	.lvl = 13,
-	.species = SPECIES_ELECTRIKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 0,
+    .lvl = 13,
+    .species = SPECIES_ELECTRIKE,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Wallace[] = {
-	{
-	.iv = 255,
-	.lvl = 57,
-	.species = SPECIES_WAILORD,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_TENTACRUEL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 56,
-	.species = SPECIES_LUDICOLO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 56,
-	.species = SPECIES_WHISCASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 56,
-	.species = SPECIES_GYARADOS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_MILOTIC,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC
-	}
+    {
+    .iv = 255,
+    .lvl = 57,
+    .species = SPECIES_WAILORD,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_TENTACRUEL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 56,
+    .species = SPECIES_LUDICOLO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 56,
+    .species = SPECIES_WHISCASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 56,
+    .species = SPECIES_GYARADOS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_MILOTIC,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_MAGIKARP,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_MAGIKARP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 7,
-	.species = SPECIES_MAGIKARP,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 7,
+    .species = SPECIES_MAGIKARP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_GOLDEEN,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_BARBOACH,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_GOLDEEN,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_BARBOACH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = {
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 7,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_MAGIKARP,
-	}
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 7,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_MAGIKARP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = {
-	{
-	.iv = 10,
-	.lvl = 11,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 10,
+    .lvl = 11,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = {
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_BARBOACH,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_BARBOACH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = {
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = {
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 20,
-	.lvl = 26,
-	.species = SPECIES_CARVANHA,
-	},
-	{
-	.iv = 20,
-	.lvl = 26,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 20,
+    .lvl = 26,
+    .species = SPECIES_CARVANHA,
+    },
+    {
+    .iv = 20,
+    .lvl = 26,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_CARVANHA,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_TENTACRUEL,
-	},
-	{
-	.iv = 31,
-	.lvl = 31,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_CARVANHA,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_TENTACRUEL,
+    },
+    {
+    .iv = 31,
+    .lvl = 31,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = {
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_SHARPEDO,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_SHARPEDO,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 0,
-	.lvl = 23,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_GYARADOS,
-	},
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 0,
+    .lvl = 23,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_GYARADOS,
+    },
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = {
-	{
-	.iv = 20,
-	.lvl = 6,
-	.species = SPECIES_VOLTORB,
-	},
-	{
-	.iv = 20,
-	.lvl = 6,
-	.species = SPECIES_VOLTORB,
-	},
-	{
-	.iv = 200,
-	.lvl = 14,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 20,
+    .lvl = 6,
+    .species = SPECIES_VOLTORB,
+    },
+    {
+    .iv = 20,
+    .lvl = 6,
+    .species = SPECIES_VOLTORB,
+    },
+    {
+    .iv = 200,
+    .lvl = 14,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = {
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = {
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = {
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_MAGNETON,
-	}
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_MAGNETON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = {
-	{
-	.iv = 40,
-	.lvl = 39,
-	.species = SPECIES_MAGNETON,
-	}
+    {
+    .iv = 40,
+    .lvl = 39,
+    .species = SPECIES_MAGNETON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = {
-	{
-	.iv = 80,
-	.lvl = 14,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 80,
-	.lvl = 14,
-	.species = SPECIES_MAGNEMITE,
-	},
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_VOLTORB,
-	}
+    {
+    .iv = 80,
+    .lvl = 14,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 80,
+    .lvl = 14,
+    .species = SPECIES_MAGNEMITE,
+    },
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_VOLTORB,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = {
-	{
-	.iv = 10,
-	.lvl = 28,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 10,
+    .lvl = 28,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = {
-	{
-	.iv = 20,
-	.lvl = 31,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 20,
+    .lvl = 31,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_MAGNETON,
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_MAGNETON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_MAGNETON,
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_MAGNETON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = {
-	{
-	.iv = 10,
-	.lvl = 28,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 10,
+    .lvl = 28,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = {
-	{
-	.iv = 20,
-	.lvl = 31,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 20,
+    .lvl = 31,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_DODRIO,
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_DODRIO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_DODRIO,
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_DODRIO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = {
-	{
-	.iv = 10,
-	.lvl = 28,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 10,
+    .lvl = 28,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = {
-	{
-	.iv = 20,
-	.lvl = 31,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 20,
+    .lvl = 31,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_DODRIO,
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_DODRIO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_DODRIO,
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_DODRIO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camden[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Demetrius[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_ELECTRIKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_ELECTRIKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo1[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 80,
-	.lvl = 34,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 80,
+    .lvl = 34,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = {
-	{
-	.iv = 10,
-	.lvl = 39,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 10,
+    .lvl = 39,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = {
-	{
-	.iv = 20,
-	.lvl = 42,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 20,
+    .lvl = 42,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = {
-	{
-	.iv = 30,
-	.lvl = 45,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 30,
+    .lvl = 45,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = {
-	{
-	.iv = 40,
-	.lvl = 48,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 40,
+    .lvl = 48,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isobel[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donny[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 160,
-	.lvl = 34,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 160,
+    .lvl = 34,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Talia[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 240,
-	.lvl = 33,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 240,
+    .lvl = 33,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = {
-	{
-	.iv = 10,
-	.lvl = 39,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 10,
+    .lvl = 39,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = {
-	{
-	.iv = 20,
-	.lvl = 42,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 20,
+    .lvl = 42,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = {
-	{
-	.iv = 30,
-	.lvl = 45,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 30,
+    .lvl = 45,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = {
-	{
-	.iv = 40,
-	.lvl = 48,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 40,
+    .lvl = 48,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = {
-	{
-	.iv = 100,
-	.lvl = 37,
-	.species = SPECIES_ALTARIA,
-	},
-	{
-	.iv = 100,
-	.lvl = 37,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 100,
+    .lvl = 37,
+    .species = SPECIES_ALTARIA,
+    },
+    {
+    .iv = 100,
+    .lvl = 37,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = {
-	{
-	.iv = 110,
-	.lvl = 41,
-	.species = SPECIES_ALTARIA,
-	},
-	{
-	.iv = 110,
-	.lvl = 41,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 110,
+    .lvl = 41,
+    .species = SPECIES_ALTARIA,
+    },
+    {
+    .iv = 110,
+    .lvl = 41,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = {
-	{
-	.iv = 120,
-	.lvl = 44,
-	.species = SPECIES_ALTARIA,
-	},
-	{
-	.iv = 120,
-	.lvl = 44,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 120,
+    .lvl = 44,
+    .species = SPECIES_ALTARIA,
+    },
+    {
+    .iv = 120,
+    .lvl = 44,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = {
-	{
-	.iv = 130,
-	.lvl = 46,
-	.species = SPECIES_BAGON,
-	},
-	{
-	.iv = 130,
-	.lvl = 46,
-	.species = SPECIES_ALTARIA,
-	},
-	{
-	.iv = 130,
-	.lvl = 46,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 130,
+    .lvl = 46,
+    .species = SPECIES_BAGON,
+    },
+    {
+    .iv = 130,
+    .lvl = 46,
+    .species = SPECIES_ALTARIA,
+    },
+    {
+    .iv = 130,
+    .lvl = 46,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = {
-	{
-	.iv = 140,
-	.lvl = 49,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 140,
-	.lvl = 49,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 140,
-	.lvl = 49,
-	.species = SPECIES_SHELGON,
-	.heldItem = ITEM_DRAGON_FANG
-	}
+    {
+    .iv = 140,
+    .lvl = 49,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 140,
+    .lvl = 49,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 140,
+    .lvl = 49,
+    .species = SPECIES_SHELGON,
+    .heldItem = ITEM_DRAGON_FANG
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Aaron[] = {
-	{
-	.iv = 255,
-	.lvl = 34,
-	.species = SPECIES_BAGON,
-	.moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER
-	}
+    {
+    .iv = 255,
+    .lvl = 34,
+    .species = SPECIES_BAGON,
+    .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_TROPIUS,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_TROPIUS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = {
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_DODUO,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_SKARMORY,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_TROPIUS,
-	}
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_DODUO,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_SKARMORY,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_TROPIUS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Humberto[] = {
-	{
-	.iv = 250,
-	.lvl = 30,
-	.species = SPECIES_SKARMORY,
-	}
+    {
+    .iv = 250,
+    .lvl = 30,
+    .species = SPECIES_SKARMORY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Presley[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwardo[] = {
-	{
-	.iv = 150,
-	.lvl = 29,
-	.species = SPECIES_DODUO,
-	},
-	{
-	.iv = 150,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 150,
+    .lvl = 29,
+    .species = SPECIES_DODUO,
+    },
+    {
+    .iv = 150,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_NATU,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_NATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_TAILLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_TAILLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = {
-	{
-	.iv = 10,
-	.lvl = 32,
-	.species = SPECIES_NATU,
-	},
-	{
-	.iv = 10,
-	.lvl = 32,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 10,
+    .lvl = 32,
+    .species = SPECIES_NATU,
+    },
+    {
+    .iv = 10,
+    .lvl = 32,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = {
-	{
-	.iv = 20,
-	.lvl = 35,
-	.species = SPECIES_NATU,
-	},
-	{
-	.iv = 20,
-	.lvl = 35,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 20,
+    .lvl = 35,
+    .species = SPECIES_NATU,
+    },
+    {
+    .iv = 20,
+    .lvl = 35,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = {
-	{
-	.iv = 30,
-	.lvl = 38,
-	.species = SPECIES_NATU,
-	},
-	{
-	.iv = 30,
-	.lvl = 38,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 30,
+    .lvl = 38,
+    .species = SPECIES_NATU,
+    },
+    {
+    .iv = 30,
+    .lvl = 38,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = {
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_ALTARIA,
-	},
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_ALTARIA,
+    },
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = {
-	{
-	.iv = 150,
-	.lvl = 33,
-	.species = SPECIES_NATU,
-	},
-	{
-	.iv = 150,
-	.lvl = 33,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 150,
+    .lvl = 33,
+    .species = SPECIES_NATU,
+    },
+    {
+    .iv = 150,
+    .lvl = 33,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_TROPIUS,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_TROPIUS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_NINJASK,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_KOFFING,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_NINJASK,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_KOFFING,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Dianne[] = {
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_LANTURN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_LANTURN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jani[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_KOFFING,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_KOFFING,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = {
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	},
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    },
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = {
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = {
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	},
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    },
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = {
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_KOFFING,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_KOFFING,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_KOFFING,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	},
-	{
-	.iv = 40,
-	.lvl = 35,
-	.species = SPECIES_WEEZING,
-	.heldItem = ITEM_SMOKE_BALL,
-	.moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_KOFFING,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_KOFFING,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_KOFFING,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    },
+    {
+    .iv = 40,
+    .lvl = 35,
+    .species = SPECIES_WEEZING,
+    .heldItem = ITEM_SMOKE_BALL,
+    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jocelyn[] = {
-	{
-	.iv = 127,
-	.lvl = 13,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 127,
+    .lvl = 13,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = {
-	{
-	.iv = 150,
-	.lvl = 13,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 150,
+    .lvl = 13,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = {
-	{
-	.iv = 100,
-	.lvl = 18,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 100,
-	.lvl = 18,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 100,
+    .lvl = 18,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 100,
+    .lvl = 18,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = {
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paula[] = {
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = {
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 110,
-	.lvl = 26,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 110,
+    .lvl = 26,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = {
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 120,
-	.lvl = 29,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 120,
+    .lvl = 29,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = {
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 130,
-	.lvl = 32,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 130,
+    .lvl = 32,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = {
-	{
-	.iv = 140,
-	.lvl = 35,
-	.species = SPECIES_MEDICHAM,
-	},
-	{
-	.iv = 140,
-	.lvl = 35,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 140,
+    .lvl = 35,
+    .species = SPECIES_MEDICHAM,
+    },
+    {
+    .iv = 140,
+    .lvl = 35,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_NUMEL,
-	.moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_NUMEL,
+    .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Angelica[] = {
-	{
-	.iv = 50,
-	.lvl = 30,
-	.species = SPECIES_CASTFORM,
-	.moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE
-	}
+    {
+    .iv = 50,
+    .lvl = 30,
+    .species = SPECIES_CASTFORM,
+    .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = {
-	{
-	.iv = 10,
-	.lvl = 29,
-	.species = SPECIES_NUMEL,
-	.moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	}
+    {
+    .iv = 10,
+    .lvl = 29,
+    .species = SPECIES_NUMEL,
+    .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = {
-	{
-	.iv = 20,
-	.lvl = 32,
-	.species = SPECIES_NUMEL,
-	.moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	}
+    {
+    .iv = 20,
+    .lvl = 32,
+    .species = SPECIES_NUMEL,
+    .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_NUMEL,
-	.moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_NUMEL,
+    .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_CAMERUPT,
-	.moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_CAMERUPT,
+    .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Imani[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyla[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_HORSEA,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_HORSEA,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = {
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_GOLDEEN,
-	},
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_GOLDEEN,
+    },
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_LUVDISC,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_LUVDISC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SEAKING,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SEAKING,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_SPHEAL,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_SPHEAL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_GOLDEEN,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_SPHEAL,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_GOLDEEN,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_SPHEAL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_LUVDISC,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_LUVDISC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SEAKING,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SEAKING,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_AZUMARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_AZUMARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sienna[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_LUVDISC,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_LUVDISC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SEAKING,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SEAKING,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_HORSEA,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_SEADRA,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_HORSEA,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_SEADRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_LANTURN,
-	},
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_PELIPPER,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_LANTURN,
+    },
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_PELIPPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_LUVDISC,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_LUVDISC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlee[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_SEAKING,
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_SEAKING,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = {
-	{
-	.iv = 0,
-	.lvl = 38,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 38,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = {
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = {
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_SANDSHREW,
-	.moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_BALTOY,
-	.moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_SANDSHREW,
+    .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_BALTOY,
+    .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_SANDSHREW,
-	.moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_MARILL,
-	.moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_SANDSHREW,
+    .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_MARILL,
+    .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_TAILLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_LOMBRE,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_TAILLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_LOMBRE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_LOMBRE,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_LOMBRE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = {
-	{
-	.iv = 0,
-	.lvl = 23,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 0,
-	.lvl = 23,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 0,
+    .lvl = 23,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 0,
+    .lvl = 23,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_ODDISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_ODDISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Cedric[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_WOBBUFFET,
-	.moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_WOBBUFFET,
+    .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = {
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = {
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = {
-	{
-	.iv = 40,
-	.lvl = 40,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 40,
-	.lvl = 40,
-	.species = SPECIES_VILEPLUME,
-	},
-	{
-	.iv = 40,
-	.lvl = 40,
-	.species = SPECIES_ALTARIA,
-	}
+    {
+    .iv = 40,
+    .lvl = 40,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 40,
+    .lvl = 40,
+    .species = SPECIES_VILEPLUME,
+    },
+    {
+    .iv = 40,
+    .lvl = 40,
+    .species = SPECIES_ALTARIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_PLUSLE,
-	},
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_MINUN,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_PLUSLE,
+    },
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_MINUN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = {
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_PLUSLE,
-	},
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_MINUN,
-	}
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_PLUSLE,
+    },
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_MINUN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = {
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_SEEDOT,
-	},
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_LOTAD,
-	}
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_SEEDOT,
+    },
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_LOTAD,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_BEAUTIFLY,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_DUSTOX,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_BEAUTIFLY,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_DUSTOX,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = {
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_PLUSLE,
-	},
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_MINUN,
-	}
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_PLUSLE,
+    },
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_MINUN,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = {
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_DUSKULL,
-	.moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE
-	},
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_SHROOMISH,
-	.moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_DUSKULL,
+    .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE
+    },
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_SHROOMISH,
+    .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = {
-	{
-	.iv = 20,
-	.lvl = 30,
-	.species = SPECIES_PLUSLE,
-	},
-	{
-	.iv = 20,
-	.lvl = 30,
-	.species = SPECIES_MINUN,
-	}
+    {
+    .iv = 20,
+    .lvl = 30,
+    .species = SPECIES_PLUSLE,
+    },
+    {
+    .iv = 20,
+    .lvl = 30,
+    .species = SPECIES_MINUN,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = {
-	{
-	.iv = 30,
-	.lvl = 33,
-	.species = SPECIES_PLUSLE,
-	.moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
-	},
-	{
-	.iv = 30,
-	.lvl = 33,
-	.species = SPECIES_MINUN,
-	.moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
-	}
+    {
+    .iv = 30,
+    .lvl = 33,
+    .species = SPECIES_PLUSLE,
+    .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
+    },
+    {
+    .iv = 30,
+    .lvl = 33,
+    .species = SPECIES_MINUN,
+    .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = {
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_PLUSLE,
-	.moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
-	},
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_MINUN,
-	.moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
-	}
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_PLUSLE,
+    .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
+    },
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_MINUN,
+    .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = {
-	{
-	.iv = 10,
-	.lvl = 12,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 10,
-	.lvl = 12,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 10,
+    .lvl = 12,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 10,
+    .lvl = 12,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = {
-	{
-	.iv = 0,
-	.lvl = 13,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 0,
+    .lvl = 13,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = {
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = {
-	{
-	.iv = 0,
-	.lvl = 44,
-	.species = SPECIES_TENTACRUEL,
-	},
-	{
-	.iv = 0,
-	.lvl = 44,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 44,
+    .species = SPECIES_TENTACRUEL,
+    },
+    {
+    .iv = 0,
+    .lvl = 44,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = {
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_SPHEAL,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_SPHEAL,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = {
-	{
-	.iv = 10,
-	.lvl = 36,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 10,
-	.lvl = 36,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 10,
-	.lvl = 36,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 10,
+    .lvl = 36,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 10,
+    .lvl = 36,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 10,
+    .lvl = 36,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = {
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = {
-	{
-	.iv = 30,
-	.lvl = 42,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 30,
-	.lvl = 42,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 30,
-	.lvl = 42,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 30,
+    .lvl = 42,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 30,
+    .lvl = 42,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 30,
+    .lvl = 42,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = {
-	{
-	.iv = 40,
-	.lvl = 45,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 40,
-	.lvl = 45,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 40,
-	.lvl = 45,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 40,
+    .lvl = 45,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 40,
+    .lvl = 45,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 40,
+    .lvl = 45,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eli[] = {
-	{
-	.iv = 100,
-	.lvl = 23,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 100,
+    .lvl = 23,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Annika[] = {
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_FEEBAS,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_FEEBAS,
-	.heldItem = ITEM_ORAN_BERRY,
-	.moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
-	}
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_FEEBAS,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_FEEBAS,
+    .heldItem = ITEM_ORAN_BERRY,
+    .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jazmyn[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_ABSOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_ABSOL,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Jonas[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Kayley[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_CASTFORM,
-	.moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_CASTFORM,
+    .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Auron[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_MACHAMP,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_MACHAMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = {
-	{
-	.iv = 150,
-	.lvl = 33,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 150,
-	.lvl = 33,
-	.species = SPECIES_SPHEAL,
-	}
+    {
+    .iv = 150,
+    .lvl = 33,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 150,
+    .lvl = 33,
+    .species = SPECIES_SPHEAL,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Marley[] = {
-	{
-	.iv = 255,
-	.lvl = 34,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT
-	}
+    {
+    .iv = 255,
+    .lvl = 34,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reyna[] = {
-	{
-	.iv = 50,
-	.lvl = 33,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 200,
-	.lvl = 33,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 50,
+    .lvl = 33,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 200,
+    .lvl = 33,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hudson[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Conor[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_CHINCHOU,
-	},
-	{
-	.iv = 200,
-	.lvl = 33,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_CHINCHOU,
+    },
+    {
+    .iv = 200,
+    .lvl = 33,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_ZANGOOSE,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SEVIPER,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_ZANGOOSE,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SEVIPER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_CAMERUPT,
-	},
-	{
-	.iv = 100,
-	.lvl = 38,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 100,
-	.lvl = 40,
-	.species = SPECIES_GOLBAT,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_CAMERUPT,
+    },
+    {
+    .iv = 100,
+    .lvl = 38,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 100,
+    .lvl = 40,
+    .species = SPECIES_GOLBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_LUDICOLO,
-	},
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_SHIFTRY,
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_LUDICOLO,
+    },
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_SHIFTRY,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = {
-	{
-	.iv = 150,
-	.lvl = 44,
-	.species = SPECIES_ALTARIA,
-	.moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	},
-	{
-	.iv = 150,
-	.lvl = 43,
-	.species = SPECIES_DELCATTY,
-	.moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 150,
-	.lvl = 44,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	},
-	{
-	.iv = 150,
-	.lvl = 41,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	},
-	{
-	.iv = 250,
-	.lvl = 45,
-	.species = SPECIES_GARDEVOIR,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	}
+    {
+    .iv = 150,
+    .lvl = 44,
+    .species = SPECIES_ALTARIA,
+    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    },
+    {
+    .iv = 150,
+    .lvl = 43,
+    .species = SPECIES_DELCATTY,
+    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 150,
+    .lvl = 44,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    },
+    {
+    .iv = 150,
+    .lvl = 41,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    },
+    {
+    .iv = 250,
+    .lvl = 45,
+    .species = SPECIES_GARDEVOIR,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_TREECKO,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_TREECKO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 100,
-	.lvl = 20,
-	.species = SPECIES_GROVYLE,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 100,
+    .lvl = 20,
+    .species = SPECIES_GROVYLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_GROVYLE,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_GROVYLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_TORCHIC,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_TORCHIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 100,
-	.lvl = 20,
-	.species = SPECIES_COMBUSKEN,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 100,
+    .lvl = 20,
+    .species = SPECIES_COMBUSKEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_COMBUSKEN,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_COMBUSKEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_MUDKIP,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_MUDKIP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 100,
-	.lvl = 20,
-	.species = SPECIES_MARSHTOMP,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 100,
+    .lvl = 20,
+    .species = SPECIES_MARSHTOMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_MARSHTOMP,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_MARSHTOMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_TREECKO,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_TREECKO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 100,
-	.lvl = 20,
-	.species = SPECIES_GROVYLE,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 100,
+    .lvl = 20,
+    .species = SPECIES_GROVYLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_GROVYLE,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_GROVYLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_TORCHIC,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_TORCHIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 100,
-	.lvl = 20,
-	.species = SPECIES_COMBUSKEN,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 100,
+    .lvl = 20,
+    .species = SPECIES_COMBUSKEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_COMBUSKEN,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_COMBUSKEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_MUDKIP,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_MUDKIP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 100,
-	.lvl = 20,
-	.species = SPECIES_MARSHTOMP,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 100,
+    .lvl = 20,
+    .species = SPECIES_MARSHTOMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_MARSHTOMP,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_MARSHTOMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = {
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_WHISMUR,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_TAILLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_WHISMUR,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_TAILLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Davis[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_PINSIR,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_PINSIR,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Mitchell[] = {
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_LUNATONE,
-	.moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_SOLROCK,
-	.moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL
-	}
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_LUNATONE,
+    .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_SOLROCK,
+    .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = {
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = {
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = {
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = {
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_LAIRON,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_HARIYAMA,
-	}
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_LAIRON,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_HARIYAMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = {
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 0,
-	.lvl = 11,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 0,
+    .lvl = 11,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Halle[] = {
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_SABLEYE,
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_ABSOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_SABLEYE,
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_ABSOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Garrison[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_SANDSLASH,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_SANDSLASH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = {
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 10,
-	.lvl = 22,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 10,
+    .lvl = 22,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = {
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_DELCATTY,
-	},
-	{
-	.iv = 20,
-	.lvl = 25,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_DELCATTY,
+    },
+    {
+    .iv = 20,
+    .lvl = 25,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = {
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_DELCATTY,
-	},
-	{
-	.iv = 30,
-	.lvl = 28,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_DELCATTY,
+    },
+    {
+    .iv = 30,
+    .lvl = 28,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = {
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_BRELOOM,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_AZUMARILL,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_DELCATTY,
-	},
-	{
-	.iv = 40,
-	.lvl = 31,
-	.species = SPECIES_SEAKING,
-	}
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_BRELOOM,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_AZUMARILL,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_DELCATTY,
+    },
+    {
+    .iv = 40,
+    .lvl = 31,
+    .species = SPECIES_SEAKING,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = {
-	{
-	.iv = 50,
-	.lvl = 27,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 50,
+    .lvl = 27,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lorenzo[] = {
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_SEEDOT,
-	},
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_NUZLEAF,
-	},
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_LOMBRE,
-	}
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_SEEDOT,
+    },
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_NUZLEAF,
+    },
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_LOMBRE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = {
-	{
-	.iv = 50,
-	.lvl = 39,
-	.species = SPECIES_CACTURNE,
-	}
+    {
+    .iv = 50,
+    .lvl = 39,
+    .species = SPECIES_CACTURNE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = {
-	{
-	.iv = 60,
-	.lvl = 31,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 60,
+    .lvl = 31,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = {
-	{
-	.iv = 70,
-	.lvl = 34,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 70,
+    .lvl = 34,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = {
-	{
-	.iv = 80,
-	.lvl = 37,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 80,
+    .lvl = 37,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = {
-	{
-	.iv = 90,
-	.lvl = 39,
-	.species = SPECIES_KECLEON,
-	},
-	{
-	.iv = 90,
-	.lvl = 39,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 90,
+    .lvl = 39,
+    .species = SPECIES_KECLEON,
+    },
+    {
+    .iv = 90,
+    .lvl = 39,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = {
-	{
-	.iv = 50,
-	.lvl = 26,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 50,
-	.lvl = 26,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 50,
+    .lvl = 26,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 50,
+    .lvl = 26,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = {
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_LOTAD,
-	},
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 50,
-	.lvl = 28,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_LOTAD,
+    },
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 50,
+    .lvl = 28,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = {
-	{
-	.iv = 50,
-	.lvl = 38,
-	.species = SPECIES_SWABLU,
-	},
-	{
-	.iv = 50,
-	.lvl = 38,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 50,
+    .lvl = 38,
+    .species = SPECIES_SWABLU,
+    },
+    {
+    .iv = 50,
+    .lvl = 38,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = {
-	{
-	.iv = 60,
-	.lvl = 30,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 60,
-	.lvl = 30,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 60,
+    .lvl = 30,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 60,
+    .lvl = 30,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = {
-	{
-	.iv = 70,
-	.lvl = 33,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 70,
-	.lvl = 33,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 70,
+    .lvl = 33,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 70,
+    .lvl = 33,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = {
-	{
-	.iv = 80,
-	.lvl = 36,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 80,
-	.lvl = 36,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 80,
+    .lvl = 36,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 80,
+    .lvl = 36,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = {
-	{
-	.iv = 90,
-	.lvl = 39,
-	.species = SPECIES_BELLOSSOM,
-	},
-	{
-	.iv = 90,
-	.lvl = 39,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 90,
+    .lvl = 39,
+    .species = SPECIES_BELLOSSOM,
+    },
+    {
+    .iv = 90,
+    .lvl = 39,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julio[] = {
-	{
-	.iv = 0,
-	.lvl = 21,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 21,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = {
-	{
-	.iv = 50,
-	.lvl = 35,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 50,
-	.lvl = 35,
-	.species = SPECIES_GOLBAT,
-	}
+    {
+    .iv = 50,
+    .lvl = 35,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 50,
+    .lvl = 35,
+    .species = SPECIES_GOLBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = {
-	{
-	.iv = 50,
-	.lvl = 22,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 50,
-	.lvl = 22,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 50,
+    .lvl = 22,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 50,
+    .lvl = 22,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marc[] = {
-	{
-	.iv = 120,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 130,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	}
+    {
+    .iv = 120,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 130,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenden[] = {
-	{
-	.iv = 100,
-	.lvl = 13,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 100,
+    .lvl = 13,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lilith[] = {
-	{
-	.iv = 150,
-	.lvl = 13,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 150,
+    .lvl = 13,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristian[] = {
-	{
-	.iv = 200,
-	.lvl = 13,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 200,
+    .lvl = 13,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sylvia[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonardo[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Athena[] = {
-	{
-	.iv = 100,
-	.lvl = 32,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE
-	},
-	{
-	.iv = 100,
-	.lvl = 32,
-	.species = SPECIES_LINOONE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 100,
+    .lvl = 32,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE
+    },
+    {
+    .iv = 100,
+    .lvl = 32,
+    .species = SPECIES_LINOONE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harrison[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = {
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarence[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terry[] = {
-	{
-	.iv = 0,
-	.lvl = 37,
-	.species = SPECIES_GIRAFARIG,
-	}
+    {
+    .iv = 0,
+    .lvl = 37,
+    .species = SPECIES_GIRAFARIG,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nate[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_SPOINK,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_SPOINK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kathleen[] = {
-	{
-	.iv = 100,
-	.lvl = 36,
-	.species = SPECIES_KADABRA,
-	}
+    {
+    .iv = 100,
+    .lvl = 36,
+    .species = SPECIES_KADABRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clifford[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_GIRAFARIG,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_GIRAFARIG,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicholas[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_WOBBUFFET,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_WOBBUFFET,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_BALTOY,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_BALTOY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_BALTOY,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_BALTOY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Macey[] = {
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_NATU,
-	}
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_NATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = {
-	{
-	.iv = 25,
-	.lvl = 13,
-	.species = SPECIES_LOTAD,
-	},
-	{
-	.iv = 50,
-	.lvl = 15,
-	.species = SPECIES_TORCHIC,
-	}
+    {
+    .iv = 25,
+    .lvl = 13,
+    .species = SPECIES_LOTAD,
+    },
+    {
+    .iv = 50,
+    .lvl = 15,
+    .species = SPECIES_TORCHIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = {
-	{
-	.iv = 25,
-	.lvl = 13,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 50,
-	.lvl = 15,
-	.species = SPECIES_TREECKO,
-	}
+    {
+    .iv = 25,
+    .lvl = 13,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 50,
+    .lvl = 15,
+    .species = SPECIES_TREECKO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paxton[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabella[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = {
-	{
-	.iv = 50,
-	.lvl = 18,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 50,
-	.lvl = 20,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 50,
-	.lvl = 22,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 50,
-	.lvl = 22,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 50,
+    .lvl = 18,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 50,
+    .lvl = 20,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 50,
+    .lvl = 22,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 50,
+    .lvl = 22,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonathan[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_KECLEON,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_KECLEON,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = {
-	{
-	.iv = 25,
-	.lvl = 13,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 50,
-	.lvl = 15,
-	.species = SPECIES_MUDKIP,
-	}
+    {
+    .iv = 25,
+    .lvl = 13,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 50,
+    .lvl = 15,
+    .species = SPECIES_MUDKIP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = {
-	{
-	.iv = 25,
-	.lvl = 13,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 50,
-	.lvl = 15,
-	.species = SPECIES_TREECKO,
-	}
+    {
+    .iv = 25,
+    .lvl = 13,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 50,
+    .lvl = 15,
+    .species = SPECIES_TREECKO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = {
-	{
-	.iv = 150,
-	.lvl = 37,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 150,
-	.lvl = 38,
-	.species = SPECIES_CROBAT,
-	},
-	{
-	.iv = 150,
-	.lvl = 39,
-	.species = SPECIES_CAMERUPT,
-	}
+    {
+    .iv = 150,
+    .lvl = 37,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 150,
+    .lvl = 38,
+    .species = SPECIES_CROBAT,
+    },
+    {
+    .iv = 150,
+    .lvl = 39,
+    .species = SPECIES_CAMERUPT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = {
-	{
-	.iv = 150,
-	.lvl = 24,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 150,
-	.lvl = 24,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 150,
-	.lvl = 25,
-	.species = SPECIES_CAMERUPT,
-	}
+    {
+    .iv = 150,
+    .lvl = 24,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 150,
+    .lvl = 24,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 150,
+    .lvl = 25,
+    .species = SPECIES_CAMERUPT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = {
-	{
-	.iv = 0,
-	.lvl = 4,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 4,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 0,
+    .lvl = 4,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 4,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = {
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_LOTAD,
-	},
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_LOTAD,
+    },
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = {
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = {
-	{
-	.iv = 100,
-	.lvl = 15,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 100,
-	.lvl = 15,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 100,
-	.lvl = 15,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 100,
+    .lvl = 15,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 100,
+    .lvl = 15,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 100,
+    .lvl = 15,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = {
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 30,
-	.lvl = 32,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 30,
+    .lvl = 32,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = {
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 40,
-	.lvl = 34,
-	.species = SPECIES_BRELOOM,
-	}
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 40,
+    .lvl = 34,
+    .species = SPECIES_BRELOOM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_ODDISH,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_ODDISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = {
-	{
-	.iv = 100,
-	.lvl = 40,
-	.species = SPECIES_LUVDISC,
-	}
+    {
+    .iv = 100,
+    .lvl = 40,
+    .species = SPECIES_LUVDISC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = {
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_GOLDEEN,
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_GOLDEEN,
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = {
-	{
-	.iv = 0,
-	.lvl = 4,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 0,
-	.lvl = 4,
-	.species = SPECIES_WURMPLE,
-	}
+    {
+    .iv = 0,
+    .lvl = 4,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 0,
+    .lvl = 4,
+    .species = SPECIES_WURMPLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = {
-	{
-	.iv = 0,
-	.lvl = 3,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 0,
-	.lvl = 3,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 0,
-	.lvl = 3,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 0,
-	.lvl = 3,
-	.species = SPECIES_WURMPLE,
-	}
+    {
+    .iv = 0,
+    .lvl = 3,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 0,
+    .lvl = 3,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 0,
+    .lvl = 3,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 0,
+    .lvl = 3,
+    .species = SPECIES_WURMPLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = {
-	{
-	.iv = 50,
-	.lvl = 8,
-	.species = SPECIES_WURMPLE,
-	},
-	{
-	.iv = 50,
-	.lvl = 8,
-	.species = SPECIES_NINCADA,
-	}
+    {
+    .iv = 50,
+    .lvl = 8,
+    .species = SPECIES_WURMPLE,
+    },
+    {
+    .iv = 50,
+    .lvl = 8,
+    .species = SPECIES_NINCADA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_NINCADA,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_NINCADA,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_VOLBEAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_ILLUMISE,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_VOLBEAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_ILLUMISE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = {
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_NINCADA,
-	},
-	{
-	.iv = 0,
-	.lvl = 6,
-	.species = SPECIES_NINCADA,
-	}
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_NINCADA,
+    },
+    {
+    .iv = 0,
+    .lvl = 6,
+    .species = SPECIES_NINCADA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = {
-	{
-	.iv = 10,
-	.lvl = 27,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 10,
+    .lvl = 27,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = {
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_DUSTOX,
-	},
-	{
-	.iv = 20,
-	.lvl = 29,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_DUSTOX,
+    },
+    {
+    .iv = 20,
+    .lvl = 29,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = {
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_DUSTOX,
-	},
-	{
-	.iv = 30,
-	.lvl = 31,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_DUSTOX,
+    },
+    {
+    .iv = 30,
+    .lvl = 31,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = {
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_SURSKIT,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_NINJASK,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_DUSTOX,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_NINJASK,
-	}
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_SURSKIT,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_NINJASK,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_DUSTOX,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_NINJASK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_GEODUDE,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_GEODUDE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_NOSEPASS,
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_GRAVELER,
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_NOSEPASS,
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_GRAVELER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = {
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	}
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = {
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_BALTOY,
-	}
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_BALTOY,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = {
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_WAILMER,
-	.moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_WAILMER,
+    .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = {
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_PELIPPER,
-	.moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE
-	},
-	{
-	.iv = 0,
-	.lvl = 10,
-	.species = SPECIES_POOCHYENA,
-	.moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_PELIPPER,
+    .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE
+    },
+    {
+    .iv = 0,
+    .lvl = 10,
+    .species = SPECIES_POOCHYENA,
+    .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = {
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 16,
-	.species = SPECIES_MACHOP,
-	}
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 16,
+    .species = SPECIES_MACHOP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = {
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 10,
-	.lvl = 24,
-	.species = SPECIES_GRAVELER,
-	}
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 10,
+    .lvl = 24,
+    .species = SPECIES_GRAVELER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = {
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 20,
-	.lvl = 27,
-	.species = SPECIES_GRAVELER,
-	}
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 20,
+    .lvl = 27,
+    .species = SPECIES_GRAVELER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = {
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_GRAVELER,
-	}
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_GRAVELER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = {
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GRAVELER,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GOLEM,
-	}
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GRAVELER,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GOLEM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_DELCATTY,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_DELCATTY,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = {
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_LUVDISC,
-	}
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_LUVDISC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan1[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_VOLBEAT,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_ILLUMISE,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_VOLBEAT,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_ILLUMISE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan2[] = {
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_VOLBEAT,
-	},
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_ILLUMISE,
-	}
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_VOLBEAT,
+    },
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_ILLUMISE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan3[] = {
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_VOLBEAT,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_ILLUMISE,
-	}
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_VOLBEAT,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_ILLUMISE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan4[] = {
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_VOLBEAT,
-	},
-	{
-	.iv = 30,
-	.lvl = 36,
-	.species = SPECIES_ILLUMISE,
-	}
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_VOLBEAT,
+    },
+    {
+    .iv = 30,
+    .lvl = 36,
+    .species = SPECIES_ILLUMISE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan5[] = {
-	{
-	.iv = 40,
-	.lvl = 39,
-	.species = SPECIES_VOLBEAT,
-	},
-	{
-	.iv = 40,
-	.lvl = 39,
-	.species = SPECIES_ILLUMISE,
-	}
+    {
+    .iv = 40,
+    .lvl = 39,
+    .species = SPECIES_VOLBEAT,
+    },
+    {
+    .iv = 40,
+    .lvl = 39,
+    .species = SPECIES_ILLUMISE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = {
-	{
-	.iv = 0,
-	.lvl = 13,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 13,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Gerald[] = {
-	{
-	.iv = 100,
-	.lvl = 23,
-	.species = SPECIES_KECLEON,
-	.moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND
-	}
+    {
+    .iv = 100,
+    .lvl = 23,
+    .species = SPECIES_KECLEON,
+    .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = {
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_MEDITITE,
-	.moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_MEDITITE,
-	.moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE
-	}
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_MEDITITE,
+    .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_MEDITITE,
+    .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Danielle[] = {
-	{
-	.iv = 100,
-	.lvl = 23,
-	.species = SPECIES_MEDITITE,
-	.moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH
-	}
+    {
+    .iv = 100,
+    .lvl = 23,
+    .species = SPECIES_MEDITITE,
+    .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_NINJASK,
-	.moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_NINJASK,
+    .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Riley[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_NINCADA,
-	.moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_KOFFING,
-	.moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_NINCADA,
+    .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_KOFFING,
+    .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = {
-	{
-	.iv = 150,
-	.lvl = 29,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 150,
-	.lvl = 29,
-	.species = SPECIES_XATU,
-	}
+    {
+    .iv = 150,
+    .lvl = 29,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 150,
+    .lvl = 29,
+    .species = SPECIES_XATU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ashley[] = {
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_SWABLU,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_SWABLU,
-	},
-	{
-	.iv = 100,
-	.lvl = 27,
-	.species = SPECIES_SWABLU,
-	}
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_SWABLU,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_SWABLU,
+    },
+    {
+    .iv = 100,
+    .lvl = 27,
+    .species = SPECIES_SWABLU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = {
-	{
-	.iv = 30,
-	.lvl = 16,
-	.species = SPECIES_RALTS,
-	}
+    {
+    .iv = 30,
+    .lvl = 16,
+    .species = SPECIES_RALTS,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = {
-	{
-	.iv = 150,
-	.lvl = 47,
-	.species = SPECIES_ALTARIA,
-	.moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	},
-	{
-	.iv = 150,
-	.lvl = 46,
-	.species = SPECIES_DELCATTY,
-	.moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 150,
-	.lvl = 47,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	},
-	{
-	.iv = 150,
-	.lvl = 44,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	},
-	{
-	.iv = 250,
-	.lvl = 48,
-	.species = SPECIES_GARDEVOIR,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	}
+    {
+    .iv = 150,
+    .lvl = 47,
+    .species = SPECIES_ALTARIA,
+    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    },
+    {
+    .iv = 150,
+    .lvl = 46,
+    .species = SPECIES_DELCATTY,
+    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 150,
+    .lvl = 47,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    },
+    {
+    .iv = 150,
+    .lvl = 44,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    },
+    {
+    .iv = 250,
+    .lvl = 48,
+    .species = SPECIES_GARDEVOIR,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = {
-	{
-	.iv = 150,
-	.lvl = 50,
-	.species = SPECIES_ALTARIA,
-	.moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	},
-	{
-	.iv = 150,
-	.lvl = 49,
-	.species = SPECIES_DELCATTY,
-	.moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 150,
-	.lvl = 50,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	},
-	{
-	.iv = 150,
-	.lvl = 47,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	},
-	{
-	.iv = 250,
-	.lvl = 51,
-	.species = SPECIES_GARDEVOIR,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	}
+    {
+    .iv = 150,
+    .lvl = 50,
+    .species = SPECIES_ALTARIA,
+    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    },
+    {
+    .iv = 150,
+    .lvl = 49,
+    .species = SPECIES_DELCATTY,
+    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 150,
+    .lvl = 50,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    },
+    {
+    .iv = 150,
+    .lvl = 47,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    },
+    {
+    .iv = 250,
+    .lvl = 51,
+    .species = SPECIES_GARDEVOIR,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = {
-	{
-	.iv = 150,
-	.lvl = 53,
-	.species = SPECIES_ALTARIA,
-	.moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	},
-	{
-	.iv = 150,
-	.lvl = 52,
-	.species = SPECIES_DELCATTY,
-	.moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 150,
-	.lvl = 53,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	},
-	{
-	.iv = 150,
-	.lvl = 50,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	},
-	{
-	.iv = 250,
-	.lvl = 54,
-	.species = SPECIES_GARDEVOIR,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	}
+    {
+    .iv = 150,
+    .lvl = 53,
+    .species = SPECIES_ALTARIA,
+    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    },
+    {
+    .iv = 150,
+    .lvl = 52,
+    .species = SPECIES_DELCATTY,
+    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 150,
+    .lvl = 53,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    },
+    {
+    .iv = 150,
+    .lvl = 50,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    },
+    {
+    .iv = 250,
+    .lvl = 54,
+    .species = SPECIES_GARDEVOIR,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = {
-	{
-	.iv = 150,
-	.lvl = 56,
-	.species = SPECIES_ALTARIA,
-	.moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	},
-	{
-	.iv = 150,
-	.lvl = 55,
-	.species = SPECIES_DELCATTY,
-	.moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	},
-	{
-	.iv = 150,
-	.lvl = 56,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	},
-	{
-	.iv = 150,
-	.lvl = 53,
-	.species = SPECIES_MAGNETON,
-	.moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	},
-	{
-	.iv = 250,
-	.lvl = 57,
-	.species = SPECIES_GARDEVOIR,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	}
+    {
+    .iv = 150,
+    .lvl = 56,
+    .species = SPECIES_ALTARIA,
+    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    },
+    {
+    .iv = 150,
+    .lvl = 55,
+    .species = SPECIES_DELCATTY,
+    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    },
+    {
+    .iv = 150,
+    .lvl = 56,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    },
+    {
+    .iv = 150,
+    .lvl = 53,
+    .species = SPECIES_MAGNETON,
+    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    },
+    {
+    .iv = 250,
+    .lvl = 57,
+    .species = SPECIES_GARDEVOIR,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan13[] = {
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 200,
-	.lvl = 34,
-	.species = SPECIES_GROVYLE,
-	}
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 200,
+    .lvl = 34,
+    .species = SPECIES_GROVYLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan14[] = {
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_LUDICOLO,
-	},
-	{
-	.iv = 200,
-	.lvl = 34,
-	.species = SPECIES_COMBUSKEN,
-	}
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_LUDICOLO,
+    },
+    {
+    .iv = 200,
+    .lvl = 34,
+    .species = SPECIES_COMBUSKEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan15[] = {
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_LUDICOLO,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 200,
-	.lvl = 34,
-	.species = SPECIES_MARSHTOMP,
-	}
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_LUDICOLO,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 200,
+    .lvl = 34,
+    .species = SPECIES_MARSHTOMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = {
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 200,
-	.lvl = 34,
-	.species = SPECIES_GROVYLE,
-	}
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 200,
+    .lvl = 34,
+    .species = SPECIES_GROVYLE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = {
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_LUDICOLO,
-	},
-	{
-	.iv = 200,
-	.lvl = 34,
-	.species = SPECIES_COMBUSKEN,
-	}
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_LUDICOLO,
+    },
+    {
+    .iv = 200,
+    .lvl = 34,
+    .species = SPECIES_COMBUSKEN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May13[] = {
-	{
-	.iv = 150,
-	.lvl = 31,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_LUDICOLO,
-	},
-	{
-	.iv = 150,
-	.lvl = 32,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 200,
-	.lvl = 34,
-	.species = SPECIES_MARSHTOMP,
-	}
+    {
+    .iv = 150,
+    .lvl = 31,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_LUDICOLO,
+    },
+    {
+    .iv = 150,
+    .lvl = 32,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 200,
+    .lvl = 34,
+    .species = SPECIES_MARSHTOMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = {
-	{
-	.iv = 0,
-	.lvl = 30,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 0,
+    .lvl = 30,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_CARVANHA,
-	},
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_CARVANHA,
+    },
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_GYARADOS,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_GYARADOS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = {
-	{
-	.iv = 100,
-	.lvl = 34,
-	.species = SPECIES_GLOOM,
-	},
-	{
-	.iv = 100,
-	.lvl = 34,
-	.species = SPECIES_AZUMARILL,
-	}
+    {
+    .iv = 100,
+    .lvl = 34,
+    .species = SPECIES_GLOOM,
+    },
+    {
+    .iv = 100,
+    .lvl = 34,
+    .species = SPECIES_AZUMARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = {
-	{
-	.iv = 100,
-	.lvl = 34,
-	.species = SPECIES_SHIFTRY,
-	},
-	{
-	.iv = 100,
-	.lvl = 34,
-	.species = SPECIES_NOSEPASS,
-	}
+    {
+    .iv = 100,
+    .lvl = 34,
+    .species = SPECIES_SHIFTRY,
+    },
+    {
+    .iv = 100,
+    .lvl = 34,
+    .species = SPECIES_NOSEPASS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji1[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = {
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 31,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 36,
-	.species = SPECIES_WAILMER,
-	}
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 31,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 36,
+    .species = SPECIES_WAILMER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SKARMORY,
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SKARMORY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_SPHEAL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_SPHEAL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_CHINCHOU,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_CHINCHOU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_SPINDA,
-	},
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_SPINDA,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_SPINDA,
+    },
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_SPINDA,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = {
-	{
-	.iv = 0,
-	.lvl = 32,
-	.species = SPECIES_SWABLU,
-	.moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_NUMEL,
-	.moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 0,
+    .lvl = 32,
+    .species = SPECIES_SWABLU,
+    .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_NUMEL,
+    .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_ROSELIA,
-	.moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED
-	},
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_GRAVELER,
-	.moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_ROSELIA,
+    .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED
+    },
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_GRAVELER,
+    .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_DUSTOX,
-	.moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT
-	},
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_BEAUTIFLY,
-	.moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_DUSTOX,
+    .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT
+    },
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_BEAUTIFLY,
+    .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = {
-	{
-	.iv = 200,
-	.lvl = 39,
-	.species = SPECIES_MEDICHAM,
-	.moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	},
-	{
-	.iv = 200,
-	.lvl = 39,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	}
+    {
+    .iv = 200,
+    .lvl = 39,
+    .species = SPECIES_MEDICHAM,
+    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    },
+    {
+    .iv = 200,
+    .lvl = 39,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = {
-	{
-	.iv = 210,
-	.lvl = 43,
-	.species = SPECIES_MEDICHAM,
-	.moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	},
-	{
-	.iv = 210,
-	.lvl = 43,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	}
+    {
+    .iv = 210,
+    .lvl = 43,
+    .species = SPECIES_MEDICHAM,
+    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    },
+    {
+    .iv = 210,
+    .lvl = 43,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = {
-	{
-	.iv = 220,
-	.lvl = 46,
-	.species = SPECIES_MEDICHAM,
-	.moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	},
-	{
-	.iv = 220,
-	.lvl = 46,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	}
+    {
+    .iv = 220,
+    .lvl = 46,
+    .species = SPECIES_MEDICHAM,
+    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    },
+    {
+    .iv = 220,
+    .lvl = 46,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = {
-	{
-	.iv = 230,
-	.lvl = 49,
-	.species = SPECIES_MEDICHAM,
-	.moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	},
-	{
-	.iv = 230,
-	.lvl = 49,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	}
+    {
+    .iv = 230,
+    .lvl = 49,
+    .species = SPECIES_MEDICHAM,
+    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    },
+    {
+    .iv = 230,
+    .lvl = 49,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = {
-	{
-	.iv = 240,
-	.lvl = 52,
-	.species = SPECIES_MEDICHAM,
-	.moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	},
-	{
-	.iv = 240,
-	.lvl = 52,
-	.species = SPECIES_HARIYAMA,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	}
+    {
+    .iv = 240,
+    .lvl = 52,
+    .species = SPECIES_MEDICHAM,
+    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    },
+    {
+    .iv = 240,
+    .lvl = 52,
+    .species = SPECIES_HARIYAMA,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = {
-	{
-	.iv = 0,
-	.lvl = 35,
-	.species = SPECIES_AZUMARILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 0,
+    .lvl = 35,
+    .species = SPECIES_AZUMARILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy1[] = {
-	{
-	.iv = 0,
-	.lvl = 34,
-	.species = SPECIES_CHINCHOU,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 34,
+    .species = SPECIES_CHINCHOU,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy2[] = {
-	{
-	.iv = 0,
-	.lvl = 42,
-	.species = SPECIES_CHINCHOU,
-	},
-	{
-	.iv = 0,
-	.lvl = 40,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 42,
+    .species = SPECIES_CHINCHOU,
+    },
+    {
+    .iv = 0,
+    .lvl = 40,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy3[] = {
-	{
-	.iv = 0,
-	.lvl = 45,
-	.species = SPECIES_LANTURN,
-	},
-	{
-	.iv = 0,
-	.lvl = 43,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 45,
+    .species = SPECIES_LANTURN,
+    },
+    {
+    .iv = 0,
+    .lvl = 43,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy4[] = {
-	{
-	.iv = 0,
-	.lvl = 48,
-	.species = SPECIES_LANTURN,
-	},
-	{
-	.iv = 0,
-	.lvl = 46,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 0,
+    .lvl = 48,
+    .species = SPECIES_LANTURN,
+    },
+    {
+    .iv = 0,
+    .lvl = 46,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy5[] = {
-	{
-	.iv = 0,
-	.lvl = 51,
-	.species = SPECIES_LANTURN,
-	},
-	{
-	.iv = 0,
-	.lvl = 49,
-	.species = SPECIES_SHARPEDO,
-	}
+    {
+    .iv = 0,
+    .lvl = 51,
+    .species = SPECIES_LANTURN,
+    },
+    {
+    .iv = 0,
+    .lvl = 49,
+    .species = SPECIES_SHARPEDO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = {
-	{
-	.iv = 0,
-	.lvl = 27,
-	.species = SPECIES_GOLDEEN,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 27,
+    .species = SPECIES_GOLDEEN,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_MAGIKARP,
-	},
-	{
-	.iv = 0,
-	.lvl = 20,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_FEEBAS,
-	},
-	{
-	.iv = 0,
-	.lvl = 23,
-	.species = SPECIES_CARVANHA,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_MAGIKARP,
+    },
+    {
+    .iv = 0,
+    .lvl = 20,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_FEEBAS,
+    },
+    {
+    .iv = 0,
+    .lvl = 23,
+    .species = SPECIES_CARVANHA,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Dawson[] = {
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_ZIGZAGOON,
-	.heldItem = ITEM_NUGGET
-	},
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_POOCHYENA,
-	.heldItem = ITEM_NONE
-	}
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_ZIGZAGOON,
+    .heldItem = ITEM_NUGGET
+    },
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_POOCHYENA,
+    .heldItem = ITEM_NONE
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Sarah[] = {
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_LOTAD,
-	.heldItem = ITEM_NONE
-	},
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_ZIGZAGOON,
-	.heldItem = ITEM_NUGGET
-	}
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_LOTAD,
+    .heldItem = ITEM_NONE
+    },
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_ZIGZAGOON,
+    .heldItem = ITEM_NUGGET
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darian[] = {
-	{
-	.iv = 0,
-	.lvl = 9,
-	.species = SPECIES_MAGIKARP,
-	}
+    {
+    .iv = 0,
+    .lvl = 9,
+    .species = SPECIES_MAGIKARP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hailey[] = {
-	{
-	.iv = 0,
-	.lvl = 13,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 13,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chandler[] = {
-	{
-	.iv = 0,
-	.lvl = 12,
-	.species = SPECIES_TENTACOOL,
-	},
-	{
-	.iv = 0,
-	.lvl = 12,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 12,
+    .species = SPECIES_TENTACOOL,
+    },
+    {
+    .iv = 0,
+    .lvl = 12,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonItemDefaultMoves gTrainerParty_Kaleb[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_MINUN,
-	.heldItem = ITEM_ORAN_BERRY
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_PLUSLE,
-	.heldItem = ITEM_ORAN_BERRY
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_MINUN,
+    .heldItem = ITEM_ORAN_BERRY
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_PLUSLE,
+    .heldItem = ITEM_ORAN_BERRY
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joseph[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_VOLTORB,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_VOLTORB,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alyssa[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_MAGNEMITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_MAGNEMITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcos[] = {
-	{
-	.iv = 100,
-	.lvl = 15,
-	.species = SPECIES_VOLTORB,
-	}
+    {
+    .iv = 100,
+    .lvl = 15,
+    .species = SPECIES_VOLTORB,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rhett[] = {
-	{
-	.iv = 100,
-	.lvl = 15,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 100,
+    .lvl = 15,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tyron[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celina[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bianca[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SHROOMISH,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SHROOMISH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hayden[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophie[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_LOMBRE,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_LOMBRE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Coby[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_SKARMORY,
-	},
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_SKARMORY,
+    },
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lawrence[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_BALTOY,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_BALTOY,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wyatt[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_ARON,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_ARON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelina[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kai[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_BARBOACH,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_BARBOACH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlotte[] = {
-	{
-	.iv = 0,
-	.lvl = 19,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 19,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Deandre[] = {
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ARON,
-	},
-	{
-	.iv = 0,
-	.lvl = 14,
-	.species = SPECIES_ELECTRIKE,
-	}
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ARON,
+    },
+    {
+    .iv = 0,
+    .lvl = 14,
+    .species = SPECIES_ELECTRIKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_BALTOY,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_BALTOY,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_BALTOY,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_BALTOY,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_POOCHYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_POOCHYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_BALTOY,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_BALTOY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_ZUBAT,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_ZUBAT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_MIGHTYENA,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_MIGHTYENA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_BALTOY,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_BALTOY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha3[] = {
-	{
-	.iv = 75,
-	.lvl = 26,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 75,
-	.lvl = 28,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 75,
-	.lvl = 30,
-	.species = SPECIES_ZUBAT,
-	},
-	{
-	.iv = 75,
-	.lvl = 33,
-	.species = SPECIES_CAMERUPT,
-	}
+    {
+    .iv = 75,
+    .lvl = 26,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 75,
+    .lvl = 28,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 75,
+    .lvl = 30,
+    .species = SPECIES_ZUBAT,
+    },
+    {
+    .iv = 75,
+    .lvl = 33,
+    .species = SPECIES_CAMERUPT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_CAMERUPT,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_CAMERUPT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = {
-	{
-	.iv = 150,
-	.lvl = 42,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 150,
-	.lvl = 43,
-	.species = SPECIES_CROBAT,
-	},
-	{
-	.iv = 150,
-	.lvl = 44,
-	.species = SPECIES_CAMERUPT,
-	}
+    {
+    .iv = 150,
+    .lvl = 42,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 150,
+    .lvl = 43,
+    .species = SPECIES_CROBAT,
+    },
+    {
+    .iv = 150,
+    .lvl = 44,
+    .species = SPECIES_CAMERUPT,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pete[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabelle[] = {
-	{
-	.iv = 0,
-	.lvl = 15,
-	.species = SPECIES_MARILL,
-	}
+    {
+    .iv = 0,
+    .lvl = 15,
+    .species = SPECIES_MARILL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres1[] = {
-	{
-	.iv = 50,
-	.lvl = 25,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 50,
-	.lvl = 25,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 50,
+    .lvl = 25,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 50,
+    .lvl = 25,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Josue[] = {
-	{
-	.iv = 50,
-	.lvl = 25,
-	.species = SPECIES_TAILLOW,
-	},
-	{
-	.iv = 50,
-	.lvl = 25,
-	.species = SPECIES_WINGULL,
-	}
+    {
+    .iv = 50,
+    .lvl = 25,
+    .species = SPECIES_TAILLOW,
+    },
+    {
+    .iv = 50,
+    .lvl = 25,
+    .species = SPECIES_WINGULL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camron[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory1[] = {
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 0,
-	.lvl = 24,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 0,
+    .lvl = 24,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carolina[] = {
-	{
-	.iv = 50,
-	.lvl = 24,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 50,
-	.lvl = 24,
-	.species = SPECIES_SWELLOW,
-	},
-	{
-	.iv = 50,
-	.lvl = 24,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 50,
+    .lvl = 24,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 50,
+    .lvl = 24,
+    .species = SPECIES_SWELLOW,
+    },
+    {
+    .iv = 50,
+    .lvl = 24,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elijah[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_SKARMORY,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_SKARMORY,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_SKARMORY,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_SKARMORY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celia[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_LOMBRE,
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_LOMBRE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryan[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_SANDSLASH,
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_SANDSLASH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Branden[] = {
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_TAILLOW,
-	},
-	{
-	.iv = 0,
-	.lvl = 22,
-	.species = SPECIES_NUZLEAF,
-	}
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_TAILLOW,
+    },
+    {
+    .iv = 0,
+    .lvl = 22,
+    .species = SPECIES_NUZLEAF,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryant[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SLUGMA,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SLUGMA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shayla[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_ROSELIA,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_ROSELIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyra[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_DODUO,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_DODRIO,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_DODUO,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_DODRIO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaiden[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_NINJASK,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_GULPIN,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_NINJASK,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_GULPIN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alix[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_KADABRA,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_KIRLIA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_KADABRA,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_KIRLIA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Helene[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marlene[] = {
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 0,
-	.lvl = 18,
-	.species = SPECIES_SPOINK,
-	}
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 0,
+    .lvl = 18,
+    .species = SPECIES_SPOINK,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Devan[] = {
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_GEODUDE,
-	}
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_GEODUDE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johnson[] = {
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 0,
-	.lvl = 8,
-	.species = SPECIES_LOTAD,
-	}
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 0,
+    .lvl = 8,
+    .species = SPECIES_LOTAD,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melina[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_DODUO,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_DODUO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandi[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_RALTS,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_RALTS,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aisha[] = {
-	{
-	.iv = 0,
-	.lvl = 17,
-	.species = SPECIES_MEDITITE,
-	}
+    {
+    .iv = 0,
+    .lvl = 17,
+    .species = SPECIES_MEDITITE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makayla[] = {
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_ROSELIA,
-	},
-	{
-	.iv = 0,
-	.lvl = 33,
-	.species = SPECIES_MEDICHAM,
-	}
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_ROSELIA,
+    },
+    {
+    .iv = 0,
+    .lvl = 33,
+    .species = SPECIES_MEDICHAM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fabian[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_MANECTRIC,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_MANECTRIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dayton[] = {
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_SLUGMA,
-	},
-	{
-	.iv = 0,
-	.lvl = 25,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_SLUGMA,
+    },
+    {
+    .iv = 0,
+    .lvl = 25,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rachel[] = {
-	{
-	.iv = 0,
-	.lvl = 26,
-	.species = SPECIES_GOLDEEN,
-	}
+    {
+    .iv = 0,
+    .lvl = 26,
+    .species = SPECIES_GOLDEEN,
+    }
 };
 
 const struct TrainerMonNoItemCustomMoves gTrainerParty_Leonel[] = {
-	{
-	.iv = 100,
-	.lvl = 30,
-	.species = SPECIES_MANECTRIC,
-	.moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE
-	}
+    {
+    .iv = 100,
+    .lvl = 30,
+    .species = SPECIES_MANECTRIC,
+    .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Callie[] = {
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_MEDITITE,
-	},
-	{
-	.iv = 0,
-	.lvl = 28,
-	.species = SPECIES_MAKUHITA,
-	}
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_MEDITITE,
+    },
+    {
+    .iv = 0,
+    .lvl = 28,
+    .species = SPECIES_MAKUHITA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cale[] = {
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_DUSTOX,
-	},
-	{
-	.iv = 0,
-	.lvl = 29,
-	.species = SPECIES_BEAUTIFLY,
-	}
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_DUSTOX,
+    },
+    {
+    .iv = 0,
+    .lvl = 29,
+    .species = SPECIES_BEAUTIFLY,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Myles[] = {
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_MAKUHITA,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_TROPIUS,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_MAKUHITA,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_TROPIUS,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pat[] = {
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_POOCHYENA,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_SHROOMISH,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_MARILL,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 10,
-	.lvl = 25,
-	.species = SPECIES_GULPIN,
-	}
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_POOCHYENA,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_SHROOMISH,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_MARILL,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 10,
+    .lvl = 25,
+    .species = SPECIES_GULPIN,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin1[] = {
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 100,
-	.lvl = 29,
-	.species = SPECIES_VIGOROTH,
-	}
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 100,
+    .lvl = 29,
+    .species = SPECIES_VIGOROTH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May14[] = {
-	{
-	.iv = 25,
-	.lvl = 13,
-	.species = SPECIES_LOTAD,
-	},
-	{
-	.iv = 50,
-	.lvl = 15,
-	.species = SPECIES_TORCHIC,
-	}
+    {
+    .iv = 25,
+    .lvl = 13,
+    .species = SPECIES_LOTAD,
+    },
+    {
+    .iv = 50,
+    .lvl = 15,
+    .species = SPECIES_TORCHIC,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May15[] = {
-	{
-	.iv = 25,
-	.lvl = 13,
-	.species = SPECIES_TORKOAL,
-	},
-	{
-	.iv = 50,
-	.lvl = 15,
-	.species = SPECIES_MUDKIP,
-	}
+    {
+    .iv = 25,
+    .lvl = 13,
+    .species = SPECIES_TORKOAL,
+    },
+    {
+    .iv = 50,
+    .lvl = 15,
+    .species = SPECIES_MUDKIP,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne2[] = {
-	{
-	.iv = 255,
-	.lvl = 32,
-	.species = SPECIES_GOLEM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
-	},
-	{
-	.iv = 255,
-	.lvl = 35,
-	.species = SPECIES_KABUTO,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 35,
-	.species = SPECIES_ONIX,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 37,
-	.species = SPECIES_NOSEPASS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
-	}
+    {
+    .iv = 255,
+    .lvl = 32,
+    .species = SPECIES_GOLEM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
+    },
+    {
+    .iv = 255,
+    .lvl = 35,
+    .species = SPECIES_KABUTO,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 35,
+    .species = SPECIES_ONIX,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 37,
+    .species = SPECIES_NOSEPASS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne3[] = {
-	{
-	.iv = 255,
-	.lvl = 37,
-	.species = SPECIES_OMANYTE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
-	},
-	{
-	.iv = 255,
-	.lvl = 37,
-	.species = SPECIES_GOLEM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
-	},
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_KABUTOPS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_ONIX,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 42,
-	.species = SPECIES_NOSEPASS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
-	}
+    {
+    .iv = 255,
+    .lvl = 37,
+    .species = SPECIES_OMANYTE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
+    },
+    {
+    .iv = 255,
+    .lvl = 37,
+    .species = SPECIES_GOLEM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
+    },
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_KABUTOPS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_ONIX,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 42,
+    .species = SPECIES_NOSEPASS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne4[] = {
-	{
-	.iv = 255,
-	.lvl = 42,
-	.species = SPECIES_OMASTAR,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
-	},
-	{
-	.iv = 255,
-	.lvl = 42,
-	.species = SPECIES_GOLEM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_KABUTOPS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_ONIX,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_NOSEPASS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
-	}
+    {
+    .iv = 255,
+    .lvl = 42,
+    .species = SPECIES_OMASTAR,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
+    },
+    {
+    .iv = 255,
+    .lvl = 42,
+    .species = SPECIES_GOLEM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_KABUTOPS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_ONIX,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_NOSEPASS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne5[] = {
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_AERODACTYL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_GOLEM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
-	},
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_OMASTAR,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_KABUTOPS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_STEELIX,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 52,
-	.species = SPECIES_NOSEPASS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
-	}
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_AERODACTYL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_GOLEM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
+    },
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_OMASTAR,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_KABUTOPS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_STEELIX,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 52,
+    .species = SPECIES_NOSEPASS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Brawly2[] = {
-	{
-	.iv = 255,
-	.lvl = 33,
-	.species = SPECIES_MACHAMP,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
-	},
-	{
-	.iv = 255,
-	.lvl = 33,
-	.species = SPECIES_MEDITITE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 35,
-	.species = SPECIES_HITMONTOP,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
-	},
-	{
-	.iv = 255,
-	.lvl = 37,
-	.species = SPECIES_HARIYAMA,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 33,
+    .species = SPECIES_MACHAMP,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    },
+    {
+    .iv = 255,
+    .lvl = 33,
+    .species = SPECIES_MEDITITE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 35,
+    .species = SPECIES_HITMONTOP,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    },
+    {
+    .iv = 255,
+    .lvl = 37,
+    .species = SPECIES_HARIYAMA,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Brawly3[] = {
-	{
-	.iv = 255,
-	.lvl = 38,
-	.species = SPECIES_MACHAMP,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
-	},
-	{
-	.iv = 255,
-	.lvl = 38,
-	.species = SPECIES_MEDICHAM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_HITMONTOP,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
-	},
-	{
-	.iv = 255,
-	.lvl = 42,
-	.species = SPECIES_HARIYAMA,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 38,
+    .species = SPECIES_MACHAMP,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    },
+    {
+    .iv = 255,
+    .lvl = 38,
+    .species = SPECIES_MEDICHAM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_HITMONTOP,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    },
+    {
+    .iv = 255,
+    .lvl = 42,
+    .species = SPECIES_HARIYAMA,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Brawly4[] = {
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_HITMONCHAN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_MACHAMP,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_MEDICHAM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_HITMONTOP,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
-	},
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_HARIYAMA,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_HITMONCHAN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_MACHAMP,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_MEDICHAM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_HITMONTOP,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    },
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_HARIYAMA,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Brawly5[] = {
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_HITMONLEE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_HITMONCHAN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_MACHAMP,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_MEDICHAM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_HITMONTOP,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
-	},
-	{
-	.iv = 255,
-	.lvl = 52,
-	.species = SPECIES_HARIYAMA,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_HITMONLEE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_HITMONCHAN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_MACHAMP,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_MEDICHAM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_HITMONTOP,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    },
+    {
+    .iv = 255,
+    .lvl = 52,
+    .species = SPECIES_HARIYAMA,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Wattson2[] = {
-	{
-	.iv = 255,
-	.lvl = 36,
-	.species = SPECIES_MAREEP,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 36,
-	.species = SPECIES_ELECTRODE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 38,
-	.species = SPECIES_MAGNETON,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
-	}
+    {
+    .iv = 255,
+    .lvl = 36,
+    .species = SPECIES_MAREEP,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 36,
+    .species = SPECIES_ELECTRODE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 38,
+    .species = SPECIES_MAGNETON,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Wattson3[] = {
-	{
-	.iv = 255,
-	.lvl = 39,
-	.species = SPECIES_PIKACHU,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE
-	},
-	{
-	.iv = 255,
-	.lvl = 41,
-	.species = SPECIES_FLAAFFY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 41,
-	.species = SPECIES_ELECTRODE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_MAGNETON,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
-	}
+    {
+    .iv = 255,
+    .lvl = 39,
+    .species = SPECIES_PIKACHU,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE
+    },
+    {
+    .iv = 255,
+    .lvl = 41,
+    .species = SPECIES_FLAAFFY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 41,
+    .species = SPECIES_ELECTRODE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_MAGNETON,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Wattson4[] = {
-	{
-	.iv = 255,
-	.lvl = 44,
-	.species = SPECIES_RAICHU,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_AMPHAROS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_ELECTRODE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_MAGNETON,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
-	}
+    {
+    .iv = 255,
+    .lvl = 44,
+    .species = SPECIES_RAICHU,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_AMPHAROS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_ELECTRODE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_MAGNETON,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Wattson5[] = {
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_ELECTABUZZ,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_RAICHU,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_AMPHAROS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_ELECTRODE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_MAGNETON,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_MANECTRIC,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
-	}
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_ELECTABUZZ,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_RAICHU,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_AMPHAROS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_ELECTRODE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_MAGNETON,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_MANECTRIC,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Flannery2[] = {
-	{
-	.iv = 255,
-	.lvl = 38,
-	.species = SPECIES_MAGCARGO,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 36,
-	.species = SPECIES_PONYTA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
-	},
-	{
-	.iv = 255,
-	.lvl = 38,
-	.species = SPECIES_CAMERUPT,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
-	},
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_TORKOAL,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
-	}
+    {
+    .iv = 255,
+    .lvl = 38,
+    .species = SPECIES_MAGCARGO,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 36,
+    .species = SPECIES_PONYTA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    },
+    {
+    .iv = 255,
+    .lvl = 38,
+    .species = SPECIES_CAMERUPT,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    },
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_TORKOAL,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Flannery3[] = {
-	{
-	.iv = 255,
-	.lvl = 41,
-	.species = SPECIES_GROWLITHE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_MAGCARGO,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 41,
-	.species = SPECIES_PONYTA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_CAMERUPT,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_TORKOAL,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
-	}
+    {
+    .iv = 255,
+    .lvl = 41,
+    .species = SPECIES_GROWLITHE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_MAGCARGO,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 41,
+    .species = SPECIES_PONYTA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_CAMERUPT,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_TORKOAL,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Flannery4[] = {
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_HOUNDOUR,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_GROWLITHE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_MAGCARGO,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_RAPIDASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_CAMERUPT,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_TORKOAL,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
-	}
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_HOUNDOUR,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_GROWLITHE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_MAGCARGO,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_RAPIDASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_CAMERUPT,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_TORKOAL,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Flannery5[] = {
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_ARCANINE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_MAGCARGO,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_HOUNDOOM,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_RAPIDASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_CAMERUPT,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_TORKOAL,
-	.heldItem = ITEM_WHITE_HERB,
-	.moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
-	}
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_ARCANINE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_MAGCARGO,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_HOUNDOOM,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_RAPIDASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_CAMERUPT,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_TORKOAL,
+    .heldItem = ITEM_WHITE_HERB,
+    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Norman2[] = {
-	{
-	.iv = 255,
-	.lvl = 42,
-	.species = SPECIES_CHANSEY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 42,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_SPINDA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
-	}
+    {
+    .iv = 255,
+    .lvl = 42,
+    .species = SPECIES_CHANSEY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 42,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_SPINDA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Norman3[] = {
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
-	},
-	{
-	.iv = 255,
-	.lvl = 47,
-	.species = SPECIES_CHANSEY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_KANGASKHAN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_SPINDA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
-	}
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    },
+    {
+    .iv = 255,
+    .lvl = 47,
+    .species = SPECIES_CHANSEY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_KANGASKHAN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_SPINDA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Norman4[] = {
-	{
-	.iv = 255,
-	.lvl = 52,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
-	},
-	{
-	.iv = 255,
-	.lvl = 52,
-	.species = SPECIES_BLISSEY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_KANGASKHAN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_SPINDA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
-	}
+    {
+    .iv = 255,
+    .lvl = 52,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    },
+    {
+    .iv = 255,
+    .lvl = 52,
+    .species = SPECIES_BLISSEY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_KANGASKHAN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_SPINDA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Norman5[] = {
-	{
-	.iv = 255,
-	.lvl = 57,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
-	},
-	{
-	.iv = 255,
-	.lvl = 57,
-	.species = SPECIES_BLISSEY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_KANGASKHAN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
-	},
-	{
-	.iv = 255,
-	.lvl = 57,
-	.species = SPECIES_TAUROS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_SPINDA,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
-	},
-	{
-	.iv = 255,
-	.lvl = 60,
-	.species = SPECIES_SLAKING,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
-	}
+    {
+    .iv = 255,
+    .lvl = 57,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    },
+    {
+    .iv = 255,
+    .lvl = 57,
+    .species = SPECIES_BLISSEY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_KANGASKHAN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
+    },
+    {
+    .iv = 255,
+    .lvl = 57,
+    .species = SPECIES_TAUROS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_SPINDA,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    },
+    {
+    .iv = 255,
+    .lvl = 60,
+    .species = SPECIES_SLAKING,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Winona2[] = {
-	{
-	.iv = 255,
-	.lvl = 40,
-	.species = SPECIES_DRATINI,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 38,
-	.species = SPECIES_TROPIUS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 41,
-	.species = SPECIES_PELIPPER,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_SKARMORY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 40,
+    .species = SPECIES_DRATINI,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 38,
+    .species = SPECIES_TROPIUS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 41,
+    .species = SPECIES_PELIPPER,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_SKARMORY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Winona3[] = {
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_HOOTHOOT,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
-	},
-	{
-	.iv = 255,
-	.lvl = 43,
-	.species = SPECIES_TROPIUS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 45,
-	.species = SPECIES_DRAGONAIR,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_PELIPPER,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_SKARMORY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_HOOTHOOT,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
+    },
+    {
+    .iv = 255,
+    .lvl = 43,
+    .species = SPECIES_TROPIUS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 45,
+    .species = SPECIES_DRAGONAIR,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_PELIPPER,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_SKARMORY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Winona4[] = {
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_NOCTOWL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
-	},
-	{
-	.iv = 255,
-	.lvl = 49,
-	.species = SPECIES_TROPIUS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_DRAGONAIR,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_PELIPPER,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_SKARMORY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_NOCTOWL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
+    },
+    {
+    .iv = 255,
+    .lvl = 49,
+    .species = SPECIES_TROPIUS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_DRAGONAIR,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_PELIPPER,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_SKARMORY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Winona5[] = {
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_NOCTOWL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
-	},
-	{
-	.iv = 255,
-	.lvl = 54,
-	.species = SPECIES_TROPIUS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_PELIPPER,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_DRAGONITE,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_SKARMORY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
-	},
-	{
-	.iv = 255,
-	.lvl = 60,
-	.species = SPECIES_ALTARIA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
-	}
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_NOCTOWL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
+    },
+    {
+    .iv = 255,
+    .lvl = 54,
+    .species = SPECIES_TROPIUS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_PELIPPER,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_DRAGONITE,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_SKARMORY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    },
+    {
+    .iv = 255,
+    .lvl = 60,
+    .species = SPECIES_ALTARIA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza2[] = {
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_SLOWPOKE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 49,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 49,
-	.species = SPECIES_XATU,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_LUNATONE,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_SOLROCK,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
-	}
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_SLOWPOKE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 49,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 49,
+    .species = SPECIES_XATU,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_LUNATONE,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_SOLROCK,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza3[] = {
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_DROWZEE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_SLOWPOKE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 54,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 54,
-	.species = SPECIES_XATU,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_LUNATONE,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 55,
-	.species = SPECIES_SOLROCK,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
-	}
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_DROWZEE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_SLOWPOKE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 54,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 54,
+    .species = SPECIES_XATU,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_LUNATONE,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 55,
+    .species = SPECIES_SOLROCK,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza4[] = {
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_HYPNO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 59,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_SLOWPOKE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 59,
-	.species = SPECIES_XATU,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 60,
-	.species = SPECIES_LUNATONE,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 60,
-	.species = SPECIES_SOLROCK,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
-	}
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_HYPNO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 59,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_SLOWPOKE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 59,
+    .species = SPECIES_XATU,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 60,
+    .species = SPECIES_LUNATONE,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 60,
+    .species = SPECIES_SOLROCK,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza5[] = {
-	{
-	.iv = 255,
-	.lvl = 63,
-	.species = SPECIES_HYPNO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 64,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
-	},
-	{
-	.iv = 255,
-	.lvl = 63,
-	.species = SPECIES_SLOWKING,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
-	},
-	{
-	.iv = 255,
-	.lvl = 64,
-	.species = SPECIES_XATU,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 65,
-	.species = SPECIES_LUNATONE,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
-	},
-	{
-	.iv = 255,
-	.lvl = 65,
-	.species = SPECIES_SOLROCK,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
-	}
+    {
+    .iv = 255,
+    .lvl = 63,
+    .species = SPECIES_HYPNO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 64,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    },
+    {
+    .iv = 255,
+    .lvl = 63,
+    .species = SPECIES_SLOWKING,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    },
+    {
+    .iv = 255,
+    .lvl = 64,
+    .species = SPECIES_XATU,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 65,
+    .species = SPECIES_LUNATONE,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    },
+    {
+    .iv = 255,
+    .lvl = 65,
+    .species = SPECIES_SOLROCK,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Juan2[] = {
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_POLIWAG,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
-	},
-	{
-	.iv = 255,
-	.lvl = 46,
-	.species = SPECIES_WHISCASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_WALREIN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 48,
-	.species = SPECIES_CRAWDAUNT,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_KINGDRA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
-	}
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_POLIWAG,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
+    },
+    {
+    .iv = 255,
+    .lvl = 46,
+    .species = SPECIES_WHISCASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_WALREIN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 48,
+    .species = SPECIES_CRAWDAUNT,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_KINGDRA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Juan3[] = {
-	{
-	.iv = 255,
-	.lvl = 50,
-	.species = SPECIES_POLIWHIRL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
-	},
-	{
-	.iv = 255,
-	.lvl = 51,
-	.species = SPECIES_WHISCASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_WALREIN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 53,
-	.species = SPECIES_CRAWDAUNT,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 56,
-	.species = SPECIES_KINGDRA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
-	}
+    {
+    .iv = 255,
+    .lvl = 50,
+    .species = SPECIES_POLIWHIRL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
+    },
+    {
+    .iv = 255,
+    .lvl = 51,
+    .species = SPECIES_WHISCASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_WALREIN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 53,
+    .species = SPECIES_CRAWDAUNT,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 56,
+    .species = SPECIES_KINGDRA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Juan4[] = {
-	{
-	.iv = 255,
-	.lvl = 56,
-	.species = SPECIES_LAPRAS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_WHISCASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
-	},
-	{
-	.iv = 255,
-	.lvl = 56,
-	.species = SPECIES_POLIWHIRL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_WALREIN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 58,
-	.species = SPECIES_CRAWDAUNT,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 61,
-	.species = SPECIES_KINGDRA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
-	}
+    {
+    .iv = 255,
+    .lvl = 56,
+    .species = SPECIES_LAPRAS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_WHISCASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    },
+    {
+    .iv = 255,
+    .lvl = 56,
+    .species = SPECIES_POLIWHIRL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_WALREIN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 58,
+    .species = SPECIES_CRAWDAUNT,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 61,
+    .species = SPECIES_KINGDRA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Juan5[] = {
-	{
-	.iv = 255,
-	.lvl = 61,
-	.species = SPECIES_LAPRAS,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
-	},
-	{
-	.iv = 255,
-	.lvl = 63,
-	.species = SPECIES_WHISCASH,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
-	},
-	{
-	.iv = 255,
-	.lvl = 61,
-	.species = SPECIES_POLITOED,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG
-	},
-	{
-	.iv = 255,
-	.lvl = 63,
-	.species = SPECIES_WALREIN,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD
-	},
-	{
-	.iv = 255,
-	.lvl = 63,
-	.species = SPECIES_CRAWDAUNT,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
-	},
-	{
-	.iv = 255,
-	.lvl = 66,
-	.species = SPECIES_KINGDRA,
-	.heldItem = ITEM_CHESTO_BERRY,
-	.moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
-	}
+    {
+    .iv = 255,
+    .lvl = 61,
+    .species = SPECIES_LAPRAS,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
+    },
+    {
+    .iv = 255,
+    .lvl = 63,
+    .species = SPECIES_WHISCASH,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    },
+    {
+    .iv = 255,
+    .lvl = 61,
+    .species = SPECIES_POLITOED,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG
+    },
+    {
+    .iv = 255,
+    .lvl = 63,
+    .species = SPECIES_WALREIN,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD
+    },
+    {
+    .iv = 255,
+    .lvl = 63,
+    .species = SPECIES_CRAWDAUNT,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    },
+    {
+    .iv = 255,
+    .lvl = 66,
+    .species = SPECIES_KINGDRA,
+    .heldItem = ITEM_CHESTO_BERRY,
+    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Angelo[] = {
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_ILLUMISE,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE
-	},
-	{
-	.iv = 100,
-	.lvl = 17,
-	.species = SPECIES_VOLBEAT,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE
-	}
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_ILLUMISE,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE
+    },
+    {
+    .iv = 100,
+    .lvl = 17,
+    .species = SPECIES_VOLBEAT,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darius[] = {
-	{
-	.iv = 200,
-	.lvl = 30,
-	.species = SPECIES_TROPIUS,
-	}
+    {
+    .iv = 200,
+    .lvl = 30,
+    .species = SPECIES_TROPIUS,
+    }
 };
 
 const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = {
-	{
-	.iv = 255,
-	.lvl = 77,
-	.species = SPECIES_SKARMORY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING
-	},
-	{
-	.iv = 255,
-	.lvl = 75,
-	.species = SPECIES_CLAYDOL,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE
-	},
-	{
-	.iv = 255,
-	.lvl = 76,
-	.species = SPECIES_AGGRON,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW
-	},
-	{
-	.iv = 255,
-	.lvl = 76,
-	.species = SPECIES_CRADILY,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY
-	},
-	{
-	.iv = 255,
-	.lvl = 76,
-	.species = SPECIES_ARMALDO,
-	.heldItem = ITEM_NONE,
-	.moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH
-	},
-	{
-	.iv = 255,
-	.lvl = 78,
-	.species = SPECIES_METAGROSS,
-	.heldItem = ITEM_SITRUS_BERRY,
-	.moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL
-	}
+    {
+    .iv = 255,
+    .lvl = 77,
+    .species = SPECIES_SKARMORY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING
+    },
+    {
+    .iv = 255,
+    .lvl = 75,
+    .species = SPECIES_CLAYDOL,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE
+    },
+    {
+    .iv = 255,
+    .lvl = 76,
+    .species = SPECIES_AGGRON,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW
+    },
+    {
+    .iv = 255,
+    .lvl = 76,
+    .species = SPECIES_CRADILY,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY
+    },
+    {
+    .iv = 255,
+    .lvl = 76,
+    .species = SPECIES_ARMALDO,
+    .heldItem = ITEM_NONE,
+    .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH
+    },
+    {
+    .iv = 255,
+    .lvl = 78,
+    .species = SPECIES_METAGROSS,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anabel[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spenser[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greta[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Noland[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucy[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BELDUM,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BELDUM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres2[] = {
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres3[] = {
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_NOSEPASS,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_NOSEPASS,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres4[] = {
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_NOSEPASS,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_SANDSHREW,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_SANDSHREW,
-	}
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_NOSEPASS,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_SANDSHREW,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_SANDSHREW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_NOSEPASS,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_SANDSLASH,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_SANDSLASH,
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_NOSEPASS,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_SANDSLASH,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_SANDSLASH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory2[] = {
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 10,
-	.lvl = 30,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 10,
+    .lvl = 30,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory3[] = {
-	{
-	.iv = 20,
-	.lvl = 32,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 20,
-	.lvl = 32,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 20,
-	.lvl = 32,
-	.species = SPECIES_TENTACOOL,
-	}
+    {
+    .iv = 20,
+    .lvl = 32,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 20,
+    .lvl = 32,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 20,
+    .lvl = 32,
+    .species = SPECIES_TENTACOOL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory4[] = {
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 30,
-	.lvl = 34,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 30,
+    .lvl = 34,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory5[] = {
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 40,
-	.lvl = 36,
-	.species = SPECIES_TENTACRUEL,
-	}
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 40,
+    .lvl = 36,
+    .species = SPECIES_TENTACRUEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo2[] = {
-	{
-	.iv = 10,
-	.lvl = 37,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 10,
-	.lvl = 37,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 10,
+    .lvl = 37,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 10,
+    .lvl = 37,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo3[] = {
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_WINGULL,
-	},
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_WINGULL,
+    },
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo4[] = {
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_STARYU,
-	},
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_STARYU,
-	}
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_STARYU,
+    },
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_STARYU,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo5[] = {
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_PELIPPER,
-	},
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_STARMIE,
-	},
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_STARMIE,
-	}
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_PELIPPER,
+    },
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_STARMIE,
+    },
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_STARMIE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji2[] = {
-	{
-	.iv = 10,
-	.lvl = 37,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 10,
-	.lvl = 37,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 10,
+    .lvl = 37,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 10,
+    .lvl = 37,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji3[] = {
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_MAKUHITA,
-	},
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 20,
-	.lvl = 39,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_MAKUHITA,
+    },
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 20,
+    .lvl = 39,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji4[] = {
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_HARIYAMA,
-	},
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 30,
-	.lvl = 41,
-	.species = SPECIES_MACHOKE,
-	}
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_HARIYAMA,
+    },
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 30,
+    .lvl = 41,
+    .species = SPECIES_MACHOKE,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji5[] = {
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_HARIYAMA,
-	},
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_MACHAMP,
-	},
-	{
-	.iv = 40,
-	.lvl = 43,
-	.species = SPECIES_MACHAMP,
-	}
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_HARIYAMA,
+    },
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_MACHAMP,
+    },
+    {
+    .iv = 40,
+    .lvl = 43,
+    .species = SPECIES_MACHAMP,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin2[] = {
-	{
-	.iv = 110,
-	.lvl = 35,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 110,
-	.lvl = 35,
-	.species = SPECIES_VIGOROTH,
-	}
+    {
+    .iv = 110,
+    .lvl = 35,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 110,
+    .lvl = 35,
+    .species = SPECIES_VIGOROTH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin3[] = {
-	{
-	.iv = 120,
-	.lvl = 37,
-	.species = SPECIES_SPINDA,
-	},
-	{
-	.iv = 120,
-	.lvl = 37,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 120,
-	.lvl = 37,
-	.species = SPECIES_VIGOROTH,
-	}
+    {
+    .iv = 120,
+    .lvl = 37,
+    .species = SPECIES_SPINDA,
+    },
+    {
+    .iv = 120,
+    .lvl = 37,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 120,
+    .lvl = 37,
+    .species = SPECIES_VIGOROTH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin4[] = {
-	{
-	.iv = 130,
-	.lvl = 39,
-	.species = SPECIES_SPINDA,
-	},
-	{
-	.iv = 130,
-	.lvl = 39,
-	.species = SPECIES_LOUDRED,
-	},
-	{
-	.iv = 100,
-	.lvl = 39,
-	.species = SPECIES_VIGOROTH,
-	}
+    {
+    .iv = 130,
+    .lvl = 39,
+    .species = SPECIES_SPINDA,
+    },
+    {
+    .iv = 130,
+    .lvl = 39,
+    .species = SPECIES_LOUDRED,
+    },
+    {
+    .iv = 100,
+    .lvl = 39,
+    .species = SPECIES_VIGOROTH,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin5[] = {
-	{
-	.iv = 140,
-	.lvl = 41,
-	.species = SPECIES_SPINDA,
-	},
-	{
-	.iv = 140,
-	.lvl = 41,
-	.species = SPECIES_EXPLOUD,
-	},
-	{
-	.iv = 140,
-	.lvl = 41,
-	.species = SPECIES_SLAKING,
-	}
+    {
+    .iv = 140,
+    .lvl = 41,
+    .species = SPECIES_SPINDA,
+    },
+    {
+    .iv = 140,
+    .lvl = 41,
+    .species = SPECIES_EXPLOUD,
+    },
+    {
+    .iv = 140,
+    .lvl = 41,
+    .species = SPECIES_SLAKING,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando2[] = {
-	{
-	.iv = 10,
-	.lvl = 35,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 10,
-	.lvl = 35,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 10,
-	.lvl = 35,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 10,
+    .lvl = 35,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 10,
+    .lvl = 35,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 10,
+    .lvl = 35,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando3[] = {
-	{
-	.iv = 20,
-	.lvl = 37,
-	.species = SPECIES_ELECTRIKE,
-	},
-	{
-	.iv = 20,
-	.lvl = 37,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 20,
-	.lvl = 37,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 20,
+    .lvl = 37,
+    .species = SPECIES_ELECTRIKE,
+    },
+    {
+    .iv = 20,
+    .lvl = 37,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 20,
+    .lvl = 37,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando4[] = {
-	{
-	.iv = 30,
-	.lvl = 39,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 30,
-	.lvl = 39,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 30,
-	.lvl = 39,
-	.species = SPECIES_LOUDRED,
-	}
+    {
+    .iv = 30,
+    .lvl = 39,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 30,
+    .lvl = 39,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 30,
+    .lvl = 39,
+    .species = SPECIES_LOUDRED,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando5[] = {
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_MANECTRIC,
-	},
-	{
-	.iv = 40,
-	.lvl = 41,
-	.species = SPECIES_EXPLOUD,
-	}
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_MANECTRIC,
+    },
+    {
+    .iv = 40,
+    .lvl = 41,
+    .species = SPECIES_EXPLOUD,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer2[] = {
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_GEODUDE,
-	},
-	{
-	.iv = 10,
-	.lvl = 26,
-	.species = SPECIES_NUMEL,
-	}
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_GEODUDE,
+    },
+    {
+    .iv = 10,
+    .lvl = 26,
+    .species = SPECIES_NUMEL,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer3[] = {
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 20,
-	.lvl = 28,
-	.species = SPECIES_GRAVELER,
-	}
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 20,
+    .lvl = 28,
+    .species = SPECIES_GRAVELER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer4[] = {
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_MACHOP,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_NUMEL,
-	},
-	{
-	.iv = 30,
-	.lvl = 30,
-	.species = SPECIES_GRAVELER,
-	}
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_MACHOP,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_NUMEL,
+    },
+    {
+    .iv = 30,
+    .lvl = 30,
+    .species = SPECIES_GRAVELER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer5[] = {
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_MACHOKE,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_CAMERUPT,
-	},
-	{
-	.iv = 40,
-	.lvl = 33,
-	.species = SPECIES_GOLEM,
-	}
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_MACHOKE,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_CAMERUPT,
+    },
+    {
+    .iv = 40,
+    .lvl = 33,
+    .species = SPECIES_GOLEM,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle2[] = {
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_ZIGZAGOON,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_LOTAD,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_SEEDOT,
-	},
-	{
-	.iv = 10,
-	.lvl = 31,
-	.species = SPECIES_TAILLOW,
-	}
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_ZIGZAGOON,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_LOTAD,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_SEEDOT,
+    },
+    {
+    .iv = 10,
+    .lvl = 31,
+    .species = SPECIES_TAILLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle3[] = {
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_SKITTY,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_NUZLEAF,
-	},
-	{
-	.iv = 20,
-	.lvl = 33,
-	.species = SPECIES_TAILLOW,
-	}
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_SKITTY,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_NUZLEAF,
+    },
+    {
+    .iv = 20,
+    .lvl = 33,
+    .species = SPECIES_TAILLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle4[] = {
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_DELCATTY,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_LOMBRE,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_NUZLEAF,
-	},
-	{
-	.iv = 30,
-	.lvl = 35,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_DELCATTY,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_LOMBRE,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_NUZLEAF,
+    },
+    {
+    .iv = 30,
+    .lvl = 35,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle5[] = {
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_DELCATTY,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_MIGHTYENA,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_LINOONE,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_LUDICOLO,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_SHIFTRY,
-	},
-	{
-	.iv = 40,
-	.lvl = 37,
-	.species = SPECIES_SWELLOW,
-	}
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_DELCATTY,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_MIGHTYENA,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_LINOONE,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_LUDICOLO,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_SHIFTRY,
+    },
+    {
+    .iv = 40,
+    .lvl = 37,
+    .species = SPECIES_SWELLOW,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia2[] = {
-	{
-	.iv = 10,
-	.lvl = 34,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 10,
-	.lvl = 34,
-	.species = SPECIES_HORSEA,
-	}
+    {
+    .iv = 10,
+    .lvl = 34,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 10,
+    .lvl = 34,
+    .species = SPECIES_HORSEA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia3[] = {
-	{
-	.iv = 20,
-	.lvl = 36,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 20,
-	.lvl = 36,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 20,
-	.lvl = 36,
-	.species = SPECIES_SEADRA,
-	}
+    {
+    .iv = 20,
+    .lvl = 36,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 20,
+    .lvl = 36,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 20,
+    .lvl = 36,
+    .species = SPECIES_SEADRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia4[] = {
-	{
-	.iv = 30,
-	.lvl = 38,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 30,
-	.lvl = 38,
-	.species = SPECIES_WAILMER,
-	},
-	{
-	.iv = 30,
-	.lvl = 38,
-	.species = SPECIES_SEADRA,
-	}
+    {
+    .iv = 30,
+    .lvl = 38,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 30,
+    .lvl = 38,
+    .species = SPECIES_WAILMER,
+    },
+    {
+    .iv = 30,
+    .lvl = 38,
+    .species = SPECIES_SEADRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia5[] = {
-	{
-	.iv = 40,
-	.lvl = 40,
-	.species = SPECIES_LUVDISC,
-	},
-	{
-	.iv = 40,
-	.lvl = 40,
-	.species = SPECIES_WAILORD,
-	},
-	{
-	.iv = 40,
-	.lvl = 40,
-	.species = SPECIES_KINGDRA,
-	}
+    {
+    .iv = 40,
+    .lvl = 40,
+    .species = SPECIES_LUVDISC,
+    },
+    {
+    .iv = 40,
+    .lvl = 40,
+    .species = SPECIES_WAILORD,
+    },
+    {
+    .iv = 40,
+    .lvl = 40,
+    .species = SPECIES_KINGDRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mariela[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_CHIMECHO,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_CHIMECHO,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alvaro[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_BANETTE,
-	},
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_KADABRA,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_BANETTE,
+    },
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_KADABRA,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Everett[] = {
-	{
-	.iv = 0,
-	.lvl = 41,
-	.species = SPECIES_WOBBUFFET,
-	}
+    {
+    .iv = 0,
+    .lvl = 41,
+    .species = SPECIES_WOBBUFFET,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Red[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_CHARMANDER,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_CHARMANDER,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leaf[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_BULBASAUR,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_BULBASAUR,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan16[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_GROUDON,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_GROUDON,
+    }
 };
 
 const struct TrainerMonNoItemDefaultMoves gTrainerParty_May16[] = {
-	{
-	.iv = 0,
-	.lvl = 5,
-	.species = SPECIES_KYOGRE,
-	}
+    {
+    .iv = 0,
+    .lvl = 5,
+    .species = SPECIES_KYOGRE,
+    }
 };
diff --git a/src/daycare.c b/src/daycare.c
index 227451f48..5b166d3de 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -251,7 +251,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon)
             while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0)
             {
                 firstMove = FALSE;
-                if (learnedMove == INVALID_U16)
+                if (learnedMove == 0xFFFF)
                 {
                     // Mon already knows 4 moves.
                     DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn);
@@ -535,7 +535,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     s32 i, j;
     u8 temp[NUM_STATS];
 
-    ivs[selectedIv] = INVALID_U8;
+    ivs[selectedIv] = 0xFF;
     for (i = 0; i < NUM_STATS; i++)
     {
         temp[i] = ivs[i];
@@ -544,7 +544,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     j = 0;
     for (i = 0; i < NUM_STATS; i++)
     {
-        if (temp[i] != INVALID_U8)
+        if (temp[i] != 0xFF)
             ivs[j++] = temp[i];
     }
 }
@@ -684,7 +684,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j])
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                     break;
                 }
@@ -703,7 +703,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j))
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                 }
             }
@@ -728,7 +728,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
         {
             if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j])
             {
-                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == INVALID_U16)
+                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF)
                     DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]);
                 break;
             }
@@ -773,7 +773,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca
 
     if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL)
     {
-        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == INVALID_U16)
+        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF)
             DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE);
     }
 }
@@ -909,7 +909,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
     }
 
     // try to trigger poke sex
-    if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == INVALID_U8)
+    if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF)
     {
         u8 loveScore = GetDaycareCompatibilityScore(daycare);
         if (loveScore > (Random() * 100u) / USHRT_MAX)
diff --git a/src/decompress.c b/src/decompress.c
index 287a03e55..24d23209f 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -122,346 +122,346 @@ void sub_803471C()
 {
     asm(".syntax unified\n\
         push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x24\n\
-	mov r9, r0\n\
-	str r1, [sp]\n\
-	str r2, [sp, 0x4]\n\
-	adds r5, r3, 0\n\
-	movs r0, 0x1\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _0803473C\n\
-	b _080348D4\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x24\n\
+    mov r9, r0\n\
+    str r1, [sp]\n\
+    str r2, [sp, 0x4]\n\
+    adds r5, r3, 0\n\
+    movs r0, 0x1\n\
+    mov r1, r9\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _0803473C\n\
+    b _080348D4\n\
 _0803473C:\n\
-	asrs r0, r1, 1\n\
-	adds r0, 0x4\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x8]\n\
-	movs r0, 0\n\
-	ldr r2, [sp]\n\
-	cmp r0, r2\n\
-	blt _08034750\n\
-	b _08034964\n\
+    asrs r0, r1, 1\n\
+    adds r0, 0x4\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x8]\n\
+    movs r0, 0\n\
+    ldr r2, [sp]\n\
+    cmp r0, r2\n\
+    blt _08034750\n\
+    b _08034964\n\
 _08034750:\n\
-	movs r4, 0x8\n\
-	subs r1, r4, r1\n\
-	str r1, [sp, 0x10]\n\
+    movs r4, 0x8\n\
+    subs r1, r4, r1\n\
+    str r1, [sp, 0x10]\n\
 _08034756:\n\
-	movs r7, 0\n\
-	adds r0, 0x1\n\
-	str r0, [sp, 0x14]\n\
-	ldr r0, [sp, 0x10]\n\
-	cmp r7, r0\n\
-	bge _080347D2\n\
-	ldr r1, [sp, 0x8]\n\
-	lsls r1, 8\n\
-	str r1, [sp, 0x18]\n\
-	movs r2, 0\n\
-	mov r10, r2\n\
-	mov r0, r9\n\
-	movs r4, 0x8\n\
-	subs r0, r4, r0\n\
-	str r0, [sp, 0xC]\n\
+    movs r7, 0\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x14]\n\
+    ldr r0, [sp, 0x10]\n\
+    cmp r7, r0\n\
+    bge _080347D2\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r1, 8\n\
+    str r1, [sp, 0x18]\n\
+    movs r2, 0\n\
+    mov r10, r2\n\
+    mov r0, r9\n\
+    movs r4, 0x8\n\
+    subs r0, r4, r0\n\
+    str r0, [sp, 0xC]\n\
 _08034774:\n\
-	movs r3, 0\n\
-	asrs r0, r7, 1\n\
-	adds r1, r7, 0\n\
-	movs r2, 0x1\n\
-	ands r1, r2\n\
-	str r1, [sp, 0x20]\n\
-	lsls r0, 8\n\
-	mov r8, r0\n\
-	mov r12, r5\n\
+    movs r3, 0\n\
+    asrs r0, r7, 1\n\
+    adds r1, r7, 0\n\
+    movs r2, 0x1\n\
+    ands r1, r2\n\
+    str r1, [sp, 0x20]\n\
+    lsls r0, 8\n\
+    mov r8, r0\n\
+    mov r12, r5\n\
 _08034786:\n\
-	lsls r1, r3, 5\n\
-	ldr r4, [sp, 0x18]\n\
-	adds r0, r5, r4\n\
-	adds r0, r1\n\
-	mov r1, r8\n\
-	adds r2, r0, r1\n\
-	mov r1, r12\n\
-	add r1, r8\n\
-	movs r6, 0xF\n\
+    lsls r1, r3, 5\n\
+    ldr r4, [sp, 0x18]\n\
+    adds r0, r5, r4\n\
+    adds r0, r1\n\
+    mov r1, r8\n\
+    adds r2, r0, r1\n\
+    mov r1, r12\n\
+    add r1, r8\n\
+    movs r6, 0xF\n\
 _08034798:\n\
-	ldr r4, [sp, 0x20]\n\
-	cmp r4, 0\n\
-	bne _080347A8\n\
-	strb r4, [r1]\n\
-	add r4, sp, 0x20\n\
-	ldrb r4, [r4]\n\
-	strb r4, [r2, 0x10]\n\
-	b _080347B6\n\
+    ldr r4, [sp, 0x20]\n\
+    cmp r4, 0\n\
+    bne _080347A8\n\
+    strb r4, [r1]\n\
+    add r4, sp, 0x20\n\
+    ldrb r4, [r4]\n\
+    strb r4, [r2, 0x10]\n\
+    b _080347B6\n\
 _080347A8:\n\
-	mov r0, r10\n\
-	strb r0, [r1, 0x10]\n\
-	movs r4, 0x80\n\
-	lsls r4, 1\n\
-	adds r4, r2, r4\n\
-	str r4, [sp, 0x1C]\n\
-	strb r0, [r4]\n\
+    mov r0, r10\n\
+    strb r0, [r1, 0x10]\n\
+    movs r4, 0x80\n\
+    lsls r4, 1\n\
+    adds r4, r2, r4\n\
+    str r4, [sp, 0x1C]\n\
+    strb r0, [r4]\n\
 _080347B6:\n\
-	adds r2, 0x1\n\
-	adds r1, 0x1\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _08034798\n\
-	movs r0, 0x20\n\
-	add r12, r0\n\
-	adds r3, 0x1\n\
-	cmp r3, 0x7\n\
-	ble _08034786\n\
-	adds r7, 0x1\n\
-	ldr r1, [sp, 0xC]\n\
-	cmp r7, r1\n\
-	blt _08034774\n\
+    adds r2, 0x1\n\
+    adds r1, 0x1\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _08034798\n\
+    movs r0, 0x20\n\
+    add r12, r0\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x7\n\
+    ble _08034786\n\
+    adds r7, 0x1\n\
+    ldr r1, [sp, 0xC]\n\
+    cmp r7, r1\n\
+    blt _08034774\n\
 _080347D2:\n\
-	movs r7, 0\n\
-	movs r2, 0\n\
+    movs r7, 0\n\
+    movs r2, 0\n\
 _080347D6:\n\
-	movs r6, 0\n\
-	adds r4, r7, 0x1\n\
-	mov r8, r4\n\
-	lsls r4, r7, 5\n\
+    movs r6, 0\n\
+    adds r4, r7, 0x1\n\
+    mov r8, r4\n\
+    lsls r4, r7, 5\n\
 _080347DE:\n\
-	adds r0, r6, 0x1\n\
-	mov r10, r0\n\
-	lsls r1, r6, 8\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xC0\n\
-	adds r0, r5, r0\n\
-	adds r0, r4\n\
-	adds r1, r5, r1\n\
-	adds r1, r4\n\
-	movs r3, 0x1F\n\
+    adds r0, r6, 0x1\n\
+    mov r10, r0\n\
+    lsls r1, r6, 8\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xC0\n\
+    adds r0, r5, r0\n\
+    adds r0, r4\n\
+    adds r1, r5, r1\n\
+    adds r1, r4\n\
+    movs r3, 0x1F\n\
 _080347F2:\n\
-	strb r2, [r1]\n\
-	strb r2, [r0]\n\
-	adds r0, 0x1\n\
-	adds r1, 0x1\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _080347F2\n\
-	mov r6, r10\n\
-	cmp r6, 0x7\n\
-	ble _080347DE\n\
-	mov r7, r8\n\
-	cmp r7, 0x1\n\
-	ble _080347D6\n\
-	mov r1, r9\n\
-	cmp r1, 0x5\n\
-	bne _08034818\n\
-	movs r2, 0x90\n\
-	lsls r2, 1\n\
-	adds r5, r2\n\
+    strb r2, [r1]\n\
+    strb r2, [r0]\n\
+    adds r0, 0x1\n\
+    adds r1, 0x1\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _080347F2\n\
+    mov r6, r10\n\
+    cmp r6, 0x7\n\
+    ble _080347DE\n\
+    mov r7, r8\n\
+    cmp r7, 0x1\n\
+    ble _080347D6\n\
+    mov r1, r9\n\
+    cmp r1, 0x5\n\
+    bne _08034818\n\
+    movs r2, 0x90\n\
+    lsls r2, 1\n\
+    adds r5, r2\n\
 _08034818:\n\
-	movs r7, 0\n\
-	cmp r7, r9\n\
-	bge _080348AE\n\
+    movs r7, 0\n\
+    cmp r7, r9\n\
+    bge _080348AE\n\
 _0803481E:\n\
-	movs r3, 0\n\
-	adds r7, 0x1\n\
-	mov r8, r7\n\
-	cmp r3, r9\n\
-	bge _0803488E\n\
+    movs r3, 0\n\
+    adds r7, 0x1\n\
+    mov r8, r7\n\
+    cmp r3, r9\n\
+    bge _0803488E\n\
 _08034828:\n\
-	adds r3, 0x1\n\
-	mov r10, r3\n\
-	ldr r4, [sp, 0x4]\n\
-	adds r4, 0x20\n\
-	adds r7, r5, 0\n\
-	adds r7, 0x20\n\
-	movs r0, 0x12\n\
-	adds r0, r5\n\
-	mov r12, r0\n\
-	ldr r2, [sp, 0x4]\n\
-	adds r3, r5, 0\n\
-	movs r6, 0x3\n\
+    adds r3, 0x1\n\
+    mov r10, r3\n\
+    ldr r4, [sp, 0x4]\n\
+    adds r4, 0x20\n\
+    adds r7, r5, 0\n\
+    adds r7, 0x20\n\
+    movs r0, 0x12\n\
+    adds r0, r5\n\
+    mov r12, r0\n\
+    ldr r2, [sp, 0x4]\n\
+    adds r3, r5, 0\n\
+    movs r6, 0x3\n\
 _08034840:\n\
-	ldrb r0, [r2]\n\
-	mov r1, r12\n\
-	strb r0, [r1]\n\
-	ldrb r0, [r2, 0x1]\n\
-	strb r0, [r1, 0x1]\n\
-	ldrb r0, [r2, 0x2]\n\
-	strb r0, [r1, 0x1E]\n\
-	ldrb r0, [r2, 0x3]\n\
-	strb r0, [r1, 0x1F]\n\
-	movs r0, 0x81\n\
-	lsls r0, 1\n\
-	adds r1, r3, r0\n\
-	ldrb r0, [r2, 0x10]\n\
-	strb r0, [r1]\n\
-	ldr r0, =0x00000103\n\
-	adds r1, r3, r0\n\
-	ldrb r0, [r2, 0x11]\n\
-	strb r0, [r1]\n\
-	movs r0, 0x90\n\
-	lsls r0, 1\n\
-	adds r1, r3, r0\n\
-	ldrb r0, [r2, 0x12]\n\
-	strb r0, [r1]\n\
-	ldr r0, =0x00000121\n\
-	adds r1, r3, r0\n\
-	ldrb r0, [r2, 0x13]\n\
-	strb r0, [r1]\n\
-	movs r1, 0x4\n\
-	add r12, r1\n\
-	adds r2, 0x4\n\
-	adds r3, 0x4\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _08034840\n\
-	str r4, [sp, 0x4]\n\
-	adds r5, r7, 0\n\
-	mov r3, r10\n\
-	cmp r3, r9\n\
-	blt _08034828\n\
+    ldrb r0, [r2]\n\
+    mov r1, r12\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r2, 0x1]\n\
+    strb r0, [r1, 0x1]\n\
+    ldrb r0, [r2, 0x2]\n\
+    strb r0, [r1, 0x1E]\n\
+    ldrb r0, [r2, 0x3]\n\
+    strb r0, [r1, 0x1F]\n\
+    movs r0, 0x81\n\
+    lsls r0, 1\n\
+    adds r1, r3, r0\n\
+    ldrb r0, [r2, 0x10]\n\
+    strb r0, [r1]\n\
+    ldr r0, =0x00000103\n\
+    adds r1, r3, r0\n\
+    ldrb r0, [r2, 0x11]\n\
+    strb r0, [r1]\n\
+    movs r0, 0x90\n\
+    lsls r0, 1\n\
+    adds r1, r3, r0\n\
+    ldrb r0, [r2, 0x12]\n\
+    strb r0, [r1]\n\
+    ldr r0, =0x00000121\n\
+    adds r1, r3, r0\n\
+    ldrb r0, [r2, 0x13]\n\
+    strb r0, [r1]\n\
+    movs r1, 0x4\n\
+    add r12, r1\n\
+    adds r2, 0x4\n\
+    adds r3, 0x4\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _08034840\n\
+    str r4, [sp, 0x4]\n\
+    adds r5, r7, 0\n\
+    mov r3, r10\n\
+    cmp r3, r9\n\
+    blt _08034828\n\
 _0803488E:\n\
-	mov r2, r9\n\
-	cmp r2, 0x7\n\
-	bne _080348A0\n\
-	adds r5, 0x20\n\
-	b _080348A8\n\
-	.pool\n\
+    mov r2, r9\n\
+    cmp r2, 0x7\n\
+    bne _080348A0\n\
+    adds r5, 0x20\n\
+    b _080348A8\n\
+    .pool\n\
 _080348A0:\n\
-	mov r4, r9\n\
-	cmp r4, 0x5\n\
-	bne _080348A8\n\
-	adds r5, 0x60\n\
+    mov r4, r9\n\
+    cmp r4, 0x5\n\
+    bne _080348A8\n\
+    adds r5, 0x60\n\
 _080348A8:\n\
-	mov r7, r8\n\
-	cmp r7, r9\n\
-	blt _0803481E\n\
+    mov r7, r8\n\
+    cmp r7, r9\n\
+    blt _0803481E\n\
 _080348AE:\n\
-	mov r0, r9\n\
-	cmp r0, 0x7\n\
-	bne _080348BC\n\
-	movs r1, 0x80\n\
-	lsls r1, 1\n\
-	adds r5, r1\n\
-	b _080348C8\n\
+    mov r0, r9\n\
+    cmp r0, 0x7\n\
+    bne _080348BC\n\
+    movs r1, 0x80\n\
+    lsls r1, 1\n\
+    adds r5, r1\n\
+    b _080348C8\n\
 _080348BC:\n\
-	mov r2, r9\n\
-	cmp r2, 0x5\n\
-	bne _080348C8\n\
-	movs r4, 0xF0\n\
-	lsls r4, 1\n\
-	adds r5, r4\n\
+    mov r2, r9\n\
+    cmp r2, 0x5\n\
+    bne _080348C8\n\
+    movs r4, 0xF0\n\
+    lsls r4, 1\n\
+    adds r5, r4\n\
 _080348C8:\n\
-	ldr r0, [sp, 0x14]\n\
-	ldr r1, [sp]\n\
-	cmp r0, r1\n\
-	bge _080348D2\n\
-	b _08034756\n\
+    ldr r0, [sp, 0x14]\n\
+    ldr r1, [sp]\n\
+    cmp r0, r1\n\
+    bge _080348D2\n\
+    b _08034756\n\
 _080348D2:\n\
-	b _08034964\n\
+    b _08034964\n\
 _080348D4:\n\
-	movs r6, 0\n\
-	ldr r2, [sp]\n\
-	cmp r6, r2\n\
-	bge _08034964\n\
+    movs r6, 0\n\
+    ldr r2, [sp]\n\
+    cmp r6, r2\n\
+    bge _08034964\n\
 _080348DC:\n\
-	adds r6, 0x1\n\
-	mov r10, r6\n\
-	mov r4, r9\n\
-	cmp r4, 0x6\n\
-	bne _080348F4\n\
-	movs r0, 0\n\
-	movs r3, 0xFF\n\
+    adds r6, 0x1\n\
+    mov r10, r6\n\
+    mov r4, r9\n\
+    cmp r4, 0x6\n\
+    bne _080348F4\n\
+    movs r0, 0\n\
+    movs r3, 0xFF\n\
 _080348EA:\n\
-	strb r0, [r5]\n\
-	adds r5, 0x1\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _080348EA\n\
+    strb r0, [r5]\n\
+    adds r5, 0x1\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _080348EA\n\
 _080348F4:\n\
-	movs r7, 0\n\
-	cmp r7, r9\n\
-	bge _08034948\n\
+    movs r7, 0\n\
+    cmp r7, r9\n\
+    bge _08034948\n\
 _080348FA:\n\
-	adds r7, 0x1\n\
-	mov r8, r7\n\
-	mov r1, r9\n\
-	lsls r0, r1, 5\n\
-	cmp r1, 0x6\n\
-	bne _08034914\n\
-	movs r1, 0\n\
-	movs r3, 0x1F\n\
+    adds r7, 0x1\n\
+    mov r8, r7\n\
+    mov r1, r9\n\
+    lsls r0, r1, 5\n\
+    cmp r1, 0x6\n\
+    bne _08034914\n\
+    movs r1, 0\n\
+    movs r3, 0x1F\n\
 _0803490A:\n\
-	strb r1, [r5]\n\
-	adds r5, 0x1\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _0803490A\n\
+    strb r1, [r5]\n\
+    adds r5, 0x1\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _0803490A\n\
 _08034914:\n\
-	adds r1, r0, 0\n\
-	cmp r1, 0\n\
-	ble _0803492E\n\
-	adds r3, r1, 0\n\
+    adds r1, r0, 0\n\
+    cmp r1, 0\n\
+    ble _0803492E\n\
+    adds r3, r1, 0\n\
 _0803491C:\n\
-	ldr r2, [sp, 0x4]\n\
-	ldrb r0, [r2]\n\
-	strb r0, [r5]\n\
-	adds r2, 0x1\n\
-	str r2, [sp, 0x4]\n\
-	adds r5, 0x1\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bne _0803491C\n\
+    ldr r2, [sp, 0x4]\n\
+    ldrb r0, [r2]\n\
+    strb r0, [r5]\n\
+    adds r2, 0x1\n\
+    str r2, [sp, 0x4]\n\
+    adds r5, 0x1\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bne _0803491C\n\
 _0803492E:\n\
-	mov r4, r9\n\
-	cmp r4, 0x6\n\
-	bne _08034942\n\
-	movs r0, 0\n\
-	movs r3, 0x1F\n\
+    mov r4, r9\n\
+    cmp r4, 0x6\n\
+    bne _08034942\n\
+    movs r0, 0\n\
+    movs r3, 0x1F\n\
 _08034938:\n\
-	strb r0, [r5]\n\
-	adds r5, 0x1\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _08034938\n\
+    strb r0, [r5]\n\
+    adds r5, 0x1\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _08034938\n\
 _08034942:\n\
-	mov r7, r8\n\
-	cmp r7, r9\n\
-	blt _080348FA\n\
+    mov r7, r8\n\
+    cmp r7, r9\n\
+    blt _080348FA\n\
 _08034948:\n\
-	mov r0, r9\n\
-	cmp r0, 0x6\n\
-	bne _0803495C\n\
-	movs r0, 0\n\
-	movs r3, 0xFF\n\
+    mov r0, r9\n\
+    cmp r0, 0x6\n\
+    bne _0803495C\n\
+    movs r0, 0\n\
+    movs r3, 0xFF\n\
 _08034952:\n\
-	strb r0, [r5]\n\
-	adds r5, 0x1\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _08034952\n\
+    strb r0, [r5]\n\
+    adds r5, 0x1\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _08034952\n\
 _0803495C:\n\
-	mov r6, r10\n\
-	ldr r1, [sp]\n\
-	cmp r6, r1\n\
-	blt _080348DC\n\
+    mov r6, r10\n\
+    ldr r1, [sp]\n\
+    cmp r6, r1\n\
+    blt _080348DC\n\
 _08034964:\n\
-	add sp, 0x24\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
+    add sp, 0x24\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
         .syntax divided");
 }
 
 u32 GetDecompressedDataSize(const u32 *ptr)
 {
-	const u8 *ptr8 = (const u8 *)ptr;
+    const u8 *ptr8 = (const u8 *)ptr;
     return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]);
 }
 
diff --git a/src/decoration.c b/src/decoration.c
index 11fd59286..b45dec334 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = {
 };
 
 const struct SpriteTemplate sDecorSelectorSpriteTemplate = {
-    INVALID_U16,
+    0xFFFF,
     OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG,
     &sDecorSelectorOam,
     sDecorSelectorAnims,
@@ -409,7 +409,7 @@ const struct SpriteFrameImage Unknown_085A73FC = {
 };
 
 const struct SpriteTemplate gUnknown_085A7404 = {
-    INVALID_U16,
+    0xFFFF,
     OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG,
     &Unknown_085A73E8,
     Unknown_085A73F8,
@@ -881,7 +881,7 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2)
 
 void sub_8127500(void)
 {
-    if (sDecorPCBuffer->unk_522 == INVALID_U8)
+    if (sDecorPCBuffer->unk_522 == 0xFF)
     {
         sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo);
     }
@@ -889,10 +889,10 @@ void sub_8127500(void)
 
 void sub_8127554(void)
 {
-    if (sDecorPCBuffer->unk_522 != INVALID_U8)
+    if (sDecorPCBuffer->unk_522 != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522);
-        sDecorPCBuffer->unk_522 = INVALID_U8;
+        sDecorPCBuffer->unk_522 = 0xFF;
     }
 }
 
@@ -910,7 +910,7 @@ void sub_812759C(u8 taskId)
     sub_81269D4(3);
     sub_8127718(sCurDecorationCategory);
     sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer));
-    sDecorPCBuffer->unk_522 = INVALID_U8;
+    sDecorPCBuffer->unk_522 = 0xFF;
     sub_8127284();
     sub_81272C8();
     sub_81272F8();
@@ -1188,7 +1188,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
                 v0 = 0;
             }
             v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j);
-            if (v1 != INVALID_U16)
+            if (v1 != 0xFFFF)
             {
                 MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1);
             }
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 0606364cd..ef125e564 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -129,7 +129,7 @@ static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *);
 
 const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
 
-const struct SpriteTemplate gCameraSpriteTemplate = {0, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject};
+const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject};
 
 void (*const gCameraObjectFuncs[])(struct Sprite *) = {
     CameraObject_0,
@@ -142,255 +142,255 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
 // movement type callbacks
 static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
 {
-    MovementType_None,                         // MOVEMENT_TYPE_NONE
-    MovementType_LookAround,                   // MOVEMENT_TYPE_LOOK_AROUND
-    MovementType_WanderAround,                 // MOVEMENT_TYPE_WANDER_AROUND
-    MovementType_WanderUpAndDown,              // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
-    MovementType_WanderUpAndDown,              // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
-    MovementType_WanderLeftAndRight,           // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
-    MovementType_WanderLeftAndRight,           // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_UP
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_DOWN
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_LEFT
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_RIGHT
-    MovementType_Player,                       // MOVEMENT_TYPE_PLAYER
-    MovementType_BerryTreeGrowth,              // MOVEMENT_TYPE_BERRY_TREE_GROWTH
-    MovementType_FaceDownAndUp,                // MOVEMENT_TYPE_FACE_DOWN_AND_UP
-    MovementType_FaceLeftAndRight,             // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
-    MovementType_FaceUpAndLeft,                // MOVEMENT_TYPE_FACE_UP_AND_LEFT
-    MovementType_FaceUpAndRight,               // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
-    MovementType_FaceDownAndLeft,              // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
-    MovementType_FaceDownAndRight,             // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
-    MovementType_FaceDownUpAndLeft,            // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
-    MovementType_FaceDownUpAndRight,           // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
-    MovementType_FaceUpRightAndLeft,           // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
-    MovementType_FaceDownRightAndLeft,         // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
-    MovementType_RotateCounterclockwise,       // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
-    MovementType_RotateClockwise,              // MOVEMENT_TYPE_ROTATE_CLOCKWISE
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_UP_AND_DOWN
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_DOWN_AND_UP
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
-    MovementType_WalkSequenceUpRightLeftDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
-    MovementType_WalkSequenceRightLeftDownUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
-    MovementType_WalkSequenceDownUpRightLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
-    MovementType_WalkSequenceLeftDownUpRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
-    MovementType_WalkSequenceUpLeftRightDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
-    MovementType_WalkSequenceLeftRightDownUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
-    MovementType_WalkSequenceDownUpLeftRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
-    MovementType_WalkSequenceRightDownUpLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
-    MovementType_WalkSequenceLeftUpDownRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
-    MovementType_WalkSequenceUpDownRightLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
-    MovementType_WalkSequenceRightLeftUpDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
-    MovementType_WalkSequenceDownRightLeftUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
-    MovementType_WalkSequenceRightUpDownLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
-    MovementType_WalkSequenceUpDownLeftRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
-    MovementType_WalkSequenceLeftRightUpDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
-    MovementType_WalkSequenceDownLeftRightUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
-    MovementType_WalkSequenceUpLeftDownRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
-    MovementType_WalkSequenceDownRightUpLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
-    MovementType_WalkSequenceLeftDownRightUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
-    MovementType_WalkSequenceRightUpLeftDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
-    MovementType_WalkSequenceUpRightDownLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
-    MovementType_WalkSequenceDownLeftUpRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
-    MovementType_WalkSequenceLeftUpRightDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
-    MovementType_WalkSequenceRightDownLeftUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
-    MovementType_TreeDisguise,                 // MOVEMENT_TYPE_TREE_DISGUISE
-    MovementType_MountainDisguise,             // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
-    MovementType_Hidden,                       // MOVEMENT_TYPE_HIDDEN
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_UP
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_UP
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_UP
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
-    MovementType_Invisible,                    // MOVEMENT_TYPE_INVISIBLE
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_NONE] = MovementType_None,
+    [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround,
+    [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround,
+    [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = MovementType_WanderUpAndDown,
+    [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = MovementType_WanderUpAndDown,
+    [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = MovementType_WanderLeftAndRight,
+    [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = MovementType_WanderLeftAndRight,
+    [MOVEMENT_TYPE_FACE_UP] = MovementType_FaceDirection,
+    [MOVEMENT_TYPE_FACE_DOWN] = MovementType_FaceDirection,
+    [MOVEMENT_TYPE_FACE_LEFT] = MovementType_FaceDirection,
+    [MOVEMENT_TYPE_FACE_RIGHT] = MovementType_FaceDirection,
+    [MOVEMENT_TYPE_PLAYER] = MovementType_Player,
+    [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = MovementType_BerryTreeGrowth,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = MovementType_FaceDownAndUp,
+    [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = MovementType_FaceLeftAndRight,
+    [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = MovementType_FaceUpAndLeft,
+    [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = MovementType_FaceUpAndRight,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = MovementType_FaceDownAndLeft,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = MovementType_FaceDownAndRight,
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = MovementType_FaceDownUpAndLeft,
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = MovementType_FaceDownUpAndRight,
+    [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = MovementType_FaceUpRightAndLeft,
+    [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = MovementType_FaceDownRightAndLeft,
+    [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = MovementType_RotateCounterclockwise,
+    [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = MovementType_RotateClockwise,
+    [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = MovementType_WalkBackAndForth,
+    [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = MovementType_WalkBackAndForth,
+    [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = MovementType_WalkBackAndForth,
+    [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = MovementType_WalkBackAndForth,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = MovementType_WalkSequenceUpRightLeftDown,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = MovementType_WalkSequenceRightLeftDownUp,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = MovementType_WalkSequenceDownUpRightLeft,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = MovementType_WalkSequenceLeftDownUpRight,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = MovementType_WalkSequenceUpLeftRightDown,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = MovementType_WalkSequenceLeftRightDownUp,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = MovementType_WalkSequenceDownUpLeftRight,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = MovementType_WalkSequenceRightDownUpLeft,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = MovementType_WalkSequenceLeftUpDownRight,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = MovementType_WalkSequenceUpDownRightLeft,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = MovementType_WalkSequenceRightLeftUpDown,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = MovementType_WalkSequenceDownRightLeftUp,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = MovementType_WalkSequenceRightUpDownLeft,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = MovementType_WalkSequenceUpDownLeftRight,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = MovementType_WalkSequenceLeftRightUpDown,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = MovementType_WalkSequenceDownLeftRightUp,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = MovementType_WalkSequenceUpLeftDownRight,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = MovementType_WalkSequenceDownRightUpLeft,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = MovementType_WalkSequenceLeftDownRightUp,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = MovementType_WalkSequenceRightUpLeftDown,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = MovementType_WalkSequenceUpRightDownLeft,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = MovementType_WalkSequenceDownLeftUpRight,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = MovementType_WalkSequenceLeftUpRightDown,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = MovementType_WalkSequenceRightDownLeftUp,
+    [MOVEMENT_TYPE_COPY_PLAYER] = MovementType_CopyPlayer,
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = MovementType_CopyPlayer,
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = MovementType_CopyPlayer,
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = MovementType_CopyPlayer,
+    [MOVEMENT_TYPE_TREE_DISGUISE] = MovementType_TreeDisguise,
+    [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = MovementType_MountainDisguise,
+    [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = MovementType_CopyPlayerInGrass,
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = MovementType_CopyPlayerInGrass,
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
+    [MOVEMENT_TYPE_HIDDEN] = MovementType_Hidden,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = MovementType_WalkInPlace,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = MovementType_JogInPlace,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = MovementType_JogInPlace,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = MovementType_JogInPlace,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = MovementType_JogInPlace,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = MovementType_RunInPlace,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = MovementType_RunInPlace,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = MovementType_RunInPlace,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = MovementType_RunInPlace,
+    [MOVEMENT_TYPE_INVISIBLE] = MovementType_Invisible,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = MovementType_WalkSlowlyInPlace,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = MovementType_WalkSlowlyInPlace,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = MovementType_WalkSlowlyInPlace,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = MovementType_WalkSlowlyInPlace,
 };
 
 const u8 gRangedMovementTypes[] = {
-    0, // MOVEMENT_TYPE_NONE
-    0, // MOVEMENT_TYPE_LOOK_AROUND
-    1, // MOVEMENT_TYPE_WANDER_AROUND
-    1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
-    1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
-    1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
-    1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
-    0, // MOVEMENT_TYPE_FACE_UP
-    0, // MOVEMENT_TYPE_FACE_DOWN
-    0, // MOVEMENT_TYPE_FACE_LEFT
-    0, // MOVEMENT_TYPE_FACE_RIGHT
-    0, // MOVEMENT_TYPE_PLAYER
-    0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
-    0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
-    0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
-    0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
-    0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
-    0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
-    0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
-    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
-    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
-    0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
-    0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
-    0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
-    0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
-    1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
-    1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
-    1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
-    1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
-    1, // MOVEMENT_TYPE_COPY_PLAYER
-    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
-    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
-    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
-    0, // MOVEMENT_TYPE_TREE_DISGUISE
-    0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
-    1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
-    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
-    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
-    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
-    0, // MOVEMENT_TYPE_HIDDEN
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
-    0, // MOVEMENT_TYPE_INVISIBLE
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_NONE] = 0,
+    [MOVEMENT_TYPE_LOOK_AROUND] = 0,
+    [MOVEMENT_TYPE_WANDER_AROUND] = 1,
+    [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = 1,
+    [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = 1,
+    [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = 1,
+    [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = 1,
+    [MOVEMENT_TYPE_FACE_UP] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN] = 0,
+    [MOVEMENT_TYPE_FACE_LEFT] = 0,
+    [MOVEMENT_TYPE_FACE_RIGHT] = 0,
+    [MOVEMENT_TYPE_PLAYER] = 0,
+    [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = 0,
+    [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = 0,
+    [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = 0,
+    [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = 0,
+    [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = 0,
+    [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = 0,
+    [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = 0,
+    [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = 0,
+    [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = 1,
+    [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = 1,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = 1,
+    [MOVEMENT_TYPE_TREE_DISGUISE] = 0,
+    [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = 0,
+    [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = 1,
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = 1,
+    [MOVEMENT_TYPE_HIDDEN] = 0,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = 0,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = 0,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = 0,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = 0,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = 0,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = 0,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = 0,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = 0,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = 0,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = 0,
+    [MOVEMENT_TYPE_INVISIBLE] = 0,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = 0,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = 0,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = 0,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = 0,
 };
 
 const u8 gInitialMovementTypeFacingDirections[] = {
-    DIR_SOUTH, // MOVEMENT_TYPE_NONE
-    DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND
-    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND
-    DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
-    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
-    DIR_WEST,  // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
-    DIR_EAST,  // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN
-    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT
-    DIR_EAST,  // MOVEMENT_TYPE_FACE_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_PLAYER
-    DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
-    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
-    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
-    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER
-    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
-    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
-    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
-    DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE
-    DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
-    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
-    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
-    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
-    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
-    DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
-    DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
-    DIR_WEST,  // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
-    DIR_EAST,  // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
-    DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
-    DIR_WEST,  // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
-    DIR_EAST,  // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
-    DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_NONE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH,
+    [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST,
+    [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST,
+    [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH,
+    [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST,
+    [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST,
+    [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH,
+    [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST,
+    [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH,
+    [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH,
+    [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST,
+    [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH,
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST,
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST,
+    [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH,
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH,
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST,
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST,
+    [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST,
+    [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST,
+    [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST,
+    [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_NORTH,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_WEST,
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST,
 };
 
 #define EVENT_OBJ_PAL_TAG_0  0x1103
@@ -668,181 +668,181 @@ const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
 #include "data/field_event_obj/movement_type_func_tables.h"
 
 const u8 gFaceDirectionAnimNums[] = {
-    0, // DIR_NONE
-    0, // DIR_SOUTH
-    1, // DIR_NORTH
-    2, // DIR_WEST
-    3, // DIR_EAST
-    0, // DIR_SOUTHWEST
-    0, // DIR_SOUTHEAST
-    1, // DIR_NORTHWEST
-    1, // DIR_NORTHEAST
+    [DIR_NONE] = 0,
+    [DIR_SOUTH] = 0,
+    [DIR_NORTH] = 1,
+    [DIR_WEST] = 2,
+    [DIR_EAST] = 3,
+    [DIR_SOUTHWEST] = 0,
+    [DIR_SOUTHEAST] = 0,
+    [DIR_NORTHWEST] = 1,
+    [DIR_NORTHEAST] = 1,
 };
 const u8 gMoveDirectionAnimNums[] = {
-    4, // DIR_NONE
-    4, // DIR_SOUTH
-    5, // DIR_NORTH
-    6, // DIR_WEST
-    7, // DIR_EAST
-    4, // DIR_SOUTHWEST
-    4, // DIR_SOUTHEAST
-    5, // DIR_NORTHWEST
-    5, // DIR_NORTHEAST
+    [DIR_NONE] = 4,
+    [DIR_SOUTH] = 4,
+    [DIR_NORTH] = 5,
+    [DIR_WEST] = 6,
+    [DIR_EAST] = 7,
+    [DIR_SOUTHWEST] = 4,
+    [DIR_SOUTHEAST] = 4,
+    [DIR_NORTHWEST] = 5,
+    [DIR_NORTHEAST] = 5,
 };
 const u8 gMoveDirectionFastAnimNums[] = {
-    8,  // DIR_NONE
-    8,  // DIR_SOUTH
-    9,  // DIR_NORTH
-    10, // DIR_WEST
-    11, // DIR_EAST
-    8,  // DIR_SOUTHWEST
-    8,  // DIR_SOUTHEAST
-    9,  // DIR_NORTHWEST
-    9,  // DIR_NORTHEAST
+    [DIR_NONE] = 8,
+    [DIR_SOUTH] = 8,
+    [DIR_NORTH] = 9,
+    [DIR_WEST] = 10,
+    [DIR_EAST] = 11,
+    [DIR_SOUTHWEST] = 8,
+    [DIR_SOUTHEAST] = 8,
+    [DIR_NORTHWEST] = 9,
+    [DIR_NORTHEAST] = 9,
 };
 const u8 gMoveDirectionFasterAnimNums[] = {
-    12, // DIR_NONE
-    12, // DIR_SOUTH
-    13, // DIR_NORTH
-    14, // DIR_WEST
-    15, // DIR_EAST
-    12, // DIR_SOUTHWEST
-    12, // DIR_SOUTHEAST
-    13, // DIR_NORTHWEST
-    13, // DIR_NORTHEAST
+    [DIR_NONE] = 12,
+    [DIR_SOUTH] = 12,
+    [DIR_NORTH] = 13,
+    [DIR_WEST] = 14,
+    [DIR_EAST] = 15,
+    [DIR_SOUTHWEST] = 12,
+    [DIR_SOUTHEAST] = 12,
+    [DIR_NORTHWEST] = 13,
+    [DIR_NORTHEAST] = 13,
 };
 const u8 gMoveDirectionFastestAnimNums[] = {
-    16, // DIR_NONE
-    16, // DIR_SOUTH
-    17, // DIR_NORTH
-    18, // DIR_WEST
-    19, // DIR_EAST
-    16, // DIR_SOUTHWEST
-    16, // DIR_SOUTHEAST
-    17, // DIR_NORTHWEST
-    17, // DIR_NORTHEAST
+    [DIR_NONE] = 16,
+    [DIR_SOUTH] = 16,
+    [DIR_NORTH] = 17,
+    [DIR_WEST] = 18,
+    [DIR_EAST] = 19,
+    [DIR_SOUTHWEST] = 16,
+    [DIR_SOUTHEAST] = 16,
+    [DIR_NORTHWEST] = 17,
+    [DIR_NORTHEAST] = 17,
 };
 const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon
-    20, // DIR_NONE
-    20, // DIR_SOUTH
-    21, // DIR_NORTH
-    22, // DIR_WEST
-    23, // DIR_EAST
-    20, // DIR_SOUTHWEST
-    20, // DIR_SOUTHEAST
-    21, // DIR_NORTHWEST
-    21, // DIR_NORTHEAST
+    [DIR_NONE] = 20,
+    [DIR_SOUTH] = 20,
+    [DIR_NORTH] = 21,
+    [DIR_WEST] = 22,
+    [DIR_EAST] = 23,
+    [DIR_SOUTHWEST] = 20,
+    [DIR_SOUTHEAST] = 20,
+    [DIR_NORTHWEST] = 21,
+    [DIR_NORTHEAST] = 21,
 };
 const u8 gAcroWheelieDirectionAnimNums[] = {
-    20, // DIR_NONE
-    20, // DIR_SOUTH
-    21, // DIR_NORTH
-    22, // DIR_WEST
-    23, // DIR_EAST
-    20, // DIR_SOUTHWEST
-    20, // DIR_SOUTHEAST
-    21, // DIR_NORTHWEST
-    21, // DIR_NORTHEAST
+    [DIR_NONE] = 20,
+    [DIR_SOUTH] = 20,
+    [DIR_NORTH] = 21,
+    [DIR_WEST] = 22,
+    [DIR_EAST] = 23,
+    [DIR_SOUTHWEST] = 20,
+    [DIR_SOUTHEAST] = 20,
+    [DIR_NORTHWEST] = 21,
+    [DIR_NORTHEAST] = 21,
 };
 const u8 gUnrefAnimNums_08375633[] = {
-    24, // DIR_NONE
-    24, // DIR_SOUTH
-    25, // DIR_NORTH
-    26, // DIR_WEST
-    27, // DIR_EAST
-    24, // DIR_SOUTHWEST
-    24, // DIR_SOUTHEAST
-    25, // DIR_NORTHWEST
-    25, // DIR_NORTHEAST
+    [DIR_NONE] = 24,
+    [DIR_SOUTH] = 24,
+    [DIR_NORTH] = 25,
+    [DIR_WEST] = 26,
+    [DIR_EAST] = 27,
+    [DIR_SOUTHWEST] = 24,
+    [DIR_SOUTHEAST] = 24,
+    [DIR_NORTHWEST] = 25,
+    [DIR_NORTHEAST] = 25,
 };
 const u8 gAcroEndWheelieDirectionAnimNums[] = {
-    28, // DIR_NONE
-    28, // DIR_SOUTH
-    29, // DIR_NORTH
-    30, // DIR_WEST
-    31, // DIR_EAST
-    28, // DIR_SOUTHWEST
-    28, // DIR_SOUTHEAST
-    29, // DIR_NORTHWEST
-    29, // DIR_NORTHEAST
+    [DIR_NONE] = 28,
+    [DIR_SOUTH] = 28,
+    [DIR_NORTH] = 29,
+    [DIR_WEST] = 30,
+    [DIR_EAST] = 31,
+    [DIR_SOUTHWEST] = 28,
+    [DIR_SOUTHEAST] = 28,
+    [DIR_NORTHWEST] = 29,
+    [DIR_NORTHEAST] = 29,
 };
 const u8 gAcroUnusedActionDirectionAnimNums[] = {
-    32, // DIR_NONE
-    32, // DIR_SOUTH
-    33, // DIR_NORTH
-    34, // DIR_WEST
-    35, // DIR_EAST
-    32, // DIR_SOUTHWEST
-    32, // DIR_SOUTHEAST
-    33, // DIR_NORTHWEST
-    33, // DIR_NORTHEAST
+    [DIR_NONE] = 32,
+    [DIR_SOUTH] = 32,
+    [DIR_NORTH] = 33,
+    [DIR_WEST] = 34,
+    [DIR_EAST] = 35,
+    [DIR_SOUTHWEST] = 32,
+    [DIR_SOUTHEAST] = 32,
+    [DIR_NORTHWEST] = 33,
+    [DIR_NORTHEAST] = 33,
 };
 const u8 gAcroWheeliePedalDirectionAnimNums[] = {
-    36, // DIR_NONE
-    36, // DIR_SOUTH
-    37, // DIR_NORTH
-    38, // DIR_WEST
-    39, // DIR_EAST
-    36, // DIR_SOUTHWEST
-    36, // DIR_SOUTHEAST
-    37, // DIR_NORTHWEST
-    37, // DIR_NORTHEAST
+    [DIR_NONE] = 36,
+    [DIR_SOUTH] = 36,
+    [DIR_NORTH] = 37,
+    [DIR_WEST] = 38,
+    [DIR_EAST] = 39,
+    [DIR_SOUTHWEST] = 36,
+    [DIR_SOUTHEAST] = 36,
+    [DIR_NORTHWEST] = 37,
+    [DIR_NORTHEAST] = 37,
 };
 const u8 gFishingDirectionAnimNums[] = {
-    0, // DIR_NONE
-    0, // DIR_SOUTH
-    1, // DIR_NORTH
-    2, // DIR_WEST
-    3, // DIR_EAST
-    0, // DIR_SOUTHWEST
-    0, // DIR_SOUTHEAST
-    1, // DIR_NORTHWEST
-    1, // DIR_NORTHEAST
+    [DIR_NONE] = 0,
+    [DIR_SOUTH] = 0,
+    [DIR_NORTH] = 1,
+    [DIR_WEST] = 2,
+    [DIR_EAST] = 3,
+    [DIR_SOUTHWEST] = 0,
+    [DIR_SOUTHEAST] = 0,
+    [DIR_NORTHWEST] = 1,
+    [DIR_NORTHEAST] = 1,
 };
 const u8 gFishingNoCatchDirectionAnimNums[] = {
-    4, // DIR_NONE
-    4, // DIR_SOUTH
-    5, // DIR_NORTH
-    6, // DIR_WEST
-    7, // DIR_EAST
-    4, // DIR_SOUTHWEST
-    4, // DIR_SOUTHEAST
-    5, // DIR_NORTHWEST
-    5, // DIR_NORTHEAST
+    [DIR_NONE] = 4,
+    [DIR_SOUTH] = 4,
+    [DIR_NORTH] = 5,
+    [DIR_WEST] = 6,
+    [DIR_EAST] = 7,
+    [DIR_SOUTHWEST] = 4,
+    [DIR_SOUTHEAST] = 4,
+    [DIR_NORTHWEST] = 5,
+    [DIR_NORTHEAST] = 5,
 };
 const u8 gFishingBiteDirectionAnimNums[] = {
-    8,  // DIR_NONE
-    8,  // DIR_SOUTH
-    9,  // DIR_NORTH
-    10, // DIR_WEST
-    11, // DIR_EAST
-    8,  // DIR_SOUTHWEST
-    8,  // DIR_SOUTHEAST
-    9,  // DIR_NORTHWEST
-    9,  // DIR_NORTHEAST
+    [DIR_NONE] = 8,
+    [DIR_SOUTH] = 8,
+    [DIR_NORTH] = 9,
+    [DIR_WEST] = 10,
+    [DIR_EAST] = 11,
+    [DIR_SOUTHWEST] = 8,
+    [DIR_SOUTHEAST] = 8,
+    [DIR_NORTHWEST] = 9,
+    [DIR_NORTHEAST] = 9,
 };
 const u8 gRunningDirectionAnimNums[] = {
-    20, // DIR_NONE
-    20, // DIR_SOUTH
-    21, // DIR_NORTH
-    22, // DIR_WEST
-    23, // DIR_EAST
-    20, // DIR_SOUTHWEST
-    20, // DIR_SOUTHEAST
-    21, // DIR_NORTHWEST
-    21, // DIR_NORTHEAST
+    [DIR_NONE] = 20,
+    [DIR_SOUTH] = 20,
+    [DIR_NORTH] = 21,
+    [DIR_WEST] = 22,
+    [DIR_EAST] = 23,
+    [DIR_SOUTHWEST] = 20,
+    [DIR_SOUTHEAST] = 20,
+    [DIR_NORTHWEST] = 21,
+    [DIR_NORTHEAST] = 21,
 };
 
 const u8 gTrainerFacingDirectionMovementTypes[] = {
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_NONE
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTH
-    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTH
-    MOVEMENT_TYPE_FACE_LEFT,  // DIR_WEST
-    MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHWEST
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHEAST
-    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHWEST
-    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHEAST
+    [DIR_NONE] = MOVEMENT_TYPE_FACE_DOWN,
+    [DIR_SOUTH] = MOVEMENT_TYPE_FACE_DOWN,
+    [DIR_NORTH] = MOVEMENT_TYPE_FACE_UP,
+    [DIR_WEST] = MOVEMENT_TYPE_FACE_LEFT,
+    [DIR_EAST] = MOVEMENT_TYPE_FACE_RIGHT,
+    [DIR_SOUTHWEST] = MOVEMENT_TYPE_FACE_DOWN,
+    [DIR_SOUTHEAST] = MOVEMENT_TYPE_FACE_DOWN,
+    [DIR_NORTHWEST] = MOVEMENT_TYPE_FACE_UP,
+    [DIR_NORTHEAST] = MOVEMENT_TYPE_FACE_UP,
 };
 
 bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = {
@@ -1093,10 +1093,10 @@ const u8 gUnknown_0850DC3F[][4] = {
 static void ClearEventObject(struct EventObject *eventObject)
 {
     *eventObject = (struct EventObject){};
-    eventObject->localId = INVALID_U8;
-    eventObject->mapNum = INVALID_U8;
-    eventObject->mapGroup = INVALID_U8;
-    eventObject->movementActionId = INVALID_U8;
+    eventObject->localId = 0xFF;
+    eventObject->mapNum = 0xFF;
+    eventObject->mapGroup = 0xFF;
+    eventObject->movementActionId = 0xFF;
 }
 
 static void ClearAllEventObjects(void)
@@ -1537,7 +1537,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
     {
         eventObject->invisible = TRUE;
     }
-    *(u16 *)&spriteTemplate->paletteTag = INVALID_U16;
+    *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
     spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
     if (spriteId == MAX_SPRITES)
     {
@@ -1666,7 +1666,7 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
 
     spriteTemplate = malloc(sizeof(struct SpriteTemplate));
     MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables);
-    if (spriteTemplate->paletteTag != INVALID_U16)
+    if (spriteTemplate->paletteTag != 0xFFFF)
     {
         LoadEventObjectPalette(spriteTemplate->paletteTag);
     }
@@ -1692,7 +1692,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
 
     graphicsInfo = GetEventObjectGraphicsInfo(graphicsId);
     MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables);
-    *(u16 *)&spriteTemplate.paletteTag = INVALID_U16;
+    *(u16 *)&spriteTemplate.paletteTag = 0xFFFF;
     x += 7;
     y += 7;
     sub_80930E0(&x, &y, 8, 16);
@@ -1849,7 +1849,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y)
     spriteFrameImage.size = graphicsInfo->size;
     MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables);
     spriteTemplate.images = &spriteFrameImage;
-    *(u16 *)&spriteTemplate.paletteTag = INVALID_U16;
+    *(u16 *)&spriteTemplate.paletteTag = 0xFFFF;
     paletteSlot = graphicsInfo->paletteSlot;
     if (paletteSlot == 0)
     {
@@ -1864,7 +1864,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y)
         paletteSlot -= 16;
         sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
     }
-    *(u16 *)&spriteTemplate.paletteTag = INVALID_U16;
+    *(u16 *)&spriteTemplate.paletteTag = 0xFFFF;
     spriteId = CreateSprite(&spriteTemplate, 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
@@ -2146,9 +2146,9 @@ void Unused_LoadEventObjectPaletteSet(u16 *paletteTags)
 
 static u8 sub_808E8F4(const struct SpritePalette *spritePalette)
 {
-    if (IndexOfSpritePaletteTag(spritePalette->tag) != INVALID_U8)
+    if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xFF)
     {
-        return INVALID_U8;
+        return 0xFF;
     }
     return LoadSpritePalette(spritePalette);
 }
@@ -2181,7 +2181,7 @@ static u8 FindEventObjectPaletteIndexByTag(u16 tag)
             return i;
         }
     }
-    return INVALID_U8;
+    return 0xFF;
 }
 
 void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot)
@@ -2513,7 +2513,7 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup)
 
     if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        return INVALID_U8;
+        return 0xFF;
     }
     return gEventObjects[eventObjectId].trainerType;
 }
@@ -2529,7 +2529,7 @@ u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup)
 
     if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        return INVALID_U8;
+        return 0xFF;
     }
     return gEventObjects[eventObjectId].trainerRange_berryTreeId;
 }
@@ -4374,7 +4374,7 @@ bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Spri
 
 bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
     {
         return FALSE;
     }
@@ -4553,7 +4553,7 @@ movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerI
 
 bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
     {
         return FALSE;
     }
@@ -4699,7 +4699,7 @@ static void ClearEventObjectMovement(struct EventObject *eventObject, struct Spr
     eventObject->singleMovementActive = 0;
     eventObject->heldMovementActive = FALSE;
     eventObject->heldMovementFinished = FALSE;
-    eventObject->movementActionId = INVALID_U8;
+    eventObject->movementActionId = 0xFF;
     sprite->data[1] = 0;
 }
 
@@ -5105,7 +5105,7 @@ bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject)
 
 bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject)
 {
-    if (eventObject->heldMovementActive && eventObject->movementActionId != INVALID_U8)
+    if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF)
         return TRUE;
 
     return FALSE;
@@ -5138,7 +5138,7 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject)
 
 void EventObjectClearHeldMovement(struct EventObject *eventObject)
 {
-    eventObject->movementActionId = INVALID_U8;
+    eventObject->movementActionId = 0xFF;
     eventObject->heldMovementActive = FALSE;
     eventObject->heldMovementFinished = FALSE;
     gSprites[eventObject->spriteId].data[1] = 0;
@@ -5167,7 +5167,7 @@ u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject)
     if (eventObject->heldMovementActive)
         return eventObject->movementActionId;
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *))
@@ -5279,7 +5279,7 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject
 {
     if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
     {
-        eventObject->movementActionId = INVALID_U8;
+        eventObject->movementActionId = 0xFF;
         sprite->data[2] = 0;
         return TRUE;
     }
@@ -5706,7 +5706,7 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba
         eventObject->triggerGroundEffectsOnMove = TRUE;
         eventObject->disableCoveringGroundEffects = TRUE;
     }
-    else if (result == INVALID_U8)
+    else if (result == 0xFF)
     {
         ShiftStillEventObjectCoords(eventObject);
         eventObject->triggerGroundEffectsOnStop = TRUE;
@@ -5728,7 +5728,7 @@ u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite)
 
 bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8094188(eventObject, sprite) == INVALID_U8)
+    if (sub_8094188(eventObject, sprite) == 0xFF)
     {
         return TRUE;
     }
@@ -5737,7 +5737,7 @@ bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite)
 
 bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_809419C(eventObject, sprite) == INVALID_U8)
+    if (sub_809419C(eventObject, sprite) == 0xFF)
     {
         return TRUE;
     }
@@ -9122,7 +9122,7 @@ void CreateLevitateMovementTask(struct EventObject *eventObject)
 
     StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject);
     eventObject->warpArrowSpriteId = taskId;
-    task->data[3] = INVALID_U16;
+    task->data[3] = 0xFFFF;
 }
 
 static void ApplyLevitateMovement(u8 taskId)
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 25d85a855..1070c69e9 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID)
                 GetMonData(mon, MON_DATA_NICKNAME, text);
                 StringCopy10(gBattleTextBuff1, text);
 
-                if (var == INVALID_U16) // no place to learn it
+                if (var == 0xFFFF) // no place to learn it
                     gTasks[taskID].tState = 22;
                 else if (var == 0xFFFE) // it already knows that move
                     break;
@@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                 GetMonData(mon, MON_DATA_NICKNAME, text);
                 StringCopy10(gBattleTextBuff1, text);
 
-                if (var == INVALID_U16)
+                if (var == 0xFFFF)
                     gTasks[taskID].tState = 20;
                 else if (var == 0xFFFE)
                     break;
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 1dce3169e..c52f5190f 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -266,7 +266,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil
     else
         eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
 
-    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8)
+    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
         return NULL;
 
     for (i = 0; i < 4; i++)
@@ -287,14 +287,14 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8
     const u8 *script;
 
     eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height);
-    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8)
+    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
     {
         if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE)
             return NULL;
 
         // Look for an event object on the other side of the counter.
         eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
-        if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8)
+        if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
             return NULL;
     }
 
diff --git a/src/field_door.c b/src/field_door.c
index a1fe5bb97..c197aca14 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -695,7 +695,7 @@ static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y)
 
 static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y)
 {
-    if (frame->offset == INVALID_U16)
+    if (frame->offset == 0xFFFF)
     {
         DrawClosedDoorTiles(gfx, x, y);
         if (sub_808A964())
diff --git a/src/field_effect.c b/src/field_effect.c
index 91d61ef2f..40e15c733 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = {
 };
 
 const struct SpriteTemplate gNewGameBirchObjectTemplate = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4102,
     .oam = &gNewGameBirchOamAttributes,
     .anims = gNewGameBirchImageAnimTable,
@@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C304 = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4103,
     .oam = &gOamData_855C218,
     .anims = gSpriteAnimTable_855C2F8,
@@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C31C = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4100,
     .oam = &gOamData_855C220,
     .anims = gSpriteAnimTable_855C2F8,
@@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C334 = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C220,
     .anims = gSpriteAnimTable_855C300,
@@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C34C = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C26C,
     .anims = gSpriteAnimTable_855C300,
@@ -618,7 +618,7 @@ u32 FieldEffectScript_ReadWord(u8 **script)
 void FieldEffectScript_LoadTiles(u8 **script)
 {
     struct SpriteSheet *sheet = (struct SpriteSheet *)FieldEffectScript_ReadWord(script);
-    if (GetSpriteTileStartByTag(sheet->tag) == INVALID_U16)
+    if (GetSpriteTileStartByTag(sheet->tag) == 0xFFFF)
         LoadSpriteSheet(sheet);
     (*script) += 4;
 }
@@ -665,7 +665,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart)
     u8 i;
     u16 tag = GetSpriteTileTagByTileStart(tileStart);
 
-    if (tag != INVALID_U16)
+    if (tag != 0xFFFF)
     {
         for (i = 0; i < MAX_SPRITES; i++)
             if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart)
@@ -679,7 +679,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum)
     u8 i;
     u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum);
 
-    if (tag != INVALID_U16)
+    if (tag != 0xFFFF)
     {
         for (i = 0; i < MAX_SPRITES; i++)
             if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum)
@@ -761,7 +761,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
 {
     s32 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag);
     PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10);
-    if (spriteId == INVALID_U16)
+    if (spriteId == 0xFFFF)
         return MAX_SPRITES;
     else
         return spriteId;
@@ -772,7 +772,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio
     const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g);
     u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag);
     PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
-    if (spriteId == INVALID_U16)
+    if (spriteId == 0xFFFF)
         return MAX_SPRITES;
     else
         return spriteId;
@@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = {
 };
 
 const struct SpriteTemplate gUnknown_0855C5EC = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4378,
     .oam = &gOamData_855C218,
     .anims = gSpriteAnimTable_855C5DC,
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index a68a72c76..3046eccd5 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1007,15 +1007,15 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite)
 static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 surfBlobDirectionAnims[] = {
-        0, // DIR_NONE
-        0, // DIR_SOUTH
-        1, // DIR_NORTH
-        2, // DIR_WEST
-        3, // DIR_EAST
-        0,
-        0,
-        1,
-        1,
+        [DIR_NONE] = 0,
+        [DIR_SOUTH] = 0,
+        [DIR_NORTH] = 1,
+        [DIR_WEST] = 2,
+        [DIR_EAST] = 3,
+        [DIR_SOUTHWEST] = 0,
+        [DIR_SOUTHEAST] = 0,
+        [DIR_NORTHWEST] = 1,
+        [DIR_NORTHEAST] = 1,
     };
 
     if (sub_8155640(sprite) == 0)
diff --git a/src/field_message_box.c b/src/field_message_box.c
index 0725ca8c7..46da9e9e5 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -53,7 +53,7 @@ void task_add_textbox(void)
 void task_del_textbox(void)
 {
     u8 taskId = FindTaskIdByFunc(sub_8098154);
-    if (taskId != INVALID_U8)
+    if (taskId != 0xFF)
         DestroyTask(taskId);
 }
 
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 7da89fe83..a5aa23e32 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
     u8 eventObjectId;
     struct EventObject *eventObject;
 
-    playerEventObjTemplate.localId = INVALID_U8;
+    playerEventObjTemplate.localId = 0xFF;
     playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
     playerEventObjTemplate.x = x - 7;
     playerEventObjTemplate.y = y - 7;
diff --git a/src/field_specials.c b/src/field_specials.c
index 629f2d0de..b47df09fc 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1691,22 +1691,22 @@ const struct WindowTemplate gUnknown_085B2BAC = {
 };
 
 const u8 *const gElevatorFloorsTable[] = {
-	gText_B4F,
-	gText_B3F,
-	gText_B2F,
-	gText_B1F,
-	gText_1F,
-	gText_2F,
-	gText_3F,
-	gText_4F,
-	gText_5F,
-	gText_6F,
-	gText_7F,
-	gText_8F,
-	gText_9F,
-	gText_10F,
-	gText_11F,
-	gText_Rooftop
+    gText_B4F,
+    gText_B3F,
+    gText_B2F,
+    gText_B1F,
+    gText_1F,
+    gText_2F,
+    gText_3F,
+    gText_4F,
+    gText_5F,
+    gText_6F,
+    gText_7F,
+    gText_8F,
+    gText_9F,
+    gText_10F,
+    gText_11F,
+    gText_Rooftop
 };
 
 const u16 gUnknown_085B2BF4[][3] =
@@ -1957,12 +1957,12 @@ void sub_8139D98(void)
 
 bool32 warp0_in_pokecenter(void)
 {
-    static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, INVALID_U16 };
+    static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF };
 
     int i;
     u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum;
 
-    for (i = 0; gUnknown_085B2C2A[i] != INVALID_U16; i++)
+    for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++)
     {
         if (gUnknown_085B2C2A[i] == map)
             return TRUE;
@@ -2946,10 +2946,10 @@ void sub_813AA44(void)
 
 static void sub_813AA60(u16 a0, u16 a1)
 {
-    static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, INVALID_U16 };
-    static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, INVALID_U16 };
-    static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, INVALID_U16 };
-    static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, INVALID_U16 };
+    static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xFFFF };
+    static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xFFFF };
+    static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xFFFF };
+    static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xFFFF };
 
     static const u8 *const gUnknown_085B3170[] = {
         BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
@@ -3004,7 +3004,7 @@ static void sub_813AA60(u16 a0, u16 a1)
         {
             case 3:
                 AddTextPrinterParameterized2(0, 1, gUnknown_085B3170[a1], 0, NULL, 2, 1, 3);
-                if (gUnknown_085B312C[a1] == INVALID_U16)
+                if (gUnknown_085B312C[a1] == 0xFFFF)
                 {
                     sub_813ABD4(gUnknown_085B312C[a1]);
                 }
@@ -3017,7 +3017,7 @@ static void sub_813AA60(u16 a0, u16 a1)
                 break;
             case 4:
                 AddTextPrinterParameterized2(0, 1, gUnknown_085B319C[a1], 0, NULL, 2, 1, 3);
-                if (gUnknown_085B3142[a1] == INVALID_U16)
+                if (gUnknown_085B3142[a1] == 0xFFFF)
                 {
                     sub_813ABD4(gUnknown_085B3142[a1]);
                 }
@@ -3841,13 +3841,13 @@ bool32 sub_813B9C0(void)
         MAP_TRADE_CENTER,
         MAP_RECORD_CORNER,
         MAP_DOUBLE_BATTLE_COLOSSEUM,
-        INVALID_U16
+        0xFFFF
     };
 
     int i;
     u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum;
 
-    for (i = 0; gUnknown_085B3444[i] != INVALID_U16; i++)
+    for (i = 0; gUnknown_085B3444[i] != 0xFFFF; i++)
     {
         if (gUnknown_085B3444[i] == map)
         {
diff --git a/src/fieldmap.c b/src/fieldmap.c
index aef17d49d..7e1fc03eb 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile)
     }
     else
     {
-        return INVALID_U8;
+        return 0xFF;
     }
 }
 
@@ -922,7 +922,7 @@ void sub_8088B94(int x, int y, int a2)
 
 bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2)
 {
-    if (a2 == INVALID_U8)
+    if (a2 == 0xFF)
         return FALSE;
 
     if (a2 == 0)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 2cffd5d41..6a310efd2 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP
 
 static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &sOamData_CutGrass,
     .anims = sSpriteAnimTable_CutGrass,
diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c
index 3bbc489c1..b9af24fb1 100644
--- a/src/fldeff_groundshake.c
+++ b/src/fldeff_groundshake.c
@@ -236,7 +236,7 @@ static void sub_81BE968(void)
     u8 taskId;
 
     taskId = FindTaskIdByFunc(sub_81BE9C0);
-    if(taskId != INVALID_U8)
+    if(taskId != 0xFF)
         gTasks[taskId].data[0]++;
 }
 
diff --git a/src/fossil_specials.c b/src/fossil_specials.c
index 8f6e38e91..dfdb999a9 100644
--- a/src/fossil_specials.c
+++ b/src/fossil_specials.c
@@ -302,7 +302,7 @@ static void sub_81BED50(u8 taskId)
     case 4:
         UnsetBgTilemapBuffer(0);
         anotherTaskId = FindTaskIdByFunc(sub_81BEBB4);
-        if (anotherTaskId != INVALID_U8)
+        if (anotherTaskId != 0xFF)
             DestroyTask(anotherTaskId);
         sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0;
         sub_81BEB90();
@@ -458,104 +458,104 @@ static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e)
 {
     asm_unified("\n\
     push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x8\n\
-	str r0, [sp]\n\
-	mov r10, r1\n\
-	adds r6, r2, 0\n\
-	mov r8, r3\n\
-	ldr r0, [sp, 0x28]\n\
-	mov r9, r0\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	mov r10, r1\n\
-	lsls r6, 24\n\
-	lsrs r6, 24\n\
-	mov r0, r8\n\
-	lsls r0, 24\n\
-	mov r8, r0\n\
-	lsrs r7, r0, 24\n\
-	mov r1, r9\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	mov r9, r1\n\
-	mov r0, r10\n\
-	adds r1, r7, 0\n\
-	bl __divsi3\n\
-	adds r5, r0, 0\n\
-	lsls r5, 24\n\
-	lsrs r4, r5, 24\n\
-	ldr r3, =gUnknown_030012A8\n\
-	strh r4, [r3]\n\
-	mov r0, r10\n\
-	adds r1, r7, 0\n\
-	str r3, [sp, 0x4]\n\
-	bl __modsi3\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	ldr r3, [sp, 0x4]\n\
-	strh r2, [r3, 0x2]\n\
-	movs r1, 0x7\n\
-	ands r4, r1\n\
-	ands r2, r1\n\
-	strh r4, [r3, 0x4]\n\
-	strh r2, [r3, 0x6]\n\
-	lsrs r0, 27\n\
-	lsrs r5, 27\n\
-	strh r0, [r3, 0x8]\n\
-	strh r5, [r3, 0xA]\n\
-	mov r1, r8\n\
-	lsrs r1, 27\n\
-	lsls r1, 6\n\
-	mov r8, r1\n\
-	mov r1, r8\n\
-	muls r1, r5\n\
-	lsls r0, 6\n\
-	adds r1, r0\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	strh r1, [r3, 0xC]\n\
-	lsls r4, 3\n\
-	adds r4, r2\n\
-	adds r1, r4\n\
-	lsls r4, r1, 16\n\
-	lsrs r4, 17\n\
-	strh r1, [r3, 0xE]\n\
-	movs r1, 0x1\n\
-	mov r0, r10\n\
-	ands r1, r0\n\
-	movs r2, 0x1\n\
-	eors r1, r2\n\
-	lsls r0, r1, 2\n\
-	lsls r6, r0\n\
-	eors r1, r2\n\
-	lsls r1, 2\n\
-	movs r0, 0xF\n\
-	lsls r0, r1\n\
-	orrs r6, r0\n\
-	lsls r6, 24\n\
-	lsrs r6, 24\n\
-	mov r1, r9\n\
-	lsls r1, 5\n\
-	mov r9, r1\n\
-	add r9, r4\n\
-	ldr r1, [sp]\n\
-	add r1, r9\n\
-	ldrb r0, [r1]\n\
-	ands r6, r0\n\
-	strb r6, [r1]\n\
-	add sp, 0x8\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x8\n\
+    str r0, [sp]\n\
+    mov r10, r1\n\
+    adds r6, r2, 0\n\
+    mov r8, r3\n\
+    ldr r0, [sp, 0x28]\n\
+    mov r9, r0\n\
+    lsls r1, 16\n\
+    lsrs r1, 16\n\
+    mov r10, r1\n\
+    lsls r6, 24\n\
+    lsrs r6, 24\n\
+    mov r0, r8\n\
+    lsls r0, 24\n\
+    mov r8, r0\n\
+    lsrs r7, r0, 24\n\
+    mov r1, r9\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    mov r9, r1\n\
+    mov r0, r10\n\
+    adds r1, r7, 0\n\
+    bl __divsi3\n\
+    adds r5, r0, 0\n\
+    lsls r5, 24\n\
+    lsrs r4, r5, 24\n\
+    ldr r3, =gUnknown_030012A8\n\
+    strh r4, [r3]\n\
+    mov r0, r10\n\
+    adds r1, r7, 0\n\
+    str r3, [sp, 0x4]\n\
+    bl __modsi3\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    ldr r3, [sp, 0x4]\n\
+    strh r2, [r3, 0x2]\n\
+    movs r1, 0x7\n\
+    ands r4, r1\n\
+    ands r2, r1\n\
+    strh r4, [r3, 0x4]\n\
+    strh r2, [r3, 0x6]\n\
+    lsrs r0, 27\n\
+    lsrs r5, 27\n\
+    strh r0, [r3, 0x8]\n\
+    strh r5, [r3, 0xA]\n\
+    mov r1, r8\n\
+    lsrs r1, 27\n\
+    lsls r1, 6\n\
+    mov r8, r1\n\
+    mov r1, r8\n\
+    muls r1, r5\n\
+    lsls r0, 6\n\
+    adds r1, r0\n\
+    lsls r1, 16\n\
+    lsrs r1, 16\n\
+    strh r1, [r3, 0xC]\n\
+    lsls r4, 3\n\
+    adds r4, r2\n\
+    adds r1, r4\n\
+    lsls r4, r1, 16\n\
+    lsrs r4, 17\n\
+    strh r1, [r3, 0xE]\n\
+    movs r1, 0x1\n\
+    mov r0, r10\n\
+    ands r1, r0\n\
+    movs r2, 0x1\n\
+    eors r1, r2\n\
+    lsls r0, r1, 2\n\
+    lsls r6, r0\n\
+    eors r1, r2\n\
+    lsls r1, 2\n\
+    movs r0, 0xF\n\
+    lsls r0, r1\n\
+    orrs r6, r0\n\
+    lsls r6, 24\n\
+    lsrs r6, 24\n\
+    mov r1, r9\n\
+    lsls r1, 5\n\
+    mov r9, r1\n\
+    add r9, r4\n\
+    ldr r1, [sp]\n\
+    add r1, r9\n\
+    ldrb r0, [r1]\n\
+    ands r6, r0\n\
+    strb r6, [r1]\n\
+    add sp, 0x8\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
                 ");
 }
 #endif // NONMATCHING
diff --git a/src/frontier_util.c b/src/frontier_util.c
index e799f96c8..528cce699 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -681,7 +681,7 @@ static const u8 sFacilityToBrainEventObjGfx[][2] =
 const u16 gFrontierBannedSpecies[] =
 {
     SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI,
-    SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, INVALID_U16
+    SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF
 };
 
 static const u8 *const gUnknown_08611CB0[][2] =
@@ -1829,7 +1829,7 @@ void sub_81A3ACC(void)
     s32 i;
 
     for (i = 0; i < 20; i++)
-        gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF;
 }
 
 static void sub_81A3B00(void)
@@ -1974,10 +1974,10 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL
     if (species == SPECIES_EGG || species == SPECIES_NONE)
         return;
 
-    for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16 && gFrontierBannedSpecies[i] != species; i++)
+    for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF && gFrontierBannedSpecies[i] != species; i++)
         ;
 
-    if (gFrontierBannedSpecies[i] != INVALID_U16)
+    if (gFrontierBannedSpecies[i] != 0xFFFF)
         return;
     if (lvlMode == FRONTIER_LVL_50 && monLevel > 50)
         return;
@@ -2060,7 +2060,7 @@ static void sub_81A3FD4(void)
         s32 i;
         s32 caughtBannedMons = 0;
         s32 species = gFrontierBannedSpecies[0];
-        for (i = 0; species != INVALID_U16; i++, species = gFrontierBannedSpecies[i])
+        for (i = 0; species != 0xFFFF; i++, species = gFrontierBannedSpecies[i])
         {
             if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
                 caughtBannedMons++;
@@ -2068,7 +2068,7 @@ static void sub_81A3FD4(void)
         gStringVar1[0] = EOS;
         gSpecialVar_0x8004 = 1;
         count = 0;
-        for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16; i++)
+        for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++)
             count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons);
 
         if (count == 0)
diff --git a/src/gpu_regs.c b/src/gpu_regs.c
index 805f23b48..2d48b304a 100644
--- a/src/gpu_regs.c
+++ b/src/gpu_regs.c
@@ -20,166 +20,166 @@ static void UpdateRegDispstatIntrBits(u16 regIE);
 
 void InitGpuRegManager(void)
 {
-	s32 i;
+    s32 i;
 
-	for (i = 0; i < GPU_REG_BUF_SIZE; i++)
+    for (i = 0; i < GPU_REG_BUF_SIZE; i++)
     {
-		sGpuRegBuffer[i] = 0;
-		sGpuRegWaitingList[i] = EMPTY_SLOT;
-	}
+        sGpuRegBuffer[i] = 0;
+        sGpuRegWaitingList[i] = EMPTY_SLOT;
+    }
 
-	sGpuRegBufferLocked = FALSE;
-	sShouldSyncRegIE = FALSE;
-	sRegIE = 0;
+    sGpuRegBufferLocked = FALSE;
+    sShouldSyncRegIE = FALSE;
+    sRegIE = 0;
 }
 
 static void CopyBufferedValueToGpuReg(u8 regOffset)
 {
-	if (regOffset == REG_OFFSET_DISPSTAT)
+    if (regOffset == REG_OFFSET_DISPSTAT)
     {
-		REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR);
-		REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT);
-	}
-	else
+        REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR);
+        REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT);
+    }
+    else
     {
-		GPU_REG(regOffset) = GPU_REG_BUF(regOffset);
-	}
+        GPU_REG(regOffset) = GPU_REG_BUF(regOffset);
+    }
 }
 
 void CopyBufferedValuesToGpuRegs(void)
 {
-	if (!sGpuRegBufferLocked)
+    if (!sGpuRegBufferLocked)
     {
-		s32 i;
+        s32 i;
 
-		for (i = 0; i < GPU_REG_BUF_SIZE; i++)
+        for (i = 0; i < GPU_REG_BUF_SIZE; i++)
         {
-			u8 regOffset = sGpuRegWaitingList[i];
-			if (regOffset == EMPTY_SLOT)
-				return;
-			CopyBufferedValueToGpuReg(regOffset);
-			sGpuRegWaitingList[i] = EMPTY_SLOT;
-		}
-	}
+            u8 regOffset = sGpuRegWaitingList[i];
+            if (regOffset == EMPTY_SLOT)
+                return;
+            CopyBufferedValueToGpuReg(regOffset);
+            sGpuRegWaitingList[i] = EMPTY_SLOT;
+        }
+    }
 }
 
 void SetGpuReg(u8 regOffset, u16 value)
 {
-	if (regOffset < GPU_REG_BUF_SIZE)
-	{
-		u16 vcount;
-
-		GPU_REG_BUF(regOffset) = value;
-		vcount = REG_VCOUNT & 0xFF;
-
-		if ((vcount >= 161 && vcount <= 225)
-		 || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) {
-			CopyBufferedValueToGpuReg(regOffset);
-		} else {
-			s32 i;
-
-			sGpuRegBufferLocked = TRUE;
-
-			for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) {
-				if (sGpuRegWaitingList[i] == regOffset) {
-					sGpuRegBufferLocked = FALSE;
-					return;
-				}
-			}
-
-			sGpuRegWaitingList[i] = regOffset;
-			sGpuRegBufferLocked = FALSE;
-		}
-	}
+    if (regOffset < GPU_REG_BUF_SIZE)
+    {
+        u16 vcount;
+
+        GPU_REG_BUF(regOffset) = value;
+        vcount = REG_VCOUNT & 0xFF;
+
+        if ((vcount >= 161 && vcount <= 225)
+         || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) {
+            CopyBufferedValueToGpuReg(regOffset);
+        } else {
+            s32 i;
+
+            sGpuRegBufferLocked = TRUE;
+
+            for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) {
+                if (sGpuRegWaitingList[i] == regOffset) {
+                    sGpuRegBufferLocked = FALSE;
+                    return;
+                }
+            }
+
+            sGpuRegWaitingList[i] = regOffset;
+            sGpuRegBufferLocked = FALSE;
+        }
+    }
 }
 
 void SetGpuReg_ForcedBlank(u8 regOffset, u16 value)
 {
-	if (regOffset < GPU_REG_BUF_SIZE)
-	{
-		GPU_REG_BUF(regOffset) = value;
-
-		if (REG_DISPCNT & DISPCNT_FORCED_BLANK) {
-			CopyBufferedValueToGpuReg(regOffset);
-		} else {
-			s32 i;
-
-			sGpuRegBufferLocked = TRUE;
-
-			for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) {
-				if (sGpuRegWaitingList[i] == regOffset) {
-					sGpuRegBufferLocked = FALSE;
-					return;
-				}
-			}
-
-			sGpuRegWaitingList[i] = regOffset;
-			sGpuRegBufferLocked = FALSE;
-		}
-	}
+    if (regOffset < GPU_REG_BUF_SIZE)
+    {
+        GPU_REG_BUF(regOffset) = value;
+
+        if (REG_DISPCNT & DISPCNT_FORCED_BLANK) {
+            CopyBufferedValueToGpuReg(regOffset);
+        } else {
+            s32 i;
+
+            sGpuRegBufferLocked = TRUE;
+
+            for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) {
+                if (sGpuRegWaitingList[i] == regOffset) {
+                    sGpuRegBufferLocked = FALSE;
+                    return;
+                }
+            }
+
+            sGpuRegWaitingList[i] = regOffset;
+            sGpuRegBufferLocked = FALSE;
+        }
+    }
 }
 
 u16 GetGpuReg(u8 regOffset)
 {
-	if (regOffset == REG_OFFSET_DISPSTAT)
-		return REG_DISPSTAT;
+    if (regOffset == REG_OFFSET_DISPSTAT)
+        return REG_DISPSTAT;
 
-	if (regOffset == REG_OFFSET_VCOUNT)
-		return REG_VCOUNT;
+    if (regOffset == REG_OFFSET_VCOUNT)
+        return REG_VCOUNT;
 
-	return GPU_REG_BUF(regOffset);
+    return GPU_REG_BUF(regOffset);
 }
 
 void SetGpuRegBits(u8 regOffset, u16 mask)
 {
-	u16 regValue = GPU_REG_BUF(regOffset);
-	SetGpuReg(regOffset, regValue | mask);
+    u16 regValue = GPU_REG_BUF(regOffset);
+    SetGpuReg(regOffset, regValue | mask);
 }
 
 void ClearGpuRegBits(u8 regOffset, u16 mask)
 {
-	u16 regValue = GPU_REG_BUF(regOffset);
-	SetGpuReg(regOffset, regValue & ~mask);
+    u16 regValue = GPU_REG_BUF(regOffset);
+    SetGpuReg(regOffset, regValue & ~mask);
 }
 
 static void SyncRegIE(void)
 {
-	if (sShouldSyncRegIE) {
-		u16 temp = REG_IME;
-		REG_IME = 0;
-		REG_IE = sRegIE;
-		REG_IME = temp;
-		sShouldSyncRegIE = FALSE;
-	}
+    if (sShouldSyncRegIE) {
+        u16 temp = REG_IME;
+        REG_IME = 0;
+        REG_IE = sRegIE;
+        REG_IME = temp;
+        sShouldSyncRegIE = FALSE;
+    }
 }
 
 void EnableInterrupts(u16 mask)
 {
-	sRegIE |= mask;
-	sShouldSyncRegIE = TRUE;
-	SyncRegIE();
-	UpdateRegDispstatIntrBits(sRegIE);
+    sRegIE |= mask;
+    sShouldSyncRegIE = TRUE;
+    SyncRegIE();
+    UpdateRegDispstatIntrBits(sRegIE);
 }
 
 void DisableInterrupts(u16 mask)
 {
-	sRegIE &= ~mask;
-	sShouldSyncRegIE = TRUE;
-	SyncRegIE();
-	UpdateRegDispstatIntrBits(sRegIE);
+    sRegIE &= ~mask;
+    sShouldSyncRegIE = TRUE;
+    SyncRegIE();
+    UpdateRegDispstatIntrBits(sRegIE);
 }
 
 static void UpdateRegDispstatIntrBits(u16 regIE)
 {
-	u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR);
-	u16 newValue = 0;
+    u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR);
+    u16 newValue = 0;
 
-	if (regIE & INTR_FLAG_VBLANK)
-		newValue |= DISPSTAT_VBLANK_INTR;
+    if (regIE & INTR_FLAG_VBLANK)
+        newValue |= DISPSTAT_VBLANK_INTR;
 
-	if (regIE & INTR_FLAG_HBLANK)
-		newValue |= DISPSTAT_HBLANK_INTR;
+    if (regIE & INTR_FLAG_HBLANK)
+        newValue |= DISPSTAT_HBLANK_INTR;
 
-	if (oldValue != newValue)
-		SetGpuReg(REG_OFFSET_DISPSTAT, newValue);
+    if (oldValue != newValue)
+        SetGpuReg(REG_OFFSET_DISPSTAT, newValue);
 }
diff --git a/src/ground.c b/src/ground.c
index abfeb3f3e..6cb7b8557 100644
--- a/src/ground.c
+++ b/src/ground.c
@@ -588,7 +588,7 @@ void sub_81152DC(u8 taskId)
         break;
     default:
         task->data[9] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-        if (task->data[9] == INVALID_U8)
+        if (task->data[9] == 0xFF)
         {
             DestroyAnimVisualTask(taskId);
         }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index b75243b84..ad5673036 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -467,11 +467,11 @@ static void Task_Hof_InitMonData(u8 taskId)
 
     sUnknown_0203BCD4 = 0;
     gTasks[taskId].tDisplayedMonId = 0;
-    gTasks[taskId].tPlayerSpriteID = INVALID_U8;
+    gTasks[taskId].tPlayerSpriteID = 0xFF;
 
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+        gTasks[taskId].tMonSpriteId(i) = 0xFF;
     }
 
     if (gTasks[taskId].tDontSaveData)
@@ -522,7 +522,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
 static void Task_Hof_TrySaveData(u8 taskId)
 {
     gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData;
-    if (TrySavingData(SAVE_HALL_OF_FAME) == INVALID_U8 && gDamagedSaveSectors != 0)
+    if (TrySavingData(SAVE_HALL_OF_FAME) == 0xFF && gDamagedSaveSectors != 0)
     {
         UnsetBgTilemapBuffer(1);
         UnsetBgTilemapBuffer(3);
@@ -645,7 +645,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId)
     BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK);
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8)
+        if (gTasks[taskId].tMonSpriteId(i) != 0xFF)
             gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0;
     }
 
@@ -668,7 +668,7 @@ static void sub_8173DC0(u8 taskId)
         u16 i;
         for (i = 0; i < PARTY_SIZE; i++)
         {
-            if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8)
+            if (gTasks[taskId].tMonSpriteId(i) != 0xFF)
                 gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1;
         }
         BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24));
@@ -752,7 +752,7 @@ static void Task_Hof_HandleExit(u8 taskId)
         for (i = 0; i < PARTY_SIZE; i++)
         {
             u8 spriteId = gTasks[taskId].tMonSpriteId(i);
-            if (spriteId != INVALID_U8)
+            if (spriteId != 0xFF)
             {
                 FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
                 FreeAndDestroyMonPicSprite(spriteId);
@@ -847,7 +847,7 @@ void CB2_DoHallOfFamePC(void)
 
             for (i = 0; i < PARTY_SIZE; i++)
             {
-                gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+                gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
 
             sHofMonPtr = AllocZeroed(0x2000);
@@ -937,7 +937,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
         }
         else
         {
-            gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+            gTasks[taskId].tMonSpriteId(i) = 0xFF;
         }
     }
 
@@ -967,7 +967,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId)
     for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 spriteId = gTasks[taskId].tMonSpriteId(i);
-        if (spriteId != INVALID_U8)
+        if (spriteId != 0xFF)
             gSprites[spriteId].oam.priority = 1;
     }
 
@@ -999,10 +999,10 @@ static void Task_HofPC_HandleInput(u8 taskId)
             for (i = 0; i < 6; i++)
             {
                 u8 spriteId = gTasks[taskId].tMonSpriteId(i);
-                if (spriteId != INVALID_U8)
+                if (spriteId != 0xFF)
                 {
                     FreeAndDestroyMonPicSprite(spriteId);
-                    gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+                    gTasks[taskId].tMonSpriteId(i) = 0xFF;
                 }
             }
             if (gTasks[taskId].tCurrPageNo != 0)
@@ -1060,10 +1060,10 @@ static void Task_HofPC_HandleExit(u8 taskId)
         for (i = 0; i < PARTY_SIZE; i++)
         {
             u16 spriteId = gTasks[taskId].tMonSpriteId(i);
-            if (spriteId != INVALID_U8)
+            if (spriteId != 0xFF)
             {
                 FreeAndDestroyMonPicSprite(spriteId);
-                gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+                gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
         }
 
@@ -1130,7 +1130,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
     {
         stringPtr = StringCopy(text, gText_Number);
         dexNumber = SpeciesToPokedexNum(currMon->species);
-        if (dexNumber != INVALID_U16)
+        if (dexNumber != 0xFFFF)
         {
             stringPtr[0] = (dexNumber / 100) + CHAR_0;
             stringPtr++;
@@ -1417,7 +1417,7 @@ void sub_8175280(void)
 
     gSpecialVar_0x8004 = 180;
     taskId = CreateTask(sub_8175364, 0);
-    if (taskId != INVALID_U8)
+    if (taskId != 0xFF)
     {
         gTasks[taskId].data[1] = gSpecialVar_0x8004;
         gSpecialVar_0x8005 = taskId;
@@ -1428,7 +1428,7 @@ static void sub_81752C0(void)
 {
     u8 taskId;
 
-    if ((taskId = FindTaskIdByFunc(sub_8175364)) != INVALID_U8)
+    if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF)
         DestroyTask(taskId);
 
     sub_8152254();
@@ -1473,7 +1473,7 @@ static void sub_8175364(u8 taskId)
         {
             DestroyTask(taskId);
             gSpecialVar_0x8004 = var;
-            gSpecialVar_0x8005 = INVALID_U16;
+            gSpecialVar_0x8005 = 0xFFFF;
         }
         LoadCompressedObjectPic(sHallOfFame_ConfettiSpriteSheet);
         LoadCompressedObjectPalette(sHallOfFame_ConfettiSpritePalette);
@@ -1483,7 +1483,7 @@ static void sub_8175364(u8 taskId)
         if (data[1] != 0 && data[1] % 3 == 0)
         {
             var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var);
-            if (var != INVALID_U8)
+            if (var != 0xFF)
             {
                 sub_8152438(var, sub_81752F4);
                 if ((Random() & 3) == 0)
@@ -1496,12 +1496,12 @@ static void sub_8175364(u8 taskId)
         if (data[1] != 0)
             data[1]--;
         else if (data[15] == 0)
-            data[0] = INVALID_U8;
+            data[0] = 0xFF;
         break;
-    case INVALID_U8:
+    case 0xFF:
         sub_81752C0();
         gSpecialVar_0x8004 = var;
-        gSpecialVar_0x8005 = INVALID_U16;
+        gSpecialVar_0x8005 = 0xFFFF;
         break;
     }
 }
diff --git a/src/intro.c b/src/intro.c
index 44d1c086d..94692e6ec 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -62,10 +62,10 @@ static const u32 gIntro3MiscTiles[] = INCBIN_U32("graphics/intro/intro3_misc.4bp
 static const u16 gIntro1FlygonPalette[] = INCBIN_U16("graphics/intro/intro1_flygon.gbapal");
 static const u32 gIntro1EonTiles_Unused[] = INCBIN_U32("graphics/intro/intro1_eon.4bpp.lz");
 static const u8 sUnknownBytes[] = {
-	0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D,
+    0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D,
     0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F,
     0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10,
-	0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00
+    0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00
 };
 static const struct CompressedSpriteSheet gUnknown_085E4A74[] =
 {
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c
index 1b4e9e15a..20a360901 100644
--- a/src/intro_credits_graphics.c
+++ b/src/intro_credits_graphics.c
@@ -58,7 +58,7 @@ static void sub_817B7C4(struct Sprite *sprite);
 static void nullsub_66(struct Sprite *sprite);
 
 static const struct SpriteTemplate gUnknown_085F504C = {
-    2000, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
+    2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
 };
 
 static const struct CompressedSpriteSheet gUnknown_085F5064[] = {
diff --git a/src/item.c b/src/item.c
index e2583ddb1..6a1f1955a 100644
--- a/src/item.c
+++ b/src/item.c
@@ -244,152 +244,152 @@ NAKED
 bool8 CheckBagHasSpace(u16 itemId, u16 count)
 {
     asm_unified("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x4\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	mov r8, r0\n\
-	lsls r1, 16\n\
-	lsrs r5, r1, 16\n\
-	bl ItemId_GetPocket\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080D6906\n\
-	bl InBattlePyramid\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080D6838\n\
-	ldr r0, =0x00004004\n\
-	bl FlagGet\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	bne _080D684C\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r8, r0\n\
+    lsls r1, 16\n\
+    lsrs r5, r1, 16\n\
+    bl ItemId_GetPocket\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080D6906\n\
+    bl InBattlePyramid\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080D6838\n\
+    ldr r0, =0x00004004\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    bne _080D684C\n\
 _080D6838:\n\
-	mov r0, r8\n\
-	adds r1, r5, 0\n\
-	bl CheckPyramidBagHasSpace\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	b _080D6916\n\
-	.pool\n\
+    mov r0, r8\n\
+    adds r1, r5, 0\n\
+    bl CheckPyramidBagHasSpace\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    b _080D6916\n\
+    .pool\n\
 _080D684C:\n\
-	mov r0, r8\n\
-	bl ItemId_GetPocket\n\
-	subs r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	ldr r7, =0x000003e7\n\
-	cmp r2, 0x3\n\
-	beq _080D6860\n\
-	movs r7, 0x63\n\
+    mov r0, r8\n\
+    bl ItemId_GetPocket\n\
+    subs r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    ldr r7, =0x000003e7\n\
+    cmp r2, 0x3\n\
+    beq _080D6860\n\
+    movs r7, 0x63\n\
 _080D6860:\n\
-	movs r6, 0\n\
-	ldr r1, =gBagPockets\n\
-	lsls r4, r2, 3\n\
-	adds r0, r4, r1\n\
-	mov r9, r4\n\
-	ldrb r0, [r0, 0x4]\n\
-	cmp r6, r0\n\
-	bcs _080D68BC\n\
-	subs r0, r2, 0x2\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r10, r0\n\
+    movs r6, 0\n\
+    ldr r1, =gBagPockets\n\
+    lsls r4, r2, 3\n\
+    adds r0, r4, r1\n\
+    mov r9, r4\n\
+    ldrb r0, [r0, 0x4]\n\
+    cmp r6, r0\n\
+    bcs _080D68BC\n\
+    subs r0, r2, 0x2\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r10, r0\n\
 _080D6878:\n\
-	adds r0, r4, r1\n\
-	ldr r1, [r0]\n\
-	lsls r0, r6, 2\n\
-	adds r1, r0, r1\n\
-	ldrh r0, [r1]\n\
-	cmp r0, r8\n\
-	bne _080D68AC\n\
-	adds r0, r1, 0x2\n\
-	str r2, [sp]\n\
-	bl GetBagItemQuantity\n\
-	lsls r0, 16\n\
-	lsrs r1, r0, 16\n\
-	adds r0, r1, r5\n\
-	ldr r2, [sp]\n\
-	cmp r0, r7\n\
-	ble _080D6914\n\
-	mov r0, r10\n\
-	cmp r0, 0x1\n\
-	bls _080D6906\n\
-	subs r0, r7, r1\n\
-	subs r0, r5, r0\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	cmp r5, 0\n\
-	beq _080D6914\n\
+    adds r0, r4, r1\n\
+    ldr r1, [r0]\n\
+    lsls r0, r6, 2\n\
+    adds r1, r0, r1\n\
+    ldrh r0, [r1]\n\
+    cmp r0, r8\n\
+    bne _080D68AC\n\
+    adds r0, r1, 0x2\n\
+    str r2, [sp]\n\
+    bl GetBagItemQuantity\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    adds r0, r1, r5\n\
+    ldr r2, [sp]\n\
+    cmp r0, r7\n\
+    ble _080D6914\n\
+    mov r0, r10\n\
+    cmp r0, 0x1\n\
+    bls _080D6906\n\
+    subs r0, r7, r1\n\
+    subs r0, r5, r0\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0\n\
+    beq _080D6914\n\
 _080D68AC:\n\
-	adds r0, r6, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	ldr r1, =gBagPockets\n\
-	adds r0, r4, r1\n\
-	ldrb r0, [r0, 0x4]\n\
-	cmp r6, r0\n\
-	bcc _080D6878\n\
+    adds r0, r6, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    ldr r1, =gBagPockets\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0, 0x4]\n\
+    cmp r6, r0\n\
+    bcc _080D6878\n\
 _080D68BC:\n\
-	cmp r5, 0\n\
-	beq _080D6914\n\
-	movs r6, 0\n\
-	ldr r3, =gBagPockets\n\
-	mov r1, r9\n\
-	adds r0, r1, r3\n\
-	ldrb r0, [r0, 0x4]\n\
-	cmp r6, r0\n\
-	bcs _080D6902\n\
-	adds r4, r3, 0\n\
-	subs r0, r2, 0x2\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
+    cmp r5, 0\n\
+    beq _080D6914\n\
+    movs r6, 0\n\
+    ldr r3, =gBagPockets\n\
+    mov r1, r9\n\
+    adds r0, r1, r3\n\
+    ldrb r0, [r0, 0x4]\n\
+    cmp r6, r0\n\
+    bcs _080D6902\n\
+    adds r4, r3, 0\n\
+    subs r0, r2, 0x2\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
 _080D68D6:\n\
-	adds r0, r1, r4\n\
-	ldr r1, [r0]\n\
-	lsls r0, r6, 2\n\
-	adds r0, r1\n\
-	ldrh r0, [r0]\n\
-	cmp r0, 0\n\
-	bne _080D68F2\n\
-	cmp r5, r7\n\
-	bls _080D6914\n\
-	cmp r2, 0x1\n\
-	bls _080D6906\n\
-	subs r0, r5, r7\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
+    adds r0, r1, r4\n\
+    ldr r1, [r0]\n\
+    lsls r0, r6, 2\n\
+    adds r0, r1\n\
+    ldrh r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _080D68F2\n\
+    cmp r5, r7\n\
+    bls _080D6914\n\
+    cmp r2, 0x1\n\
+    bls _080D6906\n\
+    subs r0, r5, r7\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
 _080D68F2:\n\
-	adds r0, r6, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	mov r1, r9\n\
-	adds r0, r1, r3\n\
-	ldrb r0, [r0, 0x4]\n\
-	cmp r6, r0\n\
-	bcc _080D68D6\n\
+    adds r0, r6, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    mov r1, r9\n\
+    adds r0, r1, r3\n\
+    ldrb r0, [r0, 0x4]\n\
+    cmp r6, r0\n\
+    bcc _080D68D6\n\
 _080D6902:\n\
-	cmp r5, 0\n\
-	beq _080D6914\n\
+    cmp r5, 0\n\
+    beq _080D6914\n\
 _080D6906:\n\
-	movs r0, 0\n\
-	b _080D6916\n\
-	.pool\n\
+    movs r0, 0\n\
+    b _080D6916\n\
+    .pool\n\
 _080D6914:\n\
-	movs r0, 0x1\n\
+    movs r0, 0x1\n\
 _080D6916:\n\
-	add sp, 0x4\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r1}\n\
-	bx r1");
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1");
 }
 #endif // NONMATCHING
 
diff --git a/src/item_icon.c b/src/item_icon.c
index 2af938ff8..d037782bd 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -161,7 +161,7 @@ u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tile
 
 const void *GetItemIconPicOrPalette(u16 itemId, u8 which)
 {
-    if (itemId == INVALID_U16)
+    if (itemId == 0xFFFF)
         itemId = ITEM_FIELD_ARROW;
     else if (itemId >= ITEMS_COUNT)
         itemId = 0;
diff --git a/src/item_menu.c b/src/item_menu.c
index 5b18b06ec..2c75a80f2 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -532,11 +532,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)
         if (temp <= 1)
             gUnknown_0203CE54->unk81B = 1;
         gUnknown_0203CE54->unk0 = 0;
-        gUnknown_0203CE54->unk81A = INVALID_U8;
+        gUnknown_0203CE54->unk81A = 0xFF;
         gUnknown_0203CE54->unk81E = -1;
         gUnknown_0203CE54->unk81F = -1;
-        memset(gUnknown_0203CE54->unk804, INVALID_U8, sizeof(gUnknown_0203CE54->unk804));
-        memset(gUnknown_0203CE54->unk810, INVALID_U8, 10);
+        memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804));
+        memset(gUnknown_0203CE54->unk810, 0xFF, 10);
         SetMainCallback2(CB2_Bag);
     }
 }
@@ -819,7 +819,7 @@ void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused)
         PlaySE(SE_SELECT);
         ShakeBagVisual();
     }
-    if (gUnknown_0203CE54->unk81A == INVALID_U8)
+    if (gUnknown_0203CE54->unk81A == 0xFF)
     {
         RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1);
         if (a != -2)
@@ -840,7 +840,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a)
     int offset;
     if (item_index_in_pocket != -2)
     {
-        if (gUnknown_0203CE54->unk81A != INVALID_U8)
+        if (gUnknown_0203CE54->unk81A != 0xFF)
         {
             if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket)
                 bag_menu_print_cursor(a, 2);
@@ -897,7 +897,7 @@ void bag_menu_print_cursor_(u8 a, u8 b)
 
 void bag_menu_print_cursor(u8 a, u8 b)
 {
-    if (b == INVALID_U8)
+    if (b == 0xFF)
         FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b);
@@ -906,32 +906,32 @@ void bag_menu_print_cursor(u8 a, u8 b)
 
 void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void)
 {
-    if (gUnknown_0203CE54->unk81E == INVALID_U8)
+    if (gUnknown_0203CE54->unk81E == 0xFF)
         gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]);
 }
 
 void sub_81AB824(void)
 {
-    if (gUnknown_0203CE54->unk81E != INVALID_U8)
+    if (gUnknown_0203CE54->unk81E != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E);
-        gUnknown_0203CE54->unk81E = INVALID_U8;
+        gUnknown_0203CE54->unk81E = 0xFF;
     }
     sub_81AB89C();
 }
 
 void bag_menu_add_list_scroll_arrow_indicators_maybe(void)
 {
-    if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == INVALID_U8)
+    if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF)
         gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6);
 }
 
 void sub_81AB89C(void)
 {
-    if (gUnknown_0203CE54->unk81F != INVALID_U8)
+    if (gUnknown_0203CE54->unk81F != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F);
-        gUnknown_0203CE54->unk81F = INVALID_U8;
+        gUnknown_0203CE54->unk81F = 0xFF;
     }
 }
 
@@ -2303,7 +2303,7 @@ u8 sub_81AE124(u8 a)
 u8 bag_menu_add_window(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr == INVALID_U8)
+    if (*ptr == 0xFF)
     {
         *ptr = AddWindow(&gUnknown_086141AC[a]);
         SetWindowBorderStyle(*ptr, 0, 1, 14);
@@ -2315,20 +2315,20 @@ u8 bag_menu_add_window(u8 a)
 void bag_menu_remove_window(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr != INVALID_U8)
+    if (*ptr != 0xFF)
     {
         sub_8198070(*ptr, 0);
         ClearWindowTilemap(*ptr);
         RemoveWindow(*ptr);
         schedule_bg_copy_tilemap_to_vram(1);
-        *ptr = INVALID_U8;
+        *ptr = 0xFF;
     }
 }
 
 u8 AddItemMessageWindow(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr == INVALID_U8)
+    if (*ptr == 0xFF)
         *ptr = AddWindow(&gUnknown_086141AC[a]);
     return *ptr;
 }
@@ -2336,13 +2336,13 @@ u8 AddItemMessageWindow(u8 a)
 void bag_menu_RemoveBagItem_message_window(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr != INVALID_U8)
+    if (*ptr != 0xFF)
     {
         sub_8197DF8(*ptr, 0);
         ClearWindowTilemap(*ptr);
         RemoveWindow(*ptr);
         schedule_bg_copy_tilemap_to_vram(1);
-        *ptr = INVALID_U8;
+        *ptr = 0xFF;
     }
 }
 
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index 67add5926..85b42b9b3 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] =
 
 static const struct SpriteTemplate gUnknown_0857FC7C =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x7544,
     .oam = &sOamData_857FBD0,
     .anims = sSpriteAnimTable_857FBE0,
@@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 =
 void RemoveBagSprite(u8 id)
 {
     u8 *spriteId = &gUnknown_0203CE54->unk804[id];
-    if (*spriteId != INVALID_U8)
+    if (*spriteId != 0xFF)
     {
         FreeSpriteTilesByTag(id + 100);
         FreeSpritePaletteByTag(id + 100);
         FreeSpriteOamMatrix(&gSprites[*spriteId]);
         DestroySprite(&gSprites[*spriteId]);
-        *spriteId = INVALID_U8;
+        *spriteId = 0xFF;
     }
 }
 
@@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite)
 void AddBagItemIconSprite(u16 itemId, u8 id)
 {
     u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2];
-    if (*spriteId == INVALID_U8)
+    if (*spriteId == 0xFF)
     {
         u8 iconSpriteId;
 
diff --git a/src/landmark.c b/src/landmark.c
index 4eade159a..0f8ee1a75 100644
--- a/src/landmark.c
+++ b/src/landmark.c
@@ -338,8 +338,8 @@ static const struct Landmark *const Landmarks_MtChimney_2[]  =
 
 static const struct LandmarkList gLandmarkLists[] =
 {
-	{MAPSEC_ROUTE_103, 2, Landmarks_Route103_2},
-	{MAPSEC_ROUTE_104, 0, Landmarks_Route104_0},
+    {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2},
+    {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0},
     {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1},
     {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0},
     {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1},
diff --git a/src/learn_move.c b/src/learn_move.c
index cb8bb66ff..4e02cedd3 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -381,7 +381,7 @@ static void LearnMoveMain(void)
 
             if (selection == 0)
             {
-                if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16)
+                if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF)
                 {
                     sub_816084C(gText_PkmnLearnedMove4);
                     gSpecialVar_0x8004 = 1;
@@ -727,12 +727,12 @@ static void CreateHearts(void)
 
 static void AddScrollArrows(void)
 {
-    if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF)
     {
         sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset);
     }
 
-    if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF)
     {
         gTempScrollArrowTemplate = gUnknown_085CEBD0;
         gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce;
@@ -742,16 +742,16 @@ static void AddScrollArrows(void)
 
 static void RemoveScrollArrows(void)
 {
-    if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2);
-        sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8;
+        sLearnMoveStruct->scrollArrowTaskId2 = 0xFF;
     }
 
-    if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1);
-        sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8;
+        sLearnMoveStruct->scrollArrowTaskId1 = 0xFF;
     }
 }
 
@@ -792,7 +792,7 @@ void ShowHideHearts(s32 item)
     {
         numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10);
         
-        if (numHearts == INVALID_U8)
+        if (numHearts == 0xFF)
         {
             numHearts = 0;
         }
@@ -812,7 +812,7 @@ void ShowHideHearts(s32 item)
 
         numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10);
         
-        if (numHearts == INVALID_U8)
+        if (numHearts == 0xFF)
         {
             numHearts = 0;
         }
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index 2f706fcc8..c5aa25c10 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -64,7 +64,7 @@
     v12 = (u16*)((u32)&sub_82E53F4 & ~1);
     v13 = (u16*)gUnknown_03007898->unk_8;
         
-    for (i = 47; i != INVALID_U16; i--)
+    for (i = 47; i != 0xFFFF; i--)
     {
         *v13 = *v12;
         ++v12;
diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c
index 81363ae0d..556b79bf8 100644
--- a/src/librfu_stwi.c
+++ b/src/librfu_stwi.c
@@ -116,7 +116,7 @@ u16 STWI_read_status(u8 index)
     case 3:
         return gRfuState->activeCommand;
     default:
-        return INVALID_U16;
+        return 0xFFFF;
     }
 }
 
diff --git a/src/link.c b/src/link.c
index e4bd5053c..79df699ef 100644
--- a/src/link.c
+++ b/src/link.c
@@ -2250,7 +2250,7 @@ static bool8 DoHandshake(void)
     u16 minRecv;
 
     playerCount = 0;
-    minRecv = INVALID_U16;
+    minRecv = 0xFFFF;
     if (gLink.handshakeAsMaster == TRUE)
     {
         REG_SIOMLT_SEND = MASTER_HANDSHAKE;
@@ -2274,7 +2274,7 @@ static bool8 DoHandshake(void)
         }
         else
         {
-            if (gLink.tempRecvBuffer[i] != INVALID_U16)
+            if (gLink.tempRecvBuffer[i] != 0xFFFF)
             {
                 playerCount = 0;
             }
diff --git a/src/link_rfu.c b/src/link_rfu.c
index fe5676770..2c6e22475 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -276,7 +276,7 @@ const struct {
     { gBlockSendBuffer,  40 }
 };
 const u16 gUnknown_082ED6E0[] = {
-    0x0002, 0x7f7d, 0x0000, INVALID_U16
+    0x0002, 0x7f7d, 0x0000, 0xFFFF
 };
 
 const char sUnref_082ED6E8[][15] = {
@@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6)
     }
     for (i = 0, buffer = r6; i < 16; i++)
     {
-        if (*buffer++ == INVALID_U16)
+        if (*buffer++ == 0xFFFF)
         {
             break;
         }
@@ -754,7 +754,7 @@ void sub_800C54C(u32 a0)
                 switch (gUnknown_03004140.unk_04)
                 {
                     case 23:
-                        r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8;
+                        r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF;
                         gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0;
                         sub_800D30C(r2, 0);
                         break;
@@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
                 gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14;
                 if (gUnknown_03004140.unk_07)
                 {
-                    if (gUnknown_03007890->unk_00 == INVALID_U8)
+                    if (gUnknown_03007890->unk_00 == 0xFF)
                     {
                         if (gUnknown_03004140.unk_07 == 8)
                         {
@@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
                         }
                     }
                 }
-                if (gUnknown_03007890->unk_00 == INVALID_U8)
+                if (gUnknown_03007890->unk_00 == 0xFF)
                 {
                     if (gUnknown_03004140.unk_04 == 0)
                     {
@@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
             break;
         case 38:
             sub_800D20C();
-            if (gUnknown_03007890->unk_00 != INVALID_U8)
+            if (gUnknown_03007890->unk_00 != 0xFF)
             {
                 sub_800D30C(0x50, 0x00);
             }
@@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
             sub_800D610();
         }
     }
-    if (r8 == INVALID_U8)
+    if (r8 == 0xFF)
     {
         sub_800D30C(0xf2, 0x00);
         sub_800D610();
@@ -1322,7 +1322,7 @@ static void sub_800CF34(void)
                     if (gUnknown_03007880[i]->unk_61 == 1)
                     {
                         r5 = 0x02;
-                        for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++)
+                        for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
                         {
                             if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
                             {
@@ -1469,7 +1469,7 @@ static u8 sub_800D294(void)
 
     for (i = 0; i < gUnknown_03007890->unk_08; i++)
     {
-        for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++)
+        for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
         {
             if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
             {
@@ -2242,12 +2242,12 @@ void sub_800E084(void)
 
 void sub_800E0E8(void)
 {
-    if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16)
+    if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF)
     {
         LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet);
     }
     LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette);
-    gWirelessStatusIndicatorSpriteId = INVALID_U8;
+    gWirelessStatusIndicatorSpriteId = 0xFF;
 }
 
 u8 sub_800E124(void)
@@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum)
 
 void sub_800E174(void)
 {
-    if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234)
+    if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234)
     {
         struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId];
         u8 signalStrength = 255;
@@ -2461,7 +2461,7 @@ void sub_800E604(void)
     u8 unk_ee_bak = gUnknown_03005000.unk_ee;
     CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000);
     gUnknown_03005000.unk_ee = unk_ee_bak;
-    gUnknown_03005000.unk_0c = INVALID_U8;
+    gUnknown_03005000.unk_0c = 0xFF;
     if (gUnknown_03005000.unk_ee != 4)
     {
         gUnknown_03005000.unk_ee = 0;
@@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void)
                 {
                     if (gUnknown_03005000.unk_14[i][1])
                     {
-                        if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7))
+                        if (gUnknown_03005000.unk_cee[i] != 0xFF && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7))
                         {
                             if (++gUnknown_03005000.unk_cea[i] > 4)
                                 sub_8011170(0x8100);
@@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0)
     s32 i;
     for (i = 0; gUnknown_082ED6E0[i] != a0; i++)
     {
-        if (gUnknown_082ED6E0[i] == INVALID_U16)
+        if (gUnknown_082ED6E0[i] == 0xFFFF)
             return FALSE;
     }
     return TRUE;
@@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void)
 bool32 sub_801064C(u16 a0, const u8 *a1)
 {
     u8 r1 = sub_8011CE4(a1, a0);
-    if (r1 == INVALID_U8)
+    if (r1 == 0xFF)
         return TRUE;
     if (gUnknown_03005000.unk_cd1[r1] == 9)
         return TRUE;
@@ -3906,7 +3906,7 @@ void sub_80106D4(void)
 u32 sub_8010714(u16 a0, const u8 *a1)
 {
     u8 r0 = sub_8011CE4(a1, a0);
-    if (r0 == INVALID_U8)
+    if (r0 == 0xFF)
         return 2;
     if (gUnknown_03007880[r0]->unk_0 == 0)
         return 1;
diff --git a/src/list_menu.c b/src/list_menu.c
index e066d1e9c..caf4b798d 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu
     s32 i;
 
     u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow);
-    for (i = 0; rect[i].palNum != INVALID_U8; i++)
+    for (i = 0; rect[i].palNum != 0xFF; i++)
     {
         PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId,
                                             rect[i].x,
@@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId)
     }
 }
 
-#define TASK_NONE INVALID_U8
+#define TASK_NONE 0xFF
 
 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
 {
@@ -953,52 +953,52 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value)
     case 0:
     case 1:
         data->field_4 = (void*)(value);
-		break;
+        break;
     case 2:
         data->field_C = value;
-		break;
+        break;
     case 3:
         data->field_E = value;
-		break;
+        break;
     case 4:
         data->field_10 = value;
-		break;
+        break;
     case 5:
         data->field_11 = value;
-		break;
+        break;
     case 6:
         data->field_12 = value;
-		break;
+        break;
     case 7:
         data->field_13 = value;
-		break;
+        break;
     case 8:
         data->field_14_0 = value;
-		break;
+        break;
     case 9:
         data->field_14_1 = value;
-		break;
+        break;
     case 10:
         data->field_15_0 = value;
-		break;
+        break;
     case 11:
         data->field_15_1 = value;
-		break;
+        break;
     case 12:
         data->field_16_0 = value;
-		break;
+        break;
     case 13:
         data->field_16_1 = value;
-		break;
+        break;
     case 14:
         data->field_16_2 = value;
-		break;
+        break;
     case 15:
         data->field_17_0 = value;
-		break;
+        break;
     case 16:
         data->field_17_1 = value;
-		break;
+        break;
     }
 }
 
@@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId)
     struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data;
     u16 currItem = (*data->scrollOffset);
 
-    if (currItem == data->fullyUpThreshold && currItem != INVALID_U16)
+    if (currItem == data->fullyUpThreshold && currItem != 0xFFFF)
         gSprites[data->topSpriteId].invisible = TRUE;
     else
         gSprites[data->topSpriteId].invisible = FALSE;
diff --git a/src/mail_data.c b/src/mail_data.c
index cf75636b3..809dcc2a8 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -20,7 +20,7 @@ void ClearMailStruct(struct MailStruct *mail)
     s32 i;
 
     for (i = 0; i < MAIL_WORDS_COUNT; i++)
-        mail->words[i] = INVALID_U16;
+        mail->words[i] = 0xFFFF;
 
     for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
         mail->playerName[i] = EOS;
@@ -35,7 +35,7 @@ void ClearMailStruct(struct MailStruct *mail)
 bool8 MonHasMail(struct Pokemon *mon)
 {
     u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM);
-    if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != INVALID_U8)
+    if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -56,7 +56,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
         if (gSaveBlock1Ptr->mail[id].itemId == 0)
         {
             for (i = 0; i < MAIL_WORDS_COUNT; i++)
-                gSaveBlock1Ptr->mail[id].words[i] = INVALID_U16;
+                gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF;
 
             for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++)
                 gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
@@ -76,7 +76,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
         }
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u16 SpeciesToMailSpecies(u16 species, u32 personality)
@@ -113,8 +113,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail)
     u16 itemId = mail->itemId;
     u8 mailId = GiveMailToMon(mon, itemId);
 
-    if (mailId == INVALID_U8)
-        return INVALID_U8;
+    if (mailId == 0xFF)
+        return 0xFF;
 
     gSaveBlock1Ptr->mail[mailId] = *mail;
 
@@ -142,7 +142,7 @@ void TakeMailFromMon(struct Pokemon *mon)
     {
         mailId = GetMonData(mon, MON_DATA_MAIL);
         gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
-        mailId = INVALID_U8;
+        mailId = 0xFF;
         heldItem[0] = ITEM_NONE;
         heldItem[1] = ITEM_NONE << 8;
         SetMonData(mon, MON_DATA_MAIL, &mailId);
@@ -163,7 +163,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
 
     newHeldItem[0] = ITEM_NONE;
     newHeldItem[1] = ITEM_NONE << 8;
-    newMailId = INVALID_U8;
+    newMailId = 0xFF;
 
     for (i = PARTY_SIZE; i < MAIL_COUNT; i++)
     {
@@ -177,7 +177,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
         }
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 bool8 ItemIsMail(u16 itemId)
diff --git a/src/main_menu.c b/src/main_menu.c
index ee777d106..e11f783eb 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -335,25 +335,25 @@ static const struct MenuAction sMenuActions_Gender[] = {
 
 static const u8 *const gMalePresetNames[] = {
     gText_DefaultNameStu,
-	gText_DefaultNameMilton,
-	gText_DefaultNameTom,
-	gText_DefaultNameKenny,
-	gText_DefaultNameReid,
-	gText_DefaultNameJude,
-	gText_DefaultNameJaxson,
-	gText_DefaultNameEaston,
-	gText_DefaultNameWalker,
-	gText_DefaultNameTeru,
-	gText_DefaultNameJohnny,
-	gText_DefaultNameBrett,
-	gText_DefaultNameSeth,
-	gText_DefaultNameTerry,
-	gText_DefaultNameCasey,
-	gText_DefaultNameDarren,
-	gText_DefaultNameLandon,
-	gText_DefaultNameCollin,
-	gText_DefaultNameStanley,
-	gText_DefaultNameQuincy
+    gText_DefaultNameMilton,
+    gText_DefaultNameTom,
+    gText_DefaultNameKenny,
+    gText_DefaultNameReid,
+    gText_DefaultNameJude,
+    gText_DefaultNameJaxson,
+    gText_DefaultNameEaston,
+    gText_DefaultNameWalker,
+    gText_DefaultNameTeru,
+    gText_DefaultNameJohnny,
+    gText_DefaultNameBrett,
+    gText_DefaultNameSeth,
+    gText_DefaultNameTerry,
+    gText_DefaultNameCasey,
+    gText_DefaultNameDarren,
+    gText_DefaultNameLandon,
+    gText_DefaultNameCollin,
+    gText_DefaultNameStanley,
+    gText_DefaultNameQuincy
 };
 
 static const u8 *const gFemalePresetNames[] = {
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 2fd60cd5b..110ec068e 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void)
 {
     u16 var = sub_811F01C();
 
-    if (var == INVALID_U16)
+    if (var == 0xFFFF)
     {
         gSpecialVar_Result = FALSE;
     }
@@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void)
     if (giddy->taleCounter == 0)
         InitGiddyTaleList();
 
-    if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array?
+    if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array?
     {
         u8 *stringPtr;
         u32 adjective = Random();
@@ -348,7 +348,7 @@ static void InitGiddyTaleList(void)
         r1 = Random() % 10;
         if (r1 < 3 && r7 < 8)
         {
-            giddy->randomWords[i] = INVALID_U16;
+            giddy->randomWords[i] = 0xFFFF;
             r7++;
         }
         else
diff --git a/src/menu.c b/src/menu.c
index e1dd136d1..61096138a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -140,8 +140,8 @@ extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 void sub_81971D0(void)
 {
     InitWindows(gUnknown_0860F098);
-    gStartMenuWindowId = INVALID_U8;
-    gUnknown_0203CD8D = INVALID_U8;
+    gStartMenuWindowId = 0xFF;
+    gUnknown_0203CD8D = 0xFF;
 }
 
 void sub_81971F4(void)
@@ -486,7 +486,7 @@ u8 GetPlayerTextSpeedDelay(void)
 
 u8 sub_81979C4(u8 a1)
 {
-    if (gStartMenuWindowId == INVALID_U8)
+    if (gStartMenuWindowId == 0xFF)
         gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139);
     return gStartMenuWindowId;
 }
@@ -498,10 +498,10 @@ u8 GetStartMenuWindowId(void)
 
 void RemoveStartMenuWindow(void)
 {
-    if (gStartMenuWindowId != INVALID_U8)
+    if (gStartMenuWindowId != 0xFF)
     {
         RemoveWindow(gStartMenuWindowId);
-        gStartMenuWindowId = INVALID_U8;
+        gStartMenuWindowId = 0xFF;
     }
 }
 
@@ -517,7 +517,7 @@ u16 sub_8197A38(void)
 
 u8 AddMapNamePopUpWindow(void)
 {
-    if (gUnknown_0203CD8D == INVALID_U8)
+    if (gUnknown_0203CD8D == 0xFF)
         gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107);
     return gUnknown_0203CD8D;
 }
@@ -529,10 +529,10 @@ u8 GetMapNamePopUpWindowId(void)
 
 void RemoveMapNamePopUpWindow(void)
 {
-    if (gUnknown_0203CD8D != INVALID_U8)
+    if (gUnknown_0203CD8D != 0xFF)
     {
         RemoveWindow(gUnknown_0203CD8D);
-        gUnknown_0203CD8D = INVALID_U8;
+        gUnknown_0203CD8D = 0xFF;
     }
 }
 
@@ -808,7 +808,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
 {
     u16 width = 0;
 
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         PutWindowTilemap(gUnknown_0203CDA0);
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
@@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
     u8 color[3];
     u16 width = 0;
 
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         if (a3 != 0)
         {
@@ -865,13 +865,13 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
 
 void sub_81982D8(void)
 {
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
         CopyWindowToVram(gUnknown_0203CDA0, 3);
 }
 
 void sub_81982F0(void)
 {
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
         CopyWindowToVram(gUnknown_0203CDA0, 3);
@@ -880,13 +880,13 @@ void sub_81982F0(void)
 
 void sub_8198314(void)
 {
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0);
         ClearWindowTilemap(gUnknown_0203CDA0);
         CopyWindowToVram(gUnknown_0203CDA0, 3);
         RemoveWindow(gUnknown_0203CDA0);
-        gUnknown_0203CDA0 = INVALID_U8;
+        gUnknown_0203CDA0 = 0xFF;
     }
 }
 
@@ -2096,253 +2096,253 @@ void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16
 NAKED
 void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
 {
-	asm("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, #0x28\n\
-	str r0, [sp]\n\
-	str r1, [sp, #0x4]\n\
-	ldr r0, [sp, #0x48]\n\
-	ldr r4, [sp, #0x4C]\n\
-	ldr r1, [sp, #0x50]\n\
-	ldr r5, [sp, #0x54]\n\
-	lsl r2, #16\n\
-	lsr r2, #16\n\
-	str r2, [sp, #0x8]\n\
-	lsl r3, #16\n\
-	lsr r3, #16\n\
-	lsl r0, #16\n\
-	lsr r0, #16\n\
-	str r0, [sp, #0xC]\n\
-	lsl r4, #16\n\
-	lsr r4, #16\n\
-	lsl r1, #16\n\
-	lsr r1, #16\n\
-	lsl r5, #16\n\
-	lsr r5, #16\n\
-	ldr r2, [sp, #0x4]\n\
-	ldrh r0, [r2, #0x4]\n\
-	ldr r2, [sp, #0xC]\n\
-	sub r0, r2\n\
-	ldr r2, [sp, #0x8]\n\
-	add r2, r1, r2\n\
-	str r2, [sp, #0x10]\n\
-	cmp r0, r1\n\
-	bge _0819A0CC\n\
-	ldr r1, [sp, #0x8]\n\
-	add r0, r1\n\
-	str r0, [sp, #0x10]\n\
+    asm("push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, #0x28\n\
+    str r0, [sp]\n\
+    str r1, [sp, #0x4]\n\
+    ldr r0, [sp, #0x48]\n\
+    ldr r4, [sp, #0x4C]\n\
+    ldr r1, [sp, #0x50]\n\
+    ldr r5, [sp, #0x54]\n\
+    lsl r2, #16\n\
+    lsr r2, #16\n\
+    str r2, [sp, #0x8]\n\
+    lsl r3, #16\n\
+    lsr r3, #16\n\
+    lsl r0, #16\n\
+    lsr r0, #16\n\
+    str r0, [sp, #0xC]\n\
+    lsl r4, #16\n\
+    lsr r4, #16\n\
+    lsl r1, #16\n\
+    lsr r1, #16\n\
+    lsl r5, #16\n\
+    lsr r5, #16\n\
+    ldr r2, [sp, #0x4]\n\
+    ldrh r0, [r2, #0x4]\n\
+    ldr r2, [sp, #0xC]\n\
+    sub r0, r2\n\
+    ldr r2, [sp, #0x8]\n\
+    add r2, r1, r2\n\
+    str r2, [sp, #0x10]\n\
+    cmp r0, r1\n\
+    bge _0819A0CC\n\
+    ldr r1, [sp, #0x8]\n\
+    add r0, r1\n\
+    str r0, [sp, #0x10]\n\
 _0819A0CC:\n\
-	ldr r2, [sp, #0x4]\n\
-	ldrh r1, [r2, #0x6]\n\
-	sub r0, r1, r4\n\
-	cmp r0, r5\n\
-	bge _0819A0DE\n\
-	add r0, r3, r1\n\
-	sub r0, r4\n\
-	str r0, [sp, #0x14]\n\
-	b _0819A0E2\n\
+    ldr r2, [sp, #0x4]\n\
+    ldrh r1, [r2, #0x6]\n\
+    sub r0, r1, r4\n\
+    cmp r0, r5\n\
+    bge _0819A0DE\n\
+    add r0, r3, r1\n\
+    sub r0, r4\n\
+    str r0, [sp, #0x14]\n\
+    b _0819A0E2\n\
 _0819A0DE:\n\
-	add r5, r3, r5\n\
-	str r5, [sp, #0x14]\n\
+    add r5, r3, r5\n\
+    str r5, [sp, #0x14]\n\
 _0819A0E2:\n\
-	ldr r0, [sp]\n\
-	ldrh r1, [r0, #0x4]\n\
-	mov r2, #0x7\n\
-	add r0, r1, #0\n\
-	and r0, r2\n\
-	add r1, r0\n\
-	asr r1, #3\n\
-	str r1, [sp, #0x18]\n\
-	ldr r0, [sp, #0x4]\n\
-	ldrh r1, [r0, #0x4]\n\
-	add r0, r1, #0\n\
-	and r0, r2\n\
-	add r1, r0\n\
-	asr r1, #3\n\
-	str r1, [sp, #0x1C]\n\
-	mov r12, r3\n\
-	mov r8, r4\n\
-	ldr r1, [sp, #0x14]\n\
-	cmp r12, r1\n\
-	blt _0819A10C\n\
-	b _0819A24A\n\
+    ldr r0, [sp]\n\
+    ldrh r1, [r0, #0x4]\n\
+    mov r2, #0x7\n\
+    add r0, r1, #0\n\
+    and r0, r2\n\
+    add r1, r0\n\
+    asr r1, #3\n\
+    str r1, [sp, #0x18]\n\
+    ldr r0, [sp, #0x4]\n\
+    ldrh r1, [r0, #0x4]\n\
+    add r0, r1, #0\n\
+    and r0, r2\n\
+    add r1, r0\n\
+    asr r1, #3\n\
+    str r1, [sp, #0x1C]\n\
+    mov r12, r3\n\
+    mov r8, r4\n\
+    ldr r1, [sp, #0x14]\n\
+    cmp r12, r1\n\
+    blt _0819A10C\n\
+    b _0819A24A\n\
 _0819A10C:\n\
-	ldr r5, [sp, #0x8]\n\
-	ldr r6, [sp, #0xC]\n\
-	mov r2, r12\n\
-	add r2, #0x1\n\
-	str r2, [sp, #0x20]\n\
-	mov r0, r8\n\
-	add r0, #0x1\n\
-	str r0, [sp, #0x24]\n\
-	ldr r1, [sp, #0x10]\n\
-	cmp r5, r1\n\
-	blt _0819A124\n\
-	b _0819A23A\n\
+    ldr r5, [sp, #0x8]\n\
+    ldr r6, [sp, #0xC]\n\
+    mov r2, r12\n\
+    add r2, #0x1\n\
+    str r2, [sp, #0x20]\n\
+    mov r0, r8\n\
+    add r0, #0x1\n\
+    str r0, [sp, #0x24]\n\
+    ldr r1, [sp, #0x10]\n\
+    cmp r5, r1\n\
+    blt _0819A124\n\
+    b _0819A23A\n\
 _0819A124:\n\
-	mov r7, #0x1\n\
-	mov r2, #0xF0\n\
-	mov r10, r2\n\
-	mov r0, #0xF\n\
-	mov r9, r0\n\
+    mov r7, #0x1\n\
+    mov r2, #0xF0\n\
+    mov r10, r2\n\
+    mov r0, #0xF\n\
+    mov r9, r0\n\
 _0819A12E:\n\
-	asr r0, r5, #1\n\
-	mov r1, #0x3\n\
-	and r0, r1\n\
-	ldr r2, [sp]\n\
-	ldr r1, [r2]\n\
-	add r1, r0\n\
-	asr r0, r5, #3\n\
-	lsl r0, #5\n\
-	add r1, r0\n\
-	mov r2, r12\n\
-	asr r0, r2, #3\n\
-	ldr r2, [sp, #0x18]\n\
-	mul r0, r2\n\
-	lsl r0, #5\n\
-	add r1, r0\n\
-	mov r2, r12\n\
-	lsl r0, r2, #29\n\
-	lsr r0, #27\n\
-	add r3, r1, r0\n\
-	asr r0, r6, #1\n\
-	mov r1, #0x3\n\
-	and r0, r1\n\
-	ldr r2, [sp, #0x4]\n\
-	ldr r1, [r2]\n\
-	add r1, r0\n\
-	asr r0, r6, #3\n\
-	lsl r0, #5\n\
-	add r1, r0\n\
-	mov r2, r8\n\
-	asr r0, r2, #3\n\
-	ldr r2, [sp, #0x1C]\n\
-	mul r0, r2\n\
-	lsl r0, #5\n\
-	add r1, r0\n\
-	mov r2, r8\n\
-	lsl r0, r2, #29\n\
-	lsr r0, #27\n\
-	add r4, r1, r0\n\
-	add r0, r4, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A1DA\n\
-	sub r4, #0x1\n\
-	add r0, r6, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A1B2\n\
-	ldrh r0, [r4]\n\
-	ldr r2, =0x00000fff\n\
-	and r2, r0\n\
-	add r0, r5, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A1A8\n\
-	ldrb r1, [r3]\n\
-	mov r0, r10\n\
-	and r0, r1\n\
-	lsl r0, #8\n\
-	b _0819A22A\n\
-	.pool\n\
+    asr r0, r5, #1\n\
+    mov r1, #0x3\n\
+    and r0, r1\n\
+    ldr r2, [sp]\n\
+    ldr r1, [r2]\n\
+    add r1, r0\n\
+    asr r0, r5, #3\n\
+    lsl r0, #5\n\
+    add r1, r0\n\
+    mov r2, r12\n\
+    asr r0, r2, #3\n\
+    ldr r2, [sp, #0x18]\n\
+    mul r0, r2\n\
+    lsl r0, #5\n\
+    add r1, r0\n\
+    mov r2, r12\n\
+    lsl r0, r2, #29\n\
+    lsr r0, #27\n\
+    add r3, r1, r0\n\
+    asr r0, r6, #1\n\
+    mov r1, #0x3\n\
+    and r0, r1\n\
+    ldr r2, [sp, #0x4]\n\
+    ldr r1, [r2]\n\
+    add r1, r0\n\
+    asr r0, r6, #3\n\
+    lsl r0, #5\n\
+    add r1, r0\n\
+    mov r2, r8\n\
+    asr r0, r2, #3\n\
+    ldr r2, [sp, #0x1C]\n\
+    mul r0, r2\n\
+    lsl r0, #5\n\
+    add r1, r0\n\
+    mov r2, r8\n\
+    lsl r0, r2, #29\n\
+    lsr r0, #27\n\
+    add r4, r1, r0\n\
+    add r0, r4, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A1DA\n\
+    sub r4, #0x1\n\
+    add r0, r6, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A1B2\n\
+    ldrh r0, [r4]\n\
+    ldr r2, =0x00000fff\n\
+    and r2, r0\n\
+    add r0, r5, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A1A8\n\
+    ldrb r1, [r3]\n\
+    mov r0, r10\n\
+    and r0, r1\n\
+    lsl r0, #8\n\
+    b _0819A22A\n\
+    .pool\n\
 _0819A1A8:\n\
-	ldrb r1, [r3]\n\
-	mov r0, r9\n\
-	and r0, r1\n\
-	lsl r0, #12\n\
-	b _0819A22A\n\
+    ldrb r1, [r3]\n\
+    mov r0, r9\n\
+    and r0, r1\n\
+    lsl r0, #12\n\
+    b _0819A22A\n\
 _0819A1B2:\n\
-	ldrh r0, [r4]\n\
-	ldr r2, =0x0000f0ff\n\
-	and r2, r0\n\
-	add r0, r5, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A1D0\n\
-	ldrb r1, [r3]\n\
-	mov r0, r10\n\
-	and r0, r1\n\
-	lsl r0, #4\n\
-	b _0819A22A\n\
-	.pool\n\
+    ldrh r0, [r4]\n\
+    ldr r2, =0x0000f0ff\n\
+    and r2, r0\n\
+    add r0, r5, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A1D0\n\
+    ldrb r1, [r3]\n\
+    mov r0, r10\n\
+    and r0, r1\n\
+    lsl r0, #4\n\
+    b _0819A22A\n\
+    .pool\n\
 _0819A1D0:\n\
-	ldrb r1, [r3]\n\
-	mov r0, r9\n\
-	and r0, r1\n\
-	lsl r0, #8\n\
-	b _0819A22A\n\
+    ldrb r1, [r3]\n\
+    mov r0, r9\n\
+    and r0, r1\n\
+    lsl r0, #8\n\
+    b _0819A22A\n\
 _0819A1DA:\n\
-	add r0, r6, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A206\n\
-	ldrh r0, [r4]\n\
-	ldr r2, =0x0000ff0f\n\
-	and r2, r0\n\
-	add r0, r5, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A1FC\n\
-	ldrb r1, [r3]\n\
-	mov r0, r10\n\
-	b _0819A228\n\
-	.pool\n\
+    add r0, r6, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A206\n\
+    ldrh r0, [r4]\n\
+    ldr r2, =0x0000ff0f\n\
+    and r2, r0\n\
+    add r0, r5, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A1FC\n\
+    ldrb r1, [r3]\n\
+    mov r0, r10\n\
+    b _0819A228\n\
+    .pool\n\
 _0819A1FC:\n\
-	ldrb r1, [r3]\n\
-	mov r0, r9\n\
-	and r0, r1\n\
-	lsl r0, #4\n\
-	b _0819A22A\n\
+    ldrb r1, [r3]\n\
+    mov r0, r9\n\
+    and r0, r1\n\
+    lsl r0, #4\n\
+    b _0819A22A\n\
 _0819A206:\n\
-	ldrh r0, [r4]\n\
-	ldr r2, =0x0000fff0\n\
-	and r2, r0\n\
-	add r0, r5, #0\n\
-	and r0, r7\n\
-	cmp r0, #0\n\
-	beq _0819A224\n\
-	ldrb r1, [r3]\n\
-	mov r0, r10\n\
-	and r0, r1\n\
-	lsr r0, #4\n\
-	b _0819A22A\n\
-	.pool\n\
+    ldrh r0, [r4]\n\
+    ldr r2, =0x0000fff0\n\
+    and r2, r0\n\
+    add r0, r5, #0\n\
+    and r0, r7\n\
+    cmp r0, #0\n\
+    beq _0819A224\n\
+    ldrb r1, [r3]\n\
+    mov r0, r10\n\
+    and r0, r1\n\
+    lsr r0, #4\n\
+    b _0819A22A\n\
+    .pool\n\
 _0819A224:\n\
-	ldrb r1, [r3]\n\
-	mov r0, r9\n\
+    ldrb r1, [r3]\n\
+    mov r0, r9\n\
 _0819A228:\n\
-	and r0, r1\n\
+    and r0, r1\n\
 _0819A22A:\n\
-	orr r2, r0\n\
-	strh r2, [r4]\n\
-	add r5, #0x1\n\
-	add r6, #0x1\n\
-	ldr r0, [sp, #0x10]\n\
-	cmp r5, r0\n\
-	bge _0819A23A\n\
-	b _0819A12E\n\
+    orr r2, r0\n\
+    strh r2, [r4]\n\
+    add r5, #0x1\n\
+    add r6, #0x1\n\
+    ldr r0, [sp, #0x10]\n\
+    cmp r5, r0\n\
+    bge _0819A23A\n\
+    b _0819A12E\n\
 _0819A23A:\n\
-	ldr r1, [sp, #0x20]\n\
-	mov r12, r1\n\
-	ldr r2, [sp, #0x24]\n\
-	mov r8, r2\n\
-	ldr r0, [sp, #0x14]\n\
-	cmp r12, r0\n\
-	bge _0819A24A\n\
-	b _0819A10C\n\
+    ldr r1, [sp, #0x20]\n\
+    mov r12, r1\n\
+    ldr r2, [sp, #0x24]\n\
+    mov r8, r2\n\
+    ldr r0, [sp, #0x14]\n\
+    cmp r12, r0\n\
+    bge _0819A24A\n\
+    b _0819A10C\n\
 _0819A24A:\n\
-	add sp, #0x28\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n");
+    add sp, #0x28\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n");
 }
 #endif
 
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 2bae89ecf..8a2c3ad91 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -10,246 +10,246 @@
 // wonder what the third flag is supposed to do
 static const u8 sTileBitAttributes[] =
 {
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NORMAL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_WALL
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_TALL_GRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_LONG_GRASS
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_04
-    TILE_ATTRIBUTES(FALSE, FALSE, TRUE),  // MB_UNUSED_05
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_DEEP_SAND
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHORT_GRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_UNUSED_CAVE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LONG_GRASS_SOUTH_EDGE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NO_RUNNING
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_INDOOR_ENCOUNTER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MOUNTAIN_TOP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BATTLE_PYRAMID_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MOSSDEEP_GYM_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MT_PYRE_HOLE
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_POND_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEMI_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATERFALL
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_SOOTOPOLIS_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_OCEAN_WATER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PUDDLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHALLOW_WATER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_NO_SURFACING
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_STAIRS_OUTSIDE_ABANDONED_SHIP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHOAL_CAVE_ENTRANCE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1F
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ICE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SAND
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEAWEED
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_23
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_ASHGRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_FOOTPRINTS
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_THIN_ICE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_ICE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_HOT_SPRINGS
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LAVARIDGE_GYM_B1F_WARP
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEAWEED_NO_SURFACING
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_REFLECTION_UNDER_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2F
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_WEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTHWEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTHWEST
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_EAST
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_WEST
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_NORTH
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_NORTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_NORTHWEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_SOUTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_SOUTHWEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_WEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_WEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_TRICK_HOUSE_PUZZLE_8_FLOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_49
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_4A
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4B
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4F
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_EASTWARD_CURRENT
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WESTWARD_CURRENT
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_NORTHWARD_CURRENT
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_SOUTHWARD_CURRENT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_54
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_55
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_56
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_57
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_58
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_59
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5A
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5B
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5F
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NON_ANIMATED_DOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LADDER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_EAST_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WEST_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NORTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SOUTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_FLOOR_HOLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_AQUA_HIDEOUT_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LAVARIDGE_GYM_1F_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ANIMATED_DOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UP_ESCALATOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_DOWN_ESCALATOR
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATER_DOOR
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATER_SOUTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_DEEP_SOUTH_WARP
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_UNUSED_6F
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WARP_OR_BRIDGE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_71
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_VERTICAL_LOG_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_VERTICAL_LOG_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_HORIZONTAL_LOG_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_HORIZONTAL_LOG_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_FORTREE_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_79
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_SOUTH_BRIDGE_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_SOUTH_BRIDGE_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_3
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_4
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_7E
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE110_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_COUNTER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_81
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_82
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_1
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_REGION_MAP
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TELEVISION
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEBLOCK_FEEDER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_88
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SLOT_MACHINE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROULETTE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PETALBURG_GYM_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RUNNING_SHOES_INSTRUCTION
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_QUESTIONNAIRE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9F
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BERRY_TREE_SOIL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A1
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A2
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A3
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A4
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A5
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_PC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_REGISTER_PC
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_UNUSED
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BLOCK_DECORATION
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_DECORATION
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_LARGE_MAT_EDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_B6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_NORTH_WALL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_BALLOON
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_IMPASSABLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_GLITTER_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_JUMP_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_SPIN_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_SOUND_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_BREAKABLE_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SAND_ORNAMENT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTH_AND_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_WEST_AND_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_HOLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LARGE_MAT_CENTER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_TV_SHIELD
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PLAYER_ROOM_PC_ON
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_POSTER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CF
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MUDDY_SLOPE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BUMPY_SLOPE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_FLOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ISOLATED_VERTICAL_RAIL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ISOLATED_HORIZONTAL_RAIL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_VERTICAL_RAIL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_HORIZONTAL_RAIL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PICTURE_BOOK_SHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BOOKSHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEMON_CENTER_BOOKSHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_VASE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRASH_CAN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SHOP_SHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BLUEPRINT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_2
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WIRELESS_BOX_RESULTS
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRAINER_HILL_TIMER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNKNOWN_CLOSED_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_ED
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EF
+    [MB_NORMAL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TALL_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_LONG_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_UNUSED_04] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_05] = TILE_ATTRIBUTES(FALSE, FALSE, TRUE),
+    [MB_DEEP_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_SHORT_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_CAVE] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_LONG_GRASS_SOUTH_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_NO_RUNNING] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_INDOOR_ENCOUNTER] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_MOUNTAIN_TOP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_BATTLE_PYRAMID_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_MOSSDEEP_GYM_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_MT_PYRE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_POND_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_SEMI_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_WATERFALL] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_OCEAN_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_PUDDLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SHALLOW_WATER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SHOAL_CAVE_ENTRANCE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_1D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_1E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_1F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SEAWEED] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_UNUSED_23] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ASHGRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_FOOTPRINTS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_THIN_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_CRACKED_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_HOT_SPRINGS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LAVARIDGE_GYM_B1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SEAWEED_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_REFLECTION_UNDER_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_2C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_2D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_2E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_2F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_IMPASSABLE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_EAST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_WEST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_NORTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_SOUTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_49] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_4A] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_4B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_EASTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_WESTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_NORTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_SOUTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_UNUSED_54] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_55] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_56] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_57] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_58] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_59] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5A] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_NON_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LADDER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_EAST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WEST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_NORTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_CRACKED_FLOOR_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_AQUA_HIDEOUT_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LAVARIDGE_GYM_1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UP_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_DOWN_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WATER_DOOR] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_WATER_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_DEEP_SOUTH_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_6F] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_WARP_OR_BRIDGE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_71] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_VERTICAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_VERTICAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_HORIZONTAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_HORIZONTAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_FORTREE_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_79] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_ROUTE120_SOUTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_SOUTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_3] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_4] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_7E] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE110_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_COUNTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_81] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_82] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_CABLE_BOX_RESULTS_1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_REGION_MAP] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TELEVISION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_POKEBLOCK_FEEDER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_88] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SLOT_MACHINE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_ROULETTE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_CLOSED_SOOTOPOLIS_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TRICK_HOUSE_PUZZLE_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_PETALBURG_GYM_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_RUNNING_SHOES_INSTRUCTION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_QUESTIONNAIRE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_RED_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_RED_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BROWN_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_YELLOW_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_LEFT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_SHRUB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_SHRUB_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BLUE_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_RIGHT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_9E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_9F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_BERRY_TREE_SOIL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A3] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A4] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A5] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_REGISTER_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_UNUSED] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_BLOCK_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_DECORATION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_LARGE_MAT_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_B6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_NORTH_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_BALLOON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_IMPASSABLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_GLITTER_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_JUMP_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPIN_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_SOUND_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_SAND_ORNAMENT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_WEST_AND_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LARGE_MAT_CENTER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_TV_SHIELD] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PLAYER_ROOM_PC_ON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_C6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_POSTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_C8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_C9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_MUDDY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_BUMPY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_CRACKED_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ISOLATED_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ISOLATED_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_D7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_D8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_D9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_PICTURE_BOOK_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_POKEMON_CENTER_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_VASE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TRASH_CAN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SHOP_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_BLUEPRINT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
 };
 
 bool8 MetatileBehavior_IsATile(u8 metatileBehavior)
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 12ff4240f..0a0bd3b7d 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -2141,7 +2141,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore =
 
 static const struct SpriteTemplate gUnknown_0858C180 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x0000,
     .oam = &gOamData_858BFEC,
     .anims = gSpriteAnimTable_858C0BC,
diff --git a/src/new_game.c b/src/new_game.c
index 18b128624..4804b28f3 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -205,14 +205,14 @@ void NewGameInitData(void)
     ScriptContext2_RunNewScript(EventScript_2715DE);
     ResetMiniGamesResults();
     copy_strings_to_sav1();
-	SetLilycoveLady();
-	ResetAllApprenticeData();
-	ClearRankingHallRecords();
-	sub_8195E10();
-	sub_801AFD8();
-	sub_800E5AC();
-	sub_81D54BC();
-	ResetContestLinkResults();
+    SetLilycoveLady();
+    ResetAllApprenticeData();
+    ClearRankingHallRecords();
+    sub_8195E10();
+    sub_801AFD8();
+    sub_800E5AC();
+    sub_81D54BC();
+    ResetContestLinkResults();
 }
 
 static void ResetMiniGamesResults(void)
diff --git a/src/overworld.c b/src/overworld.c
index 13c36819f..12e02a9b5 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -296,15 +296,51 @@ static const u8 sUnusedData[] =
 
 const struct UCoords32 gDirectionToVectors[] =
 {
-    { 0,  0}, // DIR_NONE
-    { 0,  1}, // DIR_SOUTH
-    { 0, -1}, // DIR_NORTH
-    {-1,  0}, // DIR_WEST
-    { 1,  0}, // DIR_EAST
-    {-1,  1}, // DIR_SOUTHWEST
-    { 1,  1}, // DIR_SOUTHEAST
-    {-1, -1}, // DIR_NORTHWEST
-    { 1, -1}, // DIR_NORTHEAST
+    [DIR_NONE] =
+    {
+        .x =  0,
+        .y =  0,
+    },
+    [DIR_SOUTH] =
+    {
+        .x =  0,
+        .y =  1,
+    },
+    [DIR_NORTH] =
+    {
+        .x =  0,
+        .y = -1,
+    },
+    [DIR_WEST] =
+    {
+        .x = -1,
+        .y =  0,
+    },
+    [DIR_EAST] =
+    {
+        .x =  1,
+        .y =  0,
+    },
+    [DIR_SOUTHWEST] =
+    {
+        .x = -1,
+        .y =  1,
+    },
+    [DIR_SOUTHEAST] =
+    {
+        .x =  1,
+        .y =  1,
+    },
+    [DIR_NORTHWEST] =
+    {
+        .x = -1,
+        .y = -1,
+    },
+    [DIR_NORTHEAST] =
+    {
+        .x =  1,
+        .y = -1,
+    },
 };
 
 static const struct BgTemplate gUnknown_08339DAC[] =
@@ -1110,7 +1146,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
 u16 GetLocationMusic(struct WarpData *warp)
 {
     if (NoMusicInSotopolisWithLegendaries(warp) == TRUE)
-        return INVALID_U16;
+        return 0xFFFF;
     else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return MUS_OOAME;
     else if (IsInflitratedSpaceCenter(warp) == TRUE)
@@ -1171,7 +1207,7 @@ void Overworld_PlaySpecialMapMusic(void)
 {
     u16 music = GetCurrLocationDefaultMusic();
 
-    if (music != MUS_OOAME && music != INVALID_U16)
+    if (music != MUS_OOAME && music != 0xFFFF)
     {
         if (gSaveBlock1Ptr->savedMusic)
             music = gSaveBlock1Ptr->savedMusic;
@@ -1201,7 +1237,7 @@ static void sub_8085810(void)
     {
         u16 newMusic = GetWarpDestinationMusic();
         u16 currentMusic = GetCurrentMapMusic();
-        if (newMusic != MUS_OOAME && newMusic != INVALID_U16)
+        if (newMusic != MUS_OOAME && newMusic != 0xFFFF)
         {
             if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI)
                 return;
diff --git a/src/palette.c b/src/palette.c
index 3c7485d05..1e92f4bba 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -63,7 +63,7 @@ static EWRAM_DATA u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0};
 
 static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
-    .uid = INVALID_U16,
+    .uid = 0xFFFF,
     .pst_field_B_5 = 1
 };
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 41d6dcc8f..1418588b8 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
     sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu));
     sPokeblockMenu->caseId = caseId;
     sPokeblockMenu->callbackOnUse = NULL;
-    sPokeblockMenu->unkTaskId = INVALID_U8;
+    sPokeblockMenu->unkTaskId = 0xFF;
     sPokeblockMenu->isSwapping = FALSE;
     sSavedPokeblockData.callback = callback;
 
@@ -901,7 +901,7 @@ static void sub_8136344(void)
 
 static void sub_81363BC(void)
 {
-    if (sPokeblockMenu->unkTaskId == INVALID_U8)
+    if (sPokeblockMenu->unkTaskId == 0xFF)
     {
         sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed,
                                                                             0x456, 0x456, &sSavedPokeblockData.lastItemPage);
@@ -910,10 +910,10 @@ static void sub_81363BC(void)
 
 static void sub_8136418(void)
 {
-    if (sPokeblockMenu->unkTaskId != INVALID_U8)
+    if (sPokeblockMenu->unkTaskId != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId);
-        sPokeblockMenu->unkTaskId = INVALID_U8;
+        sPokeblockMenu->unkTaskId = 0xFF;
     }
 }
 
@@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
                 break;
             case LIST_B_PRESSED:
                 PlaySE(SE_SELECT);
-                gSpecialVar_Result = INVALID_U16;
+                gSpecialVar_Result = 0xFFFF;
                 gSpecialVar_ItemId = 0;
                 FadePaletteAndSetTaskToClosePokeblockCase(taskId);
                 break;
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 91dbd1c99..2271d7adf 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -88,31 +88,31 @@ EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0};
 // const rom data
 static const u8 sNatureToMonPokeblockAnim[][2] =
 {
-    {  0, 0 }, // HARDY
-    {  3, 0 }, // LONELY
-    {  4, 1 }, // BRAVE
-    {  5, 0 }, // ADAMANT
-    { 10, 0 }, // NAUGHTY
-    { 13, 0 }, // BOLD
-    { 15, 0 }, // DOCILE
-    { 16, 2 }, // RELAXED
-    { 18, 0 }, // IMPISH
-    { 19, 0 }, // LAX
-    { 20, 0 }, // TIMID
-    { 25, 0 }, // HASTY
-    { 27, 3 }, // SERIOUS
-    { 28, 0 }, // JOLLY
-    { 29, 0 }, // NAIVE
-    { 33, 4 }, // MODEST
-    { 36, 0 }, // MILD
-    { 37, 0 }, // QUIET
-    { 39, 0 }, // BASHFUL
-    { 42, 0 }, // RASH
-    { 45, 0 }, // CALM
-    { 46, 5 }, // GENTLE
-    { 47, 6 }, // SASSY
-    { 48, 0 }, // CAREFUL
-    { 53, 0 }, // QUIRKY
+    [NATURE_HARDY] = {  0, 0 },
+    [NATURE_LONELY] = {  3, 0 },
+    [NATURE_BRAVE] = {  4, 1 },
+    [NATURE_ADAMANT] = {  5, 0 },
+    [NATURE_NAUGHTY] = { 10, 0 },
+    [NATURE_BOLD] = { 13, 0 },
+    [NATURE_DOCILE] = { 15, 0 },
+    [NATURE_RELAXED] = { 16, 2 },
+    [NATURE_IMPISH] = { 18, 0 },
+    [NATURE_LAX] = { 19, 0 },
+    [NATURE_TIMID] = { 20, 0 },
+    [NATURE_HASTY] = { 25, 0 },
+    [NATURE_SERIOUS] = { 27, 3 },
+    [NATURE_JOLLY] = { 28, 0 },
+    [NATURE_NAIVE] = { 29, 0 },
+    [NATURE_MODEST] = { 33, 4 },
+    [NATURE_MILD] = { 36, 0 },
+    [NATURE_QUIET] = { 37, 0 },
+    [NATURE_BASHFUL] = { 39, 0 },
+    [NATURE_RASH] = { 42, 0 },
+    [NATURE_CALM] = { 45, 0 },
+    [NATURE_GENTLE] = { 46, 5 },
+    [NATURE_SASSY] = { 47, 6 },
+    [NATURE_CAREFUL] = { 48, 0 },
+    [NATURE_QUIRKY] = { 53, 0 },
 };
 
 static const s16 sMonPokeblockAnims[][10] =
diff --git a/src/pokedex.c b/src/pokedex.c
index 4e28c8a14..0a12ae57e 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1271,7 +1271,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView)
     pokedexView->seenCount = 0;
     pokedexView->ownCount = 0;
     for (i = 0; i <= 3; i++)
-        pokedexView->unk61E[i] |= INVALID_U16;
+        pokedexView->unk61E[i] |= 0xFFFF;
     pokedexView->unk628 = 0;
     pokedexView->unk62A = 0;
     pokedexView->unk62C = 0;
@@ -2459,7 +2459,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y)
             return spriteId;
         }
     }
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 static void CreateInterfaceSprites(u8 a)
@@ -2717,8 +2717,8 @@ void sub_80BE4E0(struct Sprite *sprite)
 
         sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256;
         var = 0x10000 / gSineTable[sprite->data[5] + 0x40];
-        if (var > INVALID_U16)
-            var = INVALID_U16;
+        if (var > 0xFFFF)
+            var = 0xFFFF;
         SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var);
         sprite->oam.matrixNum = data1 + 1;
 
@@ -3558,61 +3558,61 @@ void sub_80BFD0C(u8 a, u16 unused)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
-	mov r7, r8\n\
-	push {r7}\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r8, r0\n\
-	movs r0, 0x1\n\
-	bl GetBgTilemapBuffer\n\
-	adds r7, r0, 0\n\
-	movs r1, 0\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    movs r0, 0x1\n\
+    bl GetBgTilemapBuffer\n\
+    adds r7, r0, 0\n\
+    movs r1, 0\n\
 _080BFD22:\n\
-	lsls r0, r1, 3\n\
-	subs r0, r1\n\
-	adds r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
-	movs r3, 0x80\n\
-	lsls r3, 7\n\
-	cmp r1, r8\n\
-	bne _080BFD38\n\
-	movs r3, 0x80\n\
-	lsls r3, 6\n\
+    lsls r0, r1, 3\n\
+    subs r0, r1\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    movs r3, 0x80\n\
+    lsls r3, 7\n\
+    cmp r1, r8\n\
+    bne _080BFD38\n\
+    movs r3, 0x80\n\
+    lsls r3, 6\n\
 _080BFD38:\n\
-	movs r2, 0\n\
-	adds r6, r1, 0x1\n\
-	ldr r4, =0x00000fff\n\
+    movs r2, 0\n\
+    adds r6, r1, 0x1\n\
+    ldr r4, =0x00000fff\n\
 _080BFD3E:\n\
-	adds r1, r5, r2\n\
-	lsls r1, 1\n\
-	adds r1, r7\n\
-	ldrh r0, [r1]\n\
-	ands r0, r4\n\
-	orrs r0, r3\n\
-	strh r0, [r1]\n\
-	adds r1, 0x40\n\
-	ldrh r0, [r1]\n\
-	ands r0, r4\n\
-	orrs r0, r3\n\
-	strh r0, [r1]\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	cmp r2, 0x6\n\
-	bls _080BFD3E\n\
-	lsls r0, r6, 24\n\
-	lsrs r1, r0, 24\n\
-	cmp r1, 0x3\n\
-	bls _080BFD22\n\
-	movs r0, 0x1\n\
-	bl CopyBgTilemapBufferToVram\n\
-	pop {r3}\n\
-	mov r8, r3\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
+    adds r1, r5, r2\n\
+    lsls r1, 1\n\
+    adds r1, r7\n\
+    ldrh r0, [r1]\n\
+    ands r0, r4\n\
+    orrs r0, r3\n\
+    strh r0, [r1]\n\
+    adds r1, 0x40\n\
+    ldrh r0, [r1]\n\
+    ands r0, r4\n\
+    orrs r0, r3\n\
+    strh r0, [r1]\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    cmp r2, 0x6\n\
+    bls _080BFD3E\n\
+    lsls r0, r6, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0x3\n\
+    bls _080BFD22\n\
+    movs r0, 0x1\n\
+    bl CopyBgTilemapBufferToVram\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
     .syntax divided\n");
 }
 #endif
@@ -3648,66 +3648,66 @@ void sub_80BFD7C(u8 a, u16 b)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
-	mov r7, r8\n\
-	push {r7}\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r8, r0\n\
-	movs r0, 0x1\n\
-	bl GetBgTilemapBuffer\n\
-	adds r7, r0, 0\n\
-	movs r1, 0\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    movs r0, 0x1\n\
+    bl GetBgTilemapBuffer\n\
+    adds r7, r0, 0\n\
+    movs r1, 0\n\
 _080BFD92:\n\
-	lsls r0, r1, 3\n\
-	subs r0, r1\n\
-	adds r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	cmp r1, r8\n\
-	beq _080BFDA4\n\
-	cmp r1, 0x3\n\
-	bne _080BFDAA\n\
+    lsls r0, r1, 3\n\
+    subs r0, r1\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    cmp r1, r8\n\
+    beq _080BFDA4\n\
+    cmp r1, 0x3\n\
+    bne _080BFDAA\n\
 _080BFDA4:\n\
-	movs r3, 0x80\n\
-	lsls r3, 6\n\
-	b _080BFDAE\n\
+    movs r3, 0x80\n\
+    lsls r3, 6\n\
+    b _080BFDAE\n\
 _080BFDAA:\n\
-	movs r3, 0x80\n\
-	lsls r3, 7\n\
+    movs r3, 0x80\n\
+    lsls r3, 7\n\
 _080BFDAE:\n\
-	movs r2, 0\n\
-	adds r5, r1, 0x1\n\
-	ldr r4, =0x00000fff\n\
+    movs r2, 0\n\
+    adds r5, r1, 0x1\n\
+    ldr r4, =0x00000fff\n\
 _080BFDB4:\n\
-	adds r1, r6, r2\n\
-	lsls r1, 1\n\
-	adds r1, r7\n\
-	ldrh r0, [r1]\n\
-	ands r0, r4\n\
-	orrs r0, r3\n\
-	strh r0, [r1]\n\
-	adds r1, 0x40\n\
-	ldrh r0, [r1]\n\
-	ands r0, r4\n\
-	orrs r0, r3\n\
-	strh r0, [r1]\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	cmp r2, 0x6\n\
-	bls _080BFDB4\n\
-	lsls r0, r5, 24\n\
-	lsrs r1, r0, 24\n\
-	cmp r1, 0x3\n\
-	bls _080BFD92\n\
-	movs r0, 0x1\n\
-	bl CopyBgTilemapBufferToVram\n\
-	pop {r3}\n\
-	mov r8, r3\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
+    adds r1, r6, r2\n\
+    lsls r1, 1\n\
+    adds r1, r7\n\
+    ldrh r0, [r1]\n\
+    ands r0, r4\n\
+    orrs r0, r3\n\
+    strh r0, [r1]\n\
+    adds r1, 0x40\n\
+    ldrh r0, [r1]\n\
+    ands r0, r4\n\
+    orrs r0, r3\n\
+    strh r0, [r1]\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    cmp r2, 0x6\n\
+    bls _080BFDB4\n\
+    lsls r0, r5, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0x3\n\
+    bls _080BFD92\n\
+    movs r0, 0x1\n\
+    bl CopyBgTilemapBufferToVram\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
     .syntax divided\n");
 }
 #endif
@@ -4012,216 +4012,216 @@ void sub_80C0460(u16 weight, u8 left, u8 top)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x14\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	mov r10, r1\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	str r2, [sp, 0x10]\n\
-	ldr r5, =0x000186a0\n\
-	muls r0, r5\n\
-	ldr r1, =0x000011b8\n\
-	bl __divsi3\n\
-	adds r7, r0, 0\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	cmp r0, 0x4\n\
-	bls _080C0494\n\
-	adds r7, 0xA\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x14\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    mov r10, r1\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    str r2, [sp, 0x10]\n\
+    ldr r5, =0x000186a0\n\
+    muls r0, r5\n\
+    ldr r1, =0x000011b8\n\
+    bl __divsi3\n\
+    adds r7, r0, 0\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    cmp r0, 0x4\n\
+    bls _080C0494\n\
+    adds r7, 0xA\n\
 _080C0494:\n\
-	movs r0, 0\n\
-	mov r8, r0\n\
-	mov r4, sp\n\
-	adds r0, r7, 0\n\
-	adds r1, r5, 0\n\
-	bl __udivsi3\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0xA1\n\
-	bne _080C04C0\n\
-	movs r6, 0x1\n\
-	mov r1, sp\n\
-	movs r0, 0x77\n\
-	strb r0, [r1]\n\
-	b _080C04C6\n\
-	.pool\n\
+    movs r0, 0\n\
+    mov r8, r0\n\
+    mov r4, sp\n\
+    adds r0, r7, 0\n\
+    adds r1, r5, 0\n\
+    bl __udivsi3\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0xA1\n\
+    bne _080C04C0\n\
+    movs r6, 0x1\n\
+    mov r1, sp\n\
+    movs r0, 0x77\n\
+    strb r0, [r1]\n\
+    b _080C04C6\n\
+    .pool\n\
 _080C04C0:\n\
-	movs r1, 0x1\n\
-	mov r8, r1\n\
-	movs r6, 0x1\n\
+    movs r1, 0x1\n\
+    mov r8, r1\n\
+    movs r6, 0x1\n\
 _080C04C6:\n\
-	ldr r1, =0x000186a0\n\
-	adds r0, r7, 0\n\
-	bl __umodsi3\n\
-	adds r7, r0, 0\n\
-	mov r4, sp\n\
-	adds r4, 0x1\n\
-	ldr r1, =0x00002710\n\
-	bl __udivsi3\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0xA1\n\
-	bne _080C0504\n\
-	mov r2, r8\n\
-	cmp r2, 0\n\
-	bne _080C0504\n\
-	adds r1, r6, 0\n\
-	adds r0, r1, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	add r1, sp\n\
-	movs r0, 0x77\n\
-	strb r0, [r1]\n\
-	b _080C050E\n\
-	.pool\n\
+    ldr r1, =0x000186a0\n\
+    adds r0, r7, 0\n\
+    bl __umodsi3\n\
+    adds r7, r0, 0\n\
+    mov r4, sp\n\
+    adds r4, 0x1\n\
+    ldr r1, =0x00002710\n\
+    bl __udivsi3\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0xA1\n\
+    bne _080C0504\n\
+    mov r2, r8\n\
+    cmp r2, 0\n\
+    bne _080C0504\n\
+    adds r1, r6, 0\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    add r1, sp\n\
+    movs r0, 0x77\n\
+    strb r0, [r1]\n\
+    b _080C050E\n\
+    .pool\n\
 _080C0504:\n\
-	movs r3, 0x1\n\
-	mov r8, r3\n\
-	adds r0, r6, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
+    movs r3, 0x1\n\
+    mov r8, r3\n\
+    adds r0, r6, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
 _080C050E:\n\
-	ldr r1, =0x00002710\n\
-	adds r0, r7, 0\n\
-	bl __umodsi3\n\
-	adds r7, r0, 0\n\
-	mov r0, sp\n\
-	adds r4, r0, r6\n\
-	movs r1, 0xFA\n\
-	lsls r1, 2\n\
-	adds r0, r7, 0\n\
-	bl __udivsi3\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0xA1\n\
-	bne _080C054C\n\
-	mov r1, r8\n\
-	cmp r1, 0\n\
-	bne _080C054C\n\
-	adds r1, r6, 0\n\
-	adds r0, r1, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	add r1, sp\n\
-	movs r0, 0x77\n\
-	strb r0, [r1]\n\
-	b _080C0552\n\
-	.pool\n\
+    ldr r1, =0x00002710\n\
+    adds r0, r7, 0\n\
+    bl __umodsi3\n\
+    adds r7, r0, 0\n\
+    mov r0, sp\n\
+    adds r4, r0, r6\n\
+    movs r1, 0xFA\n\
+    lsls r1, 2\n\
+    adds r0, r7, 0\n\
+    bl __udivsi3\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0xA1\n\
+    bne _080C054C\n\
+    mov r1, r8\n\
+    cmp r1, 0\n\
+    bne _080C054C\n\
+    adds r1, r6, 0\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    add r1, sp\n\
+    movs r0, 0x77\n\
+    strb r0, [r1]\n\
+    b _080C0552\n\
+    .pool\n\
 _080C054C:\n\
-	adds r0, r6, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
+    adds r0, r6, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
 _080C0552:\n\
-	movs r1, 0xFA\n\
-	lsls r1, 2\n\
-	adds r0, r7, 0\n\
-	bl __umodsi3\n\
-	adds r7, r0, 0\n\
-	adds r1, r6, 0\n\
-	adds r0, r1, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r5, r6, 0\n\
-	mov r2, sp\n\
-	adds r4, r2, r1\n\
-	adds r0, r7, 0\n\
-	movs r1, 0x64\n\
-	bl __udivsi3\n\
-	adds r0, 0xA1\n\
-	movs r3, 0\n\
-	mov r9, r3\n\
-	strb r0, [r4]\n\
-	adds r0, r7, 0\n\
-	movs r1, 0x64\n\
-	bl __umodsi3\n\
-	adds r7, r0, 0\n\
-	adds r0, r5, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r1, r6, 0\n\
-	mov r2, sp\n\
-	adds r0, r2, r5\n\
-	movs r3, 0xAD\n\
-	mov r8, r3\n\
-	mov r2, r8\n\
-	strb r2, [r0]\n\
-	adds r0, r1, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r5, r6, 0\n\
-	mov r3, sp\n\
-	adds r4, r3, r1\n\
-	adds r0, r7, 0\n\
-	movs r1, 0xA\n\
-	bl __udivsi3\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	adds r0, r5, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r1, r6, 0\n\
-	mov r2, sp\n\
-	adds r0, r2, r5\n\
-	mov r3, r9\n\
-	strb r3, [r0]\n\
-	adds r0, r1, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r2, r6, 0\n\
-	add r1, sp\n\
-	movs r0, 0xE0\n\
-	strb r0, [r1]\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r3, r6, 0\n\
-	mov r0, sp\n\
-	adds r1, r0, r2\n\
-	movs r0, 0xD6\n\
-	strb r0, [r1]\n\
-	adds r0, r3, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r2, r6, 0\n\
-	mov r0, sp\n\
-	adds r1, r0, r3\n\
-	movs r0, 0xE7\n\
-	strb r0, [r1]\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r3, sp\n\
-	adds r1, r3, r2\n\
-	mov r2, r8\n\
-	strb r2, [r1]\n\
-	adds r1, r3, r0\n\
-	movs r0, 0xFF\n\
-	strb r0, [r1]\n\
-	mov r0, sp\n\
-	mov r1, r10\n\
-	ldr r2, [sp, 0x10]\n\
-	bl sub_80BE8DC\n\
-	add sp, 0x14\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
+    movs r1, 0xFA\n\
+    lsls r1, 2\n\
+    adds r0, r7, 0\n\
+    bl __umodsi3\n\
+    adds r7, r0, 0\n\
+    adds r1, r6, 0\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r5, r6, 0\n\
+    mov r2, sp\n\
+    adds r4, r2, r1\n\
+    adds r0, r7, 0\n\
+    movs r1, 0x64\n\
+    bl __udivsi3\n\
+    adds r0, 0xA1\n\
+    movs r3, 0\n\
+    mov r9, r3\n\
+    strb r0, [r4]\n\
+    adds r0, r7, 0\n\
+    movs r1, 0x64\n\
+    bl __umodsi3\n\
+    adds r7, r0, 0\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r1, r6, 0\n\
+    mov r2, sp\n\
+    adds r0, r2, r5\n\
+    movs r3, 0xAD\n\
+    mov r8, r3\n\
+    mov r2, r8\n\
+    strb r2, [r0]\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r5, r6, 0\n\
+    mov r3, sp\n\
+    adds r4, r3, r1\n\
+    adds r0, r7, 0\n\
+    movs r1, 0xA\n\
+    bl __udivsi3\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r1, r6, 0\n\
+    mov r2, sp\n\
+    adds r0, r2, r5\n\
+    mov r3, r9\n\
+    strb r3, [r0]\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r2, r6, 0\n\
+    add r1, sp\n\
+    movs r0, 0xE0\n\
+    strb r0, [r1]\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r3, r6, 0\n\
+    mov r0, sp\n\
+    adds r1, r0, r2\n\
+    movs r0, 0xD6\n\
+    strb r0, [r1]\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r2, r6, 0\n\
+    mov r0, sp\n\
+    adds r1, r0, r3\n\
+    movs r0, 0xE7\n\
+    strb r0, [r1]\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r3, sp\n\
+    adds r1, r3, r2\n\
+    mov r2, r8\n\
+    strb r2, [r1]\n\
+    adds r1, r3, r0\n\
+    movs r0, 0xFF\n\
+    strb r0, [r1]\n\
+    mov r0, sp\n\
+    mov r1, r10\n\
+    ldr r2, [sp, 0x10]\n\
+    bl sub_80BE8DC\n\
+    add sp, 0x14\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
     .syntax divided\n");
 }
 #endif
@@ -4627,12 +4627,12 @@ u32 sub_80C0E68(u16 a)
 u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot)
 {
     num = NationalPokedexNumToSpecies(num);
-    return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, INVALID_U16);
+    return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF);
 }
 
 u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot)
 {
-    return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, INVALID_U16);
+    return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF);
 }
 
 int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2)
@@ -4655,7 +4655,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     sPokedexView->pokemonListCount = resultsCount;
 
     // Search by name
-    if (abcGroup != INVALID_U8)
+    if (abcGroup != 0xFF)
     {
         for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
         {
@@ -4674,7 +4674,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     }
 
     // Search by body color
-    if (bodyColor != INVALID_U8)
+    if (bodyColor != 0xFF)
     {
         for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
         {
@@ -4690,15 +4690,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     }
 
     // Search by type
-    if (type1 != INVALID_U8 || type2 != INVALID_U8)
+    if (type1 != 0xFF || type2 != 0xFF)
     {
-        if (type1 == INVALID_U8)
+        if (type1 == 0xFF)
         {
             type1 = type2;
-            type2 = INVALID_U8;
+            type2 = 0xFF;
         }
 
-        if (type2 == INVALID_U8)
+        if (type2 == 0xFF)
         {
             for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
             {
@@ -4744,7 +4744,6 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
             sPokedexView->pokedexList[i].dexNum = 0xFFFF;
             sPokedexView->pokedexList[i].seen = FALSE;
             sPokedexView->pokedexList[i].owned = FALSE;
-
         }
     }
 
@@ -4987,7 +4986,7 @@ void sub_80C170C(u8 taskId)
         return;
     }
 
-    if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][0];
@@ -4995,7 +4994,7 @@ void sub_80C170C(u8 taskId)
         CopyWindowToVram(0, 2);
         CopyBgTilemapBufferToVram(3);
     }
-    if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][1];
@@ -5003,7 +5002,7 @@ void sub_80C170C(u8 taskId)
         CopyWindowToVram(0, 2);
         CopyBgTilemapBufferToVram(3);
     }
-    if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][2];
@@ -5011,7 +5010,7 @@ void sub_80C170C(u8 taskId)
         CopyWindowToVram(0, 2);
         CopyBgTilemapBufferToVram(3);
     }
-    if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][3];
@@ -5215,54 +5214,54 @@ void sub_80C1D98(u8 a, u8 b, u8 c, u8 d)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
-	mov r7, r8\n\
-	push {r7}\n\
-	adds r4, r3, 0\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	mov r8, r1\n\
-	lsls r2, 24\n\
-	lsrs r5, r2, 24\n\
-	lsls r4, 24\n\
-	lsrs r4, 24\n\
-	movs r0, 0x3\n\
-	bl GetBgTilemapBuffer\n\
-	adds r2, r0, 0\n\
-	movs r3, 0\n\
-	cmp r3, r4\n\
-	bcs _080C1DEC\n\
-	lsls r0, r5, 6\n\
-	adds r7, r0, r2\n\
-	ldr r5, =0x00000fff\n\
-	lsls r2, r6, 12\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    adds r4, r3, 0\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    mov r8, r1\n\
+    lsls r2, 24\n\
+    lsrs r5, r2, 24\n\
+    lsls r4, 24\n\
+    lsrs r4, 24\n\
+    movs r0, 0x3\n\
+    bl GetBgTilemapBuffer\n\
+    adds r2, r0, 0\n\
+    movs r3, 0\n\
+    cmp r3, r4\n\
+    bcs _080C1DEC\n\
+    lsls r0, r5, 6\n\
+    adds r7, r0, r2\n\
+    ldr r5, =0x00000fff\n\
+    lsls r2, r6, 12\n\
 _080C1DC8:\n\
-	mov r0, r8\n\
-	adds r1, r0, r3\n\
-	lsls r1, 1\n\
-	adds r1, r7\n\
-	ldrh r0, [r1]\n\
-	ands r0, r5\n\
-	orrs r0, r2\n\
-	strh r0, [r1]\n\
-	adds r1, 0x40\n\
-	ldrh r0, [r1]\n\
-	ands r0, r5\n\
-	orrs r0, r2\n\
-	strh r0, [r1]\n\
-	adds r0, r3, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r3, r0, 16\n\
-	cmp r3, r4\n\
-	bcc _080C1DC8\n\
+    mov r0, r8\n\
+    adds r1, r0, r3\n\
+    lsls r1, 1\n\
+    adds r1, r7\n\
+    ldrh r0, [r1]\n\
+    ands r0, r5\n\
+    orrs r0, r2\n\
+    strh r0, [r1]\n\
+    adds r1, 0x40\n\
+    ldrh r0, [r1]\n\
+    ands r0, r5\n\
+    orrs r0, r2\n\
+    strh r0, [r1]\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    cmp r3, r4\n\
+    bcc _080C1DC8\n\
 _080C1DEC:\n\
-	pop {r3}\n\
-	mov r8, r3\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
     .syntax divided\n");
 }
 #endif
@@ -5475,12 +5474,12 @@ u8 sub_80C2318(u8 taskId, u8 b)
             return gUnknown_0856EFAE[r2];
         case 0:
             if (r2 == 0)
-                return INVALID_U8;
+                return 0xFF;
             else
                 return r2;
         case 1:
             if (r2 == 0)
-                return INVALID_U8;
+                return 0xFF;
             else
                 return r2 - 1;
         case 2:
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index 843812723..30a127c71 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -4,7 +4,7 @@
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "overworld.h"
 #include "palette.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 1f8d5339b..dbef22338 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2300,7 +2300,7 @@ static const u8 sHoldEffectToType[][2] =
 const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
 {
     {   // B_POSITION_PLAYER_LEFT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2309,7 +2309,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
         .callback = sub_8039BB4,
     },
     {   // B_POSITION_OPPONENT_LEFT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACA8,
         .anims = NULL,
@@ -2318,7 +2318,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
         .callback = oac_poke_opponent,
     },
     {   // B_POSITION_PLAYER_RIGHT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2327,7 +2327,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
         .callback = sub_8039BB4,
     },
     {   // B_POSITION_OPPONENT_RIGHT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACA8,
         .anims = NULL,
@@ -2340,7 +2340,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
 static const struct SpriteTemplate gUnknown_08329DF8[] =
 {
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2349,7 +2349,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2358,7 +2358,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2367,7 +2367,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2376,7 +2376,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2385,7 +2385,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2394,7 +2394,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2403,7 +2403,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2450,20 +2450,20 @@ static const s8 gUnknown_08329ECE[][3] =
 static const u16 sHMMoves[] =
 {
     MOVE_CUT, MOVE_FLY, MOVE_SURF, MOVE_STRENGTH, MOVE_FLASH,
-    MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, INVALID_U16
+    MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, 0xFFFF
 };
 
 static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] =
 {
     {SPECIES_NONE,      ITEM_NONE},
     {SPECIES_MAREEP,    ITEM_GANLON_BERRY},
-    {SPECIES_PINECO,	ITEM_APICOT_BERRY},
-    {SPECIES_HOUNDOUR,	ITEM_BIG_MUSHROOM},
-    {SPECIES_TEDDIURSA,	ITEM_PETAYA_BERRY},
-    {SPECIES_AIPOM,		ITEM_BERRY_JUICE},
-    {SPECIES_SHUCKLE,	ITEM_BERRY_JUICE},
-    {SPECIES_STANTLER,	ITEM_PETAYA_BERRY},
-    {SPECIES_SMEARGLE,	ITEM_SALAC_BERRY},
+    {SPECIES_PINECO,    ITEM_APICOT_BERRY},
+    {SPECIES_HOUNDOUR,    ITEM_BIG_MUSHROOM},
+    {SPECIES_TEDDIURSA,    ITEM_PETAYA_BERRY},
+    {SPECIES_AIPOM,        ITEM_BERRY_JUICE},
+    {SPECIES_SHUCKLE,    ITEM_BERRY_JUICE},
+    {SPECIES_STANTLER,    ITEM_PETAYA_BERRY},
+    {SPECIES_SMEARGLE,    ITEM_SALAC_BERRY},
 };
 
 static const struct OamData sOamData_8329F20 =
@@ -2485,8 +2485,8 @@ static const struct OamData sOamData_8329F20 =
 
 static const struct SpriteTemplate gUnknown_08329F28 =
 {
-    .tileTag = INVALID_U16,
-    .paletteTag = INVALID_U16,
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
     .oam = &sOamData_8329F20,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -3286,7 +3286,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
         if (existingMove == move)
             return -2;
     }
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move)
@@ -3303,7 +3303,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move)
         }
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot)
@@ -3341,7 +3341,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
 
         move = (gLevelUpLearnsets[species][i] & 0x1FF);
 
-        if (GiveMoveToBoxMon(boxMon, move) == INVALID_U16)
+        if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF)
             DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move);
     }
 }
@@ -6495,7 +6495,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves)
     {
         u16 moveLevel;
 
-        if (gLevelUpLearnsets[species][i] == INVALID_U16)
+        if (gLevelUpLearnsets[species][i] == 0xFFFF)
             break;
 
         moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
@@ -6524,7 +6524,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves)
     u8 numMoves = 0;
     int i;
 
-    for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != INVALID_U16; i++)
+    for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++)
          moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF;
 
      return numMoves;
@@ -6549,7 +6549,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon)
     {
         u16 moveLevel;
 
-        if (gLevelUpLearnsets[species][i] == INVALID_U16)
+        if (gLevelUpLearnsets[species][i] == 0xFFFF)
             break;
 
         moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
@@ -6584,7 +6584,7 @@ u16 SpeciesToPokedexNum(u16 species)
         species = SpeciesToHoennPokedexNum(species);
         if (species <= 202)
             return species;
-        return INVALID_U16;
+        return 0xFFFF;
     }
 }
 
@@ -6747,7 +6747,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u
 bool32 IsHMMove2(u16 move)
 {
     int i = 0;
-    while (sHMMoves[i] != INVALID_U16)
+    while (sHMMoves[i] != 0xFFFF)
     {
         if (sHMMoves[i++] == move)
             return TRUE;
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index c9a4f5c91..edaedbabd 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -588,7 +588,7 @@ static const u8 sUnknown_0860AA64[][2] =
     {0, 2},
     {1, 2},
     {0, 2},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const u8 sUnknown_0860AA80[][2] =
@@ -787,30 +787,30 @@ static const u8 sBackAnimationIds[] =
 static const u8 sBackAnimNatureModTable[] =
 {
     0x00, // NATURE_HARDY
-	0x02, // NATURE_LONELY
-	0x00, // NATURE_BRAVE
-	0x00, // NATURE_ADAMANT
-	0x00, // NATURE_NAUGHTY
-	0x01, // NATURE_BOLD
-	0x01, // NATURE_DOCILE
-	0x01, // NATURE_RELAXED
-	0x00, // NATURE_IMPISH
-	0x01, // NATURE_LAX
-	0x02, // NATURE_TIMID
-	0x00, // NATURE_HASTY
-	0x01, // NATURE_SERIOUS
-	0x00, // NATURE_JOLLY
-	0x00, // NATURE_NAIVE
-	0x02, // NATURE_MODEST
-	0x02, // NATURE_MILD
-	0x02, // NATURE_QUIET
-	0x02, // NATURE_BASHFUL
-	0x01, // NATURE_RASH
-	0x01, // NATURE_CALM
-	0x02, // NATURE_GENTLE
-	0x01, // NATURE_SASSY
-	0x02, // NATURE_CAREFUL
-	0x01, // NATURE_QUIRKY
+    0x02, // NATURE_LONELY
+    0x00, // NATURE_BRAVE
+    0x00, // NATURE_ADAMANT
+    0x00, // NATURE_NAUGHTY
+    0x01, // NATURE_BOLD
+    0x01, // NATURE_DOCILE
+    0x01, // NATURE_RELAXED
+    0x00, // NATURE_IMPISH
+    0x01, // NATURE_LAX
+    0x02, // NATURE_TIMID
+    0x00, // NATURE_HASTY
+    0x01, // NATURE_SERIOUS
+    0x00, // NATURE_JOLLY
+    0x00, // NATURE_NAIVE
+    0x02, // NATURE_MODEST
+    0x02, // NATURE_MILD
+    0x02, // NATURE_QUIET
+    0x02, // NATURE_BASHFUL
+    0x01, // NATURE_RASH
+    0x01, // NATURE_CALM
+    0x02, // NATURE_GENTLE
+    0x01, // NATURE_SASSY
+    0x02, // NATURE_CAREFUL
+    0x01, // NATURE_QUIRKY
 };
 
 static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] =
@@ -1164,67 +1164,67 @@ NAKED
 static void sub_817F9F4(struct Sprite *sprite)
 {
     asm(".syntax unified\n\
-        	push {r4,lr}\n\
-	adds r4, r0, 0\n\
-	movs r0, 0x32\n\
-	ldrsh r1, [r4, r0]\n\
-	movs r0, 0xC0\n\
-	lsls r0, 1\n\
-	cmp r1, r0\n\
-	ble _0817FA14\n\
-	ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\
-	str r0, [r4, 0x1C]\n\
-	movs r0, 0\n\
-	strh r0, [r4, 0x24]\n\
-	b _0817FA5E\n\
-	.pool\n\
+            push {r4,lr}\n\
+    adds r4, r0, 0\n\
+    movs r0, 0x32\n\
+    ldrsh r1, [r4, r0]\n\
+    movs r0, 0xC0\n\
+    lsls r0, 1\n\
+    cmp r1, r0\n\
+    ble _0817FA14\n\
+    ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\
+    str r0, [r4, 0x1C]\n\
+    movs r0, 0\n\
+    strh r0, [r4, 0x24]\n\
+    b _0817FA5E\n\
+    .pool\n\
 _0817FA14:\n\
-	adds r0, r1, 0\n\
-	cmp r1, 0\n\
-	bge _0817FA1C\n\
-	adds r0, 0x7F\n\
+    adds r0, r1, 0\n\
+    cmp r1, 0\n\
+    bge _0817FA1C\n\
+    adds r0, 0x7F\n\
 _0817FA1C:\n\
-	asrs r2, r0, 7\n\
-	lsls r0, r2, 16\n\
-	asrs r0, 16\n\
-	cmp r0, 0\n\
-	blt _0817FA60\n\
-	cmp r0, 0x1\n\
-	ble _0817FA48\n\
-	cmp r0, 0x3\n\
-	bgt _0817FA60\n\
-	ldr r2, =0xffffff00\n\
-	adds r1, r2\n\
-	lsls r0, r1, 16\n\
-	asrs r0, 16\n\
-	movs r1, 0x2E\n\
-	ldrsh r2, [r4, r1]\n\
-	lsls r1, r2, 1\n\
-	adds r1, r2\n\
-	lsls r1, 16\n\
-	b _0817FA56\n\
-	.pool\n\
+    asrs r2, r0, 7\n\
+    lsls r0, r2, 16\n\
+    asrs r0, 16\n\
+    cmp r0, 0\n\
+    blt _0817FA60\n\
+    cmp r0, 0x1\n\
+    ble _0817FA48\n\
+    cmp r0, 0x3\n\
+    bgt _0817FA60\n\
+    ldr r2, =0xffffff00\n\
+    adds r1, r2\n\
+    lsls r0, r1, 16\n\
+    asrs r0, 16\n\
+    movs r1, 0x2E\n\
+    ldrsh r2, [r4, r1]\n\
+    lsls r1, r2, 1\n\
+    adds r1, r2\n\
+    lsls r1, 16\n\
+    b _0817FA56\n\
+    .pool\n\
 _0817FA48:\n\
-	lsls r0, r2, 7\n\
-	subs r0, r1, r0\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	movs r2, 0x2E\n\
-	ldrsh r1, [r4, r2]\n\
-	lsls r1, 17\n\
+    lsls r0, r2, 7\n\
+    subs r0, r1, r0\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    movs r2, 0x2E\n\
+    ldrsh r1, [r4, r2]\n\
+    lsls r1, 17\n\
 _0817FA56:\n\
-	asrs r1, 16\n\
-	bl Sin\n\
-	negs r0, r0\n\
+    asrs r1, 16\n\
+    bl Sin\n\
+    negs r0, r0\n\
 _0817FA5E:\n\
-	strh r0, [r4, 0x26]\n\
+    strh r0, [r4, 0x26]\n\
 _0817FA60:\n\
-	ldrh r0, [r4, 0x32]\n\
-	adds r0, 0xC\n\
-	strh r0, [r4, 0x32]\n\
-	pop {r4}\n\
-	pop {r0}\n\
-	bx r0\n\
+    ldrh r0, [r4, 0x32]\n\
+    adds r0, 0xC\n\
+    strh r0, [r4, 0x32]\n\
+    pop {r4}\n\
+    pop {r0}\n\
+    bx r0\n\
         .syntax divided");
 }
 
@@ -1666,7 +1666,7 @@ static void sub_818031C(struct Sprite *sprite)
     else
         amplitude = 0;
 
-    if (var5 == INVALID_U8)
+    if (var5 == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.y = 0;
@@ -2570,7 +2570,7 @@ static void pokemonanimfunc_2C(struct Sprite *sprite)
         sprite->data[4] = 0;
     }
 
-    if (sUnknown_0860AA64[sprite->data[6]][1] == INVALID_U8)
+    if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -4157,17 +4157,17 @@ static void sub_8183574(struct Sprite *sprite)
     u8 var9 = sprite->data[6];
     u8 var5 = sUnknown_0860AA80[sprite->data[5]][0];
     u8 var2 = var5;
-    if (var5 != INVALID_U8)
+    if (var5 != 0xFF)
         var5 = sprite->data[7];
     else
-        var5 = INVALID_U8; // needed to match
+        var5 = 0xFF; // needed to match
 
     var6 = sUnknown_0860AA80[sprite->data[5]][1];
     var7 = 0;
     if (var2 != 0xFE)
         var7 = (var6 - var9) * var5 / var6;
 
-    if (var5 == INVALID_U8)
+    if (var5 == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.y = 0;
@@ -5278,7 +5278,7 @@ static const struct YellowBlendStruct sUnknown_0860ADCC[] =
     {0, 1},
     {1, 1},
     {0, 1},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const struct YellowBlendStruct sUnknown_0860AE1C[] =
@@ -5296,7 +5296,7 @@ static const struct YellowBlendStruct sUnknown_0860AE1C[] =
     {0, 2},
     {1, 2},
     {0, 2},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const struct YellowBlendStruct sUnknown_0860AE54[] =
@@ -5310,7 +5310,7 @@ static const struct YellowBlendStruct sUnknown_0860AE54[] =
     {0, 20},
     {1, 1},
     {0, 1},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const struct YellowBlendStruct *const sUnknown_0860AE7C[] =
@@ -5324,7 +5324,7 @@ static void BackAnimBlendYellow(struct Sprite *sprite)
 {
     const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]];
     sub_8184770(sprite);
-    if (array[sprite->data[6]].field_1 == INVALID_U8)
+    if (array[sprite->data[6]].field_1 == 0xFF)
     {
         sprite->pos2.x = 0;
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 5926f9513..994cc520e 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species)
     if (species > SPECIES_EGG)
         species = 260;
     palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8)
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
         LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
 }
 
 void LoadMonIconPalette(u16 species)
 {
     u8 palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8)
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
         LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
 }
 
@@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x,
 
     struct SpriteTemplate spriteTemplate =
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = iconTemplate->paletteTag,
         .oam = iconTemplate->oam,
         .anims = iconTemplate->anims,
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index f90a6b8c2..2d9a2f08f 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -109,7 +109,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
 
 static u8 CompareMonSize(u16 species, u16 *sizeRecord)
 {
-    if (gSpecialVar_Result == INVALID_U8)
+    if (gSpecialVar_Result == 0xFF)
     {
         return 0;
     }
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 30e16da28..465b97da2 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -134,7 +134,7 @@ s16 GetFirstFreeBoxSpot(u8 boxId)
             return i;
     }
 
-    return INVALID_S16; // all spots are taken
+    return -1; // all spots are taken
 }
 
 u8 CountPartyNonEggMons(void)
@@ -426,7 +426,7 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx
                 return i;
         }
     }
-    return INVALID_S16;
+    return -1;
 }
 
 void ResetPokemonStorageSystem(void)
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index bef127cce..f1c248a1a 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1152,7 +1152,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         break;
     case 17:
         pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0);
-        if (pssData->spriteIds[0] != INVALID_U8)
+        if (pssData->spriteIds[0] != 0xFF)
         {
             pssData->unk40F0 = 0;
             gMain.state++;
@@ -1509,7 +1509,7 @@ static void sub_81C0604(u8 taskId, s8 a)
             r4_2 = sub_81C08F8(a);
         }
 
-        if (r4_2 != INVALID_S8)
+        if (r4_2 != -1)
         {
             PlaySE(SE_SELECT);
             if (pssData->summary.unk7 != 0)
@@ -1564,7 +1564,7 @@ static void sub_81C0704(u8 taskId)
         break;
     case 8:
         pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]);
-        if (pssData->spriteIds[0] == INVALID_U8)
+        if (pssData->spriteIds[0] == 0xFF)
             return;
         gSprites[pssData->spriteIds[0]].data[2] = 1;
         sub_81C0E24();
@@ -1601,9 +1601,9 @@ static s8 sub_81C08F8(s8 a)
     if (pssData->currPageIndex == PSS_PAGE_INFO)
     {
         if (a == -1 && pssData->curMonIndex == 0)
-            return INVALID_S8;
+            return -1;
         else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex)
-            return INVALID_S8;
+            return -1;
         else
             return pssData->curMonIndex + a;
     }
@@ -1615,7 +1615,7 @@ static s8 sub_81C08F8(s8 a)
         {
             index += a;
             if (index < 0 || index > pssData->maxMonIndex)
-                return INVALID_S8;
+                return -1;
         } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0);
         return index;
     }
@@ -1643,7 +1643,7 @@ static s8 sub_81C09B4(s8 a)
 
         r5 += a;
         if (r5 < 0 || r5 >= 6)
-            return INVALID_S8;
+            return -1;
         b = c[r5];
         if (sub_81C0A50(&mon[b]) == TRUE)
             return b;
@@ -2341,7 +2341,7 @@ static void sub_81C1DA4(u16 a, s16 b)
     else
     {
         u8 taskId = FindTaskIdByFunc(sub_81C1E20);
-        if (taskId == INVALID_U8)
+        if (taskId == 0xFF)
         {
             taskId = CreateTask(sub_81C1E20, 8);
         }
@@ -2392,7 +2392,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move)
     else
     {
         u8 taskId = FindTaskIdByFunc(sub_81C1F80);
-        if (taskId == INVALID_U8)
+        if (taskId == 0xFF)
             taskId = CreateTask(sub_81C1F80, 8);
         gTasks[taskId].data[0] = b;
         gTasks[taskId].data[1] = a;
@@ -2580,12 +2580,12 @@ static void sub_81C240C(u16 move)
     {
         effectValue = gContestEffects[gContestMoves[move].effect].appeal;
 
-        if (effectValue != INVALID_U8)
+        if (effectValue != 0xFF)
             effectValue /= 10;
 
         for (i = 0; i < 8; i++)
         {
-            if (effectValue != INVALID_U8 && i < effectValue)
+            if (effectValue != 0xFF && i < effectValue)
             {
                 tilemap[(i / 4 * 32) + (i & 3) + 0x1E6] = 0x103A;
             }
@@ -2597,12 +2597,12 @@ static void sub_81C240C(u16 move)
 
         effectValue = gContestEffects[gContestMoves[move].effect].jam;
 
-        if (effectValue != INVALID_U8)
+        if (effectValue != 0xFF)
             effectValue /= 10;
 
         for (i = 0; i < 8; i++)
         {
-            if (effectValue != INVALID_U8 && i < effectValue)
+            if (effectValue != 0xFF && i < effectValue)
             {
                 tilemap[(i / 4 * 32) + (i & 3) + 0x226] = 0x103C;
             }
@@ -2634,7 +2634,7 @@ static void sub_81C2554(void)
     }
     for (i = 0; i < 8; i++)
     {
-        pssData->windowIds[i] = INVALID_U8;
+        pssData->windowIds[i] = 0xFF;
     }
 }
 
@@ -2661,7 +2661,7 @@ static void sub_81C2628(void)
     struct Pokemon *mon = &pssData->currentMon;
     struct PokeSummary *summary = &pssData->summary;
     u16 dexNum = SpeciesToPokedexNum(summary->species);
-    if (dexNum != INVALID_U16)
+    if (dexNum != 0xFFFF)
     {
         StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]);
         ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3);
@@ -2895,7 +2895,7 @@ static void sub_81C2C38(u8 a)
 static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId)
 {
     u8 *windowIdPtr = &(pssData->windowIds[templateId]);
-    if (*windowIdPtr == INVALID_U8)
+    if (*windowIdPtr == 0xFF)
     {
         *windowIdPtr = AddWindow(&template[templateId]);
         FillWindowPixelBuffer(*windowIdPtr, 0);
@@ -2906,11 +2906,11 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te
 static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex)
 {
     u8 *windowIdPtr = &(pssData->windowIds[windowIndex]);
-    if (*windowIdPtr != INVALID_U8)
+    if (*windowIdPtr != 0xFF)
     {
         ClearWindowTilemap(*windowIdPtr);
         RemoveWindow(*windowIdPtr);
-        *windowIdPtr = INVALID_U8;
+        *windowIdPtr = 0xFF;
     }
 }
 
@@ -2919,7 +2919,7 @@ static void sub_81C2D9C(u8 pageIndex)
     u16 i;
     for (i = 0; i < 8; i++)
     {
-        if (pssData->windowIds[i] != INVALID_U8)
+        if (pssData->windowIds[i] != 0xFF)
             FillWindowPixelBuffer(pssData->windowIds[i], 0);
     }
     gUnknown_0861CE54[pageIndex]();
@@ -3651,16 +3651,16 @@ static void sub_81C4190(void)
 
     for (i = 0; i < 28; i++)
     {
-        pssData->spriteIds[i] = INVALID_U8;
+        pssData->spriteIds[i] = 0xFF;
     }
 }
 
 static void DestroySpriteInArray(u8 spriteArrayId)
 {
-    if (pssData->spriteIds[spriteArrayId] != INVALID_U8)
+    if (pssData->spriteIds[spriteArrayId] != 0xFF)
     {
         DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]);
-        pssData->spriteIds[spriteArrayId] = INVALID_U8;
+        pssData->spriteIds[spriteArrayId] = 0xFF;
     }
 }
 
@@ -3675,7 +3675,7 @@ static void sub_81C424C(void)
 
     for (i = 3; i < 28; i++)
     {
-        if (pssData->spriteIds[i] != INVALID_U8)
+        if (pssData->spriteIds[i] != 0xFF)
             sub_81C4204(i, TRUE);
     }
 }
@@ -3704,7 +3704,7 @@ static void sub_81C42C8(void)
 
     for (i = 3; i < 8; i++)
     {
-        if (pssData->spriteIds[i] == INVALID_U8)
+        if (pssData->spriteIds[i] == 0xFF)
             pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
 
         sub_81C4204(i, TRUE);
@@ -3851,13 +3851,13 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1)
                 }
             }
             (*a1)++;
-            return INVALID_S8;
+            return -1;
         case 1:
             pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid);
             LoadCompressedObjectPalette(pal);
             SetMultiuseSpriteTemplateToPokemon(pal->tag, 1);
             (*a1)++;
-            return INVALID_S8;
+            return -1;
     }
 }
 
@@ -3921,10 +3921,10 @@ void SummaryScreen_SetUnknownTaskId(u8 a0)
 
 void SummaryScreen_DestroyUnknownTask(void)
 {
-    if (sUnknownTaskId != INVALID_U8)
+    if (sUnknownTaskId != 0xFF)
     {
         DestroyTask(sUnknownTaskId);
-        sUnknownTaskId = INVALID_U8;
+        sUnknownTaskId = 0xFF;
     }
 }
 
@@ -3994,7 +3994,7 @@ static void CreateSetStatusSprite(void)
     u8 *spriteId = &pssData->spriteIds[2];
     u8 anim;
 
-    if (*spriteId == INVALID_U8)
+    if (*spriteId == 0xFF)
     {
         *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0);
     }
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index d0f65c4b0..b22e1db32 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -89,13 +89,13 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y);
 // const rom data
 static const TaskFunc sTasksForAnimations[] =
 {
-    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE
-    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT
-    Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT
-    Task_RayDescendsAnim, // RAY_ANIM_DESCENDS
-    Task_RayChargesAnim, // RAY_ANIM_CHARGES
-    Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY
-    Task_EndAfterFadeScreen // RAY_ANIM_END
+    [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim,
+    [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim,
+    [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim,
+    [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim,
+    [RAY_ANIM_CHARGES] = Task_RayChargesAnim,
+    [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim,
+    [RAY_ANIM_END] = Task_EndAfterFadeScreen,
 };
 
 static const struct OamData sOamData_862A6BC =
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 4a4941294..975b51386 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = INVALID_S32;
+        s32 highestId = -1;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
@@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = INVALID_S32;
+        s32 highestId = -1;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 3fc08ff3f..81935b7c6 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId)
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index da94c5c46..34444cbf4 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -160,7 +160,7 @@ static const union AnimCmd *const sSpriteAnimTable_85104E4[] =
 
 static const struct SpriteTemplate sSpriteTemplate_85104F0 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &sOamData_08510464,
     .anims = sSpriteAnimTable_85104E4,
diff --git a/src/rock.c b/src/rock.c
index b50ecc155..3b8e505d8 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -738,7 +738,7 @@ void sub_811131C(struct Sprite *sprite)
     if (TranslateAnimArc(sprite))
     {
         u8 taskId = FindTaskIdByFunc(sub_81110A4);
-        if (taskId != INVALID_U8)
+        if (taskId != 0xFF)
             gTasks[taskId].data[11]--;
 
         DestroySprite(sprite);
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c
index ef82cbf0a..0553b9cf4 100644
--- a/src/rom_8011DC0.c
+++ b/src/rom_8011DC0.c
@@ -961,7 +961,7 @@ u8 sub_80132D4(struct UnkStruct_Main0 *arg0)
         if (var == 1)
         {
             id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr);
-            if (id != INVALID_U8)
+            if (id != 0xFF)
             {
                 data->field_0->arr[i].unk = data->field_4->arr[id].unk0;
                 data->field_0->arr[i].field_18 = var;
@@ -1382,7 +1382,7 @@ void sub_8013C7C(u8 taskId)
     case 3:
         if (sub_8013E44() == 1)
             PlaySE(SE_PC_LOGIN);
-        if (gTasks[taskId].data[15] == INVALID_U8)
+        if (gTasks[taskId].data[15] == 0xFF)
             data->state = 10;
         break;
     case 10:
@@ -1401,14 +1401,14 @@ void sub_8013C7C(u8 taskId)
 
 bool32 sub_8013D88(u32 arg0, u32 id)
 {
-    if (id == INVALID_U8)
+    if (id == 0xFF)
         return TRUE;
 
     if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array
     {
         const u8 *bytes = gUnknown_082F04D8[id];
 
-        while ((*(bytes) != INVALID_U8))
+        while ((*(bytes) != 0xFF))
         {
             if ((*bytes) == arg0)
                 return TRUE;
@@ -1454,7 +1454,7 @@ u8 sub_8013E44(void)
         if (data->field_0->arr[i].field_1A_0 != 0)
         {
             id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr);
-            if (id != INVALID_U8)
+            if (id != 0xFF)
             {
                 if (data->field_0->arr[i].field_1A_0 == 1)
                 {
@@ -1500,7 +1500,7 @@ u8 sub_8013E44(void)
 
     for (id = 0; id < 4; id++)
     {
-        if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != INVALID_U8)
+        if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF)
             ret = 1;
     }
 
@@ -2178,7 +2178,7 @@ void sub_8014F48(u8 taskId)
             break;
         case 0:
             id = ListMenuHandleInputGetItemId(data->listTaskId);
-            if (gMain.newKeys & A_BUTTON && id != INVALID_S32)
+            if (gMain.newKeys & A_BUTTON && id != -1)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 unusedVar;
@@ -2732,7 +2732,7 @@ void sub_80156E0(u8 taskId)
         break;
     case 6:
         var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244);
-        if (var5 != INVALID_S32)
+        if (var5 != -1)
         {
             if (gReceivedRemoteLinkPlayers == 0)
             {
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
index 47d9eaf70..e175ecc64 100644
--- a/src/rom_8034C54.c
+++ b/src/rom_8034C54.c
@@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
     u32 r5 = arg0->field_14;
     gUnknown_03000DD4 = arg0->firstOamId;
     gUnknown_03000DD8 = 0;
-    gUnknown_03000DDC = INVALID_S32;
+    gUnknown_03000DDC = -1;
 
     while (r5 != 0)
     {
@@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
         arg1 -= (r4 * r5);
         r5 /= 10;
 
-        if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0)
+        if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0)
         {
             gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
             gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0;
 
-            if (gUnknown_03000DDC == INVALID_S32)
+            if (gUnknown_03000DDC == -1)
                 gUnknown_03000DDC = gUnknown_03000DD8;
         }
         else
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 395ced06e..f617321af 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -461,7 +461,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] =
 static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge =
 {
     .tileTag = ROTATING_GATE_TILE_TAG,
-    .paletteTag = INVALID_U16,
+    .paletteTag = 0xFFFF,
     .oam = &sOamData_RotatingGateLarge,
     .anims = sSpriteAnimTable_RotatingGateLarge,
     .images = NULL,
@@ -472,7 +472,7 @@ static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge =
 static const struct SpriteTemplate sSpriteTemplate_RotatingGateRegular =
 {
     .tileTag = ROTATING_GATE_TILE_TAG,
-    .paletteTag = INVALID_U16,
+    .paletteTag = 0xFFFF,
     .oam = &sOamData_RotatingGateRegular,
     .anims = sSpriteAnimTable_RotatingGateRegular,
     .images = NULL,
diff --git a/src/rtc.c b/src/rtc.c
index 7553d7629..3f413d0e3 100644
--- a/src/rtc.c
+++ b/src/rtc.c
@@ -46,12 +46,12 @@ void RtcRestoreInterrupts(void)
 u32 ConvertBcdToBinary(u8 bcd)
 {
     if (bcd > 0x9F)
-        return INVALID_U8;
+        return 0xFF;
 
     if ((bcd & 0xF) <= 9)
         return (10 * ((bcd >> 4) & 0xF)) + (bcd & 0xF);
     else
-        return INVALID_U8;
+        return 0xFF;
 }
 
 bool8 IsLeapYear(u32 year)
@@ -166,17 +166,17 @@ u16 RtcCheckInfo(struct SiiRtcInfo *rtc)
 
     year = ConvertBcdToBinary(rtc->year);
 
-    if (year == INVALID_U8)
+    if (year == 0xFF)
         errorFlags |= RTC_ERR_INVALID_YEAR;
 
     month = ConvertBcdToBinary(rtc->month);
 
-    if (month == INVALID_U8 || month == 0 || month > 12)
+    if (month == 0xFF || month == 0 || month > 12)
         errorFlags |= RTC_ERR_INVALID_MONTH;
 
     value = ConvertBcdToBinary(rtc->day);
 
-    if (value == INVALID_U8)
+    if (value == 0xFF)
         errorFlags |= RTC_ERR_INVALID_DAY;
 
     if (month == MONTH_FEB)
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 69914b565..accf94981 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -185,7 +185,7 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void)
 {
     GetPokeblockFeederInFront();
 
-    if (gSpecialVar_Result == INVALID_U16)
+    if (gSpecialVar_Result == 0xFFFF)
         return NULL;
     else
         return &sPokeblockFeeders[gSpecialVar_Result].pokeblock;
@@ -195,7 +195,7 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void)
 {
     GetPokeblockFeederWithinRange();
 
-    if (gSpecialVar_Result == INVALID_U16)
+    if (gSpecialVar_Result == 0xFFFF)
         return NULL;
     else
         return &sPokeblockFeeders[gSpecialVar_Result].pokeblock;
@@ -245,7 +245,7 @@ bool8 GetInFrontFeederPokeblockAndSteps(void)
 {
     GetPokeblockFeederInFront();
 
-    if (gSpecialVar_Result == INVALID_U16)
+    if (gSpecialVar_Result == 0xFFFF)
     {
         return FALSE;
     }
diff --git a/src/save.c b/src/save.c
index de103864b..4ae516fc9 100644
--- a/src/save.c
+++ b/src/save.c
@@ -160,7 +160,7 @@ static u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location
 
         if (gDamagedSaveSectors != 0) // skip the damaged sector.
         {
-            retVal = INVALID_U8;
+            retVal = 0xFF;
             gLastWrittenSector = gLastKnownGoodSector;
             gSaveCounter = gLastSaveCounter;
         }
@@ -220,7 +220,7 @@ static u8 TryWriteSector(u8 sector, u8 *data)
     if (ProgramFlashSectorAndVerify(sector, data) != 0) // is damaged?
     {
         SetDamagedSectorBits(ENABLE, sector); // set damaged sector bits.
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -263,14 +263,14 @@ static u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location)
         gUnknown_03006208++;
         if (gDamagedSaveSectors)
         {
-            retVal = INVALID_U8;
+            retVal = 0xFF;
             gLastWrittenSector = gLastKnownGoodSector;
             gSaveCounter = gLastSaveCounter;
         }
     }
     else
     {
-        retVal = INVALID_U8;
+        retVal = 0xFF;
     }
 
     return retVal;
@@ -284,7 +284,7 @@ static u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location)
 
     if (gDamagedSaveSectors)
     {
-        retVal = INVALID_U8;
+        retVal = 0xFF;
         gLastWrittenSector = gLastKnownGoodSector;
         gSaveCounter = gLastSaveCounter;
     }
@@ -329,15 +329,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location)
     {
         if (ProgramFlashByte(sector, i, ((u8 *)gFastSaveSection)[i]))
         {
-            status = INVALID_U8;
+            status = 0xFF;
             break;
         }
     }
 
-    if (status == INVALID_U8)
+    if (status == 0xFF)
     {
         SetDamagedSectorBits(ENABLE, sector);
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -347,15 +347,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location)
         {
             if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i]))
             {
-                status = INVALID_U8;
+                status = 0xFF;
                 break;
             }
         }
 
-        if (status == INVALID_U8)
+        if (status == 0xFF)
         {
             SetDamagedSectorBits(ENABLE, sector);
-            return INVALID_U8;
+            return 0xFF;
         }
         else
         {
@@ -379,7 +379,7 @@ static u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location)
         SetDamagedSectorBits(ENABLE, sector);
         gLastWrittenSector = gLastKnownGoodSector;
         gSaveCounter = gLastSaveCounter;
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -402,7 +402,7 @@ static u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location)
         SetDamagedSectorBits(ENABLE, sector);
         gLastWrittenSector = gLastKnownGoodSector;
         gSaveCounter = gLastSaveCounter;
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -425,7 +425,7 @@ static u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location)
         SetDamagedSectorBits(ENABLE, sector);
         gLastWrittenSector = gLastKnownGoodSector;
         gSaveCounter = gLastSaveCounter;
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -440,7 +440,7 @@ static u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location)
     gFastSaveSection = &gSaveDataBuffer;
     if (a1 != 0xFFFF)
     {
-        retVal = INVALID_U8;
+        retVal = 0xFF;
     }
     else
     {
@@ -715,8 +715,8 @@ u8 TrySavingData(u8 saveType)
 {
     if (gFlashMemoryPresent != TRUE)
     {
-        gUnknown_03006294 = INVALID_U8;
-        return INVALID_U8;
+        gUnknown_03006294 = 0xFF;
+        return 0xFF;
     }
 
     HandleSavingData(saveType);
@@ -728,8 +728,8 @@ u8 TrySavingData(u8 saveType)
     else
     {
         DoSaveFailedScreen(saveType);
-        gUnknown_03006294 = INVALID_U8;
-        return INVALID_U8;
+        gUnknown_03006294 = 0xFF;
+        return 0xFF;
     }
 }
 
@@ -748,7 +748,7 @@ bool8 sub_81533AC(void) // trade.s save
     u8 retVal = sub_81529D4(SECTOR_SAVE_SLOT_LENGTH, gRamSaveSectionLocations);
     if (gDamagedSaveSectors)
         DoSaveFailedScreen(0);
-    if (retVal == INVALID_U8)
+    if (retVal == 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -808,7 +808,7 @@ u8 Save_LoadGameData(u8 a1)
     if (gFlashMemoryPresent != TRUE)
     {
         gSaveFileStatus = 4;
-        return INVALID_U8;
+        return 0xFF;
     }
 
     UpdateSaveAddresses();
@@ -861,10 +861,10 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst)
     u8* savData;
 
     if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE)
-        return INVALID_U8;
+        return 0xFF;
     ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection));
     if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D)
-        return INVALID_U8;
+        return 0xFF;
     // copies whole save section except u32 counter
     i = 0;
     size = 0xFFB;
@@ -882,7 +882,7 @@ u32 sub_8153634(u8 sector, u8* src)
     void* savDataBuffer;
 
     if (sector != 30 && sector != 31)
-        return INVALID_U8;
+        return 0xFF;
 
     savDataBuffer = &gSaveDataBuffer;
     *(u32*)(savDataBuffer) = 0xB39D;
@@ -894,7 +894,7 @@ u32 sub_8153634(u8 sector, u8* src)
     for (; i <= size; i++)
         savData[i] = src[i];
     if (ProgramFlashSectorAndVerify(sector, savDataBuffer) != 0)
-        return INVALID_U8;
+        return 0xFF;
     return 1;
 }
 
diff --git a/src/save_location.c b/src/save_location.c
index f7d3aa60b..d49afa736 100644
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -12,7 +12,7 @@ static bool32 IsCurMapInLocationList(const u16 *list)
     s32 i;
     u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum);
 
-    for (i = 0; list[i] != INVALID_U16; i++)
+    for (i = 0; list[i] != 0xFFFF; i++)
     {
         if (list[i] == locSum)
             return TRUE;
@@ -61,7 +61,7 @@ static const u16 sSaveLocationPokeCenterList[] =
     MAP_TRADE_CENTER,
     MAP_RECORD_CORNER,
     MAP_DOUBLE_BATTLE_COLOSSEUM,
-    INVALID_U16,
+    0xFFFF,
 };
 
 static bool32 IsCurMapPokeCenter(void)
@@ -72,7 +72,7 @@ static bool32 IsCurMapPokeCenter(void)
 static const u16 sSaveLocationReloadLocList[] = // There's only 1 location, and it's presumed its for the save reload feature for battle tower.
 {
     MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY,
-    INVALID_U16,
+    0xFFFF,
 };
 
 static bool32 IsCurMapReloadLocation(void)
@@ -83,7 +83,7 @@ static bool32 IsCurMapReloadLocation(void)
 // Nulled out list. Unknown what this would have been.
 static const u16 sUnknown_0861440E[] =
 {
-    INVALID_U16,
+    0xFFFF,
 };
 
 static bool32 sub_81AFCEC(void)
diff --git a/src/scanline_effect.c b/src/scanline_effect.c
index 2e264ee29..a9ae9427b 100644
--- a/src/scanline_effect.c
+++ b/src/scanline_effect.c
@@ -22,10 +22,10 @@ void ScanlineEffect_Stop(void)
 {
     gScanlineEffect.state = 0;
     DmaStop(0);
-    if (gScanlineEffect.waveTaskId != INVALID_U8)
+    if (gScanlineEffect.waveTaskId != 0xFF)
     {
         DestroyTask(gScanlineEffect.waveTaskId);
-        gScanlineEffect.waveTaskId = INVALID_U8;
+        gScanlineEffect.waveTaskId = 0xFF;
     }
 }
 
@@ -40,7 +40,7 @@ void ScanlineEffect_Clear(void)
     gScanlineEffect.state = 0;
     gScanlineEffect.unused16 = 0;
     gScanlineEffect.unused17 = 0;
-    gScanlineEffect.waveTaskId = INVALID_U8;
+    gScanlineEffect.waveTaskId = 0xFF;
 }
 
 void ScanlineEffect_SetParams(struct ScanlineEffectParams params)
@@ -132,7 +132,7 @@ static void TaskFunc_UpdateWavePerFrame(u8 taskId)
     if (sShouldStopWaveTask)
     {
         DestroyTask(taskId);
-        gScanlineEffect.waveTaskId = INVALID_U8;
+        gScanlineEffect.waveTaskId = 0xFF;
     }
     else
     {
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 4217f7237..f486b93a6 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -790,7 +790,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx)
     u16 y;
 
     PlayerGetDestCoords(&x, &y);
-    if (mapGroup == INVALID_U8 && mapNum == INVALID_U8)
+    if (mapGroup == 0xFF && mapNum == 0xFF)
         SetFixedHoleWarpAsDestination(x - 7, y - 7);
     else
         Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7);
@@ -1491,7 +1491,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
     if (width > 0x1C)
         width = 0x1C;
 
-    for (i = 0, height = 4; gStringVar4[i] != INVALID_U8;)
+    for (i = 0, height = 4; gStringVar4[i] != 0xFF;)
     {
         if (gStringVar4[i++] == 0xFE)
             height += 3;
@@ -2238,8 +2238,8 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-	sub_808D074(GetPlayerFacingDirection());
-	sub_80B0244();
+    sub_808D074(GetPlayerFacingDirection());
+    sub_80B0244();
     ResetInitialPlayerAvatarState();
     return TRUE;
 }
@@ -2292,7 +2292,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
     Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y);
-	sub_80AF79C();
+    sub_80AF79C();
     ResetInitialPlayerAvatarState();
     return TRUE;
 }
diff --git a/src/script.c b/src/script.c
index 4e133a188..c61ae7183 100644
--- a/src/script.c
+++ b/src/script.c
@@ -391,11 +391,11 @@ bool32 sub_80991F8(void)
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
     if (scriptData->magic != RAM_SCRIPT_MAGIC)
         return FALSE;
-    if (scriptData->mapGroup != INVALID_U8)
+    if (scriptData->mapGroup != 0xFF)
         return FALSE;
-    if (scriptData->mapNum != INVALID_U8)
+    if (scriptData->mapNum != 0xFF)
         return FALSE;
-    if (scriptData->objectId != INVALID_U8)
+    if (scriptData->objectId != 0xFF)
         return FALSE;
     if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum)
         return FALSE;
@@ -409,11 +409,11 @@ u8 *sub_8099244(void)
         return NULL;
     if (scriptData->magic != RAM_SCRIPT_MAGIC)
         return NULL;
-    if (scriptData->mapGroup != INVALID_U8)
+    if (scriptData->mapGroup != 0xFF)
         return NULL;
-    if (scriptData->mapNum != INVALID_U8)
+    if (scriptData->mapNum != 0xFF)
         return NULL;
-    if (scriptData->objectId != INVALID_U8)
+    if (scriptData->objectId != 0xFF)
         return NULL;
     if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum)
     {
diff --git a/src/script_menu.c b/src/script_menu.c
index fcb2d17a2..2aa546288 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1040,7 +1040,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
     }
     else
     {
-        gSpecialVar_Result = INVALID_U8;
+        gSpecialVar_Result = 0xFF;
         DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, 0);
         return TRUE;
     }
@@ -1054,7 +1054,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8
     }
     else
     {
-        gSpecialVar_Result = INVALID_U8;
+        gSpecialVar_Result = 0xFF;
         DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, defaultChoice);
         return TRUE;
     }
@@ -1201,7 +1201,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top)
     }
     else
     {
-        gSpecialVar_Result = INVALID_U8;
+        gSpecialVar_Result = 0xFF;
         DisplayYesNoMenu();
         taskId = CreateTask(Task_HandleYesNoInput, 0x50);
         return TRUE;
@@ -1211,7 +1211,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top)
 // unused
 bool8 IsScriptActive(void)
 {
-    if (gSpecialVar_Result == INVALID_U8)
+    if (gSpecialVar_Result == 0xFF)
         return FALSE;
     else
         return TRUE;
@@ -1261,7 +1261,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr
         int i;
         u8 newWidth;
 
-        gSpecialVar_Result = INVALID_U8;
+        gSpecialVar_Result = 0xFF;
         width = 0;
 
         for (i = 0; i < gMultichoiceLists[multichoiceId].count; i++)
@@ -1320,7 +1320,7 @@ bool8 ScrSpecial_CreatePCMenu(void)
     }
     else
     {
-        gSpecialVar_Result = INVALID_U8;
+        gSpecialVar_Result = 0xFF;
         CreatePCMenu();
         return TRUE;
     }
@@ -1389,7 +1389,7 @@ bool8 sub_80E2548(void)
     }
     else
     {
-        gSpecialVar_Result = INVALID_U8;
+        gSpecialVar_Result = 0xFF;
         sub_80E2578();
         return TRUE;
     }
@@ -1407,7 +1407,7 @@ static void sub_80E2578(void)
 
     for (i = 0; i < ARRAY_COUNT(gUnknown_03001124); i++)
     {
-        gUnknown_03001124[i] |= INVALID_U8;
+        gUnknown_03001124[i] |= 0xFF;
     }
 
     GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH);
@@ -1508,7 +1508,7 @@ static void sub_80E2578(void)
         for (j = 0; j < ARRAY_COUNT(gUnknown_0858BB80); j++)
         {
             u8 test = gUnknown_03001124[j];
-            if (test != INVALID_U8)
+            if (test != 0xFF)
             {
                 pixelWidth = display_text_and_get_width(gUnknown_0858BB80[test], pixelWidth);
             }
@@ -1520,7 +1520,7 @@ static void sub_80E2578(void)
 
         for (temp = 0, i = 0; i < ARRAY_COUNT(gUnknown_0858BB80); i++)
         {
-            if (gUnknown_03001124[i] != INVALID_U8)
+            if (gUnknown_03001124[i] != 0xFF)
             {
                 AddTextPrinterParameterized(windowId, 1, gUnknown_0858BB80[gUnknown_03001124[i]], 8, temp * 16 + 1, TEXT_SPEED_FF, NULL);
                 temp++;
@@ -1575,7 +1575,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y)
     u8 taskId;
     u8 spriteId;
 
-    if (FindTaskIdByFunc(Task_PokemonPicWindow) != INVALID_U8)
+    if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF)
     {
         return FALSE;
     }
@@ -1599,7 +1599,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void)
 {
     u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow);
 
-    if (taskId == INVALID_U8)
+    if (taskId == 0xFF)
         return NULL;
     gTasks[taskId].tState++;
     return IsPicboxClosed;
@@ -1607,7 +1607,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void)
 
 static bool8 IsPicboxClosed(void)
 {
-    if (FindTaskIdByFunc(Task_PokemonPicWindow) == INVALID_U8)
+    if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -1672,7 +1672,7 @@ bool16 sp106_CreateStartMenu(void)
         return FALSE;
     }
 
-    gSpecialVar_Result = INVALID_U8;
+    gSpecialVar_Result = 0xFF;
     CreateStartMenu();
     return TRUE;
 }
diff --git a/src/script_movement.c b/src/script_movement.c
index 54e6f9995..9fee9e060 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -50,7 +50,7 @@ void sub_80D338C(void)
     u8 taskId;
 
     taskId = sub_80D33F4();
-    if (taskId != INVALID_U8)
+    if (taskId != 0xFF)
     {
         UnfreezeObjects(taskId);
         DestroyTask(taskId);
@@ -65,7 +65,7 @@ static void sub_80D33AC(u8 priority)
 
     taskId = CreateTask(sub_80D3660, priority);
     for (i = 1; i < 16; i++)
-        gTasks[taskId].data[i] = INVALID_U16;
+        gTasks[taskId].data[i] = 0xFFFF;
 }
 
 static u8 sub_80D33F4(void)
@@ -188,7 +188,7 @@ static void UnfreezeObjects(u8 taskId)
     pEventObjId = (u8 *)&gTasks[taskId].data[1];
     for (i = 0; i < 16; i++, pEventObjId++)
     {
-        if (*pEventObjId != INVALID_U8)
+        if (*pEventObjId != 0xFF)
             UnfreezeEventObject(&gEventObjects[*pEventObjId]);
     }
 }
@@ -201,7 +201,7 @@ static void sub_80D3660(u8 taskId)
     for (i = 0; i < 16; i++)
     {
         sub_80D3508(taskId, i, &var);
-        if (var != INVALID_U8)
+        if (var != 0xFF)
             sub_80A2490(taskId, i, var, sub_80D35CC(i));
     }
 }
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c
index 77c1a88e0..7fc61f953 100755
--- a/src/script_pokemon_util_80F87D8.c
+++ b/src/script_pokemon_util_80F87D8.c
@@ -318,7 +318,7 @@ void ShowContestEntryMonPic(void)
     u8 taskId;
     u8 left, top;
 
-    if (FindTaskIdByFunc(sub_80F8EE8) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF)
     {
         AllocateMonSpritesGfx();
         left = 10;
@@ -361,7 +361,7 @@ void ShowContestEntryMonPic(void)
 void sub_80F8EB8(void)
 {
     u8 taskId = FindTaskIdByFunc(sub_80F8EE8);
-    if (taskId != INVALID_U8)
+    if (taskId != 0xFF)
     {
         gTasks[taskId].data[0]++;
         FreeMonSpritesGfx();
diff --git a/src/secret_base.c b/src/secret_base.c
index 78e6bd7d0..4bf1709d2 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId)
             return i;
         }
     }
-    return INVALID_S16;
+    return -1;
 }
 
 u8 sub_80EA9D8(void)
@@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language)
     secretBaseRecordId = sub_80EA990(base->secretBaseId);
     if (secretBaseRecordId != 0)
     {
-        if (secretBaseRecordId != INVALID_S16)
+        if (secretBaseRecordId != -1)
         {
             if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1)
             {
@@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
                 gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0;
             }
         }
-        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16)
+        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF)
         {
             gSaveBlock1Ptr->secretBases[0].sbr_field_e ++;
         }
diff --git a/src/shop.c b/src/shop.c
index c0359bda0..b08d94545 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -446,9 +446,9 @@ static void CB2_InitBuyMenu(void)
         ResetTasks();
         clear_scheduled_bg_copies_to_vram();
         gShopDataPtr = AllocZeroed(sizeof(struct ShopData));
-        gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8;
-        gShopDataPtr->itemSpriteIds[0] = INVALID_U8;
-        gShopDataPtr->itemSpriteIds[1] = INVALID_U8;
+        gShopDataPtr->scrollIndicatorsTaskId = 0xFF;
+        gShopDataPtr->itemSpriteIds[0] = 0xFF;
+        gShopDataPtr->itemSpriteIds[1] = 0xFF;
         BuyMenuBuildListMenuTemplate();
         BuyMenuInitBgs();
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
@@ -580,7 +580,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
 
 static void BuyMenuAddScrollIndicatorArrows(void)
 {
-    if (gShopDataPtr->scrollIndicatorsTaskId == INVALID_U8 && gMartInfo.itemCount + 1 > 8)
+    if (gShopDataPtr->scrollIndicatorsTaskId == 0xFF && gMartInfo.itemCount + 1 > 8)
     {
         gShopDataPtr->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(
             SCROLL_ARROW_UP,
@@ -596,10 +596,10 @@ static void BuyMenuAddScrollIndicatorArrows(void)
 
 static void BuyMenuRemoveScrollIndicatorArrows(void)
 {
-    if (gShopDataPtr->scrollIndicatorsTaskId != INVALID_U8)
+    if (gShopDataPtr->scrollIndicatorsTaskId != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gShopDataPtr->scrollIndicatorsTaskId);
-        gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8;
+        gShopDataPtr->scrollIndicatorsTaskId = 0xFF;
     }
 }
 
@@ -613,10 +613,10 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
 {
     u8 spriteId;
     u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot];
-    if (*spriteIdPtr != INVALID_U8)
+    if (*spriteIdPtr != 0xFF)
         return;
 
-    if (gMartInfo.martType == MART_TYPE_0 || item == INVALID_U16)
+    if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF)
     {
         spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item);
         if (spriteId != MAX_SPRITES)
@@ -637,13 +637,13 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
 static void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot)
 {
     u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot];
-    if (*spriteIdPtr == INVALID_U8)
+    if (*spriteIdPtr == 0xFF)
         return;
 
     FreeSpriteTilesByTag(iconSlot + 2110);
     FreeSpritePaletteByTag(iconSlot + 2110);
     DestroySprite(&gSprites[*spriteIdPtr]);
-    *spriteIdPtr = INVALID_U8;
+    *spriteIdPtr = 0xFF;
 }
 
 static void BuyMenuInitBgs(void)
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 97fe0b146..0871506cd 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -1637,7 +1637,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
 
 /*static */bool8 sub_8102A44(void)
 {
-    if (FindTaskIdByFunc(sub_8102A64) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_8102A64) == 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -2672,7 +2672,7 @@ s16 sub_8102D5C(s16 a0)
 
 /*static */bool8 sub_810432C(void)
 {
-    if (FindTaskIdByFunc(sub_810434C) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_810434C) == 0xFF)
         return TRUE;
     return FALSE;
 }
@@ -3007,7 +3007,7 @@ s16 sub_8102D5C(s16 a0)
 
 /*static */bool8 sub_8104AEC(void)
 {
-    if (FindTaskIdByFunc(sub_8104B0C) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_8104B0C) == 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -3108,7 +3108,7 @@ s16 sub_8102D5C(s16 a0)
     task = gTasks + sSlotMachine->unk3D;
     task->data[1] = arg0;
 
-    for (i = 0; gUnknown_083ED048[arg0][i].unk00 != INVALID_U8; i++)
+    for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++)
     {
         u8 spriteId;
         spriteId = sub_8105BB4(
@@ -3138,7 +3138,7 @@ s16 sub_8102D5C(s16 a0)
 {
     u8 i;
     struct Task *task = gTasks + sSlotMachine->unk3D;
-    if ((u16)task->data[1] != INVALID_U16)
+    if ((u16)task->data[1] != 0xFFFF)
         gUnknown_083ED064[task->data[1]]();
     for (i = 4; i < 16; i++)
     {
@@ -4201,74 +4201,74 @@ extern const u16 gSlotMachineMenu_Pal[];
 /*static */void SlotMachineSetup_8_0(void)
 {
     gUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AAF4[0].data = gUnknown_0203AAD4;
-	gUnknown_0203AAF4[0].size = 0x600;
-
-	gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600;
-	gUnknown_0203AAF8[0].size = 0x200;
-
-	gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800;
-	gUnknown_0203AAFC[0].size = 0x200;
-
-	gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00;
-	gUnknown_0203AB00[0].size = 0x200;
-
-	gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00;
-	gUnknown_0203AB04[0].size = 0x300;
-
-	gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000;
-	gUnknown_0203AB08[0].size = 0x400;
-
-	gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400;
-	gUnknown_0203AB0C[0].size = 0x200;
-
-	gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600;
-	gUnknown_0203AB10[0].size = 0x300;
-
-	gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900;
-	gUnknown_0203AB14[0].size = 0x300;
-
-	gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
-	gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00;
-	gUnknown_0203AB18[0].size = 0x200;
-	gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00;
-	gUnknown_0203AB18[1].size = 0x200;
-
-	gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
-	gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000;
-	gUnknown_0203AB1C[0].size = 640;
-
-	gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5);
-	gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280;
-	gUnknown_0203AB20[0].size = 0x80;
-	gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300;
-	gUnknown_0203AB20[1].size = 0x80;
-	gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380;
-	gUnknown_0203AB20[2].size = 0x80;
-	gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400;
-	gUnknown_0203AB20[3].size = 0x80;
-	gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480;
-	gUnknown_0203AB20[4].size = 0x80;
-
-	gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
-	gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600;
-	gUnknown_0203AB24[0].size = 0x480;
-	gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880;
-	gUnknown_0203AB24[1].size = 0x480;
-
-	gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
-	gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00;
-	gUnknown_0203AB28[0].size = 0x180;
-	gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080;
-	gUnknown_0203AB28[1].size = 0x180;
+    gUnknown_0203AAF4[0].data = gUnknown_0203AAD4;
+    gUnknown_0203AAF4[0].size = 0x600;
+
+    gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600;
+    gUnknown_0203AAF8[0].size = 0x200;
+
+    gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800;
+    gUnknown_0203AAFC[0].size = 0x200;
+
+    gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00;
+    gUnknown_0203AB00[0].size = 0x200;
+
+    gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00;
+    gUnknown_0203AB04[0].size = 0x300;
+
+    gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000;
+    gUnknown_0203AB08[0].size = 0x400;
+
+    gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400;
+    gUnknown_0203AB0C[0].size = 0x200;
+
+    gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600;
+    gUnknown_0203AB10[0].size = 0x300;
+
+    gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900;
+    gUnknown_0203AB14[0].size = 0x300;
+
+    gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
+    gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00;
+    gUnknown_0203AB18[0].size = 0x200;
+    gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00;
+    gUnknown_0203AB18[1].size = 0x200;
+
+    gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1);
+    gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000;
+    gUnknown_0203AB1C[0].size = 640;
+
+    gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5);
+    gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280;
+    gUnknown_0203AB20[0].size = 0x80;
+    gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300;
+    gUnknown_0203AB20[1].size = 0x80;
+    gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380;
+    gUnknown_0203AB20[2].size = 0x80;
+    gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400;
+    gUnknown_0203AB20[3].size = 0x80;
+    gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480;
+    gUnknown_0203AB20[4].size = 0x80;
+
+    gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
+    gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600;
+    gUnknown_0203AB24[0].size = 0x480;
+    gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880;
+    gUnknown_0203AB24[1].size = 0x480;
+
+    gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2);
+    gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00;
+    gUnknown_0203AB28[0].size = 0x180;
+    gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080;
+    gUnknown_0203AB28[1].size = 0x180;
 }
 
 const u8 sReelSymbols[][21] =
diff --git a/src/smokescreen.c b/src/smokescreen.c
index 1119e9e90..9b37cd234 100644
--- a/src/smokescreen.c
+++ b/src/smokescreen.c
@@ -12,7 +12,7 @@ u8 sub_807521C(s16 x, s16 y, u8 a3)
     u8 spriteId1, spriteId2, spriteId3, spriteId4;
     struct Sprite *mainSprite;
 
-    if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == INVALID_U16)
+    if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == 0xFFFF)
     {
         LoadCompressedObjectPicUsingHeap(&gUnknown_0831C620);
         LoadCompressedObjectPaletteUsingHeap(&gUnknown_0831C628);
diff --git a/src/sound.c b/src/sound.c
index 7798700c3..ba3f659cc 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -247,7 +247,7 @@ void FadeInNewBGM(u16 songNum, u8 speed)
 {
     if (gDisableMusic)
         songNum = 0;
-    if (songNum == INVALID_U16)
+    if (songNum == 0xFFFF)
         songNum = 0;
     m4aSongNumStart(songNum);
     m4aMPlayImmInit(&gMPlayInfo_BGM);
@@ -544,7 +544,7 @@ void PlayBGM(u16 songNum)
 {
     if (gDisableMusic)
         songNum = 0;
-    if (songNum == INVALID_U16)
+    if (songNum == 0xFFFF)
         songNum = 0;
     m4aSongNumStart(songNum);
 }
diff --git a/src/sprite.c b/src/sprite.c
index 3f0223dee..4087dd8c4 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -108,7 +108,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
     0                         \
 }
 
-#define ANIM_END        INVALID_U16
+#define ANIM_END        0xFFFF
 #define AFFINE_ANIM_END 0x7FFF
 
 // forward declarations
@@ -204,7 +204,7 @@ const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffin
 const struct SpriteTemplate gDummySpriteTemplate =
 {
     .tileTag = 0,
-    .paletteTag = INVALID_U16,
+    .paletteTag = 0xFFFF,
     .oam = &gDummyOamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -572,12 +572,12 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y,
 
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
 
-    if (template->tileTag == INVALID_U16)
+    if (template->tileTag == 0xFFFF)
     {
         s16 tileNum;
         sprite->images = template->images;
         tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP));
-        if (tileNum == INVALID_S16)
+        if (tileNum == -1)
         {
             ResetSprite(sprite);
             return MAX_SPRITES;
@@ -595,7 +595,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y,
     if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)
         InitSpriteAffineAnim(sprite);
 
-    if (template->paletteTag != INVALID_U16)
+    if (template->paletteTag != 0xFFFF)
         sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag);
 
     return index;
@@ -740,7 +740,7 @@ s16 AllocSpriteTiles(u16 tileCount)
             i++;
 
             if (i == TOTAL_OBJ_TILE_COUNT)
-                return INVALID_S16;
+                return -1;
         }
 
         start = i;
@@ -751,7 +751,7 @@ s16 AllocSpriteTiles(u16 tileCount)
             i++;
 
             if (i == TOTAL_OBJ_TILE_COUNT)
-                return INVALID_S16;
+                return -1;
 
             if (!SPRITE_TILE_IS_ALLOCATED(i))
                 numTilesFound++;
@@ -877,7 +877,7 @@ void ResetAllSprites(void)
 
 void FreeSpriteTiles(struct Sprite *sprite)
 {
-    if (sprite->template->tileTag != INVALID_U16)
+    if (sprite->template->tileTag != 0xFFFF)
         FreeSpriteTilesByTag(sprite->template->tileTag);
 }
 
@@ -923,7 +923,7 @@ void BeginAnim(struct Sprite *sprite)
     sprite->animLoopCounter = 0;
     imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue;
 
-    if (imageValue != INVALID_S16)
+    if (imageValue != -1)
     {
         sprite->animBeginning = FALSE;
         duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration;
@@ -1441,7 +1441,7 @@ u8 AllocOamMatrix(void)
         bit <<= 1;
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 void FreeOamMatrix(u8 matrixNum)
@@ -1462,7 +1462,7 @@ void FreeOamMatrix(u8 matrixNum)
 void InitSpriteAffineAnim(struct Sprite *sprite)
 {
     u8 matrixNum = AllocOamMatrix();
-    if (matrixNum != INVALID_U8)
+    if (matrixNum != 0xFF)
     {
         CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
         sprite->oam.matrixNum = matrixNum;
@@ -1508,7 +1508,7 @@ void LoadSpriteSheets(const struct SpriteSheet *sheets)
 void FreeSpriteTilesByTag(u16 tag)
 {
     u8 index = IndexOfSpriteTileTag(tag);
-    if (index != INVALID_U8)
+    if (index != 0xFF)
     {
         u16 i;
         u16 *rangeStarts;
@@ -1523,7 +1523,7 @@ void FreeSpriteTilesByTag(u16 tag)
         for (i = start; i < start + count; i++)
             FREE_SPRITE_TILE(i);
 
-        sSpriteTileRangeTags[index] = INVALID_U16;
+        sSpriteTileRangeTags[index] = 0xFFFF;
     }
 }
 
@@ -1533,7 +1533,7 @@ void FreeSpriteTileRanges(void)
 
     for (i = 0; i < MAX_SPRITES; i++)
     {
-        sSpriteTileRangeTags[i] = INVALID_U16;
+        sSpriteTileRangeTags[i] = 0xFFFF;
         SET_SPRITE_TILE_RANGE(i, 0, 0);
     }
 }
@@ -1541,8 +1541,8 @@ void FreeSpriteTileRanges(void)
 u16 GetSpriteTileStartByTag(u16 tag)
 {
     u8 index = IndexOfSpriteTileTag(tag);
-    if (index == INVALID_U8)
-        return INVALID_U16;
+    if (index == 0xFF)
+        return 0xFFFF;
     return sSpriteTileRanges[index * 2];
 }
 
@@ -1554,7 +1554,7 @@ u8 IndexOfSpriteTileTag(u16 tag)
         if (sSpriteTileRangeTags[i] == tag)
             return i;
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u16 GetSpriteTileTagByTileStart(u16 start)
@@ -1563,16 +1563,16 @@ u16 GetSpriteTileTagByTileStart(u16 start)
 
     for (i = 0; i < MAX_SPRITES; i++)
     {
-        if (sSpriteTileRangeTags[i] != INVALID_U16 && sSpriteTileRanges[i * 2] == start)
+        if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start)
             return sSpriteTileRangeTags[i];
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 void AllocSpriteTileRange(u16 tag, u16 start, u16 count)
 {
-    u8 freeIndex = IndexOfSpriteTileTag(INVALID_U16);
+    u8 freeIndex = IndexOfSpriteTileTag(0xFFFF);
     sSpriteTileRangeTags[freeIndex] = tag;
     SET_SPRITE_TILE_RANGE(freeIndex, start, count);
 }
@@ -1582,21 +1582,21 @@ void FreeAllSpritePalettes(void)
     u8 i;
     gReservedSpritePaletteCount = 0;
     for (i = 0; i < 16; i++)
-        sSpritePaletteTags[i] = INVALID_U16;
+        sSpritePaletteTags[i] = 0xFFFF;
 }
 
 u8 LoadSpritePalette(const struct SpritePalette *palette)
 {
     u8 index = IndexOfSpritePaletteTag(palette->tag);
 
-    if (index != INVALID_U8)
+    if (index != 0xFF)
         return index;
 
-    index = IndexOfSpritePaletteTag(INVALID_U16);
+    index = IndexOfSpritePaletteTag(0xFFFF);
 
-    if (index == INVALID_U8)
+    if (index == 0xFF)
     {
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -1610,7 +1610,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes)
 {
     u8 i;
     for (i = 0; palettes[i].data != NULL; i++)
-        if (LoadSpritePalette(&palettes[i]) == INVALID_U8)
+        if (LoadSpritePalette(&palettes[i]) == 0xFF)
             break;
 }
 
@@ -1621,10 +1621,10 @@ void DoLoadSpritePalette(const u16 *src, u16 paletteOffset)
 
 u8 AllocSpritePalette(u16 tag)
 {
-    u8 index = IndexOfSpritePaletteTag(INVALID_U16);
-    if (index == INVALID_U8)
+    u8 index = IndexOfSpritePaletteTag(0xFFFF);
+    if (index == 0xFF)
     {
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {
@@ -1640,7 +1640,7 @@ u8 IndexOfSpritePaletteTag(u16 tag)
         if (sSpritePaletteTags[i] == tag)
             return i;
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum)
@@ -1651,8 +1651,8 @@ u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum)
 void FreeSpritePaletteByTag(u16 tag)
 {
     u8 index = IndexOfSpritePaletteTag(tag);
-    if (index != INVALID_U8)
-        sSpritePaletteTags[index] = INVALID_U16;
+    if (index != 0xFF)
+        sSpritePaletteTags[index] = 0xFFFF;
 }
 
 void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables)
diff --git a/src/strings.c b/src/strings.c
index 5dcf97e2b..dd674d348 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -255,25 +255,25 @@ const u8 gText_ThePC[] = _("the PC");
 const u8 *const gReturnToXStringsTable[] = 
 {
     gText_TheField,
-	gText_TheBattle,
-	gText_ThePokemonList,
-	gText_TheShop,
-	gText_TheField,
-	gText_TheField,
-	gText_ThePC,
-	gText_TheField,
-	gText_TheField,
-	gText_TheField,
-	gText_TheBattle,
-	gText_ThePC
+    gText_TheBattle,
+    gText_ThePokemonList,
+    gText_TheShop,
+    gText_TheField,
+    gText_TheField,
+    gText_ThePC,
+    gText_TheField,
+    gText_TheField,
+    gText_TheField,
+    gText_TheBattle,
+    gText_ThePC
 };
 
 const u8 *const gReturnToXStringsTable2[] = 
 {
     gText_TheField,
-	gText_TheBattle,
-	gText_ThePokemonList,
-	gText_TheField
+    gText_TheBattle,
+    gText_ThePokemonList,
+    gText_TheField
 };
 
 const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}.");
@@ -286,10 +286,10 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS");
 const u8 *const gPocketNamesStringsTable[] = 
 {
     gText_ItemsPocket,
-	gText_PokeBallsPocket,
-	gText_TMHMPocket,
-	gText_BerriesPocket,
-	gText_KeyItemsPocket
+    gText_PokeBallsPocket,
+    gText_TMHMPocket,
+    gText_BerriesPocket,
+    gText_KeyItemsPocket
 };
 
 const u8 gText_UnkF908Var1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}");
diff --git a/src/task.c b/src/task.c
index 2a77b8a9b..14b97a361 100644
--- a/src/task.c
+++ b/src/task.c
@@ -19,7 +19,7 @@ void ResetTasks(void)
         gTasks[i].func = TaskDummy;
         gTasks[i].prev = i;
         gTasks[i].next = i + 1;
-        gTasks[i].priority = INVALID_S8;
+        gTasks[i].priority = -1;
         memset(gTasks[i].data, 0, sizeof(gTasks[i].data));
     }
 
@@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func)
         if (gTasks[i].isActive == TRUE && gTasks[i].func == func)
             return (u8)i;
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u8 GetTaskCount(void)
diff --git a/src/text.c b/src/text.c
index 44895722d..07c15596e 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1877,7 +1877,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
     if (func == NULL)
         return 0;
 
-    if (letterSpacing == INVALID_S16)
+    if (letterSpacing == -1)
         localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING);
     else
         localLetterSpacing = letterSpacing;
@@ -1953,7 +1953,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
                 func = GetFontWidthFunc(*++str);
                 if (func == NULL)
                     return 0;
-                if (letterSpacing == INVALID_S16)
+                if (letterSpacing == -1)
                     localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING);
                 break;
             case 0x11:
diff --git a/src/title_screen.c b/src/title_screen.c
index 70a1a3449..d60e3fc0b 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -66,14 +66,14 @@ static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clo
 
 const u16 gUnknown_0853FF70[] =
 {
-	0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710,
-	0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10,
-	0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008,
-	0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000,
-	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+    0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710,
+    0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10,
+    0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008,
+    0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000,
+    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
 };
 
 static const struct OamData sVersionBannerLeftOamData =
diff --git a/src/trader.c b/src/trader.c
index afb0cca48..e23efb4ce 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -155,7 +155,7 @@ void ScrSpecial_IsDecorationFull(void)
 {
     gSpecialVar_Result = FALSE;
     if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
-        && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == INVALID_S8)
+        && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1)
     {
         sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category);
         gSpecialVar_Result = TRUE;
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index fd97623fe..f5354a1e8 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
 {
     if (!isTrainer)
     {
-        if (paletteTag == INVALID_U16)
+        if (paletteTag == 0xFFFF)
         {
-            sCreatingSpriteTemplate.paletteTag |= INVALID_U16;
+            sCreatingSpriteTemplate.paletteTag |= 0xFFFF;
             LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
     }
     else
     {
-        if (paletteTag == INVALID_U16)
+        if (paletteTag == 0xFFFF)
         {
-            sCreatingSpriteTemplate.paletteTag |= INVALID_U16;
+            sCreatingSpriteTemplate.paletteTag |= 0xFFFF;
             LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     }
     if (i == PICS_COUNT)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     framePics = Alloc(4 * 0x800);
     if (!framePics)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     images = Alloc(4 * sizeof(struct SpriteFrameImage));
     if (!images)
     {
         Free(framePics);
-        return INVALID_U16;
+        return 0xFFFF;
     }
     if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys))
     {
         // debug trap?
-        return INVALID_U16;
+        return 0xFFFF;
     }
     for (j = 0; j < 4; j ++)
     {
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = INVALID_U16;
+    sCreatingSpriteTemplate.tileTag = 0xFFFF;
     sCreatingSpriteTemplate.oam = &gUnknown_0860B064;
     AssignSpriteAnimsTable(isTrainer);
     sCreatingSpriteTemplate.images = images;
@@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == INVALID_U16)
+    if (paletteTag == 0xFFFF)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     }
     if (i == PICS_COUNT)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     framePics = Alloc(4 * 0x800);
     if (!framePics)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     if (flags & 0x80)
     {
@@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     if (!images)
     {
         Free(framePics);
-        return INVALID_U16;
+        return 0xFFFF;
     }
     if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE))
     {
         // debug trap?
-        return INVALID_U16;
+        return 0xFFFF;
     }
     for (j = 0; j < 4; j ++)
     {
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = INVALID_U16;
+    sCreatingSpriteTemplate.tileTag = 0xFFFF;
     sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species];
     sCreatingSpriteTemplate.images = images;
     if (flags2 == 0x01)
@@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == INVALID_U16)
+    if (paletteTag == 0xFFFF)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId)
     }
     if (i == PICS_COUNT)
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     framePics = sSpritePics[i].frames;
     images = sSpritePics[i].images;
-    if (sSpritePics[i].paletteTag != INVALID_U16)
+    if (sSpritePics[i].paletteTag != 0xFFFF)
     {
         FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
     }
@@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic,
 {
     if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE))
     {
-        return INVALID_U16;
+        return 0xFFFF;
     }
     LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer);
     return 0;
@@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic,
         Free(framePics);
         return 0;
     }
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys)
diff --git a/src/trainer_see.c b/src/trainer_see.c
index d3d450de4..17781bf4e 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -75,17 +75,17 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train
 static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
 {
     sub_80B4178,
-	sub_80B417C,
-	sub_80B41C0,
-	sub_80B4200,
-	sub_80B425C,
-	sub_80B4318,
-	sub_80B435C,
-	sub_80B4390,
-	sub_80B43AC,
-	sub_80B43E0,
-	sub_80B4438,
-	sub_80B44AC
+    sub_80B417C,
+    sub_80B41C0,
+    sub_80B4200,
+    sub_80B425C,
+    sub_80B4318,
+    sub_80B435C,
+    sub_80B4390,
+    sub_80B43AC,
+    sub_80B43E0,
+    sub_80B4438,
+    sub_80B44AC
 };
 
 static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
diff --git a/src/tv.c b/src/tv.c
index 0c5c3f564..f77e93cb7 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -799,7 +799,7 @@ u8 special_0x44(void)
             j --;
         }
     } while (j != selIdx);
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u8 FindAnyTVShowOnTheAir(void)
@@ -807,9 +807,9 @@ u8 FindAnyTVShowOnTheAir(void)
     u8 response;
 
     response = special_0x44();
-    if (response == INVALID_U8)
+    if (response == 0xFF)
     {
-        return INVALID_U8;
+        return 0xFF;
     }
     if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK)
     {
@@ -833,7 +833,7 @@ void UpdateTVScreensOnMap(int width, int height)
             {
                 SetTVMetatilesOnMap(width, height, 0x3);
             }
-            else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != INVALID_U8 || FindAnyTVNewsOnTheAir() != INVALID_U8 || IsTVShowInSearchOfTrainersAiring()))
+            else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xFF || FindAnyTVNewsOnTheAir() != 0xFF || IsTVShowInSearchOfTrainersAiring()))
             {
                 FlagClear(FLAG_SYS_TV_WATCH);
                 SetTVMetatilesOnMap(width, height, 0x3);
@@ -887,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void)
             return i;
         }
     }
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u8 special_0x4a(void)
@@ -932,7 +932,7 @@ void GabbyAndTyBeforeInterview(void)
     gSaveBlock1Ptr->gabbyAndTyData.mon1 = gBattleResults.playerMon1Species;
     gSaveBlock1Ptr->gabbyAndTyData.mon2 = gBattleResults.playerMon2Species;
     gSaveBlock1Ptr->gabbyAndTyData.lastMove = gBattleResults.lastUsedMovePlayer;
-    if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != INVALID_U8)
+    if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != 0xFF)
     {
         gSaveBlock1Ptr->gabbyAndTyData.battleNum ++;
     }
@@ -1007,7 +1007,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void)
 
 bool8 GabbyAndTyGetLastQuote(void)
 {
-    if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == INVALID_U16)
+    if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == 0xFFFF)
     {
         return FALSE;
     }
@@ -1125,7 +1125,7 @@ void PutPokemonTodayCaughtOnAir(void)
         if (!rbernoulli(1, 1) && StringCompare(gSpeciesNames[gBattleResults.caughtMonSpecies], gBattleResults.caughtMonNick))
         {
             sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-            if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE)
+            if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE)
             {
                 for (i = 0; i < 11; i ++)
                 {
@@ -1206,7 +1206,7 @@ void PutPokemonTodayFailedOnTheAir(void)
         if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON))
         {
             sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-            if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE)
+            if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE)
             {
                 show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
                 show->pokemonTodayFailed.kind = TVSHOW_POKEMON_TODAY_FAILED;
@@ -1282,7 +1282,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye
     u8 name[32];
 
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE);
         if (gSpecialVar_Result != 1)
@@ -1329,7 +1329,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus
     u8 name[32];
 
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot == INVALID_S8)
+    if (sCurTVShowSlot == -1)
     {
         return FALSE;
     }
@@ -1396,7 +1396,7 @@ void ContestLiveUpdates_BeforeInterview_1(u8 a0)
 
     DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show = &gSaveBlock1Ptr->tvShows[24];
         show->contestLiveUpdates.round1Rank = a0;
@@ -1410,7 +1410,7 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0)
 
     show = &gSaveBlock1Ptr->tvShows[24];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show->contestLiveUpdates.round2Rank = a0;
     }
@@ -1422,7 +1422,7 @@ void ContestLiveUpdates_BeforeInterview_3(u8 a0)
 
     show = &gSaveBlock1Ptr->tvShows[24];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show->contestLiveUpdates.appealFlags1 = a0;
     }
@@ -1434,7 +1434,7 @@ void ContestLiveUpdates_BeforeInterview_4(u16 a0)
 
     show = &gSaveBlock1Ptr->tvShows[24];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show->contestLiveUpdates.move = a0;
     }
@@ -1446,7 +1446,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1)
 
     show = &gSaveBlock1Ptr->tvShows[24];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show->contestLiveUpdates.winningSpecies = gContestMons[a1].species;
         StringCopy(show->contestLiveUpdates.winningTrainerName, gContestMons[a1].trainerName);
@@ -1507,7 +1507,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0)
     show = &gSaveBlock1Ptr->tvShows[24];
     InterviewBefore_BravoTrainerPkmnProfile();
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24);
         show->bravoTrainer.move = a0;
@@ -1521,7 +1521,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0)
 
     show = &gSaveBlock1Ptr->tvShows[24];
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show->bravoTrainer.contestResult = a0;
         show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory;
@@ -1577,7 +1577,7 @@ void SaveRecordedItemPurchasesForTVShow(void)
      && !rbernoulli(1, 3))
     {
         sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-        if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE)
+        if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE)
         {
             TV_SortPurchasesByQuantity();
             if (gMartPurchaseHistory[0].quantity >= 20)
@@ -1742,7 +1742,7 @@ static void sub_80ED718(void)
         if (!rbernoulli(1, 200))
         {
             sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-            if (sCurTVShowSlot != INVALID_S8)
+            if (sCurTVShowSlot != -1)
             {
                 outbreakIdx = Random() % ARRAY_COUNT(sPokeOutbreakSpeciesList);
                 show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
@@ -1843,7 +1843,7 @@ void sub_80ED950(bool8 flag)
             PutFishingAdviceShowOnTheAir();
         }
         sPokemonAnglerAttemptCounters &= 0xFF;
-        if (sPokemonAnglerAttemptCounters != INVALID_U8)
+        if (sPokemonAnglerAttemptCounters != 0xFF)
         {
             sPokemonAnglerAttemptCounters += 0x01;
         }
@@ -1855,7 +1855,7 @@ void sub_80ED950(bool8 flag)
             PutFishingAdviceShowOnTheAir();
         }
         sPokemonAnglerAttemptCounters &= 0xFF00;
-        if (sPokemonAnglerAttemptCounters >> 8 != INVALID_U8)
+        if (sPokemonAnglerAttemptCounters >> 8 != 0xFF)
         {
             sPokemonAnglerAttemptCounters += 0x0100;
         }
@@ -1867,7 +1867,7 @@ void PutFishingAdviceShowOnTheAir(void)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->pokemonAngler.kind = TVSHOW_FISHING_ADVICE;
@@ -1910,7 +1910,7 @@ void sub_80EDA80(void)
     if (!rbernoulli(1, 1))
     {
         sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-        if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE)
+        if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE)
         {
             show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
             show2->worldOfMasters.kind = TVSHOW_WORLD_OF_MASTERS;
@@ -1936,7 +1936,7 @@ void sub_80EDB44(void)
 
     HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TODAYS_RIVAL_TRAINER, TRUE);
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->rivalTrainer.kind = TVSHOW_TODAYS_RIVAL_TRAINER;
@@ -1984,7 +1984,7 @@ void sub_80EDC60(const u16 *words)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->trendWatcher.kind = TVSHOW_TREND_WATCHER;
@@ -2003,7 +2003,7 @@ void sub_80EDCE8(void)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->treasureInvestigators.kind = TVSHOW_TREASURE_INVESTIGATORS;
@@ -2024,7 +2024,7 @@ void sub_80EDD78(u16 nCoinsPaidOut)
     u16 nCoinsWon;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE)
     {
         flag = FALSE;
         switch (sFindThatGamerWhichGame)
@@ -2207,7 +2207,7 @@ void TV_PutSecretBaseVisitOnTheAir(void)
 
     HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_VISIT, TRUE);
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->secretBaseVisit.kind = TVSHOW_SECRET_BASE_VISIT;
@@ -2227,7 +2227,7 @@ void sub_80EE184(void)
     u16 balls;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->breakingNews.kind = TVSHOW_BREAKING_NEWS;
@@ -2298,7 +2298,7 @@ void sub_80EE2CC(void)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->lottoWinner.kind = TVSHOW_LOTTO_WINNER;
@@ -2318,7 +2318,7 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1
     u8 j;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->battleSeminar.kind = TVSHOW_BATTLE_SEMINAR;
@@ -2347,7 +2347,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->safariFanClub.kind = TVSHOW_SAFARI_FAN_CLUB;
@@ -2365,7 +2365,7 @@ void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->cuties.kind = TVSHOW_CUTIES;
@@ -2440,7 +2440,7 @@ void sub_80EE72C(void)
     TVShow *show;
 
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE)
+    if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB;
@@ -2456,7 +2456,7 @@ void sub_80EE72C(void)
 bool8 sub_80EE7C0(void)
 {
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot == INVALID_S8)
+    if (sCurTVShowSlot == -1)
     {
         return TRUE;
     }
@@ -2493,7 +2493,7 @@ bool8 sub_80EE818(void)
         }
     }
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot == INVALID_S8)
+    if (sCurTVShowSlot == -1)
     {
         return FALSE;
     }
@@ -2557,7 +2557,7 @@ void sub_80EEA70(void)
     if (HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_SECRETS, FALSE) != TRUE)
     {
         sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-        if (sCurTVShowSlot != INVALID_S8)
+        if (sCurTVShowSlot != -1)
         {
             show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
             show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS;
@@ -2608,7 +2608,7 @@ static void sub_80EEBF4(u8 actionIdx)
 
     HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_NUMBER_ONE, TRUE);
     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
-    if (sCurTVShowSlot != INVALID_S8)
+    if (sCurTVShowSlot != -1)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->numberOne.kind = TVSHOW_NUMBER_ONE;
@@ -2665,7 +2665,7 @@ static void sub_80EED88(void)
     if (FlagGet(FLAG_SYS_GAME_CLEAR))
     {
         sCurTVShowSlot = sub_80EEE30(gSaveBlock1Ptr->pokeNews);
-        if (sCurTVShowSlot != INVALID_S8 && rbernoulli(1, 100) != TRUE)
+        if (sCurTVShowSlot != -1 && rbernoulli(1, 100) != TRUE)
         {
             newsKind = (Random() % 4) + POKENEWS_SLATEPORT;
             if (sub_80EF0E4(newsKind) != TRUE)
@@ -2689,7 +2689,7 @@ s8 sub_80EEE30(PokeNews *pokeNews)
             return i;
         }
     }
-    return INVALID_S8;
+    return -1;
 }
 
 void ClearPokemonNews(void)
@@ -2742,7 +2742,7 @@ u8 FindAnyTVNewsOnTheAir(void)
             return i;
         }
     }
-    return INVALID_U8;
+    return 0xFF;
 }
 
 void DoPokeNews(void)
@@ -2751,7 +2751,7 @@ void DoPokeNews(void)
     u16 n;
 
     i = FindAnyTVNewsOnTheAir();
-    if (i == INVALID_U8)
+    if (i == 0xFF)
     {
         gSpecialVar_Result = FALSE;
     }
@@ -3252,7 +3252,7 @@ static void sub_80EFA88(void)
 {
     sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
     gSpecialVar_0x8006 = sCurTVShowSlot;
-    if (sCurTVShowSlot == INVALID_S8)
+    if (sCurTVShowSlot == -1)
     {
         gSpecialVar_Result = TRUE;
     }
@@ -3273,7 +3273,7 @@ s8 FindEmptyTVSlotWithinFirstFiveShowsOfArray(TVShow *shows)
             return i;
         }
     }
-    return INVALID_S8;
+    return -1;
 }
 
 s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows)
@@ -3287,7 +3287,7 @@ s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows)
             return i;
         }
     }
-    return INVALID_S8;
+    return -1;
 }
 
 bool8 TV_BernoulliTrial(u16 ratio)
@@ -3310,7 +3310,7 @@ void TV_FanClubLetter_RandomWordToStringVar3(TVShow *show)
         {
             i = 0;
         }
-        if (show->fanclubLetter.words[i] != INVALID_U16)
+        if (show->fanclubLetter.words[i] != 0xFFFF)
         {
             break;
         }
@@ -3677,7 +3677,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2
                 sRecordMixingPartnersWithoutShowsToShare = i;
             }
             sTVShowMixingCurSlot = sub_80F06D0(argslist[i][0]);
-            if (sTVShowMixingCurSlot == INVALID_S8)
+            if (sTVShowMixingCurSlot == -1)
             {
                 sRecordMixingPartnersWithoutShowsToShare ++;
                 if (sRecordMixingPartnersWithoutShowsToShare == sTVShowMixingNumPlayers)
@@ -3690,7 +3690,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2
                 for (j = 0; j < sTVShowMixingNumPlayers - 1; j ++)
                 {
                     sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(argslist[(i + j + 1) % sTVShowMixingNumPlayers][0]);
-                    if (sCurTVShowSlot != INVALID_S8
+                    if (sCurTVShowSlot != -1
                         && sub_80F049C(&argslist[(i + j + 1) % sTVShowMixingNumPlayers][0], &argslist[i][0], (i + j + 1) % sTVShowMixingNumPlayers) == 1)
                     {
                         break;
@@ -3801,7 +3801,7 @@ static s8 sub_80F06D0(TVShow *tvShows)
             return i;
         }
     }
-    return INVALID_S8;
+    return -1;
 }
 
 #ifdef NONMATCHING
@@ -4486,12 +4486,12 @@ static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews pla
         for (j = 0; j < sTVShowNewsMixingNumPlayers; j ++)
         {
             sTVShowMixingCurSlot = sub_80F0ECC(*argslist[j], i);
-            if (sTVShowMixingCurSlot != INVALID_S8)
+            if (sTVShowMixingCurSlot != -1)
             {
                 for (k = 0; k < sTVShowNewsMixingNumPlayers - 1; k++)
                 {
                     sCurTVShowSlot = sub_80EEE30(*argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers]);
-                    if (sCurTVShowSlot != INVALID_S8)
+                    if (sCurTVShowSlot != -1)
                     {
                         sub_80F0E58(argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers], argslist[j]);
                     }
@@ -4538,7 +4538,7 @@ static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx)
 {
     if (pokeNews[idx].kind == POKENEWS_NONE)
     {
-        return INVALID_S8;
+        return -1;
     }
     return idx;
 }
@@ -7425,7 +7425,7 @@ static void DoTVShowSecretBaseSecrets(void)
                     }
                     break;
                 default:
-                    for (i = 0; i < INVALID_U16; i ++)
+                    for (i = 0; i < 0xFFFF; i ++)
                     {
                         sTVSecretBaseSecretsRandomValues[1] = Random() % bitCount;
                         if (sTVSecretBaseSecretsRandomValues[1] != sTVSecretBaseSecretsRandomValues[0])
@@ -7447,7 +7447,7 @@ static void DoTVShowSecretBaseSecrets(void)
             }
             else
             {
-                for (i = 0; i < INVALID_U16; i ++)
+                for (i = 0; i < 0xFFFF; i ++)
                 {
                     sTVSecretBaseSecretsRandomValues[2] = Random() % bitCount;
                     if (sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[0] && sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[1])
diff --git a/src/walda_phrase.c b/src/walda_phrase.c
index 44da22f31..ff2ee7399 100644
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -176,7 +176,7 @@ static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2)
     s32 i, j;
     u8 var1, var2;
 
-    for (i = arg2 - 1; i != INVALID_S32; i--)
+    for (i = arg2 - 1; i != -1; i--)
     {
         var1 = (array[0] & 0x80) >> 7;
 
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 8fb7d08d6..3a8adaf15 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -43,4554 +43,4554 @@ EWRAM_DATA static u32 sFeebasRngValue = 0;
 // const rom data
 const struct WildPokemon gRoute101_LandMons[] =
 {
-	{2, 2, SPECIES_WURMPLE},
-	{2, 2, SPECIES_POOCHYENA},
-	{2, 2, SPECIES_WURMPLE},
-	{3, 3, SPECIES_WURMPLE},
-	{3, 3, SPECIES_POOCHYENA},
-	{3, 3, SPECIES_POOCHYENA},
-	{3, 3, SPECIES_WURMPLE},
-	{3, 3, SPECIES_POOCHYENA},
-	{2, 2, SPECIES_ZIGZAGOON},
-	{2, 2, SPECIES_ZIGZAGOON},
-	{3, 3, SPECIES_ZIGZAGOON},
-	{3, 3, SPECIES_ZIGZAGOON},
+    {2, 2, SPECIES_WURMPLE},
+    {2, 2, SPECIES_POOCHYENA},
+    {2, 2, SPECIES_WURMPLE},
+    {3, 3, SPECIES_WURMPLE},
+    {3, 3, SPECIES_POOCHYENA},
+    {3, 3, SPECIES_POOCHYENA},
+    {3, 3, SPECIES_WURMPLE},
+    {3, 3, SPECIES_POOCHYENA},
+    {2, 2, SPECIES_ZIGZAGOON},
+    {2, 2, SPECIES_ZIGZAGOON},
+    {3, 3, SPECIES_ZIGZAGOON},
+    {3, 3, SPECIES_ZIGZAGOON},
 };
 
 const struct WildPokemonInfo gRoute101_LandMonsInfo = {20, gRoute101_LandMons};
 
 const struct WildPokemon gRoute102_LandMons[] =
 {
-	{3, 3, SPECIES_POOCHYENA},
-	{3, 3, SPECIES_WURMPLE},
-	{4, 4, SPECIES_POOCHYENA},
-	{4, 4, SPECIES_WURMPLE},
-	{3, 3, SPECIES_LOTAD},
-	{4, 4, SPECIES_LOTAD},
-	{3, 3, SPECIES_ZIGZAGOON},
-	{3, 3, SPECIES_ZIGZAGOON},
-	{4, 4, SPECIES_ZIGZAGOON},
-	{4, 4, SPECIES_RALTS},
-	{4, 4, SPECIES_ZIGZAGOON},
-	{3, 3, SPECIES_SEEDOT},
+    {3, 3, SPECIES_POOCHYENA},
+    {3, 3, SPECIES_WURMPLE},
+    {4, 4, SPECIES_POOCHYENA},
+    {4, 4, SPECIES_WURMPLE},
+    {3, 3, SPECIES_LOTAD},
+    {4, 4, SPECIES_LOTAD},
+    {3, 3, SPECIES_ZIGZAGOON},
+    {3, 3, SPECIES_ZIGZAGOON},
+    {4, 4, SPECIES_ZIGZAGOON},
+    {4, 4, SPECIES_RALTS},
+    {4, 4, SPECIES_ZIGZAGOON},
+    {3, 3, SPECIES_SEEDOT},
 };
 
 const struct WildPokemonInfo gRoute102_LandMonsInfo = {20, gRoute102_LandMons};
 
 const struct WildPokemon gRoute102_WaterMons[] =
 {
-	{20, 30, SPECIES_MARILL},
-	{10, 20, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
-	{20, 30, SPECIES_GOLDEEN},
+    {20, 30, SPECIES_MARILL},
+    {10, 20, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
+    {20, 30, SPECIES_GOLDEEN},
 };
 
 const struct WildPokemonInfo gRoute102_WaterMonsInfo = {4, gRoute102_WaterMons};
 
 const struct WildPokemon gRoute102_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_CORPHISH},
-	{25, 30, SPECIES_CORPHISH},
-	{30, 35, SPECIES_CORPHISH},
-	{20, 25, SPECIES_CORPHISH},
-	{35, 40, SPECIES_CORPHISH},
-	{40, 45, SPECIES_CORPHISH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_CORPHISH},
+    {25, 30, SPECIES_CORPHISH},
+    {30, 35, SPECIES_CORPHISH},
+    {20, 25, SPECIES_CORPHISH},
+    {35, 40, SPECIES_CORPHISH},
+    {40, 45, SPECIES_CORPHISH},
 };
 
 const struct WildPokemonInfo gRoute102_FishingMonsInfo = {30, gRoute102_FishingMons};
 
 const struct WildPokemon gRoute103_LandMons[] =
 {
-	{2, 2, SPECIES_POOCHYENA},
-	{3, 3, SPECIES_POOCHYENA},
-	{3, 3, SPECIES_POOCHYENA},
-	{4, 4, SPECIES_POOCHYENA},
-	{2, 2, SPECIES_WINGULL},
-	{3, 3, SPECIES_ZIGZAGOON},
-	{3, 3, SPECIES_ZIGZAGOON},
-	{4, 4, SPECIES_ZIGZAGOON},
-	{3, 3, SPECIES_WINGULL},
-	{3, 3, SPECIES_WINGULL},
-	{2, 2, SPECIES_WINGULL},
-	{4, 4, SPECIES_WINGULL},
+    {2, 2, SPECIES_POOCHYENA},
+    {3, 3, SPECIES_POOCHYENA},
+    {3, 3, SPECIES_POOCHYENA},
+    {4, 4, SPECIES_POOCHYENA},
+    {2, 2, SPECIES_WINGULL},
+    {3, 3, SPECIES_ZIGZAGOON},
+    {3, 3, SPECIES_ZIGZAGOON},
+    {4, 4, SPECIES_ZIGZAGOON},
+    {3, 3, SPECIES_WINGULL},
+    {3, 3, SPECIES_WINGULL},
+    {2, 2, SPECIES_WINGULL},
+    {4, 4, SPECIES_WINGULL},
 };
 
 const struct WildPokemonInfo gRoute103_LandMonsInfo = {20, gRoute103_LandMons};
 
 const struct WildPokemon gRoute103_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute103_WaterMonsInfo = {4, gRoute103_WaterMons};
 
 const struct WildPokemon gRoute103_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute103_FishingMonsInfo = {30, gRoute103_FishingMons};
 
 const struct WildPokemon gRoute104_LandMons[] =
 {
-	{4, 4, SPECIES_POOCHYENA},
-	{4, 4, SPECIES_WURMPLE},
-	{5, 5, SPECIES_POOCHYENA},
-	{5, 5, SPECIES_MARILL},
-	{4, 4, SPECIES_MARILL},
-	{5, 5, SPECIES_POOCHYENA},
-	{4, 4, SPECIES_TAILLOW},
-	{5, 5, SPECIES_TAILLOW},
-	{4, 4, SPECIES_WINGULL},
-	{4, 4, SPECIES_WINGULL},
-	{3, 3, SPECIES_WINGULL},
-	{5, 5, SPECIES_WINGULL},
+    {4, 4, SPECIES_POOCHYENA},
+    {4, 4, SPECIES_WURMPLE},
+    {5, 5, SPECIES_POOCHYENA},
+    {5, 5, SPECIES_MARILL},
+    {4, 4, SPECIES_MARILL},
+    {5, 5, SPECIES_POOCHYENA},
+    {4, 4, SPECIES_TAILLOW},
+    {5, 5, SPECIES_TAILLOW},
+    {4, 4, SPECIES_WINGULL},
+    {4, 4, SPECIES_WINGULL},
+    {3, 3, SPECIES_WINGULL},
+    {5, 5, SPECIES_WINGULL},
 };
 
 const struct WildPokemonInfo gRoute104_LandMonsInfo = {20, gRoute104_LandMons};
 
 const struct WildPokemon gRoute104_WaterMons[] =
 {
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute104_WaterMonsInfo = {4, gRoute104_WaterMons};
 
 const struct WildPokemon gRoute104_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_MAGIKARP},
-	{25, 30, SPECIES_MAGIKARP},
-	{30, 35, SPECIES_MAGIKARP},
-	{20, 25, SPECIES_MAGIKARP},
-	{35, 40, SPECIES_MAGIKARP},
-	{40, 45, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_MAGIKARP},
+    {25, 30, SPECIES_MAGIKARP},
+    {30, 35, SPECIES_MAGIKARP},
+    {20, 25, SPECIES_MAGIKARP},
+    {35, 40, SPECIES_MAGIKARP},
+    {40, 45, SPECIES_MAGIKARP},
 };
 
 const struct WildPokemonInfo gRoute104_FishingMonsInfo = {30, gRoute104_FishingMons};
 
 const struct WildPokemon gRoute105_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute105_WaterMonsInfo = {4, gRoute105_WaterMons};
 
 const struct WildPokemon gRoute105_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute105_FishingMonsInfo = {30, gRoute105_FishingMons};
 
 const struct WildPokemon gRoute110_LandMons[] =
 {
-	{12, 12, SPECIES_POOCHYENA},
-	{12, 12, SPECIES_ELECTRIKE},
-	{12, 12, SPECIES_GULPIN},
-	{13, 13, SPECIES_ELECTRIKE},
-	{13, 13, SPECIES_MINUN},
-	{13, 13, SPECIES_ODDISH},
-	{13, 13, SPECIES_MINUN},
-	{13, 13, SPECIES_GULPIN},
-	{12, 12, SPECIES_WINGULL},
-	{12, 12, SPECIES_WINGULL},
-	{12, 12, SPECIES_PLUSLE},
-	{13, 13, SPECIES_PLUSLE},
+    {12, 12, SPECIES_POOCHYENA},
+    {12, 12, SPECIES_ELECTRIKE},
+    {12, 12, SPECIES_GULPIN},
+    {13, 13, SPECIES_ELECTRIKE},
+    {13, 13, SPECIES_MINUN},
+    {13, 13, SPECIES_ODDISH},
+    {13, 13, SPECIES_MINUN},
+    {13, 13, SPECIES_GULPIN},
+    {12, 12, SPECIES_WINGULL},
+    {12, 12, SPECIES_WINGULL},
+    {12, 12, SPECIES_PLUSLE},
+    {13, 13, SPECIES_PLUSLE},
 };
 
 const struct WildPokemonInfo gRoute110_LandMonsInfo = {20, gRoute110_LandMons};
 
 const struct WildPokemon gRoute110_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute110_WaterMonsInfo = {4, gRoute110_WaterMons};
 
 const struct WildPokemon gRoute110_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute110_FishingMonsInfo = {30, gRoute110_FishingMons};
 
 const struct WildPokemon gRoute111_LandMons[] =
 {
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{21, 21, SPECIES_SANDSHREW},
-	{21, 21, SPECIES_TRAPINCH},
-	{19, 19, SPECIES_BALTOY},
-	{21, 21, SPECIES_BALTOY},
-	{19, 19, SPECIES_SANDSHREW},
-	{19, 19, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_BALTOY},
-	{20, 20, SPECIES_CACNEA},
-	{22, 22, SPECIES_CACNEA},
-	{22, 22, SPECIES_CACNEA},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {21, 21, SPECIES_SANDSHREW},
+    {21, 21, SPECIES_TRAPINCH},
+    {19, 19, SPECIES_BALTOY},
+    {21, 21, SPECIES_BALTOY},
+    {19, 19, SPECIES_SANDSHREW},
+    {19, 19, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_BALTOY},
+    {20, 20, SPECIES_CACNEA},
+    {22, 22, SPECIES_CACNEA},
+    {22, 22, SPECIES_CACNEA},
 };
 
 const struct WildPokemonInfo gRoute111_LandMonsInfo = {10, gRoute111_LandMons};
 
 const struct WildPokemon gRoute111_WaterMons[] =
 {
-	{20, 30, SPECIES_MARILL},
-	{10, 20, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
-	{20, 30, SPECIES_GOLDEEN},
+    {20, 30, SPECIES_MARILL},
+    {10, 20, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
+    {20, 30, SPECIES_GOLDEEN},
 };
 
 const struct WildPokemonInfo gRoute111_WaterMonsInfo = {4, gRoute111_WaterMons};
 
 const struct WildPokemon gRoute111_RockSmashMons[] =
 {
-	{10, 15, SPECIES_GEODUDE},
-	{5, 10, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
+    {10, 15, SPECIES_GEODUDE},
+    {5, 10, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
 };
 
 const struct WildPokemonInfo gRoute111_RockSmashMonsInfo = {20, gRoute111_RockSmashMons};
 
 const struct WildPokemon gRoute111_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{20, 25, SPECIES_BARBOACH},
-	{35, 40, SPECIES_BARBOACH},
-	{40, 45, SPECIES_BARBOACH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {20, 25, SPECIES_BARBOACH},
+    {35, 40, SPECIES_BARBOACH},
+    {40, 45, SPECIES_BARBOACH},
 };
 
 const struct WildPokemonInfo gRoute111_FishingMonsInfo = {30, gRoute111_FishingMons};
 
 const struct WildPokemon gRoute112_LandMons[] =
 {
-	{15, 15, SPECIES_NUMEL},
-	{15, 15, SPECIES_NUMEL},
-	{15, 15, SPECIES_MARILL},
-	{14, 14, SPECIES_NUMEL},
-	{14, 14, SPECIES_NUMEL},
-	{14, 14, SPECIES_MARILL},
-	{16, 16, SPECIES_NUMEL},
-	{16, 16, SPECIES_MARILL},
-	{16, 16, SPECIES_NUMEL},
-	{16, 16, SPECIES_NUMEL},
-	{16, 16, SPECIES_NUMEL},
-	{16, 16, SPECIES_NUMEL},
+    {15, 15, SPECIES_NUMEL},
+    {15, 15, SPECIES_NUMEL},
+    {15, 15, SPECIES_MARILL},
+    {14, 14, SPECIES_NUMEL},
+    {14, 14, SPECIES_NUMEL},
+    {14, 14, SPECIES_MARILL},
+    {16, 16, SPECIES_NUMEL},
+    {16, 16, SPECIES_MARILL},
+    {16, 16, SPECIES_NUMEL},
+    {16, 16, SPECIES_NUMEL},
+    {16, 16, SPECIES_NUMEL},
+    {16, 16, SPECIES_NUMEL},
 };
 
 const struct WildPokemonInfo gRoute112_LandMonsInfo = {20, gRoute112_LandMons};
 
 const struct WildPokemon gRoute113_LandMons[] =
 {
-	{15, 15, SPECIES_SPINDA},
-	{15, 15, SPECIES_SPINDA},
-	{15, 15, SPECIES_SLUGMA},
-	{14, 14, SPECIES_SPINDA},
-	{14, 14, SPECIES_SPINDA},
-	{14, 14, SPECIES_SLUGMA},
-	{16, 16, SPECIES_SPINDA},
-	{16, 16, SPECIES_SLUGMA},
-	{16, 16, SPECIES_SPINDA},
-	{16, 16, SPECIES_SKARMORY},
-	{16, 16, SPECIES_SPINDA},
-	{16, 16, SPECIES_SKARMORY},
+    {15, 15, SPECIES_SPINDA},
+    {15, 15, SPECIES_SPINDA},
+    {15, 15, SPECIES_SLUGMA},
+    {14, 14, SPECIES_SPINDA},
+    {14, 14, SPECIES_SPINDA},
+    {14, 14, SPECIES_SLUGMA},
+    {16, 16, SPECIES_SPINDA},
+    {16, 16, SPECIES_SLUGMA},
+    {16, 16, SPECIES_SPINDA},
+    {16, 16, SPECIES_SKARMORY},
+    {16, 16, SPECIES_SPINDA},
+    {16, 16, SPECIES_SKARMORY},
 };
 
 const struct WildPokemonInfo gRoute113_LandMonsInfo = {20, gRoute113_LandMons};
 
 const struct WildPokemon gRoute114_LandMons[] =
 {
-	{16, 16, SPECIES_SWABLU},
-	{16, 16, SPECIES_LOTAD},
-	{17, 17, SPECIES_SWABLU},
-	{15, 15, SPECIES_SWABLU},
-	{15, 15, SPECIES_LOTAD},
-	{16, 16, SPECIES_LOMBRE},
-	{16, 16, SPECIES_LOMBRE},
-	{18, 18, SPECIES_LOMBRE},
-	{17, 17, SPECIES_SEVIPER},
-	{15, 15, SPECIES_SEVIPER},
-	{17, 17, SPECIES_SEVIPER},
-	{15, 15, SPECIES_NUZLEAF},
+    {16, 16, SPECIES_SWABLU},
+    {16, 16, SPECIES_LOTAD},
+    {17, 17, SPECIES_SWABLU},
+    {15, 15, SPECIES_SWABLU},
+    {15, 15, SPECIES_LOTAD},
+    {16, 16, SPECIES_LOMBRE},
+    {16, 16, SPECIES_LOMBRE},
+    {18, 18, SPECIES_LOMBRE},
+    {17, 17, SPECIES_SEVIPER},
+    {15, 15, SPECIES_SEVIPER},
+    {17, 17, SPECIES_SEVIPER},
+    {15, 15, SPECIES_NUZLEAF},
 };
 
 const struct WildPokemonInfo gRoute114_LandMonsInfo = {20, gRoute114_LandMons};
 
 const struct WildPokemon gRoute114_WaterMons[] =
 {
-	{20, 30, SPECIES_MARILL},
-	{10, 20, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
-	{20, 30, SPECIES_GOLDEEN},
+    {20, 30, SPECIES_MARILL},
+    {10, 20, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
+    {20, 30, SPECIES_GOLDEEN},
 };
 
 const struct WildPokemonInfo gRoute114_WaterMonsInfo = {4, gRoute114_WaterMons};
 
 const struct WildPokemon gRoute114_RockSmashMons[] =
 {
-	{10, 15, SPECIES_GEODUDE},
-	{5, 10, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
+    {10, 15, SPECIES_GEODUDE},
+    {5, 10, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
 };
 
 const struct WildPokemonInfo gRoute114_RockSmashMonsInfo = {20, gRoute114_RockSmashMons};
 
 const struct WildPokemon gRoute114_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{20, 25, SPECIES_BARBOACH},
-	{35, 40, SPECIES_BARBOACH},
-	{40, 45, SPECIES_BARBOACH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {20, 25, SPECIES_BARBOACH},
+    {35, 40, SPECIES_BARBOACH},
+    {40, 45, SPECIES_BARBOACH},
 };
 
 const struct WildPokemonInfo gRoute114_FishingMonsInfo = {30, gRoute114_FishingMons};
 
 const struct WildPokemon gRoute116_LandMons[] =
 {
-	{6, 6, SPECIES_POOCHYENA},
-	{6, 6, SPECIES_WHISMUR},
-	{6, 6, SPECIES_NINCADA},
-	{7, 7, SPECIES_ABRA},
-	{7, 7, SPECIES_NINCADA},
-	{6, 6, SPECIES_TAILLOW},
-	{7, 7, SPECIES_TAILLOW},
-	{8, 8, SPECIES_TAILLOW},
-	{7, 7, SPECIES_POOCHYENA},
-	{8, 8, SPECIES_POOCHYENA},
-	{7, 7, SPECIES_SKITTY},
-	{8, 8, SPECIES_SKITTY},
+    {6, 6, SPECIES_POOCHYENA},
+    {6, 6, SPECIES_WHISMUR},
+    {6, 6, SPECIES_NINCADA},
+    {7, 7, SPECIES_ABRA},
+    {7, 7, SPECIES_NINCADA},
+    {6, 6, SPECIES_TAILLOW},
+    {7, 7, SPECIES_TAILLOW},
+    {8, 8, SPECIES_TAILLOW},
+    {7, 7, SPECIES_POOCHYENA},
+    {8, 8, SPECIES_POOCHYENA},
+    {7, 7, SPECIES_SKITTY},
+    {8, 8, SPECIES_SKITTY},
 };
 
 const struct WildPokemonInfo gRoute116_LandMonsInfo = {20, gRoute116_LandMons};
 
 const struct WildPokemon gRoute117_LandMons[] =
 {
-	{13, 13, SPECIES_POOCHYENA},
-	{13, 13, SPECIES_ODDISH},
-	{14, 14, SPECIES_POOCHYENA},
-	{14, 14, SPECIES_ODDISH},
-	{13, 13, SPECIES_MARILL},
-	{13, 13, SPECIES_ODDISH},
-	{13, 13, SPECIES_ILLUMISE},
-	{13, 13, SPECIES_ILLUMISE},
-	{14, 14, SPECIES_ILLUMISE},
-	{14, 14, SPECIES_ILLUMISE},
-	{13, 13, SPECIES_VOLBEAT},
-	{13, 13, SPECIES_SEEDOT},
+    {13, 13, SPECIES_POOCHYENA},
+    {13, 13, SPECIES_ODDISH},
+    {14, 14, SPECIES_POOCHYENA},
+    {14, 14, SPECIES_ODDISH},
+    {13, 13, SPECIES_MARILL},
+    {13, 13, SPECIES_ODDISH},
+    {13, 13, SPECIES_ILLUMISE},
+    {13, 13, SPECIES_ILLUMISE},
+    {14, 14, SPECIES_ILLUMISE},
+    {14, 14, SPECIES_ILLUMISE},
+    {13, 13, SPECIES_VOLBEAT},
+    {13, 13, SPECIES_SEEDOT},
 };
 
 const struct WildPokemonInfo gRoute117_LandMonsInfo = {20, gRoute117_LandMons};
 
 const struct WildPokemon gRoute117_WaterMons[] =
 {
-	{20, 30, SPECIES_MARILL},
-	{10, 20, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
-	{20, 30, SPECIES_GOLDEEN},
+    {20, 30, SPECIES_MARILL},
+    {10, 20, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
+    {20, 30, SPECIES_GOLDEEN},
 };
 
 const struct WildPokemonInfo gRoute117_WaterMonsInfo = {4, gRoute117_WaterMons};
 
 const struct WildPokemon gRoute117_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_CORPHISH},
-	{25, 30, SPECIES_CORPHISH},
-	{30, 35, SPECIES_CORPHISH},
-	{20, 25, SPECIES_CORPHISH},
-	{35, 40, SPECIES_CORPHISH},
-	{40, 45, SPECIES_CORPHISH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_CORPHISH},
+    {25, 30, SPECIES_CORPHISH},
+    {30, 35, SPECIES_CORPHISH},
+    {20, 25, SPECIES_CORPHISH},
+    {35, 40, SPECIES_CORPHISH},
+    {40, 45, SPECIES_CORPHISH},
 };
 
 const struct WildPokemonInfo gRoute117_FishingMonsInfo = {30, gRoute117_FishingMons};
 
 const struct WildPokemon gRoute118_LandMons[] =
 {
-	{24, 24, SPECIES_ZIGZAGOON},
-	{24, 24, SPECIES_ELECTRIKE},
-	{26, 26, SPECIES_ZIGZAGOON},
-	{26, 26, SPECIES_ELECTRIKE},
-	{26, 26, SPECIES_LINOONE},
-	{26, 26, SPECIES_MANECTRIC},
-	{25, 25, SPECIES_WINGULL},
-	{25, 25, SPECIES_WINGULL},
-	{26, 26, SPECIES_WINGULL},
-	{26, 26, SPECIES_WINGULL},
-	{27, 27, SPECIES_WINGULL},
-	{25, 25, SPECIES_KECLEON},
+    {24, 24, SPECIES_ZIGZAGOON},
+    {24, 24, SPECIES_ELECTRIKE},
+    {26, 26, SPECIES_ZIGZAGOON},
+    {26, 26, SPECIES_ELECTRIKE},
+    {26, 26, SPECIES_LINOONE},
+    {26, 26, SPECIES_MANECTRIC},
+    {25, 25, SPECIES_WINGULL},
+    {25, 25, SPECIES_WINGULL},
+    {26, 26, SPECIES_WINGULL},
+    {26, 26, SPECIES_WINGULL},
+    {27, 27, SPECIES_WINGULL},
+    {25, 25, SPECIES_KECLEON},
 };
 
 const struct WildPokemonInfo gRoute118_LandMonsInfo = {20, gRoute118_LandMons};
 
 const struct WildPokemon gRoute118_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute118_WaterMonsInfo = {4, gRoute118_WaterMons};
 
 const struct WildPokemon gRoute118_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_CARVANHA},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_CARVANHA},
-	{20, 25, SPECIES_CARVANHA},
-	{35, 40, SPECIES_CARVANHA},
-	{40, 45, SPECIES_CARVANHA},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_CARVANHA},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_CARVANHA},
+    {20, 25, SPECIES_CARVANHA},
+    {35, 40, SPECIES_CARVANHA},
+    {40, 45, SPECIES_CARVANHA},
 };
 
 const struct WildPokemonInfo gRoute118_FishingMonsInfo = {30, gRoute118_FishingMons};
 
 const struct WildPokemon gRoute124_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute124_WaterMonsInfo = {4, gRoute124_WaterMons};
 
 const struct WildPokemon gRoute124_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute124_FishingMonsInfo = {30, gRoute124_FishingMons};
 
 const struct WildPokemon gPetalburgWoods_LandMons[] =
 {
-	{5, 5, SPECIES_POOCHYENA},
-	{5, 5, SPECIES_WURMPLE},
-	{5, 5, SPECIES_SHROOMISH},
-	{6, 6, SPECIES_POOCHYENA},
-	{5, 5, SPECIES_SILCOON},
-	{5, 5, SPECIES_CASCOON},
-	{6, 6, SPECIES_WURMPLE},
-	{6, 6, SPECIES_SHROOMISH},
-	{5, 5, SPECIES_TAILLOW},
-	{5, 5, SPECIES_SLAKOTH},
-	{6, 6, SPECIES_TAILLOW},
-	{6, 6, SPECIES_SLAKOTH},
+    {5, 5, SPECIES_POOCHYENA},
+    {5, 5, SPECIES_WURMPLE},
+    {5, 5, SPECIES_SHROOMISH},
+    {6, 6, SPECIES_POOCHYENA},
+    {5, 5, SPECIES_SILCOON},
+    {5, 5, SPECIES_CASCOON},
+    {6, 6, SPECIES_WURMPLE},
+    {6, 6, SPECIES_SHROOMISH},
+    {5, 5, SPECIES_TAILLOW},
+    {5, 5, SPECIES_SLAKOTH},
+    {6, 6, SPECIES_TAILLOW},
+    {6, 6, SPECIES_SLAKOTH},
 };
 
 const struct WildPokemonInfo gPetalburgWoods_LandMonsInfo = {20, gPetalburgWoods_LandMons};
 
 const struct WildPokemon gRusturfTunnel_LandMons[] =
 {
-	{6, 6, SPECIES_WHISMUR},
-	{7, 7, SPECIES_WHISMUR},
-	{6, 6, SPECIES_WHISMUR},
-	{6, 6, SPECIES_WHISMUR},
-	{7, 7, SPECIES_WHISMUR},
-	{7, 7, SPECIES_WHISMUR},
-	{5, 5, SPECIES_WHISMUR},
-	{8, 8, SPECIES_WHISMUR},
-	{5, 5, SPECIES_WHISMUR},
-	{8, 8, SPECIES_WHISMUR},
-	{5, 5, SPECIES_WHISMUR},
-	{8, 8, SPECIES_WHISMUR},
+    {6, 6, SPECIES_WHISMUR},
+    {7, 7, SPECIES_WHISMUR},
+    {6, 6, SPECIES_WHISMUR},
+    {6, 6, SPECIES_WHISMUR},
+    {7, 7, SPECIES_WHISMUR},
+    {7, 7, SPECIES_WHISMUR},
+    {5, 5, SPECIES_WHISMUR},
+    {8, 8, SPECIES_WHISMUR},
+    {5, 5, SPECIES_WHISMUR},
+    {8, 8, SPECIES_WHISMUR},
+    {5, 5, SPECIES_WHISMUR},
+    {8, 8, SPECIES_WHISMUR},
 };
 
 const struct WildPokemonInfo gRusturfTunnel_LandMonsInfo = {10, gRusturfTunnel_LandMons};
 
 const struct WildPokemon gGraniteCave_1F_LandMons[] =
 {
-	{7, 7, SPECIES_ZUBAT},
-	{8, 8, SPECIES_MAKUHITA},
-	{7, 7, SPECIES_MAKUHITA},
-	{8, 8, SPECIES_ZUBAT},
-	{9, 9, SPECIES_MAKUHITA},
-	{8, 8, SPECIES_ABRA},
-	{10, 10, SPECIES_MAKUHITA},
-	{6, 6, SPECIES_MAKUHITA},
-	{7, 7, SPECIES_GEODUDE},
-	{8, 8, SPECIES_GEODUDE},
-	{6, 6, SPECIES_GEODUDE},
-	{9, 9, SPECIES_GEODUDE},
+    {7, 7, SPECIES_ZUBAT},
+    {8, 8, SPECIES_MAKUHITA},
+    {7, 7, SPECIES_MAKUHITA},
+    {8, 8, SPECIES_ZUBAT},
+    {9, 9, SPECIES_MAKUHITA},
+    {8, 8, SPECIES_ABRA},
+    {10, 10, SPECIES_MAKUHITA},
+    {6, 6, SPECIES_MAKUHITA},
+    {7, 7, SPECIES_GEODUDE},
+    {8, 8, SPECIES_GEODUDE},
+    {6, 6, SPECIES_GEODUDE},
+    {9, 9, SPECIES_GEODUDE},
 };
 
 const struct WildPokemonInfo gGraniteCave_1F_LandMonsInfo = {10, gGraniteCave_1F_LandMons};
 
 const struct WildPokemon gGraniteCave_B1F_LandMons[] =
 {
-	{9, 9, SPECIES_ZUBAT},
-	{10, 10, SPECIES_ARON},
-	{9, 9, SPECIES_ARON},
-	{11, 11, SPECIES_ARON},
-	{10, 10, SPECIES_ZUBAT},
-	{9, 9, SPECIES_ABRA},
-	{10, 10, SPECIES_MAKUHITA},
-	{11, 11, SPECIES_MAKUHITA},
-	{10, 10, SPECIES_SABLEYE},
-	{10, 10, SPECIES_SABLEYE},
-	{9, 9, SPECIES_SABLEYE},
-	{11, 11, SPECIES_SABLEYE},
+    {9, 9, SPECIES_ZUBAT},
+    {10, 10, SPECIES_ARON},
+    {9, 9, SPECIES_ARON},
+    {11, 11, SPECIES_ARON},
+    {10, 10, SPECIES_ZUBAT},
+    {9, 9, SPECIES_ABRA},
+    {10, 10, SPECIES_MAKUHITA},
+    {11, 11, SPECIES_MAKUHITA},
+    {10, 10, SPECIES_SABLEYE},
+    {10, 10, SPECIES_SABLEYE},
+    {9, 9, SPECIES_SABLEYE},
+    {11, 11, SPECIES_SABLEYE},
 };
 
 const struct WildPokemonInfo gGraniteCave_B1F_LandMonsInfo = {10, gGraniteCave_B1F_LandMons};
 
 const struct WildPokemon gMtPyre_1F_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{23, 23, SPECIES_SHUPPET},
-	{22, 22, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {23, 23, SPECIES_SHUPPET},
+    {22, 22, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
 };
 
 const struct WildPokemonInfo gMtPyre_1F_LandMonsInfo = {10, gMtPyre_1F_LandMons};
 
 const struct WildPokemon gVictoryRoad_1F_LandMons[] =
 {
-	{40, 40, SPECIES_GOLBAT},
-	{40, 40, SPECIES_HARIYAMA},
-	{40, 40, SPECIES_LAIRON},
-	{40, 40, SPECIES_LOUDRED},
-	{36, 36, SPECIES_ZUBAT},
-	{36, 36, SPECIES_MAKUHITA},
-	{38, 38, SPECIES_GOLBAT},
-	{38, 38, SPECIES_HARIYAMA},
-	{36, 36, SPECIES_ARON},
-	{36, 36, SPECIES_WHISMUR},
-	{36, 36, SPECIES_ARON},
-	{36, 36, SPECIES_WHISMUR},
+    {40, 40, SPECIES_GOLBAT},
+    {40, 40, SPECIES_HARIYAMA},
+    {40, 40, SPECIES_LAIRON},
+    {40, 40, SPECIES_LOUDRED},
+    {36, 36, SPECIES_ZUBAT},
+    {36, 36, SPECIES_MAKUHITA},
+    {38, 38, SPECIES_GOLBAT},
+    {38, 38, SPECIES_HARIYAMA},
+    {36, 36, SPECIES_ARON},
+    {36, 36, SPECIES_WHISMUR},
+    {36, 36, SPECIES_ARON},
+    {36, 36, SPECIES_WHISMUR},
 };
 
 const struct WildPokemonInfo gVictoryRoad_1F_LandMonsInfo = {10, gVictoryRoad_1F_LandMons};
 
 const struct WildPokemon gSafariZone_South_LandMons[] =
 {
-	{25, 25, SPECIES_ODDISH},
-	{27, 27, SPECIES_ODDISH},
-	{25, 25, SPECIES_GIRAFARIG},
-	{27, 27, SPECIES_GIRAFARIG},
-	{25, 25, SPECIES_NATU},
-	{25, 25, SPECIES_DODUO},
-	{25, 25, SPECIES_GLOOM},
-	{27, 27, SPECIES_WOBBUFFET},
-	{25, 25, SPECIES_PIKACHU},
-	{27, 27, SPECIES_WOBBUFFET},
-	{27, 27, SPECIES_PIKACHU},
-	{29, 29, SPECIES_WOBBUFFET},
+    {25, 25, SPECIES_ODDISH},
+    {27, 27, SPECIES_ODDISH},
+    {25, 25, SPECIES_GIRAFARIG},
+    {27, 27, SPECIES_GIRAFARIG},
+    {25, 25, SPECIES_NATU},
+    {25, 25, SPECIES_DODUO},
+    {25, 25, SPECIES_GLOOM},
+    {27, 27, SPECIES_WOBBUFFET},
+    {25, 25, SPECIES_PIKACHU},
+    {27, 27, SPECIES_WOBBUFFET},
+    {27, 27, SPECIES_PIKACHU},
+    {29, 29, SPECIES_WOBBUFFET},
 };
 
 const struct WildPokemonInfo gSafariZone_South_LandMonsInfo = {25, gSafariZone_South_LandMons};
 
 const struct WildPokemon gUnderwater2_WaterMons[] =
 {
-	{20, 30, SPECIES_CLAMPERL},
-	{20, 30, SPECIES_CHINCHOU},
-	{30, 35, SPECIES_CLAMPERL},
-	{30, 35, SPECIES_RELICANTH},
-	{30, 35, SPECIES_RELICANTH},
+    {20, 30, SPECIES_CLAMPERL},
+    {20, 30, SPECIES_CHINCHOU},
+    {30, 35, SPECIES_CLAMPERL},
+    {30, 35, SPECIES_RELICANTH},
+    {30, 35, SPECIES_RELICANTH},
 };
 
 const struct WildPokemonInfo gUnderwater2_WaterMonsInfo = {4, gUnderwater2_WaterMons};
 
 const struct WildPokemon gAbandonedShip_Rooms_B1F_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_TENTACOOL},
-	{30, 35, SPECIES_TENTACRUEL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_TENTACOOL},
+    {30, 35, SPECIES_TENTACRUEL},
 };
 
 const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_WaterMonsInfo = {4, gAbandonedShip_Rooms_B1F_WaterMons};
 
 const struct WildPokemon gAbandonedShip_Rooms_B1F_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_TENTACOOL},
-	{25, 30, SPECIES_TENTACOOL},
-	{30, 35, SPECIES_TENTACOOL},
-	{30, 35, SPECIES_TENTACRUEL},
-	{25, 30, SPECIES_TENTACRUEL},
-	{20, 25, SPECIES_TENTACRUEL},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_TENTACOOL},
+    {25, 30, SPECIES_TENTACOOL},
+    {30, 35, SPECIES_TENTACOOL},
+    {30, 35, SPECIES_TENTACRUEL},
+    {25, 30, SPECIES_TENTACRUEL},
+    {20, 25, SPECIES_TENTACRUEL},
 };
 
 const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_FishingMonsInfo = {20, gAbandonedShip_Rooms_B1F_FishingMons};
 
 const struct WildPokemon gGraniteCave_B2F_LandMons[] =
 {
-	{10, 10, SPECIES_ZUBAT},
-	{11, 11, SPECIES_ARON},
-	{10, 10, SPECIES_ARON},
-	{11, 11, SPECIES_ZUBAT},
-	{12, 12, SPECIES_ARON},
-	{10, 10, SPECIES_ABRA},
-	{10, 10, SPECIES_SABLEYE},
-	{11, 11, SPECIES_SABLEYE},
-	{12, 12, SPECIES_SABLEYE},
-	{10, 10, SPECIES_SABLEYE},
-	{12, 12, SPECIES_SABLEYE},
-	{10, 10, SPECIES_SABLEYE},
+    {10, 10, SPECIES_ZUBAT},
+    {11, 11, SPECIES_ARON},
+    {10, 10, SPECIES_ARON},
+    {11, 11, SPECIES_ZUBAT},
+    {12, 12, SPECIES_ARON},
+    {10, 10, SPECIES_ABRA},
+    {10, 10, SPECIES_SABLEYE},
+    {11, 11, SPECIES_SABLEYE},
+    {12, 12, SPECIES_SABLEYE},
+    {10, 10, SPECIES_SABLEYE},
+    {12, 12, SPECIES_SABLEYE},
+    {10, 10, SPECIES_SABLEYE},
 };
 
 const struct WildPokemonInfo gGraniteCave_B2F_LandMonsInfo = {10, gGraniteCave_B2F_LandMons};
 
 const struct WildPokemon gGraniteCave_B2F_RockSmashMons[] =
 {
-	{10, 15, SPECIES_GEODUDE},
-	{10, 20, SPECIES_NOSEPASS},
-	{5, 10, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
+    {10, 15, SPECIES_GEODUDE},
+    {10, 20, SPECIES_NOSEPASS},
+    {5, 10, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
 };
 
 const struct WildPokemonInfo gGraniteCave_B2F_RockSmashMonsInfo = {20, gGraniteCave_B2F_RockSmashMons};
 
 const struct WildPokemon gFieryPath_LandMons[] =
 {
-	{15, 15, SPECIES_NUMEL},
-	{15, 15, SPECIES_KOFFING},
-	{16, 16, SPECIES_NUMEL},
-	{15, 15, SPECIES_MACHOP},
-	{15, 15, SPECIES_TORKOAL},
-	{15, 15, SPECIES_SLUGMA},
-	{16, 16, SPECIES_KOFFING},
-	{16, 16, SPECIES_MACHOP},
-	{14, 14, SPECIES_TORKOAL},
-	{16, 16, SPECIES_TORKOAL},
-	{14, 14, SPECIES_GRIMER},
-	{14, 14, SPECIES_GRIMER},
+    {15, 15, SPECIES_NUMEL},
+    {15, 15, SPECIES_KOFFING},
+    {16, 16, SPECIES_NUMEL},
+    {15, 15, SPECIES_MACHOP},
+    {15, 15, SPECIES_TORKOAL},
+    {15, 15, SPECIES_SLUGMA},
+    {16, 16, SPECIES_KOFFING},
+    {16, 16, SPECIES_MACHOP},
+    {14, 14, SPECIES_TORKOAL},
+    {16, 16, SPECIES_TORKOAL},
+    {14, 14, SPECIES_GRIMER},
+    {14, 14, SPECIES_GRIMER},
 };
 
 const struct WildPokemonInfo gFieryPath_LandMonsInfo = {10, gFieryPath_LandMons};
 
 const struct WildPokemon gMeteorFalls_B1F_2R_LandMons[] =
 {
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{30, 30, SPECIES_BAGON},
-	{35, 35, SPECIES_SOLROCK},
-	{35, 35, SPECIES_BAGON},
-	{37, 37, SPECIES_SOLROCK},
-	{25, 25, SPECIES_BAGON},
-	{39, 39, SPECIES_SOLROCK},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {30, 30, SPECIES_BAGON},
+    {35, 35, SPECIES_SOLROCK},
+    {35, 35, SPECIES_BAGON},
+    {37, 37, SPECIES_SOLROCK},
+    {25, 25, SPECIES_BAGON},
+    {39, 39, SPECIES_SOLROCK},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gMeteorFalls_B1F_2R_LandMonsInfo = {10, gMeteorFalls_B1F_2R_LandMons};
 
 const struct WildPokemon gMeteorFalls_B1F_2R_WaterMons[] =
 {
-	{30, 35, SPECIES_GOLBAT},
-	{30, 35, SPECIES_GOLBAT},
-	{25, 35, SPECIES_SOLROCK},
-	{15, 25, SPECIES_SOLROCK},
-	{5, 15, SPECIES_SOLROCK},
+    {30, 35, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {25, 35, SPECIES_SOLROCK},
+    {15, 25, SPECIES_SOLROCK},
+    {5, 15, SPECIES_SOLROCK},
 };
 
 const struct WildPokemonInfo gMeteorFalls_B1F_2R_WaterMonsInfo = {4, gMeteorFalls_B1F_2R_WaterMons};
 
 const struct WildPokemon gMeteorFalls_B1F_2R_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{30, 35, SPECIES_WHISCASH},
-	{35, 40, SPECIES_WHISCASH},
-	{40, 45, SPECIES_WHISCASH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {30, 35, SPECIES_WHISCASH},
+    {35, 40, SPECIES_WHISCASH},
+    {40, 45, SPECIES_WHISCASH},
 };
 
 const struct WildPokemonInfo gMeteorFalls_B1F_2R_FishingMonsInfo = {30, gMeteorFalls_B1F_2R_FishingMons};
 
 const struct WildPokemon gJaggedPass_LandMons[] =
 {
-	{21, 21, SPECIES_NUMEL},
-	{21, 21, SPECIES_NUMEL},
-	{21, 21, SPECIES_MACHOP},
-	{20, 20, SPECIES_NUMEL},
-	{20, 20, SPECIES_SPOINK},
-	{20, 20, SPECIES_MACHOP},
-	{21, 21, SPECIES_SPOINK},
-	{22, 22, SPECIES_MACHOP},
-	{22, 22, SPECIES_NUMEL},
-	{22, 22, SPECIES_SPOINK},
-	{22, 22, SPECIES_NUMEL},
-	{22, 22, SPECIES_SPOINK},
+    {21, 21, SPECIES_NUMEL},
+    {21, 21, SPECIES_NUMEL},
+    {21, 21, SPECIES_MACHOP},
+    {20, 20, SPECIES_NUMEL},
+    {20, 20, SPECIES_SPOINK},
+    {20, 20, SPECIES_MACHOP},
+    {21, 21, SPECIES_SPOINK},
+    {22, 22, SPECIES_MACHOP},
+    {22, 22, SPECIES_NUMEL},
+    {22, 22, SPECIES_SPOINK},
+    {22, 22, SPECIES_NUMEL},
+    {22, 22, SPECIES_SPOINK},
 };
 
 const struct WildPokemonInfo gJaggedPass_LandMonsInfo = {20, gJaggedPass_LandMons};
 
 const struct WildPokemon gRoute106_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute106_WaterMonsInfo = {4, gRoute106_WaterMons};
 
 const struct WildPokemon gRoute106_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute106_FishingMonsInfo = {30, gRoute106_FishingMons};
 
 const struct WildPokemon gRoute107_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute107_WaterMonsInfo = {4, gRoute107_WaterMons};
 
 const struct WildPokemon gRoute107_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute107_FishingMonsInfo = {30, gRoute107_FishingMons};
 
 const struct WildPokemon gRoute108_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute108_WaterMonsInfo = {4, gRoute108_WaterMons};
 
 const struct WildPokemon gRoute108_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute108_FishingMonsInfo = {30, gRoute108_FishingMons};
 
 const struct WildPokemon gRoute109_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute109_WaterMonsInfo = {4, gRoute109_WaterMons};
 
 const struct WildPokemon gRoute109_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute109_FishingMonsInfo = {30, gRoute109_FishingMons};
 
 const struct WildPokemon gRoute115_LandMons[] =
 {
-	{23, 23, SPECIES_SWABLU},
-	{23, 23, SPECIES_TAILLOW},
-	{25, 25, SPECIES_SWABLU},
-	{24, 24, SPECIES_TAILLOW},
-	{25, 25, SPECIES_TAILLOW},
-	{25, 25, SPECIES_SWELLOW},
-	{24, 24, SPECIES_JIGGLYPUFF},
-	{25, 25, SPECIES_JIGGLYPUFF},
-	{24, 24, SPECIES_WINGULL},
-	{24, 24, SPECIES_WINGULL},
-	{26, 26, SPECIES_WINGULL},
-	{25, 25, SPECIES_WINGULL},
+    {23, 23, SPECIES_SWABLU},
+    {23, 23, SPECIES_TAILLOW},
+    {25, 25, SPECIES_SWABLU},
+    {24, 24, SPECIES_TAILLOW},
+    {25, 25, SPECIES_TAILLOW},
+    {25, 25, SPECIES_SWELLOW},
+    {24, 24, SPECIES_JIGGLYPUFF},
+    {25, 25, SPECIES_JIGGLYPUFF},
+    {24, 24, SPECIES_WINGULL},
+    {24, 24, SPECIES_WINGULL},
+    {26, 26, SPECIES_WINGULL},
+    {25, 25, SPECIES_WINGULL},
 };
 
 const struct WildPokemonInfo gRoute115_LandMonsInfo = {20, gRoute115_LandMons};
 
 const struct WildPokemon gRoute115_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute115_WaterMonsInfo = {4, gRoute115_WaterMons};
 
 const struct WildPokemon gRoute115_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute115_FishingMonsInfo = {30, gRoute115_FishingMons};
 
 const struct WildPokemon gNewMauville_Inside_LandMons[] =
 {
-	{24, 24, SPECIES_VOLTORB},
-	{24, 24, SPECIES_MAGNEMITE},
-	{25, 25, SPECIES_VOLTORB},
-	{25, 25, SPECIES_MAGNEMITE},
-	{23, 23, SPECIES_VOLTORB},
-	{23, 23, SPECIES_MAGNEMITE},
-	{26, 26, SPECIES_VOLTORB},
-	{26, 26, SPECIES_MAGNEMITE},
-	{22, 22, SPECIES_VOLTORB},
-	{22, 22, SPECIES_MAGNEMITE},
-	{26, 26, SPECIES_ELECTRODE},
-	{26, 26, SPECIES_MAGNETON},
+    {24, 24, SPECIES_VOLTORB},
+    {24, 24, SPECIES_MAGNEMITE},
+    {25, 25, SPECIES_VOLTORB},
+    {25, 25, SPECIES_MAGNEMITE},
+    {23, 23, SPECIES_VOLTORB},
+    {23, 23, SPECIES_MAGNEMITE},
+    {26, 26, SPECIES_VOLTORB},
+    {26, 26, SPECIES_MAGNEMITE},
+    {22, 22, SPECIES_VOLTORB},
+    {22, 22, SPECIES_MAGNEMITE},
+    {26, 26, SPECIES_ELECTRODE},
+    {26, 26, SPECIES_MAGNETON},
 };
 
 const struct WildPokemonInfo gNewMauville_Inside_LandMonsInfo = {10, gNewMauville_Inside_LandMons};
 
 const struct WildPokemon gRoute119_LandMons[] =
 {
-	{25, 25, SPECIES_ZIGZAGOON},
-	{25, 25, SPECIES_LINOONE},
-	{27, 27, SPECIES_ZIGZAGOON},
-	{25, 25, SPECIES_ODDISH},
-	{27, 27, SPECIES_LINOONE},
-	{26, 26, SPECIES_ODDISH},
-	{27, 27, SPECIES_ODDISH},
-	{24, 24, SPECIES_ODDISH},
-	{25, 25, SPECIES_TROPIUS},
-	{26, 26, SPECIES_TROPIUS},
-	{27, 27, SPECIES_TROPIUS},
-	{25, 25, SPECIES_KECLEON},
+    {25, 25, SPECIES_ZIGZAGOON},
+    {25, 25, SPECIES_LINOONE},
+    {27, 27, SPECIES_ZIGZAGOON},
+    {25, 25, SPECIES_ODDISH},
+    {27, 27, SPECIES_LINOONE},
+    {26, 26, SPECIES_ODDISH},
+    {27, 27, SPECIES_ODDISH},
+    {24, 24, SPECIES_ODDISH},
+    {25, 25, SPECIES_TROPIUS},
+    {26, 26, SPECIES_TROPIUS},
+    {27, 27, SPECIES_TROPIUS},
+    {25, 25, SPECIES_KECLEON},
 };
 
 const struct WildPokemonInfo gRoute119_LandMonsInfo = {15, gRoute119_LandMons};
 
 const struct WildPokemon gRoute119_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute119_WaterMonsInfo = {4, gRoute119_WaterMons};
 
 const struct WildPokemon gRoute119_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_CARVANHA},
-	{25, 30, SPECIES_CARVANHA},
-	{30, 35, SPECIES_CARVANHA},
-	{20, 25, SPECIES_CARVANHA},
-	{35, 40, SPECIES_CARVANHA},
-	{40, 45, SPECIES_CARVANHA},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_CARVANHA},
+    {25, 30, SPECIES_CARVANHA},
+    {30, 35, SPECIES_CARVANHA},
+    {20, 25, SPECIES_CARVANHA},
+    {35, 40, SPECIES_CARVANHA},
+    {40, 45, SPECIES_CARVANHA},
 };
 
 const struct WildPokemonInfo gRoute119_FishingMonsInfo = {30, gRoute119_FishingMons};
 
 const struct WildPokemon gRoute120_LandMons[] =
 {
-	{25, 25, SPECIES_POOCHYENA},
-	{25, 25, SPECIES_MIGHTYENA},
-	{27, 27, SPECIES_MIGHTYENA},
-	{25, 25, SPECIES_ODDISH},
-	{25, 25, SPECIES_MARILL},
-	{26, 26, SPECIES_ODDISH},
-	{27, 27, SPECIES_ODDISH},
-	{27, 27, SPECIES_MARILL},
-	{25, 25, SPECIES_ABSOL},
-	{27, 27, SPECIES_ABSOL},
-	{25, 25, SPECIES_KECLEON},
-	{25, 25, SPECIES_SEEDOT},
+    {25, 25, SPECIES_POOCHYENA},
+    {25, 25, SPECIES_MIGHTYENA},
+    {27, 27, SPECIES_MIGHTYENA},
+    {25, 25, SPECIES_ODDISH},
+    {25, 25, SPECIES_MARILL},
+    {26, 26, SPECIES_ODDISH},
+    {27, 27, SPECIES_ODDISH},
+    {27, 27, SPECIES_MARILL},
+    {25, 25, SPECIES_ABSOL},
+    {27, 27, SPECIES_ABSOL},
+    {25, 25, SPECIES_KECLEON},
+    {25, 25, SPECIES_SEEDOT},
 };
 
 const struct WildPokemonInfo gRoute120_LandMonsInfo = {20, gRoute120_LandMons};
 
 const struct WildPokemon gRoute120_WaterMons[] =
 {
-	{20, 30, SPECIES_MARILL},
-	{10, 20, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
-	{20, 30, SPECIES_GOLDEEN},
+    {20, 30, SPECIES_MARILL},
+    {10, 20, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
+    {20, 30, SPECIES_GOLDEEN},
 };
 
 const struct WildPokemonInfo gRoute120_WaterMonsInfo = {4, gRoute120_WaterMons};
 
 const struct WildPokemon gRoute120_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{20, 25, SPECIES_BARBOACH},
-	{35, 40, SPECIES_BARBOACH},
-	{40, 45, SPECIES_BARBOACH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {20, 25, SPECIES_BARBOACH},
+    {35, 40, SPECIES_BARBOACH},
+    {40, 45, SPECIES_BARBOACH},
 };
 
 const struct WildPokemonInfo gRoute120_FishingMonsInfo = {30, gRoute120_FishingMons};
 
 const struct WildPokemon gRoute121_LandMons[] =
 {
-	{26, 26, SPECIES_POOCHYENA},
-	{26, 26, SPECIES_SHUPPET},
-	{26, 26, SPECIES_MIGHTYENA},
-	{28, 28, SPECIES_SHUPPET},
-	{28, 28, SPECIES_MIGHTYENA},
-	{26, 26, SPECIES_ODDISH},
-	{28, 28, SPECIES_ODDISH},
-	{28, 28, SPECIES_GLOOM},
-	{26, 26, SPECIES_WINGULL},
-	{27, 27, SPECIES_WINGULL},
-	{28, 28, SPECIES_WINGULL},
-	{25, 25, SPECIES_KECLEON},
+    {26, 26, SPECIES_POOCHYENA},
+    {26, 26, SPECIES_SHUPPET},
+    {26, 26, SPECIES_MIGHTYENA},
+    {28, 28, SPECIES_SHUPPET},
+    {28, 28, SPECIES_MIGHTYENA},
+    {26, 26, SPECIES_ODDISH},
+    {28, 28, SPECIES_ODDISH},
+    {28, 28, SPECIES_GLOOM},
+    {26, 26, SPECIES_WINGULL},
+    {27, 27, SPECIES_WINGULL},
+    {28, 28, SPECIES_WINGULL},
+    {25, 25, SPECIES_KECLEON},
 };
 
 const struct WildPokemonInfo gRoute121_LandMonsInfo = {20, gRoute121_LandMons};
 
 const struct WildPokemon gRoute121_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute121_WaterMonsInfo = {4, gRoute121_WaterMons};
 
 const struct WildPokemon gRoute121_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute121_FishingMonsInfo = {30, gRoute121_FishingMons};
 
 const struct WildPokemon gRoute122_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute122_WaterMonsInfo = {4, gRoute122_WaterMons};
 
 const struct WildPokemon gRoute122_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute122_FishingMonsInfo = {30, gRoute122_FishingMons};
 
 const struct WildPokemon gRoute123_LandMons[] =
 {
-	{26, 26, SPECIES_POOCHYENA},
-	{26, 26, SPECIES_SHUPPET},
-	{26, 26, SPECIES_MIGHTYENA},
-	{28, 28, SPECIES_SHUPPET},
-	{28, 28, SPECIES_MIGHTYENA},
-	{26, 26, SPECIES_ODDISH},
-	{28, 28, SPECIES_ODDISH},
-	{28, 28, SPECIES_GLOOM},
-	{26, 26, SPECIES_WINGULL},
-	{27, 27, SPECIES_WINGULL},
-	{28, 28, SPECIES_WINGULL},
-	{25, 25, SPECIES_KECLEON},
+    {26, 26, SPECIES_POOCHYENA},
+    {26, 26, SPECIES_SHUPPET},
+    {26, 26, SPECIES_MIGHTYENA},
+    {28, 28, SPECIES_SHUPPET},
+    {28, 28, SPECIES_MIGHTYENA},
+    {26, 26, SPECIES_ODDISH},
+    {28, 28, SPECIES_ODDISH},
+    {28, 28, SPECIES_GLOOM},
+    {26, 26, SPECIES_WINGULL},
+    {27, 27, SPECIES_WINGULL},
+    {28, 28, SPECIES_WINGULL},
+    {25, 25, SPECIES_KECLEON},
 };
 
 const struct WildPokemonInfo gRoute123_LandMonsInfo = {20, gRoute123_LandMons};
 
 const struct WildPokemon gRoute123_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute123_WaterMonsInfo = {4, gRoute123_WaterMons};
 
 const struct WildPokemon gRoute123_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute123_FishingMonsInfo = {30, gRoute123_FishingMons};
 
 const struct WildPokemon gMtPyre_2F_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{23, 23, SPECIES_SHUPPET},
-	{22, 22, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {23, 23, SPECIES_SHUPPET},
+    {22, 22, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
 };
 
 const struct WildPokemonInfo gMtPyre_2F_LandMonsInfo = {10, gMtPyre_2F_LandMons};
 
 const struct WildPokemon gMtPyre_3F_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{23, 23, SPECIES_SHUPPET},
-	{22, 22, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {23, 23, SPECIES_SHUPPET},
+    {22, 22, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
 };
 
 const struct WildPokemonInfo gMtPyre_3F_LandMonsInfo = {10, gMtPyre_3F_LandMons};
 
 const struct WildPokemon gMtPyre_4F_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{23, 23, SPECIES_SHUPPET},
-	{22, 22, SPECIES_SHUPPET},
-	{27, 27, SPECIES_DUSKULL},
-	{27, 27, SPECIES_DUSKULL},
-	{25, 25, SPECIES_DUSKULL},
-	{29, 29, SPECIES_DUSKULL},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {23, 23, SPECIES_SHUPPET},
+    {22, 22, SPECIES_SHUPPET},
+    {27, 27, SPECIES_DUSKULL},
+    {27, 27, SPECIES_DUSKULL},
+    {25, 25, SPECIES_DUSKULL},
+    {29, 29, SPECIES_DUSKULL},
 };
 
 const struct WildPokemonInfo gMtPyre_4F_LandMonsInfo = {10, gMtPyre_4F_LandMons};
 
 const struct WildPokemon gMtPyre_5F_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{23, 23, SPECIES_SHUPPET},
-	{22, 22, SPECIES_SHUPPET},
-	{27, 27, SPECIES_DUSKULL},
-	{27, 27, SPECIES_DUSKULL},
-	{25, 25, SPECIES_DUSKULL},
-	{29, 29, SPECIES_DUSKULL},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {23, 23, SPECIES_SHUPPET},
+    {22, 22, SPECIES_SHUPPET},
+    {27, 27, SPECIES_DUSKULL},
+    {27, 27, SPECIES_DUSKULL},
+    {25, 25, SPECIES_DUSKULL},
+    {29, 29, SPECIES_DUSKULL},
 };
 
 const struct WildPokemonInfo gMtPyre_5F_LandMonsInfo = {10, gMtPyre_5F_LandMons};
 
 const struct WildPokemon gMtPyre_6F_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{23, 23, SPECIES_SHUPPET},
-	{22, 22, SPECIES_SHUPPET},
-	{27, 27, SPECIES_DUSKULL},
-	{27, 27, SPECIES_DUSKULL},
-	{25, 25, SPECIES_DUSKULL},
-	{29, 29, SPECIES_DUSKULL},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {23, 23, SPECIES_SHUPPET},
+    {22, 22, SPECIES_SHUPPET},
+    {27, 27, SPECIES_DUSKULL},
+    {27, 27, SPECIES_DUSKULL},
+    {25, 25, SPECIES_DUSKULL},
+    {29, 29, SPECIES_DUSKULL},
 };
 
 const struct WildPokemonInfo gMtPyre_6F_LandMonsInfo = {10, gMtPyre_6F_LandMons};
 
 const struct WildPokemon gMtPyre_Exterior_LandMons[] =
 {
-	{27, 27, SPECIES_SHUPPET},
-	{27, 27, SPECIES_SHUPPET},
-	{28, 28, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{29, 29, SPECIES_VULPIX},
-	{27, 27, SPECIES_VULPIX},
-	{29, 29, SPECIES_VULPIX},
-	{25, 25, SPECIES_VULPIX},
-	{27, 27, SPECIES_WINGULL},
-	{27, 27, SPECIES_WINGULL},
-	{26, 26, SPECIES_WINGULL},
-	{28, 28, SPECIES_WINGULL},
+    {27, 27, SPECIES_SHUPPET},
+    {27, 27, SPECIES_SHUPPET},
+    {28, 28, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {29, 29, SPECIES_VULPIX},
+    {27, 27, SPECIES_VULPIX},
+    {29, 29, SPECIES_VULPIX},
+    {25, 25, SPECIES_VULPIX},
+    {27, 27, SPECIES_WINGULL},
+    {27, 27, SPECIES_WINGULL},
+    {26, 26, SPECIES_WINGULL},
+    {28, 28, SPECIES_WINGULL},
 };
 
 const struct WildPokemonInfo gMtPyre_Exterior_LandMonsInfo = {10, gMtPyre_Exterior_LandMons};
 
 const struct WildPokemon gMtPyre_Summit_LandMons[] =
 {
-	{28, 28, SPECIES_SHUPPET},
-	{29, 29, SPECIES_SHUPPET},
-	{27, 27, SPECIES_SHUPPET},
-	{26, 26, SPECIES_SHUPPET},
-	{30, 30, SPECIES_SHUPPET},
-	{25, 25, SPECIES_SHUPPET},
-	{24, 24, SPECIES_SHUPPET},
-	{28, 28, SPECIES_DUSKULL},
-	{26, 26, SPECIES_DUSKULL},
-	{30, 30, SPECIES_DUSKULL},
-	{28, 28, SPECIES_CHIMECHO},
-	{28, 28, SPECIES_CHIMECHO},
+    {28, 28, SPECIES_SHUPPET},
+    {29, 29, SPECIES_SHUPPET},
+    {27, 27, SPECIES_SHUPPET},
+    {26, 26, SPECIES_SHUPPET},
+    {30, 30, SPECIES_SHUPPET},
+    {25, 25, SPECIES_SHUPPET},
+    {24, 24, SPECIES_SHUPPET},
+    {28, 28, SPECIES_DUSKULL},
+    {26, 26, SPECIES_DUSKULL},
+    {30, 30, SPECIES_DUSKULL},
+    {28, 28, SPECIES_CHIMECHO},
+    {28, 28, SPECIES_CHIMECHO},
 };
 
 const struct WildPokemonInfo gMtPyre_Summit_LandMonsInfo = {10, gMtPyre_Summit_LandMons};
 
 const struct WildPokemon gGraniteCave_StevensRoom_LandMons[] =
 {
-	{7, 7, SPECIES_ZUBAT},
-	{8, 8, SPECIES_MAKUHITA},
-	{7, 7, SPECIES_MAKUHITA},
-	{8, 8, SPECIES_ZUBAT},
-	{9, 9, SPECIES_MAKUHITA},
-	{8, 8, SPECIES_ABRA},
-	{10, 10, SPECIES_MAKUHITA},
-	{6, 6, SPECIES_MAKUHITA},
-	{7, 7, SPECIES_ARON},
-	{8, 8, SPECIES_ARON},
-	{7, 7, SPECIES_ARON},
-	{8, 8, SPECIES_ARON},
+    {7, 7, SPECIES_ZUBAT},
+    {8, 8, SPECIES_MAKUHITA},
+    {7, 7, SPECIES_MAKUHITA},
+    {8, 8, SPECIES_ZUBAT},
+    {9, 9, SPECIES_MAKUHITA},
+    {8, 8, SPECIES_ABRA},
+    {10, 10, SPECIES_MAKUHITA},
+    {6, 6, SPECIES_MAKUHITA},
+    {7, 7, SPECIES_ARON},
+    {8, 8, SPECIES_ARON},
+    {7, 7, SPECIES_ARON},
+    {8, 8, SPECIES_ARON},
 };
 
 const struct WildPokemonInfo gGraniteCave_StevensRoom_LandMonsInfo = {10, gGraniteCave_StevensRoom_LandMons};
 
 const struct WildPokemon gRoute125_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute125_WaterMonsInfo = {4, gRoute125_WaterMons};
 
 const struct WildPokemon gRoute125_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute125_FishingMonsInfo = {30, gRoute125_FishingMons};
 
 const struct WildPokemon gRoute126_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute126_WaterMonsInfo = {4, gRoute126_WaterMons};
 
 const struct WildPokemon gRoute126_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute126_FishingMonsInfo = {30, gRoute126_FishingMons};
 
 const struct WildPokemon gRoute127_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute127_WaterMonsInfo = {4, gRoute127_WaterMons};
 
 const struct WildPokemon gRoute127_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute127_FishingMonsInfo = {30, gRoute127_FishingMons};
 
 const struct WildPokemon gRoute128_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute128_WaterMonsInfo = {4, gRoute128_WaterMons};
 
 const struct WildPokemon gRoute128_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_LUVDISC},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_LUVDISC},
-	{30, 35, SPECIES_WAILMER},
-	{30, 35, SPECIES_CORSOLA},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_LUVDISC},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_LUVDISC},
+    {30, 35, SPECIES_WAILMER},
+    {30, 35, SPECIES_CORSOLA},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute128_FishingMonsInfo = {30, gRoute128_FishingMons};
 
 const struct WildPokemon gRoute129_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_WAILORD},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_WAILORD},
 };
 
 const struct WildPokemonInfo gRoute129_WaterMonsInfo = {4, gRoute129_WaterMons};
 
 const struct WildPokemon gRoute129_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute129_FishingMonsInfo = {30, gRoute129_FishingMons};
 
 const struct WildPokemon gRoute130_LandMons[] =
 {
-	{30, 30, SPECIES_WYNAUT},
-	{35, 35, SPECIES_WYNAUT},
-	{25, 25, SPECIES_WYNAUT},
-	{40, 40, SPECIES_WYNAUT},
-	{20, 20, SPECIES_WYNAUT},
-	{45, 45, SPECIES_WYNAUT},
-	{15, 15, SPECIES_WYNAUT},
-	{50, 50, SPECIES_WYNAUT},
-	{10, 10, SPECIES_WYNAUT},
-	{5, 5, SPECIES_WYNAUT},
-	{10, 10, SPECIES_WYNAUT},
-	{5, 5, SPECIES_WYNAUT},
+    {30, 30, SPECIES_WYNAUT},
+    {35, 35, SPECIES_WYNAUT},
+    {25, 25, SPECIES_WYNAUT},
+    {40, 40, SPECIES_WYNAUT},
+    {20, 20, SPECIES_WYNAUT},
+    {45, 45, SPECIES_WYNAUT},
+    {15, 15, SPECIES_WYNAUT},
+    {50, 50, SPECIES_WYNAUT},
+    {10, 10, SPECIES_WYNAUT},
+    {5, 5, SPECIES_WYNAUT},
+    {10, 10, SPECIES_WYNAUT},
+    {5, 5, SPECIES_WYNAUT},
 };
 
 const struct WildPokemonInfo gRoute130_LandMonsInfo = {20, gRoute130_LandMons};
 
 const struct WildPokemon gRoute130_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute130_WaterMonsInfo = {4, gRoute130_WaterMons};
 
 const struct WildPokemon gRoute130_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute130_FishingMonsInfo = {30, gRoute130_FishingMons};
 
 const struct WildPokemon gRoute131_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute131_WaterMonsInfo = {4, gRoute131_WaterMons};
 
 const struct WildPokemon gRoute131_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute131_FishingMonsInfo = {30, gRoute131_FishingMons};
 
 const struct WildPokemon gRoute132_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute132_WaterMonsInfo = {4, gRoute132_WaterMons};
 
 const struct WildPokemon gRoute132_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_HORSEA},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_HORSEA},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute132_FishingMonsInfo = {30, gRoute132_FishingMons};
 
 const struct WildPokemon gRoute133_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute133_WaterMonsInfo = {4, gRoute133_WaterMons};
 
 const struct WildPokemon gRoute133_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_HORSEA},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_HORSEA},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute133_FishingMonsInfo = {30, gRoute133_FishingMons};
 
 const struct WildPokemon gRoute134_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gRoute134_WaterMonsInfo = {4, gRoute134_WaterMons};
 
 const struct WildPokemon gRoute134_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_HORSEA},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_HORSEA},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gRoute134_FishingMonsInfo = {30, gRoute134_FishingMons};
 
 const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_TENTACOOL},
-	{30, 35, SPECIES_TENTACRUEL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_TENTACOOL},
+    {30, 35, SPECIES_TENTACRUEL},
 };
 
 const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo = {4, gAbandonedShip_HiddenFloorCorridors_WaterMons};
 
 const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_TENTACOOL},
-	{25, 30, SPECIES_TENTACOOL},
-	{30, 35, SPECIES_TENTACOOL},
-	{30, 35, SPECIES_TENTACRUEL},
-	{25, 30, SPECIES_TENTACRUEL},
-	{20, 25, SPECIES_TENTACRUEL},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_TENTACOOL},
+    {25, 30, SPECIES_TENTACOOL},
+    {30, 35, SPECIES_TENTACOOL},
+    {30, 35, SPECIES_TENTACRUEL},
+    {25, 30, SPECIES_TENTACRUEL},
+    {20, 25, SPECIES_TENTACRUEL},
 };
 
 const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo = {20, gAbandonedShip_HiddenFloorCorridors_FishingMons};
 
 const struct WildPokemon gSeafloorCavern_Room1_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room1_LandMonsInfo = {4, gSeafloorCavern_Room1_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room2_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room2_LandMonsInfo = {4, gSeafloorCavern_Room2_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room3_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room3_LandMonsInfo = {4, gSeafloorCavern_Room3_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room4_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room4_LandMonsInfo = {4, gSeafloorCavern_Room4_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room5_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room5_LandMonsInfo = {4, gSeafloorCavern_Room5_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room6_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room6_LandMonsInfo = {4, gSeafloorCavern_Room6_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room6_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_GOLBAT},
-	{30, 35, SPECIES_GOLBAT},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room6_WaterMonsInfo = {4, gSeafloorCavern_Room6_WaterMons};
 
 const struct WildPokemon gSeafloorCavern_Room6_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room6_FishingMonsInfo = {10, gSeafloorCavern_Room6_FishingMons};
 
 const struct WildPokemon gSeafloorCavern_Room7_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room7_LandMonsInfo = {4, gSeafloorCavern_Room7_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Room7_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_GOLBAT},
-	{30, 35, SPECIES_GOLBAT},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room7_WaterMonsInfo = {4, gSeafloorCavern_Room7_WaterMons};
 
 const struct WildPokemon gSeafloorCavern_Room7_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room7_FishingMonsInfo = {10, gSeafloorCavern_Room7_FishingMons};
 
 const struct WildPokemon gSeafloorCavern_Room8_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Room8_LandMonsInfo = {4, gSeafloorCavern_Room8_LandMons};
 
 const struct WildPokemon gSeafloorCavern_Entrance_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_GOLBAT},
-	{30, 35, SPECIES_GOLBAT},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Entrance_WaterMonsInfo = {4, gSeafloorCavern_Entrance_WaterMons};
 
 const struct WildPokemon gSeafloorCavern_Entrance_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gSeafloorCavern_Entrance_FishingMonsInfo = {10, gSeafloorCavern_Entrance_FishingMons};
 
 const struct WildPokemon gCaveOfOrigin_Entrance_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{33, 33, SPECIES_ZUBAT},
-	{28, 28, SPECIES_ZUBAT},
-	{29, 29, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{35, 35, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {33, 33, SPECIES_ZUBAT},
+    {28, 28, SPECIES_ZUBAT},
+    {29, 29, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {35, 35, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gCaveOfOrigin_Entrance_LandMonsInfo = {4, gCaveOfOrigin_Entrance_LandMons};
 
 const struct WildPokemon gCaveOfOrigin_1F_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SABLEYE},
-	{32, 32, SPECIES_SABLEYE},
-	{34, 34, SPECIES_SABLEYE},
-	{33, 33, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SABLEYE},
+    {32, 32, SPECIES_SABLEYE},
+    {34, 34, SPECIES_SABLEYE},
+    {33, 33, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gCaveOfOrigin_1F_LandMonsInfo = {4, gCaveOfOrigin_1F_LandMons};
 
 const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap1_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SABLEYE},
-	{32, 32, SPECIES_SABLEYE},
-	{34, 34, SPECIES_SABLEYE},
-	{33, 33, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SABLEYE},
+    {32, 32, SPECIES_SABLEYE},
+    {34, 34, SPECIES_SABLEYE},
+    {33, 33, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap1_LandMons};
 
 const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap2_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SABLEYE},
-	{32, 32, SPECIES_SABLEYE},
-	{34, 34, SPECIES_SABLEYE},
-	{33, 33, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SABLEYE},
+    {32, 32, SPECIES_SABLEYE},
+    {34, 34, SPECIES_SABLEYE},
+    {33, 33, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap2_LandMons};
 
 const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap3_LandMons[] =
 {
-	{30, 30, SPECIES_ZUBAT},
-	{31, 31, SPECIES_ZUBAT},
-	{32, 32, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SABLEYE},
-	{32, 32, SPECIES_SABLEYE},
-	{34, 34, SPECIES_SABLEYE},
-	{33, 33, SPECIES_ZUBAT},
-	{34, 34, SPECIES_ZUBAT},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{36, 36, SPECIES_GOLBAT},
+    {30, 30, SPECIES_ZUBAT},
+    {31, 31, SPECIES_ZUBAT},
+    {32, 32, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SABLEYE},
+    {32, 32, SPECIES_SABLEYE},
+    {34, 34, SPECIES_SABLEYE},
+    {33, 33, SPECIES_ZUBAT},
+    {34, 34, SPECIES_ZUBAT},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {36, 36, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap3_LandMons};
 
 const struct WildPokemon gNewMauville_Entrance_LandMons[] =
 {
-	{24, 24, SPECIES_VOLTORB},
-	{24, 24, SPECIES_MAGNEMITE},
-	{25, 25, SPECIES_VOLTORB},
-	{25, 25, SPECIES_MAGNEMITE},
-	{23, 23, SPECIES_VOLTORB},
-	{23, 23, SPECIES_MAGNEMITE},
-	{26, 26, SPECIES_VOLTORB},
-	{26, 26, SPECIES_MAGNEMITE},
-	{22, 22, SPECIES_VOLTORB},
-	{22, 22, SPECIES_MAGNEMITE},
-	{22, 22, SPECIES_VOLTORB},
-	{22, 22, SPECIES_MAGNEMITE},
+    {24, 24, SPECIES_VOLTORB},
+    {24, 24, SPECIES_MAGNEMITE},
+    {25, 25, SPECIES_VOLTORB},
+    {25, 25, SPECIES_MAGNEMITE},
+    {23, 23, SPECIES_VOLTORB},
+    {23, 23, SPECIES_MAGNEMITE},
+    {26, 26, SPECIES_VOLTORB},
+    {26, 26, SPECIES_MAGNEMITE},
+    {22, 22, SPECIES_VOLTORB},
+    {22, 22, SPECIES_MAGNEMITE},
+    {22, 22, SPECIES_VOLTORB},
+    {22, 22, SPECIES_MAGNEMITE},
 };
 
 const struct WildPokemonInfo gNewMauville_Entrance_LandMonsInfo = {10, gNewMauville_Entrance_LandMons};
 
 const struct WildPokemon gSafariZone_Southwest_LandMons[] =
 {
-	{25, 25, SPECIES_ODDISH},
-	{27, 27, SPECIES_ODDISH},
-	{25, 25, SPECIES_GIRAFARIG},
-	{27, 27, SPECIES_GIRAFARIG},
-	{25, 25, SPECIES_NATU},
-	{27, 27, SPECIES_DODUO},
-	{25, 25, SPECIES_GLOOM},
-	{27, 27, SPECIES_WOBBUFFET},
-	{25, 25, SPECIES_PIKACHU},
-	{27, 27, SPECIES_WOBBUFFET},
-	{27, 27, SPECIES_PIKACHU},
-	{29, 29, SPECIES_WOBBUFFET},
+    {25, 25, SPECIES_ODDISH},
+    {27, 27, SPECIES_ODDISH},
+    {25, 25, SPECIES_GIRAFARIG},
+    {27, 27, SPECIES_GIRAFARIG},
+    {25, 25, SPECIES_NATU},
+    {27, 27, SPECIES_DODUO},
+    {25, 25, SPECIES_GLOOM},
+    {27, 27, SPECIES_WOBBUFFET},
+    {25, 25, SPECIES_PIKACHU},
+    {27, 27, SPECIES_WOBBUFFET},
+    {27, 27, SPECIES_PIKACHU},
+    {29, 29, SPECIES_WOBBUFFET},
 };
 
 const struct WildPokemonInfo gSafariZone_Southwest_LandMonsInfo = {25, gSafariZone_Southwest_LandMons};
 
 const struct WildPokemon gSafariZone_Southwest_WaterMons[] =
 {
-	{20, 30, SPECIES_PSYDUCK},
-	{20, 30, SPECIES_PSYDUCK},
-	{30, 35, SPECIES_PSYDUCK},
-	{30, 35, SPECIES_PSYDUCK},
-	{30, 35, SPECIES_PSYDUCK},
+    {20, 30, SPECIES_PSYDUCK},
+    {20, 30, SPECIES_PSYDUCK},
+    {30, 35, SPECIES_PSYDUCK},
+    {30, 35, SPECIES_PSYDUCK},
+    {30, 35, SPECIES_PSYDUCK},
 };
 
 const struct WildPokemonInfo gSafariZone_Southwest_WaterMonsInfo = {9, gSafariZone_Southwest_WaterMons};
 
 const struct WildPokemon gSafariZone_Southwest_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 25, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_GOLDEEN},
-	{25, 30, SPECIES_GOLDEEN},
-	{30, 35, SPECIES_GOLDEEN},
-	{30, 35, SPECIES_SEAKING},
-	{35, 40, SPECIES_SEAKING},
-	{25, 30, SPECIES_SEAKING},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 25, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_GOLDEEN},
+    {25, 30, SPECIES_GOLDEEN},
+    {30, 35, SPECIES_GOLDEEN},
+    {30, 35, SPECIES_SEAKING},
+    {35, 40, SPECIES_SEAKING},
+    {25, 30, SPECIES_SEAKING},
 };
 
 const struct WildPokemonInfo gSafariZone_Southwest_FishingMonsInfo = {35, gSafariZone_Southwest_FishingMons};
 
 const struct WildPokemon gSafariZone_North_LandMons[] =
 {
-	{27, 27, SPECIES_PHANPY},
-	{27, 27, SPECIES_ODDISH},
-	{29, 29, SPECIES_PHANPY},
-	{29, 29, SPECIES_ODDISH},
-	{27, 27, SPECIES_NATU},
-	{29, 29, SPECIES_GLOOM},
-	{31, 31, SPECIES_GLOOM},
-	{29, 29, SPECIES_NATU},
-	{29, 29, SPECIES_XATU},
-	{27, 27, SPECIES_HERACROSS},
-	{31, 31, SPECIES_XATU},
-	{29, 29, SPECIES_HERACROSS},
+    {27, 27, SPECIES_PHANPY},
+    {27, 27, SPECIES_ODDISH},
+    {29, 29, SPECIES_PHANPY},
+    {29, 29, SPECIES_ODDISH},
+    {27, 27, SPECIES_NATU},
+    {29, 29, SPECIES_GLOOM},
+    {31, 31, SPECIES_GLOOM},
+    {29, 29, SPECIES_NATU},
+    {29, 29, SPECIES_XATU},
+    {27, 27, SPECIES_HERACROSS},
+    {31, 31, SPECIES_XATU},
+    {29, 29, SPECIES_HERACROSS},
 };
 
 const struct WildPokemonInfo gSafariZone_North_LandMonsInfo = {25, gSafariZone_North_LandMons};
 
 const struct WildPokemon gSafariZone_North_RockSmashMons[] =
 {
-	{10, 15, SPECIES_GEODUDE},
-	{5, 10, SPECIES_GEODUDE},
-	{15, 20, SPECIES_GEODUDE},
-	{20, 25, SPECIES_GEODUDE},
-	{25, 30, SPECIES_GEODUDE},
+    {10, 15, SPECIES_GEODUDE},
+    {5, 10, SPECIES_GEODUDE},
+    {15, 20, SPECIES_GEODUDE},
+    {20, 25, SPECIES_GEODUDE},
+    {25, 30, SPECIES_GEODUDE},
 };
 
 const struct WildPokemonInfo gSafariZone_North_RockSmashMonsInfo = {25, gSafariZone_North_RockSmashMons};
 
 const struct WildPokemon gSafariZone_Northwest_LandMons[] =
 {
-	{27, 27, SPECIES_RHYHORN},
-	{27, 27, SPECIES_ODDISH},
-	{29, 29, SPECIES_RHYHORN},
-	{29, 29, SPECIES_ODDISH},
-	{27, 27, SPECIES_DODUO},
-	{29, 29, SPECIES_GLOOM},
-	{31, 31, SPECIES_GLOOM},
-	{29, 29, SPECIES_DODUO},
-	{29, 29, SPECIES_DODRIO},
-	{27, 27, SPECIES_PINSIR},
-	{31, 31, SPECIES_DODRIO},
-	{29, 29, SPECIES_PINSIR},
+    {27, 27, SPECIES_RHYHORN},
+    {27, 27, SPECIES_ODDISH},
+    {29, 29, SPECIES_RHYHORN},
+    {29, 29, SPECIES_ODDISH},
+    {27, 27, SPECIES_DODUO},
+    {29, 29, SPECIES_GLOOM},
+    {31, 31, SPECIES_GLOOM},
+    {29, 29, SPECIES_DODUO},
+    {29, 29, SPECIES_DODRIO},
+    {27, 27, SPECIES_PINSIR},
+    {31, 31, SPECIES_DODRIO},
+    {29, 29, SPECIES_PINSIR},
 };
 
 const struct WildPokemonInfo gSafariZone_Northwest_LandMonsInfo = {25, gSafariZone_Northwest_LandMons};
 
 const struct WildPokemon gSafariZone_Northwest_WaterMons[] =
 {
-	{20, 30, SPECIES_PSYDUCK},
-	{20, 30, SPECIES_PSYDUCK},
-	{30, 35, SPECIES_PSYDUCK},
-	{30, 35, SPECIES_GOLDUCK},
-	{25, 40, SPECIES_GOLDUCK},
+    {20, 30, SPECIES_PSYDUCK},
+    {20, 30, SPECIES_PSYDUCK},
+    {30, 35, SPECIES_PSYDUCK},
+    {30, 35, SPECIES_GOLDUCK},
+    {25, 40, SPECIES_GOLDUCK},
 };
 
 const struct WildPokemonInfo gSafariZone_Northwest_WaterMonsInfo = {9, gSafariZone_Northwest_WaterMons};
 
 const struct WildPokemon gSafariZone_Northwest_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 25, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_GOLDEEN},
-	{25, 30, SPECIES_GOLDEEN},
-	{30, 35, SPECIES_GOLDEEN},
-	{30, 35, SPECIES_SEAKING},
-	{35, 40, SPECIES_SEAKING},
-	{25, 30, SPECIES_SEAKING},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 25, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_GOLDEEN},
+    {25, 30, SPECIES_GOLDEEN},
+    {30, 35, SPECIES_GOLDEEN},
+    {30, 35, SPECIES_SEAKING},
+    {35, 40, SPECIES_SEAKING},
+    {25, 30, SPECIES_SEAKING},
 };
 
 const struct WildPokemonInfo gSafariZone_Northwest_FishingMonsInfo = {35, gSafariZone_Northwest_FishingMons};
 
 const struct WildPokemon gVictoryRoad_B1F_LandMons[] =
 {
-	{40, 40, SPECIES_GOLBAT},
-	{40, 40, SPECIES_HARIYAMA},
-	{40, 40, SPECIES_LAIRON},
-	{40, 40, SPECIES_LAIRON},
-	{38, 38, SPECIES_GOLBAT},
-	{38, 38, SPECIES_HARIYAMA},
-	{42, 42, SPECIES_GOLBAT},
-	{42, 42, SPECIES_HARIYAMA},
-	{42, 42, SPECIES_LAIRON},
-	{38, 38, SPECIES_MAWILE},
-	{42, 42, SPECIES_LAIRON},
-	{38, 38, SPECIES_MAWILE},
+    {40, 40, SPECIES_GOLBAT},
+    {40, 40, SPECIES_HARIYAMA},
+    {40, 40, SPECIES_LAIRON},
+    {40, 40, SPECIES_LAIRON},
+    {38, 38, SPECIES_GOLBAT},
+    {38, 38, SPECIES_HARIYAMA},
+    {42, 42, SPECIES_GOLBAT},
+    {42, 42, SPECIES_HARIYAMA},
+    {42, 42, SPECIES_LAIRON},
+    {38, 38, SPECIES_MAWILE},
+    {42, 42, SPECIES_LAIRON},
+    {38, 38, SPECIES_MAWILE},
 };
 
 const struct WildPokemonInfo gVictoryRoad_B1F_LandMonsInfo = {10, gVictoryRoad_B1F_LandMons};
 
 const struct WildPokemon gVictoryRoad_B1F_RockSmashMons[] =
 {
-	{30, 40, SPECIES_GRAVELER},
-	{30, 40, SPECIES_GEODUDE},
-	{35, 40, SPECIES_GRAVELER},
-	{35, 40, SPECIES_GRAVELER},
-	{35, 40, SPECIES_GRAVELER},
+    {30, 40, SPECIES_GRAVELER},
+    {30, 40, SPECIES_GEODUDE},
+    {35, 40, SPECIES_GRAVELER},
+    {35, 40, SPECIES_GRAVELER},
+    {35, 40, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gVictoryRoad_B1F_RockSmashMonsInfo = {20, gVictoryRoad_B1F_RockSmashMons};
 
 const struct WildPokemon gVictoryRoad_B2F_LandMons[] =
 {
-	{40, 40, SPECIES_GOLBAT},
-	{40, 40, SPECIES_SABLEYE},
-	{40, 40, SPECIES_LAIRON},
-	{40, 40, SPECIES_LAIRON},
-	{42, 42, SPECIES_GOLBAT},
-	{42, 42, SPECIES_SABLEYE},
-	{44, 44, SPECIES_GOLBAT},
-	{44, 44, SPECIES_SABLEYE},
-	{42, 42, SPECIES_LAIRON},
-	{42, 42, SPECIES_MAWILE},
-	{44, 44, SPECIES_LAIRON},
-	{44, 44, SPECIES_MAWILE},
+    {40, 40, SPECIES_GOLBAT},
+    {40, 40, SPECIES_SABLEYE},
+    {40, 40, SPECIES_LAIRON},
+    {40, 40, SPECIES_LAIRON},
+    {42, 42, SPECIES_GOLBAT},
+    {42, 42, SPECIES_SABLEYE},
+    {44, 44, SPECIES_GOLBAT},
+    {44, 44, SPECIES_SABLEYE},
+    {42, 42, SPECIES_LAIRON},
+    {42, 42, SPECIES_MAWILE},
+    {44, 44, SPECIES_LAIRON},
+    {44, 44, SPECIES_MAWILE},
 };
 
 const struct WildPokemonInfo gVictoryRoad_B2F_LandMonsInfo = {10, gVictoryRoad_B2F_LandMons};
 
 const struct WildPokemon gVictoryRoad_B2F_WaterMons[] =
 {
-	{30, 35, SPECIES_GOLBAT},
-	{25, 30, SPECIES_GOLBAT},
-	{35, 40, SPECIES_GOLBAT},
-	{35, 40, SPECIES_GOLBAT},
-	{35, 40, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {25, 30, SPECIES_GOLBAT},
+    {35, 40, SPECIES_GOLBAT},
+    {35, 40, SPECIES_GOLBAT},
+    {35, 40, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gVictoryRoad_B2F_WaterMonsInfo = {4, gVictoryRoad_B2F_WaterMons};
 
 const struct WildPokemon gVictoryRoad_B2F_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{30, 35, SPECIES_WHISCASH},
-	{35, 40, SPECIES_WHISCASH},
-	{40, 45, SPECIES_WHISCASH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {30, 35, SPECIES_WHISCASH},
+    {35, 40, SPECIES_WHISCASH},
+    {40, 45, SPECIES_WHISCASH},
 };
 
 const struct WildPokemonInfo gVictoryRoad_B2F_FishingMonsInfo = {30, gVictoryRoad_B2F_FishingMons};
 
 const struct WildPokemon gMeteorFalls_1F_1R_LandMons[] =
 {
-	{16, 16, SPECIES_ZUBAT},
-	{17, 17, SPECIES_ZUBAT},
-	{18, 18, SPECIES_ZUBAT},
-	{15, 15, SPECIES_ZUBAT},
-	{14, 14, SPECIES_ZUBAT},
-	{16, 16, SPECIES_SOLROCK},
-	{18, 18, SPECIES_SOLROCK},
-	{14, 14, SPECIES_SOLROCK},
-	{19, 19, SPECIES_ZUBAT},
-	{20, 20, SPECIES_ZUBAT},
-	{19, 19, SPECIES_ZUBAT},
-	{20, 20, SPECIES_ZUBAT},
+    {16, 16, SPECIES_ZUBAT},
+    {17, 17, SPECIES_ZUBAT},
+    {18, 18, SPECIES_ZUBAT},
+    {15, 15, SPECIES_ZUBAT},
+    {14, 14, SPECIES_ZUBAT},
+    {16, 16, SPECIES_SOLROCK},
+    {18, 18, SPECIES_SOLROCK},
+    {14, 14, SPECIES_SOLROCK},
+    {19, 19, SPECIES_ZUBAT},
+    {20, 20, SPECIES_ZUBAT},
+    {19, 19, SPECIES_ZUBAT},
+    {20, 20, SPECIES_ZUBAT},
 };
 
 const struct WildPokemonInfo gMeteorFalls_1F_1R_LandMonsInfo = {10, gMeteorFalls_1F_1R_LandMons};
 
 const struct WildPokemon gMeteorFalls_1F_1R_WaterMons[] =
 {
-	{5, 35, SPECIES_ZUBAT},
-	{30, 35, SPECIES_ZUBAT},
-	{25, 35, SPECIES_SOLROCK},
-	{15, 25, SPECIES_SOLROCK},
-	{5, 15, SPECIES_SOLROCK},
+    {5, 35, SPECIES_ZUBAT},
+    {30, 35, SPECIES_ZUBAT},
+    {25, 35, SPECIES_SOLROCK},
+    {15, 25, SPECIES_SOLROCK},
+    {5, 15, SPECIES_SOLROCK},
 };
 
 const struct WildPokemonInfo gMeteorFalls_1F_1R_WaterMonsInfo = {4, gMeteorFalls_1F_1R_WaterMons};
 
 const struct WildPokemon gMeteorFalls_1F_1R_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{20, 25, SPECIES_BARBOACH},
-	{35, 40, SPECIES_BARBOACH},
-	{40, 45, SPECIES_BARBOACH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {20, 25, SPECIES_BARBOACH},
+    {35, 40, SPECIES_BARBOACH},
+    {40, 45, SPECIES_BARBOACH},
 };
 
 const struct WildPokemonInfo gMeteorFalls_1F_1R_FishingMonsInfo = {30, gMeteorFalls_1F_1R_FishingMons};
 
 const struct WildPokemon gMeteorFalls_1F_2R_LandMons[] =
 {
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_SOLROCK},
-	{33, 33, SPECIES_SOLROCK},
-	{37, 37, SPECIES_SOLROCK},
-	{35, 35, SPECIES_GOLBAT},
-	{39, 39, SPECIES_SOLROCK},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_SOLROCK},
+    {33, 33, SPECIES_SOLROCK},
+    {37, 37, SPECIES_SOLROCK},
+    {35, 35, SPECIES_GOLBAT},
+    {39, 39, SPECIES_SOLROCK},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gMeteorFalls_1F_2R_LandMonsInfo = {10, gMeteorFalls_1F_2R_LandMons};
 
 const struct WildPokemon gMeteorFalls_1F_2R_WaterMons[] =
 {
-	{30, 35, SPECIES_GOLBAT},
-	{30, 35, SPECIES_GOLBAT},
-	{25, 35, SPECIES_SOLROCK},
-	{15, 25, SPECIES_SOLROCK},
-	{5, 15, SPECIES_SOLROCK},
+    {30, 35, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {25, 35, SPECIES_SOLROCK},
+    {15, 25, SPECIES_SOLROCK},
+    {5, 15, SPECIES_SOLROCK},
 };
 
 const struct WildPokemonInfo gMeteorFalls_1F_2R_WaterMonsInfo = {4, gMeteorFalls_1F_2R_WaterMons};
 
 const struct WildPokemon gMeteorFalls_1F_2R_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{30, 35, SPECIES_WHISCASH},
-	{35, 40, SPECIES_WHISCASH},
-	{40, 45, SPECIES_WHISCASH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {30, 35, SPECIES_WHISCASH},
+    {35, 40, SPECIES_WHISCASH},
+    {40, 45, SPECIES_WHISCASH},
 };
 
 const struct WildPokemonInfo gMeteorFalls_1F_2R_FishingMonsInfo = {30, gMeteorFalls_1F_2R_FishingMons};
 
 const struct WildPokemon gMeteorFalls_B1F_1R_LandMons[] =
 {
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_SOLROCK},
-	{33, 33, SPECIES_SOLROCK},
-	{37, 37, SPECIES_SOLROCK},
-	{35, 35, SPECIES_GOLBAT},
-	{39, 39, SPECIES_SOLROCK},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_SOLROCK},
+    {33, 33, SPECIES_SOLROCK},
+    {37, 37, SPECIES_SOLROCK},
+    {35, 35, SPECIES_GOLBAT},
+    {39, 39, SPECIES_SOLROCK},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gMeteorFalls_B1F_1R_LandMonsInfo = {10, gMeteorFalls_B1F_1R_LandMons};
 
 const struct WildPokemon gMeteorFalls_B1F_1R_WaterMons[] =
 {
-	{30, 35, SPECIES_GOLBAT},
-	{30, 35, SPECIES_GOLBAT},
-	{25, 35, SPECIES_SOLROCK},
-	{15, 25, SPECIES_SOLROCK},
-	{5, 15, SPECIES_SOLROCK},
+    {30, 35, SPECIES_GOLBAT},
+    {30, 35, SPECIES_GOLBAT},
+    {25, 35, SPECIES_SOLROCK},
+    {15, 25, SPECIES_SOLROCK},
+    {5, 15, SPECIES_SOLROCK},
 };
 
 const struct WildPokemonInfo gMeteorFalls_B1F_1R_WaterMonsInfo = {4, gMeteorFalls_B1F_1R_WaterMons};
 
 const struct WildPokemon gMeteorFalls_B1F_1R_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_BARBOACH},
-	{25, 30, SPECIES_BARBOACH},
-	{30, 35, SPECIES_BARBOACH},
-	{30, 35, SPECIES_WHISCASH},
-	{35, 40, SPECIES_WHISCASH},
-	{40, 45, SPECIES_WHISCASH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_BARBOACH},
+    {25, 30, SPECIES_BARBOACH},
+    {30, 35, SPECIES_BARBOACH},
+    {30, 35, SPECIES_WHISCASH},
+    {35, 40, SPECIES_WHISCASH},
+    {40, 45, SPECIES_WHISCASH},
 };
 
 const struct WildPokemonInfo gMeteorFalls_B1F_1R_FishingMonsInfo = {30, gMeteorFalls_B1F_1R_FishingMons};
 
 const struct WildPokemon gShoalCave_LowTideStairsRoom_LandMons[] =
 {
-	{26, 26, SPECIES_ZUBAT},
-	{26, 26, SPECIES_SPHEAL},
-	{28, 28, SPECIES_ZUBAT},
-	{28, 28, SPECIES_SPHEAL},
-	{30, 30, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SPHEAL},
-	{32, 32, SPECIES_ZUBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
+    {26, 26, SPECIES_ZUBAT},
+    {26, 26, SPECIES_SPHEAL},
+    {28, 28, SPECIES_ZUBAT},
+    {28, 28, SPECIES_SPHEAL},
+    {30, 30, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SPHEAL},
+    {32, 32, SPECIES_ZUBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideStairsRoom_LandMonsInfo = {10, gShoalCave_LowTideStairsRoom_LandMons};
 
 const struct WildPokemon gShoalCave_LowTideLowerRoom_LandMons[] =
 {
-	{26, 26, SPECIES_ZUBAT},
-	{26, 26, SPECIES_SPHEAL},
-	{28, 28, SPECIES_ZUBAT},
-	{28, 28, SPECIES_SPHEAL},
-	{30, 30, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SPHEAL},
-	{32, 32, SPECIES_ZUBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
+    {26, 26, SPECIES_ZUBAT},
+    {26, 26, SPECIES_SPHEAL},
+    {28, 28, SPECIES_ZUBAT},
+    {28, 28, SPECIES_SPHEAL},
+    {30, 30, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SPHEAL},
+    {32, 32, SPECIES_ZUBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideLowerRoom_LandMonsInfo = {10, gShoalCave_LowTideLowerRoom_LandMons};
 
 const struct WildPokemon gShoalCave_LowTideInnerRoom_LandMons[] =
 {
-	{26, 26, SPECIES_ZUBAT},
-	{26, 26, SPECIES_SPHEAL},
-	{28, 28, SPECIES_ZUBAT},
-	{28, 28, SPECIES_SPHEAL},
-	{30, 30, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SPHEAL},
-	{32, 32, SPECIES_ZUBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
+    {26, 26, SPECIES_ZUBAT},
+    {26, 26, SPECIES_SPHEAL},
+    {28, 28, SPECIES_ZUBAT},
+    {28, 28, SPECIES_SPHEAL},
+    {30, 30, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SPHEAL},
+    {32, 32, SPECIES_ZUBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_LandMonsInfo = {10, gShoalCave_LowTideInnerRoom_LandMons};
 
 const struct WildPokemon gShoalCave_LowTideInnerRoom_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_ZUBAT},
-	{25, 30, SPECIES_SPHEAL},
-	{25, 30, SPECIES_SPHEAL},
-	{25, 35, SPECIES_SPHEAL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_ZUBAT},
+    {25, 30, SPECIES_SPHEAL},
+    {25, 30, SPECIES_SPHEAL},
+    {25, 35, SPECIES_SPHEAL},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_WaterMonsInfo = {4, gShoalCave_LowTideInnerRoom_WaterMons};
 
 const struct WildPokemon gShoalCave_LowTideInnerRoom_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_FishingMonsInfo = {10, gShoalCave_LowTideInnerRoom_FishingMons};
 
 const struct WildPokemon gShoalCave_LowTideEntranceRoom_LandMons[] =
 {
-	{26, 26, SPECIES_ZUBAT},
-	{26, 26, SPECIES_SPHEAL},
-	{28, 28, SPECIES_ZUBAT},
-	{28, 28, SPECIES_SPHEAL},
-	{30, 30, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SPHEAL},
-	{32, 32, SPECIES_ZUBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
-	{32, 32, SPECIES_GOLBAT},
-	{32, 32, SPECIES_SPHEAL},
+    {26, 26, SPECIES_ZUBAT},
+    {26, 26, SPECIES_SPHEAL},
+    {28, 28, SPECIES_ZUBAT},
+    {28, 28, SPECIES_SPHEAL},
+    {30, 30, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SPHEAL},
+    {32, 32, SPECIES_ZUBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
+    {32, 32, SPECIES_GOLBAT},
+    {32, 32, SPECIES_SPHEAL},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_LandMonsInfo = {10, gShoalCave_LowTideEntranceRoom_LandMons};
 
 const struct WildPokemon gShoalCave_LowTideEntranceRoom_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{5, 35, SPECIES_ZUBAT},
-	{25, 30, SPECIES_SPHEAL},
-	{25, 30, SPECIES_SPHEAL},
-	{25, 35, SPECIES_SPHEAL},
+    {5, 35, SPECIES_TENTACOOL},
+    {5, 35, SPECIES_ZUBAT},
+    {25, 30, SPECIES_SPHEAL},
+    {25, 30, SPECIES_SPHEAL},
+    {25, 35, SPECIES_SPHEAL},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_WaterMonsInfo = {4, gShoalCave_LowTideEntranceRoom_WaterMons};
 
 const struct WildPokemon gShoalCave_LowTideEntranceRoom_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_FishingMonsInfo = {10, gShoalCave_LowTideEntranceRoom_FishingMons};
 
 const struct WildPokemon gLilycoveCity_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gLilycoveCity_WaterMonsInfo = {4, gLilycoveCity_WaterMons};
 
 const struct WildPokemon gLilycoveCity_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_STARYU},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_STARYU},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gLilycoveCity_FishingMonsInfo = {10, gLilycoveCity_FishingMons};
 
 const struct WildPokemon gDewfordTown_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gDewfordTown_WaterMonsInfo = {4, gDewfordTown_WaterMons};
 
 const struct WildPokemon gDewfordTown_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gDewfordTown_FishingMonsInfo = {10, gDewfordTown_FishingMons};
 
 const struct WildPokemon gSlateportCity_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gSlateportCity_WaterMonsInfo = {4, gSlateportCity_WaterMons};
 
 const struct WildPokemon gSlateportCity_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_WAILMER},
-	{20, 25, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_WAILMER},
+    {20, 25, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gSlateportCity_FishingMonsInfo = {10, gSlateportCity_FishingMons};
 
 const struct WildPokemon gMossdeepCity_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gMossdeepCity_WaterMonsInfo = {4, gMossdeepCity_WaterMons};
 
 const struct WildPokemon gMossdeepCity_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gMossdeepCity_FishingMonsInfo = {10, gMossdeepCity_FishingMons};
 
 const struct WildPokemon gPacifidlogTown_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gPacifidlogTown_WaterMonsInfo = {4, gPacifidlogTown_WaterMons};
 
 const struct WildPokemon gPacifidlogTown_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_SHARPEDO},
-	{30, 35, SPECIES_WAILMER},
-	{25, 30, SPECIES_WAILMER},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_SHARPEDO},
+    {30, 35, SPECIES_WAILMER},
+    {25, 30, SPECIES_WAILMER},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gPacifidlogTown_FishingMonsInfo = {10, gPacifidlogTown_FishingMons};
 
 const struct WildPokemon gEverGrandeCity_WaterMons[] =
 {
-	{5, 35, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_WINGULL},
-	{15, 25, SPECIES_WINGULL},
-	{25, 30, SPECIES_PELIPPER},
-	{25, 30, SPECIES_PELIPPER},
+    {5, 35, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_WINGULL},
+    {15, 25, SPECIES_WINGULL},
+    {25, 30, SPECIES_PELIPPER},
+    {25, 30, SPECIES_PELIPPER},
 };
 
 const struct WildPokemonInfo gEverGrandeCity_WaterMonsInfo = {4, gEverGrandeCity_WaterMons};
 
 const struct WildPokemon gEverGrandeCity_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_LUVDISC},
-	{10, 30, SPECIES_WAILMER},
-	{30, 35, SPECIES_LUVDISC},
-	{30, 35, SPECIES_WAILMER},
-	{30, 35, SPECIES_CORSOLA},
-	{35, 40, SPECIES_WAILMER},
-	{40, 45, SPECIES_WAILMER},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_LUVDISC},
+    {10, 30, SPECIES_WAILMER},
+    {30, 35, SPECIES_LUVDISC},
+    {30, 35, SPECIES_WAILMER},
+    {30, 35, SPECIES_CORSOLA},
+    {35, 40, SPECIES_WAILMER},
+    {40, 45, SPECIES_WAILMER},
 };
 
 const struct WildPokemonInfo gEverGrandeCity_FishingMonsInfo = {10, gEverGrandeCity_FishingMons};
 
 const struct WildPokemon gPetalburgCity_WaterMons[] =
 {
-	{20, 30, SPECIES_MARILL},
-	{10, 20, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
-	{5, 10, SPECIES_MARILL},
+    {20, 30, SPECIES_MARILL},
+    {10, 20, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
+    {5, 10, SPECIES_MARILL},
 };
 
 const struct WildPokemonInfo gPetalburgCity_WaterMonsInfo = {1, gPetalburgCity_WaterMons};
 
 const struct WildPokemon gPetalburgCity_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_GOLDEEN},
-	{10, 30, SPECIES_CORPHISH},
-	{25, 30, SPECIES_CORPHISH},
-	{30, 35, SPECIES_CORPHISH},
-	{20, 25, SPECIES_CORPHISH},
-	{35, 40, SPECIES_CORPHISH},
-	{40, 45, SPECIES_CORPHISH},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_GOLDEEN},
+    {10, 30, SPECIES_CORPHISH},
+    {25, 30, SPECIES_CORPHISH},
+    {30, 35, SPECIES_CORPHISH},
+    {20, 25, SPECIES_CORPHISH},
+    {35, 40, SPECIES_CORPHISH},
+    {40, 45, SPECIES_CORPHISH},
 };
 
 const struct WildPokemonInfo gPetalburgCity_FishingMonsInfo = {10, gPetalburgCity_FishingMons};
 
 const struct WildPokemon gUnderwater1_WaterMons[] =
 {
-	{20, 30, SPECIES_CLAMPERL},
-	{20, 30, SPECIES_CHINCHOU},
-	{30, 35, SPECIES_CLAMPERL},
-	{30, 35, SPECIES_RELICANTH},
-	{30, 35, SPECIES_RELICANTH},
+    {20, 30, SPECIES_CLAMPERL},
+    {20, 30, SPECIES_CHINCHOU},
+    {30, 35, SPECIES_CLAMPERL},
+    {30, 35, SPECIES_RELICANTH},
+    {30, 35, SPECIES_RELICANTH},
 };
 
 const struct WildPokemonInfo gUnderwater1_WaterMonsInfo = {4, gUnderwater1_WaterMons};
 
 const struct WildPokemon gShoalCave_LowTideIceRoom_LandMons[] =
 {
-	{26, 26, SPECIES_ZUBAT},
-	{26, 26, SPECIES_SPHEAL},
-	{28, 28, SPECIES_ZUBAT},
-	{28, 28, SPECIES_SPHEAL},
-	{30, 30, SPECIES_ZUBAT},
-	{30, 30, SPECIES_SPHEAL},
-	{26, 26, SPECIES_SNORUNT},
-	{32, 32, SPECIES_SPHEAL},
-	{30, 30, SPECIES_GOLBAT},
-	{28, 28, SPECIES_SNORUNT},
-	{32, 32, SPECIES_GOLBAT},
-	{30, 30, SPECIES_SNORUNT},
+    {26, 26, SPECIES_ZUBAT},
+    {26, 26, SPECIES_SPHEAL},
+    {28, 28, SPECIES_ZUBAT},
+    {28, 28, SPECIES_SPHEAL},
+    {30, 30, SPECIES_ZUBAT},
+    {30, 30, SPECIES_SPHEAL},
+    {26, 26, SPECIES_SNORUNT},
+    {32, 32, SPECIES_SPHEAL},
+    {30, 30, SPECIES_GOLBAT},
+    {28, 28, SPECIES_SNORUNT},
+    {32, 32, SPECIES_GOLBAT},
+    {30, 30, SPECIES_SNORUNT},
 };
 
 const struct WildPokemonInfo gShoalCave_LowTideIceRoom_LandMonsInfo = {10, gShoalCave_LowTideIceRoom_LandMons};
 
 const struct WildPokemon gSkyPillar_1F_LandMons[] =
 {
-	{33, 33, SPECIES_SABLEYE},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{34, 34, SPECIES_SABLEYE},
-	{36, 36, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_BANETTE},
-	{38, 38, SPECIES_BANETTE},
-	{36, 36, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_CLAYDOL},
-	{38, 38, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_CLAYDOL},
-	{38, 38, SPECIES_CLAYDOL},
+    {33, 33, SPECIES_SABLEYE},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {34, 34, SPECIES_SABLEYE},
+    {36, 36, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_BANETTE},
+    {38, 38, SPECIES_BANETTE},
+    {36, 36, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_CLAYDOL},
+    {38, 38, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_CLAYDOL},
+    {38, 38, SPECIES_CLAYDOL},
 };
 
 const struct WildPokemonInfo gSkyPillar_1F_LandMonsInfo = {10, gSkyPillar_1F_LandMons};
 
 const struct WildPokemon gSootopolisCity_WaterMons[] =
 {
-	{5, 35, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_MAGIKARP},
-	{15, 25, SPECIES_MAGIKARP},
-	{25, 30, SPECIES_MAGIKARP},
-	{25, 30, SPECIES_MAGIKARP},
+    {5, 35, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_MAGIKARP},
+    {15, 25, SPECIES_MAGIKARP},
+    {25, 30, SPECIES_MAGIKARP},
+    {25, 30, SPECIES_MAGIKARP},
 };
 
 const struct WildPokemonInfo gSootopolisCity_WaterMonsInfo = {1, gSootopolisCity_WaterMons};
 
 const struct WildPokemon gSootopolisCity_FishingMons[] =
 {
-	{5, 10, SPECIES_MAGIKARP},
-	{5, 10, SPECIES_TENTACOOL},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_MAGIKARP},
-	{10, 30, SPECIES_MAGIKARP},
-	{30, 35, SPECIES_MAGIKARP},
-	{30, 35, SPECIES_MAGIKARP},
-	{35, 40, SPECIES_GYARADOS},
-	{35, 45, SPECIES_GYARADOS},
-	{5, 45, SPECIES_GYARADOS},
+    {5, 10, SPECIES_MAGIKARP},
+    {5, 10, SPECIES_TENTACOOL},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_MAGIKARP},
+    {10, 30, SPECIES_MAGIKARP},
+    {30, 35, SPECIES_MAGIKARP},
+    {30, 35, SPECIES_MAGIKARP},
+    {35, 40, SPECIES_GYARADOS},
+    {35, 45, SPECIES_GYARADOS},
+    {5, 45, SPECIES_GYARADOS},
 };
 
 const struct WildPokemonInfo gSootopolisCity_FishingMonsInfo = {10, gSootopolisCity_FishingMons};
 
 const struct WildPokemon gSkyPillar_3F_LandMons[] =
 {
-	{33, 33, SPECIES_SABLEYE},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{34, 34, SPECIES_SABLEYE},
-	{36, 36, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_BANETTE},
-	{38, 38, SPECIES_BANETTE},
-	{36, 36, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_CLAYDOL},
-	{38, 38, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_CLAYDOL},
-	{38, 38, SPECIES_CLAYDOL},
+    {33, 33, SPECIES_SABLEYE},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {34, 34, SPECIES_SABLEYE},
+    {36, 36, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_BANETTE},
+    {38, 38, SPECIES_BANETTE},
+    {36, 36, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_CLAYDOL},
+    {38, 38, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_CLAYDOL},
+    {38, 38, SPECIES_CLAYDOL},
 };
 
 const struct WildPokemonInfo gSkyPillar_3F_LandMonsInfo = {10, gSkyPillar_3F_LandMons};
 
 const struct WildPokemon gSkyPillar_5F_LandMons[] =
 {
-	{33, 33, SPECIES_SABLEYE},
-	{34, 34, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{34, 34, SPECIES_SABLEYE},
-	{36, 36, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_BANETTE},
-	{38, 38, SPECIES_BANETTE},
-	{36, 36, SPECIES_CLAYDOL},
-	{37, 37, SPECIES_CLAYDOL},
-	{38, 38, SPECIES_ALTARIA},
-	{39, 39, SPECIES_ALTARIA},
-	{39, 39, SPECIES_ALTARIA},
+    {33, 33, SPECIES_SABLEYE},
+    {34, 34, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {34, 34, SPECIES_SABLEYE},
+    {36, 36, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_BANETTE},
+    {38, 38, SPECIES_BANETTE},
+    {36, 36, SPECIES_CLAYDOL},
+    {37, 37, SPECIES_CLAYDOL},
+    {38, 38, SPECIES_ALTARIA},
+    {39, 39, SPECIES_ALTARIA},
+    {39, 39, SPECIES_ALTARIA},
 };
 
 const struct WildPokemonInfo gSkyPillar_5F_LandMonsInfo = {10, gSkyPillar_5F_LandMons};
 
 const struct WildPokemon gSafariZone_Southeast_LandMons[] =
 {
-	{33, 33, SPECIES_SUNKERN},
-	{34, 34, SPECIES_MAREEP},
-	{35, 35, SPECIES_SUNKERN},
-	{36, 36, SPECIES_MAREEP},
-	{34, 34, SPECIES_AIPOM},
-	{33, 33, SPECIES_SPINARAK},
-	{35, 35, SPECIES_HOOTHOOT},
-	{34, 34, SPECIES_SNUBBULL},
-	{36, 36, SPECIES_STANTLER},
-	{37, 37, SPECIES_GLIGAR},
-	{39, 39, SPECIES_STANTLER},
-	{40, 40, SPECIES_GLIGAR},
+    {33, 33, SPECIES_SUNKERN},
+    {34, 34, SPECIES_MAREEP},
+    {35, 35, SPECIES_SUNKERN},
+    {36, 36, SPECIES_MAREEP},
+    {34, 34, SPECIES_AIPOM},
+    {33, 33, SPECIES_SPINARAK},
+    {35, 35, SPECIES_HOOTHOOT},
+    {34, 34, SPECIES_SNUBBULL},
+    {36, 36, SPECIES_STANTLER},
+    {37, 37, SPECIES_GLIGAR},
+    {39, 39, SPECIES_STANTLER},
+    {40, 40, SPECIES_GLIGAR},
 };
 
 const struct WildPokemonInfo gSafariZone_Southeast_LandMonsInfo = {25, gSafariZone_Southeast_LandMons};
 
 const struct WildPokemon gSafariZone_Southeast_WaterMons[] =
 {
-	{25, 30, SPECIES_WOOPER},
-	{25, 30, SPECIES_MARILL},
-	{25, 30, SPECIES_MARILL},
-	{30, 35, SPECIES_MARILL},
-	{35, 40, SPECIES_QUAGSIRE},
+    {25, 30, SPECIES_WOOPER},
+    {25, 30, SPECIES_MARILL},
+    {25, 30, SPECIES_MARILL},
+    {30, 35, SPECIES_MARILL},
+    {35, 40, SPECIES_QUAGSIRE},
 };
 
 const struct WildPokemonInfo gSafariZone_Southeast_WaterMonsInfo = {9, gSafariZone_Southeast_WaterMons};
 
 const struct WildPokemon gSafariZone_Southeast_FishingMons[] =
 {
-	{25, 30, SPECIES_MAGIKARP},
-	{25, 30, SPECIES_GOLDEEN},
-	{25, 30, SPECIES_MAGIKARP},
-	{25, 30, SPECIES_GOLDEEN},
-	{30, 35, SPECIES_REMORAID},
-	{25, 30, SPECIES_GOLDEEN},
-	{25, 30, SPECIES_REMORAID},
-	{30, 35, SPECIES_REMORAID},
-	{30, 35, SPECIES_REMORAID},
-	{35, 40, SPECIES_OCTILLERY},
+    {25, 30, SPECIES_MAGIKARP},
+    {25, 30, SPECIES_GOLDEEN},
+    {25, 30, SPECIES_MAGIKARP},
+    {25, 30, SPECIES_GOLDEEN},
+    {30, 35, SPECIES_REMORAID},
+    {25, 30, SPECIES_GOLDEEN},
+    {25, 30, SPECIES_REMORAID},
+    {30, 35, SPECIES_REMORAID},
+    {30, 35, SPECIES_REMORAID},
+    {35, 40, SPECIES_OCTILLERY},
 };
 
 const struct WildPokemonInfo gSafariZone_Southeast_FishingMonsInfo = {35, gSafariZone_Southeast_FishingMons};
 
 const struct WildPokemon gSafariZone_Northeast_LandMons[] =
 {
-	{33, 33, SPECIES_AIPOM},
-	{34, 34, SPECIES_TEDDIURSA},
-	{35, 35, SPECIES_AIPOM},
-	{36, 36, SPECIES_TEDDIURSA},
-	{34, 34, SPECIES_SUNKERN},
-	{33, 33, SPECIES_LEDYBA},
-	{35, 35, SPECIES_HOOTHOOT},
-	{34, 34, SPECIES_PINECO},
-	{36, 36, SPECIES_HOUNDOUR},
-	{37, 37, SPECIES_MILTANK},
-	{39, 39, SPECIES_HOUNDOUR},
-	{40, 40, SPECIES_MILTANK},
+    {33, 33, SPECIES_AIPOM},
+    {34, 34, SPECIES_TEDDIURSA},
+    {35, 35, SPECIES_AIPOM},
+    {36, 36, SPECIES_TEDDIURSA},
+    {34, 34, SPECIES_SUNKERN},
+    {33, 33, SPECIES_LEDYBA},
+    {35, 35, SPECIES_HOOTHOOT},
+    {34, 34, SPECIES_PINECO},
+    {36, 36, SPECIES_HOUNDOUR},
+    {37, 37, SPECIES_MILTANK},
+    {39, 39, SPECIES_HOUNDOUR},
+    {40, 40, SPECIES_MILTANK},
 };
 
 const struct WildPokemonInfo gSafariZone_Northeast_LandMonsInfo = {25, gSafariZone_Northeast_LandMons};
 
 const struct WildPokemon gSafariZone_Northeast_RockSmashMons[] =
 {
-	{25, 30, SPECIES_SHUCKLE},
-	{20, 25, SPECIES_SHUCKLE},
-	{30, 35, SPECIES_SHUCKLE},
-	{30, 35, SPECIES_SHUCKLE},
-	{35, 40, SPECIES_SHUCKLE},
+    {25, 30, SPECIES_SHUCKLE},
+    {20, 25, SPECIES_SHUCKLE},
+    {30, 35, SPECIES_SHUCKLE},
+    {30, 35, SPECIES_SHUCKLE},
+    {35, 40, SPECIES_SHUCKLE},
 };
 
 const struct WildPokemonInfo gSafariZone_Northeast_RockSmashMonsInfo = {25, gSafariZone_Northeast_RockSmashMons};
 
 const struct WildPokemon gMagmaHideout_1F_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_1F_LandMonsInfo = {10, gMagmaHideout_1F_LandMons};
 
 const struct WildPokemon gMagmaHideout_2F_1R_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_2F_1R_LandMonsInfo = {10, gMagmaHideout_2F_1R_LandMons};
 
 const struct WildPokemon gMagmaHideout_2F_2R_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_2F_2R_LandMonsInfo = {10, gMagmaHideout_2F_2R_LandMons};
 
 const struct WildPokemon gMagmaHideout_3F_1R_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_3F_1R_LandMonsInfo = {10, gMagmaHideout_3F_1R_LandMons};
 
 const struct WildPokemon gMagmaHideout_3F_2R_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_3F_2R_LandMonsInfo = {10, gMagmaHideout_3F_2R_LandMons};
 
 const struct WildPokemon gMagmaHideout_4F_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_4F_LandMonsInfo = {10, gMagmaHideout_4F_LandMons};
 
 const struct WildPokemon gMagmaHideout_3F_3R_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_3F_3R_LandMonsInfo = {10, gMagmaHideout_3F_3R_LandMons};
 
 const struct WildPokemon gMagmaHideout_2F_3R_LandMons[] =
 {
-	{27, 27, SPECIES_GEODUDE},
-	{28, 28, SPECIES_TORKOAL},
-	{28, 28, SPECIES_GEODUDE},
-	{30, 30, SPECIES_TORKOAL},
-	{29, 29, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GEODUDE},
-	{30, 30, SPECIES_GRAVELER},
-	{30, 30, SPECIES_GRAVELER},
-	{31, 31, SPECIES_GRAVELER},
-	{32, 32, SPECIES_GRAVELER},
-	{33, 33, SPECIES_GRAVELER},
+    {27, 27, SPECIES_GEODUDE},
+    {28, 28, SPECIES_TORKOAL},
+    {28, 28, SPECIES_GEODUDE},
+    {30, 30, SPECIES_TORKOAL},
+    {29, 29, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GEODUDE},
+    {30, 30, SPECIES_GRAVELER},
+    {30, 30, SPECIES_GRAVELER},
+    {31, 31, SPECIES_GRAVELER},
+    {32, 32, SPECIES_GRAVELER},
+    {33, 33, SPECIES_GRAVELER},
 };
 
 const struct WildPokemonInfo gMagmaHideout_2F_3R_LandMonsInfo = {10, gMagmaHideout_2F_3R_LandMons};
 
 const struct WildPokemon gMirageTower_1F_LandMons[] =
 {
-	{21, 21, SPECIES_SANDSHREW},
-	{21, 21, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{22, 22, SPECIES_SANDSHREW},
-	{22, 22, SPECIES_TRAPINCH},
-	{23, 23, SPECIES_SANDSHREW},
-	{23, 23, SPECIES_TRAPINCH},
-	{24, 24, SPECIES_SANDSHREW},
-	{24, 24, SPECIES_TRAPINCH},
+    {21, 21, SPECIES_SANDSHREW},
+    {21, 21, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {22, 22, SPECIES_SANDSHREW},
+    {22, 22, SPECIES_TRAPINCH},
+    {23, 23, SPECIES_SANDSHREW},
+    {23, 23, SPECIES_TRAPINCH},
+    {24, 24, SPECIES_SANDSHREW},
+    {24, 24, SPECIES_TRAPINCH},
 };
 
 const struct WildPokemonInfo gMirageTower_1F_LandMonsInfo = {10, gMirageTower_1F_LandMons};
 
 const struct WildPokemon gMirageTower_2F_LandMons[] =
 {
-	{21, 21, SPECIES_SANDSHREW},
-	{21, 21, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{22, 22, SPECIES_SANDSHREW},
-	{22, 22, SPECIES_TRAPINCH},
-	{23, 23, SPECIES_SANDSHREW},
-	{23, 23, SPECIES_TRAPINCH},
-	{24, 24, SPECIES_SANDSHREW},
-	{24, 24, SPECIES_TRAPINCH},
+    {21, 21, SPECIES_SANDSHREW},
+    {21, 21, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {22, 22, SPECIES_SANDSHREW},
+    {22, 22, SPECIES_TRAPINCH},
+    {23, 23, SPECIES_SANDSHREW},
+    {23, 23, SPECIES_TRAPINCH},
+    {24, 24, SPECIES_SANDSHREW},
+    {24, 24, SPECIES_TRAPINCH},
 };
 
 const struct WildPokemonInfo gMirageTower_2F_LandMonsInfo = {10, gMirageTower_2F_LandMons};
 
 const struct WildPokemon gMirageTower_3F_LandMons[] =
 {
-	{21, 21, SPECIES_SANDSHREW},
-	{21, 21, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{22, 22, SPECIES_SANDSHREW},
-	{22, 22, SPECIES_TRAPINCH},
-	{23, 23, SPECIES_SANDSHREW},
-	{23, 23, SPECIES_TRAPINCH},
-	{24, 24, SPECIES_SANDSHREW},
-	{24, 24, SPECIES_TRAPINCH},
+    {21, 21, SPECIES_SANDSHREW},
+    {21, 21, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {22, 22, SPECIES_SANDSHREW},
+    {22, 22, SPECIES_TRAPINCH},
+    {23, 23, SPECIES_SANDSHREW},
+    {23, 23, SPECIES_TRAPINCH},
+    {24, 24, SPECIES_SANDSHREW},
+    {24, 24, SPECIES_TRAPINCH},
 };
 
 const struct WildPokemonInfo gMirageTower_3F_LandMonsInfo = {10, gMirageTower_3F_LandMons};
 
 const struct WildPokemon gMirageTower_4F_LandMons[] =
 {
-	{21, 21, SPECIES_SANDSHREW},
-	{21, 21, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{20, 20, SPECIES_SANDSHREW},
-	{20, 20, SPECIES_TRAPINCH},
-	{22, 22, SPECIES_SANDSHREW},
-	{22, 22, SPECIES_TRAPINCH},
-	{23, 23, SPECIES_SANDSHREW},
-	{23, 23, SPECIES_TRAPINCH},
-	{24, 24, SPECIES_SANDSHREW},
-	{24, 24, SPECIES_TRAPINCH},
+    {21, 21, SPECIES_SANDSHREW},
+    {21, 21, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {20, 20, SPECIES_SANDSHREW},
+    {20, 20, SPECIES_TRAPINCH},
+    {22, 22, SPECIES_SANDSHREW},
+    {22, 22, SPECIES_TRAPINCH},
+    {23, 23, SPECIES_SANDSHREW},
+    {23, 23, SPECIES_TRAPINCH},
+    {24, 24, SPECIES_SANDSHREW},
+    {24, 24, SPECIES_TRAPINCH},
 };
 
 const struct WildPokemonInfo gMirageTower_4F_LandMonsInfo = {10, gMirageTower_4F_LandMons};
 
 const struct WildPokemon gDesertUnderpass_LandMons[] =
 {
-	{38, 38, SPECIES_DITTO},
-	{35, 35, SPECIES_WHISMUR},
-	{40, 40, SPECIES_DITTO},
-	{40, 40, SPECIES_LOUDRED},
-	{41, 41, SPECIES_DITTO},
-	{36, 36, SPECIES_WHISMUR},
-	{38, 38, SPECIES_LOUDRED},
-	{42, 42, SPECIES_DITTO},
-	{38, 38, SPECIES_WHISMUR},
-	{43, 43, SPECIES_DITTO},
-	{44, 44, SPECIES_LOUDRED},
-	{45, 45, SPECIES_DITTO},
+    {38, 38, SPECIES_DITTO},
+    {35, 35, SPECIES_WHISMUR},
+    {40, 40, SPECIES_DITTO},
+    {40, 40, SPECIES_LOUDRED},
+    {41, 41, SPECIES_DITTO},
+    {36, 36, SPECIES_WHISMUR},
+    {38, 38, SPECIES_LOUDRED},
+    {42, 42, SPECIES_DITTO},
+    {38, 38, SPECIES_WHISMUR},
+    {43, 43, SPECIES_DITTO},
+    {44, 44, SPECIES_LOUDRED},
+    {45, 45, SPECIES_DITTO},
 };
 
 const struct WildPokemonInfo gDesertUnderpass_LandMonsInfo = {10, gDesertUnderpass_LandMons};
 
 const struct WildPokemon gArtisanCave_B1F_LandMons[] =
 {
-	{40, 40, SPECIES_SMEARGLE},
-	{41, 41, SPECIES_SMEARGLE},
-	{42, 42, SPECIES_SMEARGLE},
-	{43, 43, SPECIES_SMEARGLE},
-	{44, 44, SPECIES_SMEARGLE},
-	{45, 45, SPECIES_SMEARGLE},
-	{46, 46, SPECIES_SMEARGLE},
-	{47, 47, SPECIES_SMEARGLE},
-	{48, 48, SPECIES_SMEARGLE},
-	{49, 49, SPECIES_SMEARGLE},
-	{50, 50, SPECIES_SMEARGLE},
-	{50, 50, SPECIES_SMEARGLE},
+    {40, 40, SPECIES_SMEARGLE},
+    {41, 41, SPECIES_SMEARGLE},
+    {42, 42, SPECIES_SMEARGLE},
+    {43, 43, SPECIES_SMEARGLE},
+    {44, 44, SPECIES_SMEARGLE},
+    {45, 45, SPECIES_SMEARGLE},
+    {46, 46, SPECIES_SMEARGLE},
+    {47, 47, SPECIES_SMEARGLE},
+    {48, 48, SPECIES_SMEARGLE},
+    {49, 49, SPECIES_SMEARGLE},
+    {50, 50, SPECIES_SMEARGLE},
+    {50, 50, SPECIES_SMEARGLE},
 };
 
 const struct WildPokemonInfo gArtisanCave_B1F_LandMonsInfo = {10, gArtisanCave_B1F_LandMons};
 
 const struct WildPokemon gArtisanCave_1F_LandMons[] =
 {
-	{40, 40, SPECIES_SMEARGLE},
-	{41, 41, SPECIES_SMEARGLE},
-	{42, 42, SPECIES_SMEARGLE},
-	{43, 43, SPECIES_SMEARGLE},
-	{44, 44, SPECIES_SMEARGLE},
-	{45, 45, SPECIES_SMEARGLE},
-	{46, 46, SPECIES_SMEARGLE},
-	{47, 47, SPECIES_SMEARGLE},
-	{48, 48, SPECIES_SMEARGLE},
-	{49, 49, SPECIES_SMEARGLE},
-	{50, 50, SPECIES_SMEARGLE},
-	{50, 50, SPECIES_SMEARGLE},
+    {40, 40, SPECIES_SMEARGLE},
+    {41, 41, SPECIES_SMEARGLE},
+    {42, 42, SPECIES_SMEARGLE},
+    {43, 43, SPECIES_SMEARGLE},
+    {44, 44, SPECIES_SMEARGLE},
+    {45, 45, SPECIES_SMEARGLE},
+    {46, 46, SPECIES_SMEARGLE},
+    {47, 47, SPECIES_SMEARGLE},
+    {48, 48, SPECIES_SMEARGLE},
+    {49, 49, SPECIES_SMEARGLE},
+    {50, 50, SPECIES_SMEARGLE},
+    {50, 50, SPECIES_SMEARGLE},
 };
 
 const struct WildPokemonInfo gArtisanCave_1F_LandMonsInfo = {10, gArtisanCave_1F_LandMons};
 
 const struct WildPokemon gAlteringCave1_LandMons[] =
 {
-	{10, 10, SPECIES_ZUBAT},
-	{12, 12, SPECIES_ZUBAT},
-	{8, 8, SPECIES_ZUBAT},
-	{14, 14, SPECIES_ZUBAT},
-	{10, 10, SPECIES_ZUBAT},
-	{12, 12, SPECIES_ZUBAT},
-	{16, 16, SPECIES_ZUBAT},
-	{6, 6, SPECIES_ZUBAT},
-	{8, 8, SPECIES_ZUBAT},
-	{14, 14, SPECIES_ZUBAT},
-	{8, 8, SPECIES_ZUBAT},
-	{14, 14, SPECIES_ZUBAT},
+    {10, 10, SPECIES_ZUBAT},
+    {12, 12, SPECIES_ZUBAT},
+    {8, 8, SPECIES_ZUBAT},
+    {14, 14, SPECIES_ZUBAT},
+    {10, 10, SPECIES_ZUBAT},
+    {12, 12, SPECIES_ZUBAT},
+    {16, 16, SPECIES_ZUBAT},
+    {6, 6, SPECIES_ZUBAT},
+    {8, 8, SPECIES_ZUBAT},
+    {14, 14, SPECIES_ZUBAT},
+    {8, 8, SPECIES_ZUBAT},
+    {14, 14, SPECIES_ZUBAT},
 };
 
 const struct WildPokemonInfo gAlteringCave1_LandMonsInfo = {7, gAlteringCave1_LandMons};
 
 const struct WildPokemon gAlteringCave2_LandMons[] =
 {
-	{7, 7, SPECIES_MAREEP},
-	{9, 9, SPECIES_MAREEP},
-	{5, 5, SPECIES_MAREEP},
-	{11, 11, SPECIES_MAREEP},
-	{7, 7, SPECIES_MAREEP},
-	{9, 9, SPECIES_MAREEP},
-	{13, 13, SPECIES_MAREEP},
-	{3, 3, SPECIES_MAREEP},
-	{5, 5, SPECIES_MAREEP},
-	{11, 11, SPECIES_MAREEP},
-	{5, 5, SPECIES_MAREEP},
-	{11, 11, SPECIES_MAREEP},
+    {7, 7, SPECIES_MAREEP},
+    {9, 9, SPECIES_MAREEP},
+    {5, 5, SPECIES_MAREEP},
+    {11, 11, SPECIES_MAREEP},
+    {7, 7, SPECIES_MAREEP},
+    {9, 9, SPECIES_MAREEP},
+    {13, 13, SPECIES_MAREEP},
+    {3, 3, SPECIES_MAREEP},
+    {5, 5, SPECIES_MAREEP},
+    {11, 11, SPECIES_MAREEP},
+    {5, 5, SPECIES_MAREEP},
+    {11, 11, SPECIES_MAREEP},
 };
 
 const struct WildPokemonInfo gAlteringCave2_LandMonsInfo = {7, gAlteringCave2_LandMons};
 
 const struct WildPokemon gAlteringCave3_LandMons[] =
 {
-	{23, 23, SPECIES_PINECO},
-	{25, 25, SPECIES_PINECO},
-	{22, 22, SPECIES_PINECO},
-	{27, 27, SPECIES_PINECO},
-	{23, 23, SPECIES_PINECO},
-	{25, 25, SPECIES_PINECO},
-	{29, 29, SPECIES_PINECO},
-	{19, 19, SPECIES_PINECO},
-	{21, 21, SPECIES_PINECO},
-	{27, 27, SPECIES_PINECO},
-	{21, 21, SPECIES_PINECO},
-	{27, 27, SPECIES_PINECO},
+    {23, 23, SPECIES_PINECO},
+    {25, 25, SPECIES_PINECO},
+    {22, 22, SPECIES_PINECO},
+    {27, 27, SPECIES_PINECO},
+    {23, 23, SPECIES_PINECO},
+    {25, 25, SPECIES_PINECO},
+    {29, 29, SPECIES_PINECO},
+    {19, 19, SPECIES_PINECO},
+    {21, 21, SPECIES_PINECO},
+    {27, 27, SPECIES_PINECO},
+    {21, 21, SPECIES_PINECO},
+    {27, 27, SPECIES_PINECO},
 };
 
 const struct WildPokemonInfo gAlteringCave3_LandMonsInfo = {7, gAlteringCave3_LandMons};
 
 const struct WildPokemon gAlteringCave4_LandMons[] =
 {
-	{16, 16, SPECIES_HOUNDOUR},
-	{18, 18, SPECIES_HOUNDOUR},
-	{14, 14, SPECIES_HOUNDOUR},
-	{20, 20, SPECIES_HOUNDOUR},
-	{16, 16, SPECIES_HOUNDOUR},
-	{18, 18, SPECIES_HOUNDOUR},
-	{22, 22, SPECIES_HOUNDOUR},
-	{12, 12, SPECIES_HOUNDOUR},
-	{14, 14, SPECIES_HOUNDOUR},
-	{20, 20, SPECIES_HOUNDOUR},
-	{14, 14, SPECIES_HOUNDOUR},
-	{20, 20, SPECIES_HOUNDOUR},
+    {16, 16, SPECIES_HOUNDOUR},
+    {18, 18, SPECIES_HOUNDOUR},
+    {14, 14, SPECIES_HOUNDOUR},
+    {20, 20, SPECIES_HOUNDOUR},
+    {16, 16, SPECIES_HOUNDOUR},
+    {18, 18, SPECIES_HOUNDOUR},
+    {22, 22, SPECIES_HOUNDOUR},
+    {12, 12, SPECIES_HOUNDOUR},
+    {14, 14, SPECIES_HOUNDOUR},
+    {20, 20, SPECIES_HOUNDOUR},
+    {14, 14, SPECIES_HOUNDOUR},
+    {20, 20, SPECIES_HOUNDOUR},
 };
 
 const struct WildPokemonInfo gAlteringCave4_LandMonsInfo = {7, gAlteringCave4_LandMons};
 
 const struct WildPokemon gAlteringCave5_LandMons[] =
 {
-	{10, 10, SPECIES_TEDDIURSA},
-	{12, 12, SPECIES_TEDDIURSA},
-	{8, 8, SPECIES_TEDDIURSA},
-	{14, 14, SPECIES_TEDDIURSA},
-	{10, 10, SPECIES_TEDDIURSA},
-	{12, 12, SPECIES_TEDDIURSA},
-	{16, 16, SPECIES_TEDDIURSA},
-	{6, 6, SPECIES_TEDDIURSA},
-	{8, 8, SPECIES_TEDDIURSA},
-	{14, 14, SPECIES_TEDDIURSA},
-	{8, 8, SPECIES_TEDDIURSA},
-	{14, 14, SPECIES_TEDDIURSA},
+    {10, 10, SPECIES_TEDDIURSA},
+    {12, 12, SPECIES_TEDDIURSA},
+    {8, 8, SPECIES_TEDDIURSA},
+    {14, 14, SPECIES_TEDDIURSA},
+    {10, 10, SPECIES_TEDDIURSA},
+    {12, 12, SPECIES_TEDDIURSA},
+    {16, 16, SPECIES_TEDDIURSA},
+    {6, 6, SPECIES_TEDDIURSA},
+    {8, 8, SPECIES_TEDDIURSA},
+    {14, 14, SPECIES_TEDDIURSA},
+    {8, 8, SPECIES_TEDDIURSA},
+    {14, 14, SPECIES_TEDDIURSA},
 };
 
 const struct WildPokemonInfo gAlteringCave5_LandMonsInfo = {7, gAlteringCave5_LandMons};
 
 const struct WildPokemon gAlteringCave6_LandMons[] =
 {
-	{22, 22, SPECIES_AIPOM},
-	{24, 24, SPECIES_AIPOM},
-	{20, 20, SPECIES_AIPOM},
-	{26, 26, SPECIES_AIPOM},
-	{22, 22, SPECIES_AIPOM},
-	{24, 24, SPECIES_AIPOM},
-	{28, 28, SPECIES_AIPOM},
-	{18, 18, SPECIES_AIPOM},
-	{20, 20, SPECIES_AIPOM},
-	{26, 26, SPECIES_AIPOM},
-	{20, 20, SPECIES_AIPOM},
-	{26, 26, SPECIES_AIPOM},
+    {22, 22, SPECIES_AIPOM},
+    {24, 24, SPECIES_AIPOM},
+    {20, 20, SPECIES_AIPOM},
+    {26, 26, SPECIES_AIPOM},
+    {22, 22, SPECIES_AIPOM},
+    {24, 24, SPECIES_AIPOM},
+    {28, 28, SPECIES_AIPOM},
+    {18, 18, SPECIES_AIPOM},
+    {20, 20, SPECIES_AIPOM},
+    {26, 26, SPECIES_AIPOM},
+    {20, 20, SPECIES_AIPOM},
+    {26, 26, SPECIES_AIPOM},
 };
 
 const struct WildPokemonInfo gAlteringCave6_LandMonsInfo = {7, gAlteringCave6_LandMons};
 
 const struct WildPokemon gAlteringCave7_LandMons[] =
 {
-	{22, 22, SPECIES_SHUCKLE},
-	{24, 24, SPECIES_SHUCKLE},
-	{20, 20, SPECIES_SHUCKLE},
-	{26, 26, SPECIES_SHUCKLE},
-	{22, 22, SPECIES_SHUCKLE},
-	{24, 24, SPECIES_SHUCKLE},
-	{28, 28, SPECIES_SHUCKLE},
-	{18, 18, SPECIES_SHUCKLE},
-	{20, 20, SPECIES_SHUCKLE},
-	{26, 26, SPECIES_SHUCKLE},
-	{20, 20, SPECIES_SHUCKLE},
-	{26, 26, SPECIES_SHUCKLE},
+    {22, 22, SPECIES_SHUCKLE},
+    {24, 24, SPECIES_SHUCKLE},
+    {20, 20, SPECIES_SHUCKLE},
+    {26, 26, SPECIES_SHUCKLE},
+    {22, 22, SPECIES_SHUCKLE},
+    {24, 24, SPECIES_SHUCKLE},
+    {28, 28, SPECIES_SHUCKLE},
+    {18, 18, SPECIES_SHUCKLE},
+    {20, 20, SPECIES_SHUCKLE},
+    {26, 26, SPECIES_SHUCKLE},
+    {20, 20, SPECIES_SHUCKLE},
+    {26, 26, SPECIES_SHUCKLE},
 };
 
 const struct WildPokemonInfo gAlteringCave7_LandMonsInfo = {7, gAlteringCave7_LandMons};
 
 const struct WildPokemon gAlteringCave8_LandMons[] =
 {
-	{22, 22, SPECIES_STANTLER},
-	{24, 24, SPECIES_STANTLER},
-	{20, 20, SPECIES_STANTLER},
-	{26, 26, SPECIES_STANTLER},
-	{22, 22, SPECIES_STANTLER},
-	{24, 24, SPECIES_STANTLER},
-	{28, 28, SPECIES_STANTLER},
-	{18, 18, SPECIES_STANTLER},
-	{20, 20, SPECIES_STANTLER},
-	{26, 26, SPECIES_STANTLER},
-	{20, 20, SPECIES_STANTLER},
-	{26, 26, SPECIES_STANTLER},
+    {22, 22, SPECIES_STANTLER},
+    {24, 24, SPECIES_STANTLER},
+    {20, 20, SPECIES_STANTLER},
+    {26, 26, SPECIES_STANTLER},
+    {22, 22, SPECIES_STANTLER},
+    {24, 24, SPECIES_STANTLER},
+    {28, 28, SPECIES_STANTLER},
+    {18, 18, SPECIES_STANTLER},
+    {20, 20, SPECIES_STANTLER},
+    {26, 26, SPECIES_STANTLER},
+    {20, 20, SPECIES_STANTLER},
+    {26, 26, SPECIES_STANTLER},
 };
 
 const struct WildPokemonInfo gAlteringCave8_LandMonsInfo = {7, gAlteringCave8_LandMons};
 
 const struct WildPokemon gAlteringCave9_LandMons[] =
 {
-	{22, 22, SPECIES_SMEARGLE},
-	{24, 24, SPECIES_SMEARGLE},
-	{20, 20, SPECIES_SMEARGLE},
-	{26, 26, SPECIES_SMEARGLE},
-	{22, 22, SPECIES_SMEARGLE},
-	{24, 24, SPECIES_SMEARGLE},
-	{28, 28, SPECIES_SMEARGLE},
-	{18, 18, SPECIES_SMEARGLE},
-	{20, 20, SPECIES_SMEARGLE},
-	{26, 26, SPECIES_SMEARGLE},
-	{20, 20, SPECIES_SMEARGLE},
-	{26, 26, SPECIES_SMEARGLE},
+    {22, 22, SPECIES_SMEARGLE},
+    {24, 24, SPECIES_SMEARGLE},
+    {20, 20, SPECIES_SMEARGLE},
+    {26, 26, SPECIES_SMEARGLE},
+    {22, 22, SPECIES_SMEARGLE},
+    {24, 24, SPECIES_SMEARGLE},
+    {28, 28, SPECIES_SMEARGLE},
+    {18, 18, SPECIES_SMEARGLE},
+    {20, 20, SPECIES_SMEARGLE},
+    {26, 26, SPECIES_SMEARGLE},
+    {20, 20, SPECIES_SMEARGLE},
+    {26, 26, SPECIES_SMEARGLE},
 };
 
 const struct WildPokemonInfo gAlteringCave9_LandMonsInfo = {7, gAlteringCave9_LandMons};
 
 const struct WildPokemon gMeteorFalls_StevensCave_LandMons[] =
 {
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_GOLBAT},
-	{33, 33, SPECIES_GOLBAT},
-	{35, 35, SPECIES_SOLROCK},
-	{33, 33, SPECIES_SOLROCK},
-	{37, 37, SPECIES_SOLROCK},
-	{35, 35, SPECIES_GOLBAT},
-	{39, 39, SPECIES_SOLROCK},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
-	{38, 38, SPECIES_GOLBAT},
-	{40, 40, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_GOLBAT},
+    {33, 33, SPECIES_GOLBAT},
+    {35, 35, SPECIES_SOLROCK},
+    {33, 33, SPECIES_SOLROCK},
+    {37, 37, SPECIES_SOLROCK},
+    {35, 35, SPECIES_GOLBAT},
+    {39, 39, SPECIES_SOLROCK},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
+    {38, 38, SPECIES_GOLBAT},
+    {40, 40, SPECIES_GOLBAT},
 };
 
 const struct WildPokemonInfo gMeteorFalls_StevensCave_LandMonsInfo = {10, gMeteorFalls_StevensCave_LandMons};
 
 const struct WildPokemonHeader gWildMonHeaders[] =
 {
-	{
-		.mapGroup = MAP_GROUP(ROUTE101),
-		.mapNum = MAP_NUM(ROUTE101),
-		.landMonsInfo = &gRoute101_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE102),
-		.mapNum = MAP_NUM(ROUTE102),
-		.landMonsInfo = &gRoute102_LandMonsInfo,
-		.waterMonsInfo = &gRoute102_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute102_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE103),
-		.mapNum = MAP_NUM(ROUTE103),
-		.landMonsInfo = &gRoute103_LandMonsInfo,
-		.waterMonsInfo = &gRoute103_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute103_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE104),
-		.mapNum = MAP_NUM(ROUTE104),
-		.landMonsInfo = &gRoute104_LandMonsInfo,
-		.waterMonsInfo = &gRoute104_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute104_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE105),
-		.mapNum = MAP_NUM(ROUTE105),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute105_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute105_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE110),
-		.mapNum = MAP_NUM(ROUTE110),
-		.landMonsInfo = &gRoute110_LandMonsInfo,
-		.waterMonsInfo = &gRoute110_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute110_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE111),
-		.mapNum = MAP_NUM(ROUTE111),
-		.landMonsInfo = &gRoute111_LandMonsInfo,
-		.waterMonsInfo = &gRoute111_WaterMonsInfo,
-		.rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo,
-		.fishingMonsInfo = &gRoute111_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE112),
-		.mapNum = MAP_NUM(ROUTE112),
-		.landMonsInfo = &gRoute112_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE113),
-		.mapNum = MAP_NUM(ROUTE113),
-		.landMonsInfo = &gRoute113_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE114),
-		.mapNum = MAP_NUM(ROUTE114),
-		.landMonsInfo = &gRoute114_LandMonsInfo,
-		.waterMonsInfo = &gRoute114_WaterMonsInfo,
-		.rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo,
-		.fishingMonsInfo = &gRoute114_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE116),
-		.mapNum = MAP_NUM(ROUTE116),
-		.landMonsInfo = &gRoute116_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE117),
-		.mapNum = MAP_NUM(ROUTE117),
-		.landMonsInfo = &gRoute117_LandMonsInfo,
-		.waterMonsInfo = &gRoute117_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute117_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE118),
-		.mapNum = MAP_NUM(ROUTE118),
-		.landMonsInfo = &gRoute118_LandMonsInfo,
-		.waterMonsInfo = &gRoute118_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute118_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE124),
-		.mapNum = MAP_NUM(ROUTE124),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute124_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute124_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(PETALBURG_WOODS),
-		.mapNum = MAP_NUM(PETALBURG_WOODS),
-		.landMonsInfo = &gPetalburgWoods_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(RUSTURF_TUNNEL),
-		.mapNum = MAP_NUM(RUSTURF_TUNNEL),
-		.landMonsInfo = &gRusturfTunnel_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(GRANITE_CAVE_1F),
-		.mapNum = MAP_NUM(GRANITE_CAVE_1F),
-		.landMonsInfo = &gGraniteCave_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(GRANITE_CAVE_B1F),
-		.mapNum = MAP_NUM(GRANITE_CAVE_B1F),
-		.landMonsInfo = &gGraniteCave_B1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_1F),
-		.mapNum = MAP_NUM(MT_PYRE_1F),
-		.landMonsInfo = &gMtPyre_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(VICTORY_ROAD_1F),
-		.mapNum = MAP_NUM(VICTORY_ROAD_1F),
-		.landMonsInfo = &gVictoryRoad_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH),
-		.mapNum = MAP_NUM(SAFARI_ZONE_SOUTH),
-		.landMonsInfo = &gSafariZone_South_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(UNDERWATER2),
-		.mapNum = MAP_NUM(UNDERWATER2),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gUnderwater2_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F),
-		.mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(GRANITE_CAVE_B2F),
-		.mapNum = MAP_NUM(GRANITE_CAVE_B2F),
-		.landMonsInfo = &gGraniteCave_B2F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(FIERY_PATH),
-		.mapNum = MAP_NUM(FIERY_PATH),
-		.landMonsInfo = &gFieryPath_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R),
-		.mapNum = MAP_NUM(METEOR_FALLS_B1F_2R),
-		.landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo,
-		.waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(JAGGED_PASS),
-		.mapNum = MAP_NUM(JAGGED_PASS),
-		.landMonsInfo = &gJaggedPass_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE106),
-		.mapNum = MAP_NUM(ROUTE106),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute106_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute106_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE107),
-		.mapNum = MAP_NUM(ROUTE107),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute107_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute107_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE108),
-		.mapNum = MAP_NUM(ROUTE108),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute108_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute108_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE109),
-		.mapNum = MAP_NUM(ROUTE109),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute109_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute109_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE115),
-		.mapNum = MAP_NUM(ROUTE115),
-		.landMonsInfo = &gRoute115_LandMonsInfo,
-		.waterMonsInfo = &gRoute115_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute115_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE),
-		.mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE),
-		.landMonsInfo = &gNewMauville_Inside_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE119),
-		.mapNum = MAP_NUM(ROUTE119),
-		.landMonsInfo = &gRoute119_LandMonsInfo,
-		.waterMonsInfo = &gRoute119_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute119_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE120),
-		.mapNum = MAP_NUM(ROUTE120),
-		.landMonsInfo = &gRoute120_LandMonsInfo,
-		.waterMonsInfo = &gRoute120_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute120_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE121),
-		.mapNum = MAP_NUM(ROUTE121),
-		.landMonsInfo = &gRoute121_LandMonsInfo,
-		.waterMonsInfo = &gRoute121_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute121_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE122),
-		.mapNum = MAP_NUM(ROUTE122),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute122_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute122_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE123),
-		.mapNum = MAP_NUM(ROUTE123),
-		.landMonsInfo = &gRoute123_LandMonsInfo,
-		.waterMonsInfo = &gRoute123_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute123_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_2F),
-		.mapNum = MAP_NUM(MT_PYRE_2F),
-		.landMonsInfo = &gMtPyre_2F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_3F),
-		.mapNum = MAP_NUM(MT_PYRE_3F),
-		.landMonsInfo = &gMtPyre_3F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_4F),
-		.mapNum = MAP_NUM(MT_PYRE_4F),
-		.landMonsInfo = &gMtPyre_4F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_5F),
-		.mapNum = MAP_NUM(MT_PYRE_5F),
-		.landMonsInfo = &gMtPyre_5F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_6F),
-		.mapNum = MAP_NUM(MT_PYRE_6F),
-		.landMonsInfo = &gMtPyre_6F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR),
-		.mapNum = MAP_NUM(MT_PYRE_EXTERIOR),
-		.landMonsInfo = &gMtPyre_Exterior_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MT_PYRE_SUMMIT),
-		.mapNum = MAP_NUM(MT_PYRE_SUMMIT),
-		.landMonsInfo = &gMtPyre_Summit_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM),
-		.mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM),
-		.landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE125),
-		.mapNum = MAP_NUM(ROUTE125),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute125_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute125_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE126),
-		.mapNum = MAP_NUM(ROUTE126),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute126_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute126_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE127),
-		.mapNum = MAP_NUM(ROUTE127),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute127_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute127_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE128),
-		.mapNum = MAP_NUM(ROUTE128),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute128_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute128_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE129),
-		.mapNum = MAP_NUM(ROUTE129),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute129_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute129_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE130),
-		.mapNum = MAP_NUM(ROUTE130),
-		.landMonsInfo = &gRoute130_LandMonsInfo,
-		.waterMonsInfo = &gRoute130_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute130_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE131),
-		.mapNum = MAP_NUM(ROUTE131),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute131_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute131_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE132),
-		.mapNum = MAP_NUM(ROUTE132),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute132_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute132_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE133),
-		.mapNum = MAP_NUM(ROUTE133),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute133_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute133_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ROUTE134),
-		.mapNum = MAP_NUM(ROUTE134),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gRoute134_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gRoute134_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
-		.mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1),
-		.landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2),
-		.landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3),
-		.landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4),
-		.landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5),
-		.landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6),
-		.landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo,
-		.waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7),
-		.landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo,
-		.waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8),
-		.landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE),
-		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE),
-		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE),
-		.landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F),
-		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F),
-		.landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
-		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
-		.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
-		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
-		.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
-		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
-		.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE),
-		.mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE),
-		.landMonsInfo = &gNewMauville_Entrance_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST),
-		.mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST),
-		.landMonsInfo = &gSafariZone_Southwest_LandMonsInfo,
-		.waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH),
-		.mapNum = MAP_NUM(SAFARI_ZONE_NORTH),
-		.landMonsInfo = &gSafariZone_North_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST),
-		.mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST),
-		.landMonsInfo = &gSafariZone_Northwest_LandMonsInfo,
-		.waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(VICTORY_ROAD_B1F),
-		.mapNum = MAP_NUM(VICTORY_ROAD_B1F),
-		.landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(VICTORY_ROAD_B2F),
-		.mapNum = MAP_NUM(VICTORY_ROAD_B2F),
-		.landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo,
-		.waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R),
-		.mapNum = MAP_NUM(METEOR_FALLS_1F_1R),
-		.landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo,
-		.waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R),
-		.mapNum = MAP_NUM(METEOR_FALLS_1F_2R),
-		.landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo,
-		.waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R),
-		.mapNum = MAP_NUM(METEOR_FALLS_B1F_1R),
-		.landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo,
-		.waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
-		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
-		.landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
-		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
-		.landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
-		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
-		.landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo,
-		.waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
-		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
-		.landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo,
-		.waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(LILYCOVE_CITY),
-		.mapNum = MAP_NUM(LILYCOVE_CITY),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gLilycoveCity_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gLilycoveCity_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(DEWFORD_TOWN),
-		.mapNum = MAP_NUM(DEWFORD_TOWN),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gDewfordTown_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gDewfordTown_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SLATEPORT_CITY),
-		.mapNum = MAP_NUM(SLATEPORT_CITY),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gSlateportCity_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSlateportCity_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(MOSSDEEP_CITY),
-		.mapNum = MAP_NUM(MOSSDEEP_CITY),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gMossdeepCity_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gMossdeepCity_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(PACIFIDLOG_TOWN),
-		.mapNum = MAP_NUM(PACIFIDLOG_TOWN),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gPacifidlogTown_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(EVER_GRANDE_CITY),
-		.mapNum = MAP_NUM(EVER_GRANDE_CITY),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gEverGrandeCity_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(PETALBURG_CITY),
-		.mapNum = MAP_NUM(PETALBURG_CITY),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gPetalburgCity_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gPetalburgCity_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(UNDERWATER1),
-		.mapNum = MAP_NUM(UNDERWATER1),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gUnderwater1_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
-		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
-		.landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SKY_PILLAR_1F),
-		.mapNum = MAP_NUM(SKY_PILLAR_1F),
-		.landMonsInfo = &gSkyPillar_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SOOTOPOLIS_CITY),
-		.mapNum = MAP_NUM(SOOTOPOLIS_CITY),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = &gSootopolisCity_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSootopolisCity_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SKY_PILLAR_3F),
-		.mapNum = MAP_NUM(SKY_PILLAR_3F),
-		.landMonsInfo = &gSkyPillar_3F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SKY_PILLAR_5F),
-		.mapNum = MAP_NUM(SKY_PILLAR_5F),
-		.landMonsInfo = &gSkyPillar_5F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST),
-		.mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST),
-		.landMonsInfo = &gSafariZone_Southeast_LandMonsInfo,
-		.waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo,
-	},
-	{
-		.mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST),
-		.mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST),
-		.landMonsInfo = &gSafariZone_Northeast_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_1F),
-		.landMonsInfo = &gMagmaHideout_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R),
-		.landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R),
-		.landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R),
-		.landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R),
-		.landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_4F),
-		.landMonsInfo = &gMagmaHideout_4F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R),
-		.landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R),
-		.mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R),
-		.landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MIRAGE_TOWER_1F),
-		.mapNum = MAP_NUM(MIRAGE_TOWER_1F),
-		.landMonsInfo = &gMirageTower_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MIRAGE_TOWER_2F),
-		.mapNum = MAP_NUM(MIRAGE_TOWER_2F),
-		.landMonsInfo = &gMirageTower_2F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MIRAGE_TOWER_3F),
-		.mapNum = MAP_NUM(MIRAGE_TOWER_3F),
-		.landMonsInfo = &gMirageTower_3F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(MIRAGE_TOWER_4F),
-		.mapNum = MAP_NUM(MIRAGE_TOWER_4F),
-		.landMonsInfo = &gMirageTower_4F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(DESERT_UNDERPASS),
-		.mapNum = MAP_NUM(DESERT_UNDERPASS),
-		.landMonsInfo = &gDesertUnderpass_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F),
-		.mapNum = MAP_NUM(ARTISAN_CAVE_B1F),
-		.landMonsInfo = &gArtisanCave_B1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ARTISAN_CAVE_1F),
-		.mapNum = MAP_NUM(ARTISAN_CAVE_1F),
-		.landMonsInfo = &gArtisanCave_1F_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave1_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave2_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave3_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave4_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave5_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave6_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave7_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave8_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(ALTERING_CAVE),
-		.mapNum = MAP_NUM(ALTERING_CAVE),
-		.landMonsInfo = &gAlteringCave9_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE),
-		.mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE),
-		.landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = MAP_GROUP(UNDEFINED),
-		.mapNum = MAP_NUM(UNDEFINED),
-		.landMonsInfo = NULL,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
+    {
+        .mapGroup = MAP_GROUP(ROUTE101),
+        .mapNum = MAP_NUM(ROUTE101),
+        .landMonsInfo = &gRoute101_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE102),
+        .mapNum = MAP_NUM(ROUTE102),
+        .landMonsInfo = &gRoute102_LandMonsInfo,
+        .waterMonsInfo = &gRoute102_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute102_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE103),
+        .mapNum = MAP_NUM(ROUTE103),
+        .landMonsInfo = &gRoute103_LandMonsInfo,
+        .waterMonsInfo = &gRoute103_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute103_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE104),
+        .mapNum = MAP_NUM(ROUTE104),
+        .landMonsInfo = &gRoute104_LandMonsInfo,
+        .waterMonsInfo = &gRoute104_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute104_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE105),
+        .mapNum = MAP_NUM(ROUTE105),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute105_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute105_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE110),
+        .mapNum = MAP_NUM(ROUTE110),
+        .landMonsInfo = &gRoute110_LandMonsInfo,
+        .waterMonsInfo = &gRoute110_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute110_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE111),
+        .mapNum = MAP_NUM(ROUTE111),
+        .landMonsInfo = &gRoute111_LandMonsInfo,
+        .waterMonsInfo = &gRoute111_WaterMonsInfo,
+        .rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo,
+        .fishingMonsInfo = &gRoute111_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE112),
+        .mapNum = MAP_NUM(ROUTE112),
+        .landMonsInfo = &gRoute112_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE113),
+        .mapNum = MAP_NUM(ROUTE113),
+        .landMonsInfo = &gRoute113_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE114),
+        .mapNum = MAP_NUM(ROUTE114),
+        .landMonsInfo = &gRoute114_LandMonsInfo,
+        .waterMonsInfo = &gRoute114_WaterMonsInfo,
+        .rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo,
+        .fishingMonsInfo = &gRoute114_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE116),
+        .mapNum = MAP_NUM(ROUTE116),
+        .landMonsInfo = &gRoute116_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE117),
+        .mapNum = MAP_NUM(ROUTE117),
+        .landMonsInfo = &gRoute117_LandMonsInfo,
+        .waterMonsInfo = &gRoute117_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute117_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE118),
+        .mapNum = MAP_NUM(ROUTE118),
+        .landMonsInfo = &gRoute118_LandMonsInfo,
+        .waterMonsInfo = &gRoute118_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute118_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE124),
+        .mapNum = MAP_NUM(ROUTE124),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute124_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute124_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(PETALBURG_WOODS),
+        .mapNum = MAP_NUM(PETALBURG_WOODS),
+        .landMonsInfo = &gPetalburgWoods_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(RUSTURF_TUNNEL),
+        .mapNum = MAP_NUM(RUSTURF_TUNNEL),
+        .landMonsInfo = &gRusturfTunnel_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(GRANITE_CAVE_1F),
+        .mapNum = MAP_NUM(GRANITE_CAVE_1F),
+        .landMonsInfo = &gGraniteCave_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F),
+        .mapNum = MAP_NUM(GRANITE_CAVE_B1F),
+        .landMonsInfo = &gGraniteCave_B1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_1F),
+        .mapNum = MAP_NUM(MT_PYRE_1F),
+        .landMonsInfo = &gMtPyre_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(VICTORY_ROAD_1F),
+        .mapNum = MAP_NUM(VICTORY_ROAD_1F),
+        .landMonsInfo = &gVictoryRoad_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH),
+        .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH),
+        .landMonsInfo = &gSafariZone_South_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(UNDERWATER2),
+        .mapNum = MAP_NUM(UNDERWATER2),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gUnderwater2_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F),
+        .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F),
+        .mapNum = MAP_NUM(GRANITE_CAVE_B2F),
+        .landMonsInfo = &gGraniteCave_B2F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(FIERY_PATH),
+        .mapNum = MAP_NUM(FIERY_PATH),
+        .landMonsInfo = &gFieryPath_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R),
+        .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R),
+        .landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo,
+        .waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(JAGGED_PASS),
+        .mapNum = MAP_NUM(JAGGED_PASS),
+        .landMonsInfo = &gJaggedPass_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE106),
+        .mapNum = MAP_NUM(ROUTE106),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute106_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute106_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE107),
+        .mapNum = MAP_NUM(ROUTE107),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute107_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute107_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE108),
+        .mapNum = MAP_NUM(ROUTE108),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute108_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute108_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE109),
+        .mapNum = MAP_NUM(ROUTE109),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute109_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute109_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE115),
+        .mapNum = MAP_NUM(ROUTE115),
+        .landMonsInfo = &gRoute115_LandMonsInfo,
+        .waterMonsInfo = &gRoute115_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute115_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE),
+        .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE),
+        .landMonsInfo = &gNewMauville_Inside_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE119),
+        .mapNum = MAP_NUM(ROUTE119),
+        .landMonsInfo = &gRoute119_LandMonsInfo,
+        .waterMonsInfo = &gRoute119_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute119_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE120),
+        .mapNum = MAP_NUM(ROUTE120),
+        .landMonsInfo = &gRoute120_LandMonsInfo,
+        .waterMonsInfo = &gRoute120_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute120_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE121),
+        .mapNum = MAP_NUM(ROUTE121),
+        .landMonsInfo = &gRoute121_LandMonsInfo,
+        .waterMonsInfo = &gRoute121_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute121_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE122),
+        .mapNum = MAP_NUM(ROUTE122),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute122_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute122_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE123),
+        .mapNum = MAP_NUM(ROUTE123),
+        .landMonsInfo = &gRoute123_LandMonsInfo,
+        .waterMonsInfo = &gRoute123_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute123_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_2F),
+        .mapNum = MAP_NUM(MT_PYRE_2F),
+        .landMonsInfo = &gMtPyre_2F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_3F),
+        .mapNum = MAP_NUM(MT_PYRE_3F),
+        .landMonsInfo = &gMtPyre_3F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_4F),
+        .mapNum = MAP_NUM(MT_PYRE_4F),
+        .landMonsInfo = &gMtPyre_4F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_5F),
+        .mapNum = MAP_NUM(MT_PYRE_5F),
+        .landMonsInfo = &gMtPyre_5F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_6F),
+        .mapNum = MAP_NUM(MT_PYRE_6F),
+        .landMonsInfo = &gMtPyre_6F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR),
+        .mapNum = MAP_NUM(MT_PYRE_EXTERIOR),
+        .landMonsInfo = &gMtPyre_Exterior_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT),
+        .mapNum = MAP_NUM(MT_PYRE_SUMMIT),
+        .landMonsInfo = &gMtPyre_Summit_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM),
+        .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM),
+        .landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE125),
+        .mapNum = MAP_NUM(ROUTE125),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute125_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute125_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE126),
+        .mapNum = MAP_NUM(ROUTE126),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute126_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute126_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE127),
+        .mapNum = MAP_NUM(ROUTE127),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute127_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute127_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE128),
+        .mapNum = MAP_NUM(ROUTE128),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute128_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute128_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE129),
+        .mapNum = MAP_NUM(ROUTE129),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute129_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute129_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE130),
+        .mapNum = MAP_NUM(ROUTE130),
+        .landMonsInfo = &gRoute130_LandMonsInfo,
+        .waterMonsInfo = &gRoute130_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute130_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE131),
+        .mapNum = MAP_NUM(ROUTE131),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute131_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute131_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE132),
+        .mapNum = MAP_NUM(ROUTE132),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute132_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute132_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE133),
+        .mapNum = MAP_NUM(ROUTE133),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute133_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute133_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ROUTE134),
+        .mapNum = MAP_NUM(ROUTE134),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gRoute134_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gRoute134_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
+        .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1),
+        .landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2),
+        .landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3),
+        .landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4),
+        .landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5),
+        .landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6),
+        .landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo,
+        .waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7),
+        .landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo,
+        .waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8),
+        .landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE),
+        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE),
+        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE),
+        .landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F),
+        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F),
+        .landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
+        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
+        .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
+        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
+        .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
+        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
+        .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE),
+        .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE),
+        .landMonsInfo = &gNewMauville_Entrance_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST),
+        .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST),
+        .landMonsInfo = &gSafariZone_Southwest_LandMonsInfo,
+        .waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH),
+        .mapNum = MAP_NUM(SAFARI_ZONE_NORTH),
+        .landMonsInfo = &gSafariZone_North_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST),
+        .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST),
+        .landMonsInfo = &gSafariZone_Northwest_LandMonsInfo,
+        .waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F),
+        .mapNum = MAP_NUM(VICTORY_ROAD_B1F),
+        .landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F),
+        .mapNum = MAP_NUM(VICTORY_ROAD_B2F),
+        .landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo,
+        .waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R),
+        .mapNum = MAP_NUM(METEOR_FALLS_1F_1R),
+        .landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo,
+        .waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R),
+        .mapNum = MAP_NUM(METEOR_FALLS_1F_2R),
+        .landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo,
+        .waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R),
+        .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R),
+        .landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo,
+        .waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
+        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
+        .landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
+        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
+        .landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
+        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
+        .landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo,
+        .waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
+        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
+        .landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo,
+        .waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(LILYCOVE_CITY),
+        .mapNum = MAP_NUM(LILYCOVE_CITY),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gLilycoveCity_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gLilycoveCity_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(DEWFORD_TOWN),
+        .mapNum = MAP_NUM(DEWFORD_TOWN),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gDewfordTown_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gDewfordTown_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SLATEPORT_CITY),
+        .mapNum = MAP_NUM(SLATEPORT_CITY),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gSlateportCity_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSlateportCity_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(MOSSDEEP_CITY),
+        .mapNum = MAP_NUM(MOSSDEEP_CITY),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gMossdeepCity_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gMossdeepCity_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN),
+        .mapNum = MAP_NUM(PACIFIDLOG_TOWN),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gPacifidlogTown_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(EVER_GRANDE_CITY),
+        .mapNum = MAP_NUM(EVER_GRANDE_CITY),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gEverGrandeCity_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(PETALBURG_CITY),
+        .mapNum = MAP_NUM(PETALBURG_CITY),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gPetalburgCity_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gPetalburgCity_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(UNDERWATER1),
+        .mapNum = MAP_NUM(UNDERWATER1),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gUnderwater1_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
+        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
+        .landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SKY_PILLAR_1F),
+        .mapNum = MAP_NUM(SKY_PILLAR_1F),
+        .landMonsInfo = &gSkyPillar_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY),
+        .mapNum = MAP_NUM(SOOTOPOLIS_CITY),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = &gSootopolisCity_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSootopolisCity_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SKY_PILLAR_3F),
+        .mapNum = MAP_NUM(SKY_PILLAR_3F),
+        .landMonsInfo = &gSkyPillar_3F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SKY_PILLAR_5F),
+        .mapNum = MAP_NUM(SKY_PILLAR_5F),
+        .landMonsInfo = &gSkyPillar_5F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST),
+        .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST),
+        .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo,
+        .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo,
+    },
+    {
+        .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST),
+        .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST),
+        .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_1F),
+        .landMonsInfo = &gMagmaHideout_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R),
+        .landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R),
+        .landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R),
+        .landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R),
+        .landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_4F),
+        .landMonsInfo = &gMagmaHideout_4F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R),
+        .landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R),
+        .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R),
+        .landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MIRAGE_TOWER_1F),
+        .mapNum = MAP_NUM(MIRAGE_TOWER_1F),
+        .landMonsInfo = &gMirageTower_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MIRAGE_TOWER_2F),
+        .mapNum = MAP_NUM(MIRAGE_TOWER_2F),
+        .landMonsInfo = &gMirageTower_2F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MIRAGE_TOWER_3F),
+        .mapNum = MAP_NUM(MIRAGE_TOWER_3F),
+        .landMonsInfo = &gMirageTower_3F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(MIRAGE_TOWER_4F),
+        .mapNum = MAP_NUM(MIRAGE_TOWER_4F),
+        .landMonsInfo = &gMirageTower_4F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(DESERT_UNDERPASS),
+        .mapNum = MAP_NUM(DESERT_UNDERPASS),
+        .landMonsInfo = &gDesertUnderpass_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F),
+        .mapNum = MAP_NUM(ARTISAN_CAVE_B1F),
+        .landMonsInfo = &gArtisanCave_B1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ARTISAN_CAVE_1F),
+        .mapNum = MAP_NUM(ARTISAN_CAVE_1F),
+        .landMonsInfo = &gArtisanCave_1F_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave1_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave2_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave3_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave4_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave5_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave6_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave7_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave8_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(ALTERING_CAVE),
+        .mapNum = MAP_NUM(ALTERING_CAVE),
+        .landMonsInfo = &gAlteringCave9_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE),
+        .mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE),
+        .landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = MAP_GROUP(UNDEFINED),
+        .mapNum = MAP_NUM(UNDEFINED),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
 };
 
 const struct WildPokemon gBattlePyramidPlaceholders_1[] =
 {
-	{5, 5, SPECIES_BULBASAUR},
-	{5, 5, SPECIES_BULBASAUR},
-	{5, 5, SPECIES_BULBASAUR},
-	{5, 5, SPECIES_BULBASAUR},
-	{5, 5, SPECIES_IVYSAUR},
-	{5, 5, SPECIES_IVYSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_BULBASAUR},
+    {5, 5, SPECIES_BULBASAUR},
+    {5, 5, SPECIES_BULBASAUR},
+    {5, 5, SPECIES_BULBASAUR},
+    {5, 5, SPECIES_IVYSAUR},
+    {5, 5, SPECIES_IVYSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_CHARMANDER},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_1Info = {4, gBattlePyramidPlaceholders_1};
 
 const struct WildPokemon gBattlePyramidPlaceholders_2[] =
 {
-	{5, 5, SPECIES_IVYSAUR},
-	{5, 5, SPECIES_IVYSAUR},
-	{5, 5, SPECIES_IVYSAUR},
-	{5, 5, SPECIES_IVYSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_IVYSAUR},
+    {5, 5, SPECIES_IVYSAUR},
+    {5, 5, SPECIES_IVYSAUR},
+    {5, 5, SPECIES_IVYSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMANDER},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_2Info = {4, gBattlePyramidPlaceholders_2};
 
 const struct WildPokemon gBattlePyramidPlaceholders_3[] =
 {
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_VENUSAUR},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_VENUSAUR},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARIZARD},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_3Info = {4, gBattlePyramidPlaceholders_3};
 
 const struct WildPokemon gBattlePyramidPlaceholders_4[] =
 {
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMANDER},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMANDER},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_SQUIRTLE},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_4Info = {4, gBattlePyramidPlaceholders_4};
 
 const struct WildPokemon gBattlePyramidPlaceholders_5[] =
 {
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_WARTORTLE},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_5Info = {4, gBattlePyramidPlaceholders_5};
 
 const struct WildPokemon gBattlePyramidPlaceholders_6[] =
 {
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_WARTORTLE},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_6Info = {4, gBattlePyramidPlaceholders_6};
 
 const struct WildPokemon gBattlePyramidPlaceholders_7[] =
 {
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_WARTORTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_SQUIRTLE},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARIZARD},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
-	{5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_WARTORTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_SQUIRTLE},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARIZARD},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
+    {5, 5, SPECIES_CHARMELEON},
 };
 
 const struct WildPokemonInfo gBattlePyramidPlaceholders_7Info = {8, gBattlePyramidPlaceholders_7};
 
 const struct WildPokemonHeader gBattlePyramidWildMonHeaders[] =
 {
-	{
-		.mapGroup = 0,
-		.mapNum = 1,
-		.landMonsInfo = &gBattlePyramidPlaceholders_1Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 2,
-		.landMonsInfo = &gBattlePyramidPlaceholders_2Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 3,
-		.landMonsInfo = &gBattlePyramidPlaceholders_3Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 4,
-		.landMonsInfo = &gBattlePyramidPlaceholders_4Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 5,
-		.landMonsInfo = &gBattlePyramidPlaceholders_5Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 6,
-		.landMonsInfo = &gBattlePyramidPlaceholders_6Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 7,
-		.landMonsInfo = &gBattlePyramidPlaceholders_7Info,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 255,
-		.mapNum = 255,
-		.landMonsInfo = NULL,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
+    {
+        .mapGroup = 0,
+        .mapNum = 1,
+        .landMonsInfo = &gBattlePyramidPlaceholders_1Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 2,
+        .landMonsInfo = &gBattlePyramidPlaceholders_2Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 3,
+        .landMonsInfo = &gBattlePyramidPlaceholders_3Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 4,
+        .landMonsInfo = &gBattlePyramidPlaceholders_4Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 5,
+        .landMonsInfo = &gBattlePyramidPlaceholders_5Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 6,
+        .landMonsInfo = &gBattlePyramidPlaceholders_6Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 7,
+        .landMonsInfo = &gBattlePyramidPlaceholders_7Info,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 255,
+        .mapNum = 255,
+        .landMonsInfo = NULL,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
 };
 
 const struct WildPokemon gBattlePikeMons_1[] =
 {
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_DUSCLOPS},
-	{5, 5, SPECIES_DUSCLOPS},
-	{5, 5, SPECIES_DUSCLOPS},
-	{5, 5, SPECIES_DUSCLOPS},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_DUSCLOPS},
-	{5, 5, SPECIES_DUSCLOPS},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_DUSCLOPS},
+    {5, 5, SPECIES_DUSCLOPS},
+    {5, 5, SPECIES_DUSCLOPS},
+    {5, 5, SPECIES_DUSCLOPS},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_DUSCLOPS},
+    {5, 5, SPECIES_DUSCLOPS},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
 };
 
 const struct WildPokemonInfo gBattlePikeMonsInfo_1 = {10, gBattlePikeMons_1};
 
 const struct WildPokemon gBattlePikeMons_2[] =
 {
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_ELECTRODE},
-	{5, 5, SPECIES_ELECTRODE},
-	{5, 5, SPECIES_ELECTRODE},
-	{5, 5, SPECIES_ELECTRODE},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_ELECTRODE},
-	{5, 5, SPECIES_ELECTRODE},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_ELECTRODE},
+    {5, 5, SPECIES_ELECTRODE},
+    {5, 5, SPECIES_ELECTRODE},
+    {5, 5, SPECIES_ELECTRODE},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_ELECTRODE},
+    {5, 5, SPECIES_ELECTRODE},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
 };
 
 const struct WildPokemonInfo gBattlePikeMonsInfo_2 = {10, gBattlePikeMons_2};
 
 const struct WildPokemon gBattlePikeMons_3[] =
 {
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_BRELOOM},
-	{5, 5, SPECIES_BRELOOM},
-	{5, 5, SPECIES_BRELOOM},
-	{5, 5, SPECIES_BRELOOM},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_BRELOOM},
-	{5, 5, SPECIES_BRELOOM},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_BRELOOM},
+    {5, 5, SPECIES_BRELOOM},
+    {5, 5, SPECIES_BRELOOM},
+    {5, 5, SPECIES_BRELOOM},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_BRELOOM},
+    {5, 5, SPECIES_BRELOOM},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
 };
 
 const struct WildPokemonInfo gBattlePikeMonsInfo_3 = {10, gBattlePikeMons_3};
 
 const struct WildPokemon gBattlePikeMons_4[] =
 {
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_WOBBUFFET},
-	{5, 5, SPECIES_WOBBUFFET},
-	{5, 5, SPECIES_WOBBUFFET},
-	{5, 5, SPECIES_WOBBUFFET},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
-	{5, 5, SPECIES_WOBBUFFET},
-	{5, 5, SPECIES_WOBBUFFET},
-	{5, 5, SPECIES_SEVIPER},
-	{5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_WOBBUFFET},
+    {5, 5, SPECIES_WOBBUFFET},
+    {5, 5, SPECIES_WOBBUFFET},
+    {5, 5, SPECIES_WOBBUFFET},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
+    {5, 5, SPECIES_WOBBUFFET},
+    {5, 5, SPECIES_WOBBUFFET},
+    {5, 5, SPECIES_SEVIPER},
+    {5, 5, SPECIES_MILOTIC},
 };
 
 const struct WildPokemonInfo gBattlePikeMonsInfo_4 = {10, gBattlePikeMons_4};
 
 const struct WildPokemonHeader gBattlePikeWildMonHeaders[] =
 {
-	{
-		.mapGroup = 0,
-		.mapNum = 1,
-		.landMonsInfo = &gBattlePikeMonsInfo_1,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 2,
-		.landMonsInfo = &gBattlePikeMonsInfo_2,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 3,
-		.landMonsInfo = &gBattlePikeMonsInfo_3,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 0,
-		.mapNum = 4,
-		.landMonsInfo = &gBattlePikeMonsInfo_4,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
-	{
-		.mapGroup = 255,
-		.mapNum = 255,
-		.landMonsInfo = NULL,
-		.waterMonsInfo = NULL,
-		.rockSmashMonsInfo = NULL,
-		.fishingMonsInfo = NULL,
-	},
+    {
+        .mapGroup = 0,
+        .mapNum = 1,
+        .landMonsInfo = &gBattlePikeMonsInfo_1,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 2,
+        .landMonsInfo = &gBattlePikeMonsInfo_2,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 3,
+        .landMonsInfo = &gBattlePikeMonsInfo_3,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 0,
+        .mapNum = 4,
+        .landMonsInfo = &gBattlePikeMonsInfo_4,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+    {
+        .mapGroup = 255,
+        .mapNum = 255,
+        .landMonsInfo = NULL,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
 };
 
 const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS};
 
 const u16 gRoute119WaterTileData[] =
 {
-	0, 0x2D, 0,
-	0x2E, 0x5B, 0x83,
-	0x5C, 0x8B, 0x12A,
+    0, 0x2D, 0,
+    0x2E, 0x5B, 0x83,
+    0x5C, 0x8B, 0x12A,
 };
 
 // code
@@ -4825,7 +4825,7 @@ static u16 GetCurrentMapWildMonHeaderId(void)
     for (i = 0; ; i++)
     {
         const struct WildPokemonHeader *wildHeader = &gWildMonHeaders[i];
-        if (wildHeader->mapGroup == INVALID_U8)
+        if (wildHeader->mapGroup == 0xFF)
             break;
 
         if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup &&
@@ -4845,7 +4845,7 @@ static u16 GetCurrentMapWildMonHeaderId(void)
         }
     }
 
-    return INVALID_S16;
+    return -1;
 }
 
 static u8 PickWildMonNature(void)
@@ -5079,7 +5079,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
         return FALSE;
 
     headerId = GetCurrentMapWildMonHeaderId();
-    if (headerId == INVALID_U16)
+    if (headerId == 0xFFFF)
     {
         if (gMapHeader.mapLayoutId == 0x166)
         {
@@ -5190,7 +5190,7 @@ void RockSmashWildEncounter(void)
 {
     u16 headerId = GetCurrentMapWildMonHeaderId();
 
-    if (headerId != INVALID_U16)
+    if (headerId != 0xFFFF)
     {
         const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo;
 
@@ -5222,7 +5222,7 @@ bool8 SweetScentWildEncounter(void)
 
     PlayerGetDestCoords(&x, &y);
     headerId = GetCurrentMapWildMonHeaderId();
-    if (headerId == INVALID_U16)
+    if (headerId == 0xFFFF)
     {
         if (gMapHeader.mapLayoutId == 0x166)
         {
@@ -5292,7 +5292,7 @@ bool8 DoesCurrentMapHaveFishingMons(void)
 {
     u16 headerId = GetCurrentMapWildMonHeaderId();
 
-    if (headerId != INVALID_U16 && gWildMonHeaders[headerId].fishingMonsInfo != NULL)
+    if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL)
         return TRUE;
     else
         return FALSE;
@@ -5326,7 +5326,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon)
 
     *isWaterMon = FALSE;
     headerId = GetCurrentMapWildMonHeaderId();
-    if (headerId == INVALID_U16)
+    if (headerId == 0xFFFF)
         return SPECIES_NONE;
     landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
     waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
@@ -5358,7 +5358,7 @@ u16 GetLocalWaterMon(void)
 {
     u16 headerId = GetCurrentMapWildMonHeaderId();
 
-    if (headerId != INVALID_U16)
+    if (headerId != 0xFFFF)
     {
         const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
 
diff --git a/src/window.c b/src/window.c
index d5b996df1..4e1a38eff 100644
--- a/src/window.c
+++ b/src/window.c
@@ -52,12 +52,12 @@ bool16 InitWindows(const struct WindowTemplate *templates)
         gWindows[i].tileData = NULL;
     }
 
-    for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != INVALID_U8 && i < 0x20; ++i, bgLayer = templates[i].bg)
+    for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].bg)
     {
         if (gUnneededFireRedVariable == 1)
         {
             allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, templates[i].width * templates[i].height, 0);
-            if (allocatedBaseBlock == INVALID_S32)
+            if (allocatedBaseBlock == -1)
                 return FALSE;
         }
 
@@ -65,7 +65,7 @@ bool16 InitWindows(const struct WindowTemplate *templates)
         {
             attrib = GetBgAttribute(bgLayer, 0x8);
 
-            if (attrib != INVALID_U16)
+            if (attrib != 0xFFFF)
             {
                 allocatedTilemapBuffer = AllocZeroed(attrib);
 
@@ -121,12 +121,12 @@ u16 AddWindow(const struct WindowTemplate *template)
 
     for (win = 0; win < WINDOWS_MAX; ++win)
     {
-        if ((bgLayer = gWindows[win].window.bg) == INVALID_U8)
+        if ((bgLayer = gWindows[win].window.bg) == 0xFF)
             break;
     }
 
     if (win == WINDOWS_MAX)
-        return INVALID_U8;
+        return 0xFF;
 
     bgLayer = template->bg;
     allocatedBaseBlock = 0;
@@ -135,20 +135,20 @@ u16 AddWindow(const struct WindowTemplate *template)
     {
         allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0);
 
-        if (allocatedBaseBlock == INVALID_S32)
-            return INVALID_U8;
+        if (allocatedBaseBlock == -1)
+            return 0xFF;
     }
 
     if (gUnknown_03002F70[bgLayer] == NULL)
     {
         attrib = GetBgAttribute(bgLayer, 0x8);
 
-        if (attrib != INVALID_U16)
+        if (attrib != 0xFFFF)
         {
             allocatedTilemapBuffer = AllocZeroed(attrib);
 
             if (allocatedTilemapBuffer == NULL)
-                return INVALID_U8;
+                return 0xFF;
 
             for (i = 0; i < attrib; ++i)
                 allocatedTilemapBuffer[i] = 0;
@@ -167,7 +167,7 @@ u16 AddWindow(const struct WindowTemplate *template)
             Free(gUnknown_03002F70[bgLayer]);
             gUnknown_03002F70[bgLayer] = allocatedTilemapBuffer;
         }
-        return INVALID_U8;
+        return 0xFF;
     }
 
     gWindows[win].tileData = allocatedTilemapBuffer;
@@ -190,12 +190,12 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template)
 
     for (win = 0; win < WINDOWS_MAX; ++win)
     {
-        if (gWindows[win].window.bg == INVALID_U8)
+        if (gWindows[win].window.bg == 0xFF)
             break;
     }
 
     if (win == WINDOWS_MAX)
-        return INVALID_U8;
+        return 0xFF;
 
     bgLayer = template->bg;
     allocatedBaseBlock = 0;
@@ -204,8 +204,8 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template)
     {
         allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0);
 
-        if (allocatedBaseBlock == INVALID_S32)
-            return INVALID_U8;
+        if (allocatedBaseBlock == -1)
+            return 0xFF;
     }
 
     gWindows[win].window = *template;
@@ -609,21 +609,21 @@ u16 AddWindow8Bit(struct WindowTemplate *template)
 
     for (windowId = 0; windowId < 32; windowId++)
     {
-        if (gWindows[windowId].window.bg == INVALID_U8)
+        if (gWindows[windowId].window.bg == 0xFF)
             break;
     }
     if (windowId == WINDOWS_MAX)
-        return INVALID_U8;
+        return 0xFF;
     bgLayer = template->bg;
     if (gUnknown_03002F70[bgLayer] == 0)
     {
         u16 attribute = GetBgAttribute(bgLayer, 8);
-        if (attribute != INVALID_U16)
+        if (attribute != 0xFFFF)
         {
             s32 i;
             memAddress = Alloc(attribute);
             if (memAddress == NULL)
-                return INVALID_U8;
+                return 0xFF;
             for (i = 0; i < attribute; i++) // if we're going to zero out the memory anyway, why not call AllocZeroed?
                 memAddress[i] = 0;
             gUnknown_03002F70[bgLayer] = memAddress;
@@ -638,7 +638,7 @@ u16 AddWindow8Bit(struct WindowTemplate *template)
             Free(gUnknown_03002F70[bgLayer]);
             gUnknown_03002F70[bgLayer] = NULL;
         }
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {