Merge branch 'master' into dodrio_berry_picking

src/alloc.c

@@ -178,12 +178,12 @@ void InitHeap(void *heapStart, u32 heapSize)
 
 void *Alloc(u32 size)
 {
-    AllocInternal(sHeapStart, size);
+    return AllocInternal(sHeapStart, size);
 }
 
 void *AllocZeroed(u32 size)
 {
-    AllocZeroedInternal(sHeapStart, size);
+    return AllocZeroedInternal(sHeapStart, size);
 }
 
 void Free(void *pointer)

src/apprentice.c

@@ -2,7 +2,7 @@
 #include "apprentice.h"
 #include "battle.h"
 #include "battle_tower.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
@@ -2013,28 +2013,27 @@ static void sub_81A1218(void)
     sub_81AAC28();
 }
 
-#ifdef NONMATCHING
 static void sub_81A1224(void)
 {
-    u8 count;
     u8 i, j;
+    u8 count;
 
     if (PLAYER_APPRENTICE.field_B1_1 < 3)
         return;
 
-    count = 0;
-    for (j = 0; j < 9 && PLAYER_APPRENTICE.field_B8[j].unk0_0; count++, j++)
+    for (count = 0, j = 0; j < 9 && PLAYER_APPRENTICE.field_B8[j].unk0_0; count++, j++)
         ;
 
     for (i = 0; i < count && i < PLAYER_APPRENTICE.field_B1_1 - 3; i++)
     {
+        do {} while(0);
         if (PLAYER_APPRENTICE.field_B8[i].unk0_0 == 1
             && PLAYER_APPRENTICE.field_B8[i].unk0_3
             && PLAYER_APPRENTICE.field_B8[i].unk2 == gSpecialVar_0x8005)
         {
             PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk0_3 = 0;
             PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk2 = gSpecialVar_0x8005;
-            gSpecialVar_Result = i;
+            gSpecialVar_Result = 0;
             return;
         }
     }
@@ -2043,180 +2042,6 @@ static void sub_81A1224(void)
     PLAYER_APPRENTICE.field_B8[PLAYER_APPRENTICE.field_B1_1 - 3].unk2 = gSpecialVar_0x8005;
     gSpecialVar_Result = 1;
 }
-#else
-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\
-_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\
-_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\
-_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\
-_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\
-_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\
-_081A1362:\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
 
 static void sub_81A1370(void)
 {

src/battle_ai_script_commands.c

@@ -4,6 +4,7 @@
 #include "battle_ai_script_commands.h"
 #include "battle_factory.h"
 #include "battle_setup.h"
+#include "data.h"
 #include "item.h"
 #include "pokemon.h"
 #include "random.h"
@@ -2217,7 +2218,7 @@ static void BattleAICmd_if_flash_fired(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
-    if (gBattleResources->flags->flags[battlerId] & UNKNOWN_FLAG_FLASH_FIRE)
+    if (gBattleResources->flags->flags[battlerId] & RESOURCE_FLAG_FLASH_FIRE)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;

src/battle_ai_switch_items.c

@@ -6,6 +6,7 @@
 #include "random.h"
 #include "util.h"
 #include "constants/abilities.h"
+#include "constants/item_effects.h"
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/species.h"
@@ -778,18 +779,17 @@ u8 GetMostSuitableMonToSwitchInto(void)
     return bestMonId;
 }
 
-// TODO: use PokemonItemEffect struct instead of u8 once it's documented.
 static u8 GetAI_ItemType(u8 itemId, const u8 *itemEffect) // NOTE: should take u16 as item Id argument
 {
     if (itemId == ITEM_FULL_RESTORE)
         return AI_ITEM_FULL_RESTORE;
-    else if (itemEffect[4] & 4)
+    else if (itemEffect[4] & ITEM4_HEAL_HP)
         return AI_ITEM_HEAL_HP;
-    else if (itemEffect[3] & 0x3F)
+    else if (itemEffect[3] & ITEM3_STATUS_ALL)
         return AI_ITEM_CURE_CONDITION;
-    else if (itemEffect[0] & 0x3F || itemEffect[1] != 0 || itemEffect[2] != 0)
+    else if (itemEffect[0] & (ITEM0_HIGH_CRIT | ITEM0_X_ATTACK) || itemEffect[1] != 0 || itemEffect[2] != 0)
         return AI_ITEM_X_STAT;
-    else if (itemEffect[3] & 0x80)
+    else if (itemEffect[3] & ITEM3_MIST)
         return AI_ITEM_GUARD_SPECS;
     else
         return AI_ITEM_NOT_RECOGNIZABLE;
@@ -832,13 +832,13 @@ static bool8 ShouldUseItem(void)
         item = gBattleResources->battleHistory->trainerItems[i];
         if (item == ITEM_NONE)
             continue;
-        if (gItemEffectTable[item - 13] == NULL)
+        if (gItemEffectTable[item - ITEM_POTION] == NULL)
             continue;
 
         if (item == ITEM_ENIGMA_BERRY)
             itemEffects = gSaveBlock1Ptr->enigmaBerry.itemEffect;
         else
-            itemEffects = gItemEffectTable[item - 13];
+            itemEffects = gItemEffectTable[item - ITEM_POTION];
 
         *(gBattleStruct->AI_itemType + gActiveBattler / 2) = GetAI_ItemType(item, itemEffects);
 
@@ -862,32 +862,32 @@ static bool8 ShouldUseItem(void)
             break;
         case AI_ITEM_CURE_CONDITION:
             *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) = 0;
-            if (itemEffects[3] & 0x20 && gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
+            if (itemEffects[3] & ITEM3_SLEEP && gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBattler].status1 & STATUS1_POISON || gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON))
+            if (itemEffects[3] & ITEM3_POISON && (gBattleMons[gActiveBattler].status1 & STATUS1_POISON || gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON))
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x10;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x8 && gBattleMons[gActiveBattler].status1 & STATUS1_BURN)
+            if (itemEffects[3] & ITEM3_BURN && gBattleMons[gActiveBattler].status1 & STATUS1_BURN)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x4 && gBattleMons[gActiveBattler].status1 & STATUS1_FREEZE)
+            if (itemEffects[3] & ITEM3_FREEZE && gBattleMons[gActiveBattler].status1 & STATUS1_FREEZE)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x4;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x2 && gBattleMons[gActiveBattler].status1 & STATUS1_PARALYSIS)
+            if (itemEffects[3] & ITEM3_PARALYSIS && gBattleMons[gActiveBattler].status1 & STATUS1_PARALYSIS)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x2;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x1 && gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
+            if (itemEffects[3] & ITEM3_CONFUSION && gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x1;
                 shouldUse = TRUE;
@@ -897,17 +897,17 @@ static bool8 ShouldUseItem(void)
             *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) = 0;
             if (gDisableStructs[gActiveBattler].isFirstTurn == 0)
                 break;
-            if (itemEffects[0] & 0xF)
+            if (itemEffects[0] & ITEM0_X_ATTACK)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x1;
-            if (itemEffects[1] & 0xF0)
+            if (itemEffects[1] & ITEM1_X_DEFEND)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x2;
-            if (itemEffects[1] & 0xF)
+            if (itemEffects[1] & ITEM1_X_SPEED)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x4;
-            if (itemEffects[2] & 0xF)
+            if (itemEffects[2] & ITEM2_X_SPATK)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8;
-            if (itemEffects[2] & 0xF0)
+            if (itemEffects[2] & ITEM2_X_ACCURACY)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20;
-            if (itemEffects[0] & 0x30)
+            if (itemEffects[0] & ITEM0_HIGH_CRIT)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x80;
             shouldUse = TRUE;
             break;

src/battle_anim_effects_1.c

@@ -1121,8 +1121,8 @@ const union AnimCmd *const gUnknown_08592918[] =
 
 const struct SpriteTemplate gUnknown_0859291C =
 {
-    .tileTag = ANIM_TAG_UNUSED_HIT,
-    .paletteTag = ANIM_TAG_UNUSED_HIT,
+    .tileTag = ANIM_TAG_HIT,
+    .paletteTag = ANIM_TAG_HIT,
     .oam = &gUnknown_08524914,
     .anims = gUnknown_08592918,
     .images = NULL,
@@ -1132,8 +1132,8 @@ const struct SpriteTemplate gUnknown_0859291C =
 
 const struct SpriteTemplate gUnknown_08592934 =
 {
-    .tileTag = ANIM_TAG_UNUSED_HIT_2,
-    .paletteTag = ANIM_TAG_UNUSED_HIT_2,
+    .tileTag = ANIM_TAG_HIT_2,
+    .paletteTag = ANIM_TAG_HIT_2,
     .oam = &gUnknown_08524914,
     .anims = gUnknown_08592918,
     .images = NULL,
@@ -1442,8 +1442,8 @@ const union AnimCmd *const gUnknown_08592BF4[] =
 
 const struct SpriteTemplate gUnknown_08592BFC =
 {
-    .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST,
-    .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST,
+    .tileTag = ANIM_TAG_BUBBLE_BURST,
+    .paletteTag = ANIM_TAG_BUBBLE_BURST,
     .oam = &gUnknown_0852490C,
     .anims = gUnknown_08592BF4,
     .images = NULL,

src/battle_anim_effects_2.c

@@ -189,8 +189,8 @@ const union AffineAnimCmd *const gUnknown_08593300[] =
 
 const struct SpriteTemplate gUnknown_08593304 =
 {
-    .tileTag = ANIM_TAG_UNUSED_EXPLOSION,
-    .paletteTag = ANIM_TAG_UNUSED_EXPLOSION,
+    .tileTag = ANIM_TAG_EXPLOSION_6,
+    .paletteTag = ANIM_TAG_EXPLOSION_6,
     .oam = &gUnknown_08524974,
     .anims = gUnknown_085932E4,
     .images = NULL,
@@ -359,8 +359,8 @@ const struct SpriteTemplate gUnknown_08593488 =
 
 const struct SpriteTemplate gUnknown_085934A0 =
 {
-    .tileTag = ANIM_TAG_UNUSED_VOID_LINES,
-    .paletteTag = ANIM_TAG_UNUSED_VOID_LINES,
+    .tileTag = ANIM_TAG_VOID_LINES,
+    .paletteTag = ANIM_TAG_VOID_LINES,
     .oam = &gUnknown_08524A3C,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -1734,90 +1734,25 @@ void sub_8103FE8(struct Sprite *sprite)
     sprite->callback = sub_8104018;
 }
 
-#ifdef NONMATCHING
 static void sub_8104018(struct Sprite *sprite)
 {
-    u16 r7;
-    u16 r5;
+    u16 id, val;
     int i;
+
     if (++sprite->data[1] == 2)
     {
         sprite->data[1] = 0;
-        r5 = sprite->data[0];
-        r7 = gPlttBufferFaded[8 + r5];
-        for (i = 0; i < 8; i++)
-        {
-            gPlttBufferFaded[i + r5 + 8] = gPlttBufferFaded[i + r5 + 9];
-        }
-        gPlttBufferFaded[r5 + 15] = r7;
+        id = sprite->data[0];
+        val = gPlttBufferFaded[8 + id];
+        for (i = 8; i < 16; i++)
+            gPlttBufferFaded[i + id] = gPlttBufferFaded[i + id + 1];
+
+        gPlttBufferFaded[id + 15] = val;
 
         if (++sprite->data[2] == 24)
             DestroyAnimSprite(sprite);
     }
 }
-#else
-NAKED
-static void sub_8104018(struct Sprite *sprite)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    adds r4, r0, 0\n\
-    ldrh r0, [r4, 0x30]\n\
-    adds r0, 0x1\n\
-    strh r0, [r4, 0x30]\n\
-    lsls r0, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0x2\n\
-    bne _0810407C\n\
-    movs r0, 0\n\
-    strh r0, [r4, 0x30]\n\
-    ldrh r5, [r4, 0x2E]\n\
-    ldr r1, =gPlttBufferFaded\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x8\n\
-    lsls r0, 1\n\
-    adds r0, r1     \n\
-    ldrh r7, [r0]\n\
-    adds r6, r1, 0\n\
-    adds r1, r5, 0\n\
-    adds r1, 0x9\n\
-    lsls r0, r5, 1\n\
-    adds r0, r6\n\
-    adds r2, r0, 0\n\
-    adds r2, 0x10\n\
-    movs r3, 0x7\n\
-    lsls r1, 1\n\
-    adds r1, r6\n\
-_08104050:\n\
-    ldrh r0, [r1]\n\
-    strh r0, [r2]\n\
-    adds r1, 0x2\n\
-    adds r2, 0x2\n\
-    subs r3, 0x1\n\
-    cmp r3, 0\n\
-    bge _08104050\n\
-    adds r0, r5, 0\n\
-    adds r0, 0xF\n\
-    lsls r0, 1\n\
-    adds r0, r6\n\
-    strh r7, [r0]\n\
-    ldrh r0, [r4, 0x32]\n\
-    adds r0, 0x1\n\
-    strh r0, [r4, 0x32]\n\
-    lsls r0, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0x18\n\
-    bne _0810407C\n\
-    adds r0, r4, 0\n\
-    bl DestroyAnimSprite\n\
-_0810407C:\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool\n\
-.syntax divided\n");
-}
-#endif
 
 void sub_8104088(struct Sprite *sprite)
 {
@@ -3067,7 +3002,7 @@ void sub_8105CB4(u8 taskId)
         paletteNums[i] = AllocSpritePalette(ANIM_SPRITES_START - i);
 
     gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
-    LZDecompressWram(gBattleAnimSpritePalette_206, gMonSpritesGfxPtr->field_17C);
+    LZDecompressWram(gBattleAnimSpritePal_MusicNotes2, gMonSpritesGfxPtr->field_17C);
     for (i = 0; i < 3; i++)
         LoadPalette(&gMonSpritesGfxPtr->field_17C[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32);
 
@@ -3381,11 +3316,11 @@ void sub_81064F8(u8 taskId)
     SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
     sub_80A6B30(&animBg);
     if (IsContest())
-        sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0);
+        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceContest, 0);
     else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
-        sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0);
+        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFacePlayer, 0);
     else
-        sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0);
+        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, 0);
 
     AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset);
     LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32);

src/battle_anim_effects_3.c

@@ -4,7 +4,7 @@
 #include "battle_anim.h"
 #include "bg.h"
 #include "contest.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
@@ -25,8 +25,6 @@
 #include "constants/weather.h"
 
 extern const struct SpriteTemplate gUnknown_08593114;
-extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
-extern const union AffineAnimCmd *const gUnknown_082FF694[];
 
 void sub_815A0D4(struct Sprite *);
 void sub_815A1B0(struct Sprite *);

src/battle_anim_mons.c

@@ -3,7 +3,7 @@
 #include "battle_anim.h"
 #include "bg.h"
 #include "contest.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
@@ -27,11 +27,6 @@
 #define IS_DOUBLE_BATTLE() ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
 
 extern const struct OamData gUnknown_0852497C;
-extern const struct MonCoords gMonFrontPicCoords[];
-extern const struct MonCoords gMonBackPicCoords[];
-extern const u8 gEnemyMonElevation[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const union AffineAnimCmd *gUnknown_082FF6C0[];
 
 static void sub_80A6FB4(struct Sprite *sprite);
 static void sub_80A7144(struct Sprite *sprite);

src/battle_anim_sound_tasks.c

@@ -53,7 +53,7 @@ static void sub_8158B98(u8 taskId)
             PlaySE12WithPanning(gTasks[taskId].data[0], pan);
         }
         pan += panIncrement;
-        gTasks[taskId].data[2] = KeepPanInRange(pan);
+        gTasks[taskId].data[2] = KeepPanInRange(pan, panIncrement);
     }
 }
 
@@ -116,9 +116,12 @@ static void sub_8158D08(u8 taskId)
 
     if (gTasks[taskId].data[10]++ == gTasks[taskId].data[5])
     {
+        u16 dPan, oldPan;
         gTasks[taskId].data[10] = 0;
-        gTasks[taskId].data[11] += gTasks[taskId].data[3];
-        gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11]);
+        dPan = gTasks[taskId].data[3];
+        oldPan = gTasks[taskId].data[11] ;
+        gTasks[taskId].data[11] = dPan + oldPan;
+        gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11], oldPan);
     }
 }
 // task end
@@ -368,71 +371,21 @@ void sub_8159278(u8 taskId)
     sub_8159308(taskId);
 }
 
-#ifdef NONMATCHING
 void sub_8159308(u8 taskId)
 {
-    s16 panIncrement = gTasks[taskId].data[3];
+    u16 panIncrement = gTasks[taskId].data[3];
 
     if (gTasks[taskId].data[10]++ == gTasks[taskId].data[5])
     {
+        u16 oldPan;
         gTasks[taskId].data[10] = 0;
-
-        gTasks[taskId].data[11] += panIncrement;
-        gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11]);
+        oldPan = gTasks[taskId].data[11];
+        gTasks[taskId].data[11] = panIncrement + oldPan; 
+        gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11], oldPan);
     }
 
     gUnknown_02038440 = gTasks[taskId].data[11];
     if (gTasks[taskId].data[11] == gTasks[taskId].data[2])
         DestroyAnimVisualTask(taskId);
 }
-#else
-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\
-_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\
-_0815935A:\n\
-    pop {r4,r5}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool");
-}
-#endif
+

src/battle_anim_special.c

@@ -16,9 +16,10 @@
 #include "task.h"
 #include "trig.h"
 #include "util.h"
-#include "constants/rgb.h"
 #include "constants/items.h"
+#include "constants/moves.h"
 #include "constants/songs.h"
+#include "constants/rgb.h"
 
 // iwram
 int gUnknown_030062DC;
@@ -103,39 +104,52 @@ static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] =
     },
 };
 
-const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[] =
+#define TAG_PARTICLES_POKEBALL    55020
+#define TAG_PARTICLES_GREATBALL   55021
+#define TAG_PARTICLES_SAFARIBALL  55022
+#define TAG_PARTICLES_ULTRABALL   55023
+#define TAG_PARTICLES_MASTERBALL  55024
+#define TAG_PARTICLES_NETBALL     55025
+#define TAG_PARTICLES_DIVEBALL    55026
+#define TAG_PARTICLES_NESTBALL    55027
+#define TAG_PARTICLES_REPEATBALL  55028
+#define TAG_PARTICLES_TIMERBALL   55029
+#define TAG_PARTICLES_LUXURYBALL  55030
+#define TAG_PARTICLES_PREMIERBALL 55031
+
+const struct CompressedSpriteSheet gBallParticleSpritesheets[] =
 {
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EC},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6ED},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EE},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EF},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F0},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F1},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F2},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F3},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F4},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F5},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F6},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F7},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_POKEBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_GREATBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SAFARIBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_ULTRABALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_MASTERBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NETBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DIVEBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NESTBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_REPEATBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_TIMERBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUXURYBALL},
+    {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PREMIERBALL},
 };
 
-const struct CompressedSpritePalette gBallOpenParticlePalettes[] =
+const struct CompressedSpritePalette gBallParticlePalettes[] =
 {
-    {gBattleAnimSpritePalette_136, 0xD6EC},
-    {gBattleAnimSpritePalette_136, 0xD6ED},
-    {gBattleAnimSpritePalette_136, 0xD6EE},
-    {gBattleAnimSpritePalette_136, 0xD6EF},
-    {gBattleAnimSpritePalette_136, 0xD6F0},
-    {gBattleAnimSpritePalette_136, 0xD6F1},
-    {gBattleAnimSpritePalette_136, 0xD6F2},
-    {gBattleAnimSpritePalette_136, 0xD6F3},
-    {gBattleAnimSpritePalette_136, 0xD6F4},
-    {gBattleAnimSpritePalette_136, 0xD6F5},
-    {gBattleAnimSpritePalette_136, 0xD6F6},
-    {gBattleAnimSpritePalette_136, 0xD6F7},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_POKEBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_GREATBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SAFARIBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_ULTRABALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_MASTERBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NETBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DIVEBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NESTBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_REPEATBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_TIMERBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUXURYBALL},
+    {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL},
 };
 
-const union AnimCmd gUnknown_085E5154[] =
+const union AnimCmd gAnim_RegularBall[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -146,64 +160,64 @@ const union AnimCmd gUnknown_085E5154[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gUnknown_085E5170[] =
+const union AnimCmd gAnim_MasterBall[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_085E5178[] =
+const union AnimCmd gAnim_NetDiveBall[] =
 {
     ANIMCMD_FRAME(4, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_085E5180[] =
+const union AnimCmd gAnim_NestBall[] =
 {
     ANIMCMD_FRAME(5, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_085E5188[] =
+const union AnimCmd gAnim_LuxuryPremierBall[] =
 {
     ANIMCMD_FRAME(6, 4),
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gUnknown_085E5194[] =
+const union AnimCmd gAnim_UltraRepeatTimerBall[] =
 {
     ANIMCMD_FRAME(7, 4),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_085E519C[] =
+const union AnimCmd *const gAnims_BallParticles[] =
 {
-    gUnknown_085E5154,
-    gUnknown_085E5170,
-    gUnknown_085E5178,
-    gUnknown_085E5180,
-    gUnknown_085E5188,
-    gUnknown_085E5194,
+    gAnim_RegularBall,
+    gAnim_MasterBall,
+    gAnim_NetDiveBall,
+    gAnim_NestBall,
+    gAnim_LuxuryPremierBall,
+    gAnim_UltraRepeatTimerBall,
 };
 
-const u8 gBallOpenParticleAnimNums[] =
+const u8 gBallParticleAnimNums[] =
 {
-    0,
-    0,
-    0,
-    5,
-    1,
-    2,
-    2,
-    3,
-    5,
-    5,
-    4,
-    4,
+    [BALL_POKE] = 0,
+    [BALL_GREAT] = 0,
+    [BALL_SAFARI] = 0,
+    [BALL_ULTRA] = 5,
+    [BALL_MASTER] = 1,
+    [BALL_NET] = 2,
+    [BALL_DIVE] = 2,
+    [BALL_NEST] = 3,
+    [BALL_REPEAT] = 5,
+    [BALL_TIMER] = 5,
+    [BALL_LUXURY] = 4,
+    [BALL_PREMIER] = 4,
 };
 
-const TaskFunc gBallOpenParticleAnimationFuncs[] =
+const TaskFunc gBallParticleAnimationFuncs[] =
 {
     PokeBallOpenParticleAnimation,
     GreatBallOpenParticleAnimation,
@@ -219,132 +233,134 @@ const TaskFunc gBallOpenParticleAnimationFuncs[] =
     PremierBallOpenParticleAnimation,
 };
 
-const struct SpriteTemplate gUnknown_085E51F0[] =
+const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
 {
     {
-        .tileTag = 55020,
-        .paletteTag = 55020,
+        .tileTag = TAG_PARTICLES_POKEBALL,
+        .paletteTag = TAG_PARTICLES_POKEBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55021,
-        .paletteTag = 55021,
+        .tileTag = TAG_PARTICLES_GREATBALL,
+        .paletteTag = TAG_PARTICLES_GREATBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55022,
-        .paletteTag = 55022,
+        .tileTag = TAG_PARTICLES_SAFARIBALL,
+        .paletteTag = TAG_PARTICLES_SAFARIBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55023,
-        .paletteTag = 55023,
+        .tileTag = TAG_PARTICLES_ULTRABALL,
+        .paletteTag = TAG_PARTICLES_ULTRABALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55024,
-        .paletteTag = 55024,
+        .tileTag = TAG_PARTICLES_MASTERBALL,
+        .paletteTag = TAG_PARTICLES_MASTERBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55025,
-        .paletteTag = 55025,
+        .tileTag = TAG_PARTICLES_NETBALL,
+        .paletteTag = TAG_PARTICLES_NETBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55026,
-        .paletteTag = 55026,
+        .tileTag = TAG_PARTICLES_DIVEBALL,
+        .paletteTag = TAG_PARTICLES_DIVEBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55027,
-        .paletteTag = 55027,
+        .tileTag = TAG_PARTICLES_NESTBALL,
+        .paletteTag = TAG_PARTICLES_NESTBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55028,
-        .paletteTag = 55028,
+        .tileTag = TAG_PARTICLES_REPEATBALL,
+        .paletteTag = TAG_PARTICLES_REPEATBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55029,
-        .paletteTag = 55029,
+        .tileTag = TAG_PARTICLES_TIMERBALL,
+        .paletteTag = TAG_PARTICLES_TIMERBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55030,
-        .paletteTag = 55030,
+        .tileTag = TAG_PARTICLES_LUXURYBALL,
+        .paletteTag = TAG_PARTICLES_LUXURYBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
     {
-        .tileTag = 55031,
-        .paletteTag = 55031,
+        .tileTag = TAG_PARTICLES_PREMIERBALL,
+        .paletteTag = TAG_PARTICLES_PREMIERBALL,
         .oam = &gUnknown_08524904,
-        .anims = gUnknown_085E519C,
+        .anims = gAnims_BallParticles,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
 };
 
-const u16 gUnknown_085E5310[] =
+const u16 gBallOpenFadeColors[] =
 {
-    RGB(31, 22, 30),
-    RGB(16, 23, 30),
-    RGB(23, 30, 20),
-    RGB(31, 31, 15),
-    RGB(23, 20, 28),
-    RGB(21, 31, 25),
-    RGB(12, 25, 30),
-    RGB(30, 27, 10),
-    RGB(31, 24, 16),
-    RGB(29, 30, 30),
-    RGB(31, 17, 10),
-    RGB(31, 9, 10),
+    [BALL_POKE] = RGB(31, 22, 30),
+    [BALL_GREAT] = RGB(16, 23, 30),
+    [BALL_SAFARI] = RGB(23, 30, 20),
+    [BALL_ULTRA] = RGB(31, 31, 15),
+    [BALL_MASTER] = RGB(23, 20, 28),
+    [BALL_NET] = RGB(21, 31, 25),
+    [BALL_DIVE] = RGB(12, 25, 30),
+    [BALL_NEST] = RGB(30, 27, 10),
+    [BALL_REPEAT] = RGB(31, 24, 16),
+    [BALL_TIMER] = RGB(29, 30, 30),
+    [BALL_LUXURY] = RGB(31, 17, 10),
+    [BALL_PREMIER] = RGB(31, 9, 10),
+
+    // Garbage data
     RGB(0, 0, 0),
     RGB(1, 16, 0),
     RGB(3, 0, 1),
@@ -355,10 +371,10 @@ const u16 gUnknown_085E5310[] =
     RGB(4, 0, 0),
 };
 
-const struct SpriteTemplate gBattleAnimSpriteTemplate_85E5338 =
+const struct SpriteTemplate gPokeblockSpriteTemplate =
 {
-    .tileTag = ANIM_TAG_UNUSED_RED_BRICK,
-    .paletteTag = ANIM_TAG_UNUSED_RED_BRICK,
+    .tileTag = ANIM_TAG_POKEBLOCK,
+    .paletteTag = ANIM_TAG_POKEBLOCK,
     .oam = &gUnknown_0852490C,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -675,9 +691,9 @@ void sub_8170D24(u8 taskId)
 void AnimTask_IsBallBlockedByTrainer(u8 taskId)
 {
     if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK)
-        gBattleAnimArgs[7] = -1;
+        gBattleAnimArgs[ARG_RET_ID] = -1;
     else
-        gBattleAnimArgs[7] = 0;
+        gBattleAnimArgs[ARG_RET_ID] = 0;
 
     DestroyAnimVisualTask(taskId);
 }
@@ -687,30 +703,30 @@ u8 ItemIdToBallId(u16 ballItem)
     switch (ballItem)
     {
     case ITEM_MASTER_BALL:
-        return 4;
+        return BALL_MASTER;
     case ITEM_ULTRA_BALL:
-        return 3;
+        return BALL_ULTRA;
     case ITEM_GREAT_BALL:
-        return 1;
+        return BALL_GREAT;
     case ITEM_SAFARI_BALL:
-        return 2;
+        return BALL_SAFARI;
     case ITEM_NET_BALL:
-        return 5;
+        return BALL_NET;
     case ITEM_DIVE_BALL:
-        return 6;
+        return BALL_DIVE;
     case ITEM_NEST_BALL:
-        return 7;
+        return BALL_NEST;
     case ITEM_REPEAT_BALL:
-        return 8;
+        return BALL_REPEAT;
     case ITEM_TIMER_BALL:
-        return 9;
+        return BALL_TIMER;
     case ITEM_LUXURY_BALL:
-        return 10;
+        return BALL_LUXURY;
     case ITEM_PREMIER_BALL:
-        return 11;
+        return BALL_PREMIER;
     case ITEM_POKE_BALL:
     default:
-        return 0;
+        return BALL_POKE;
     }
 }
 
@@ -804,7 +820,6 @@ static void sub_8171134(struct Sprite *sprite)
 {
     int i;
     u8 ballId;
-    int ballId2; // extra var needed to match
 
     if (TranslateAnimHorizontalArc(sprite))
     {
@@ -825,15 +840,15 @@ static void sub_8171134(struct Sprite *sprite)
 
             sprite->data[5] = 0;
             sprite->callback = sub_81711E8;
-            ballId = ItemIdToBallId(gLastUsedItem);
-            ballId2 = ballId;
-            if (ballId2 > 11)
-                return;
-            if (ballId2 < 0)
-                return;
 
-            AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId);
-            LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId);
+            ballId = ItemIdToBallId(gLastUsedItem);
+            switch (ballId)
+            {
+            case 0 ... POKEBALL_COUNT - 1:
+                AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId);
+                LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId);
+                break;
+            }
         }
     }
 }
@@ -1259,7 +1274,7 @@ static void sub_81719EC(struct Sprite *sprite)
     sub_8171D60(4);
     for (i = 0; i < 3; i++)
     {
-        u8 spriteId = CreateSprite(&gUnknown_085E51F0[4], sprite->pos1.x, sprite->pos1.y, subpriority);
+        u8 spriteId = CreateSprite(&gBallParticlesSpriteTemplates[4], sprite->pos1.x, sprite->pos1.y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].data[0] = 24;
@@ -1268,7 +1283,7 @@ static void sub_81719EC(struct Sprite *sprite)
             gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2;
             InitAnimArcTranslation(&gSprites[spriteId]);
             gSprites[spriteId].callback = sub_8171AAC;
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[4]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[4]);
         }
     }
 }
@@ -1280,28 +1295,23 @@ static void sub_8171AAC(struct Sprite *sprite)
         DestroySprite(sprite);
 }
 
-// fakematching. I think the return type of ItemIdToBallId()
-// is wrong because of the weird required casting.
 static void sub_8171AE4(struct Sprite *sprite)
 {
     u8 ballId;
-    int ballId2; // extra var needed to match
 
     StartSpriteAnim(sprite, 1);
     StartSpriteAffineAnim(sprite, 0);
     sprite->callback = sub_8171BAC;
 
     ballId = ItemIdToBallId(gLastUsedItem);
-    ballId2 = ballId;
-    if (ballId2 > 11)
-        goto LABEL;
-    if (ballId2 < 0)
-        goto LABEL;
+    switch (ballId)
+    {
+    case 0 ... POKEBALL_COUNT - 1:
+        AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId);
+        LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId);
+        break;
+    }
 
-    AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId);
-    LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId);
-
-    LABEL:
     gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = 0;
     StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1);
     AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]);
@@ -1314,7 +1324,7 @@ static void sub_8171BAC(struct Sprite *sprite)
 
     if (sprite->animEnded)
         sprite->invisible = 1;
-    
+
     if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded)
     {
         StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 0);
@@ -1323,7 +1333,7 @@ static void sub_8171BAC(struct Sprite *sprite)
     else
     {
         gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] -= 288;
-        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8;   
+        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8;
     }
 
     if (sprite->animEnded && next)
@@ -1374,10 +1384,10 @@ static void sub_8171D60(u8 ballId)
 {
     u8 taskId;
 
-    if (GetSpriteTileStartByTag(gBallOpenParticleSpritesheets[ballId].tag) == 0xFFFF)
+    if (GetSpriteTileStartByTag(gBallParticleSpritesheets[ballId].tag) == 0xFFFF)
     {
-        LoadCompressedSpriteSheetUsingHeap(&gBallOpenParticleSpritesheets[ballId]);
-        LoadCompressedSpritePaletteUsingHeap(&gBallOpenParticlePalettes[ballId]);
+        LoadCompressedSpriteSheetUsingHeap(&gBallParticleSpritesheets[ballId]);
+        LoadCompressedSpritePaletteUsingHeap(&gBallParticlePalettes[ballId]);
     }
 }
 
@@ -1386,7 +1396,7 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId)
     u8 taskId;
 
     sub_8171D60(ballId);
-    taskId = CreateTask(gBallOpenParticleAnimationFuncs[ballId], 5);
+    taskId = CreateTask(gBallParticleAnimationFuncs[ballId], 5);
     gTasks[taskId].data[1] = x;
     gTasks[taskId].data[2] = y;
     gTasks[taskId].data[3] = priority;
@@ -1419,11 +1429,11 @@ static void PokeBallOpenParticleAnimation(u8 taskId)
         priority = gTasks[taskId].data[3];
         subpriority = gTasks[taskId].data[4];
 
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1;
             gSprites[spriteId].oam.priority = priority;
 
@@ -1478,11 +1488,11 @@ static void TimerBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1512,11 +1522,11 @@ static void DiveBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1547,11 +1557,11 @@ static void SafariBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1582,11 +1592,11 @@ static void UltraBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 10; i++)
     {
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 25;
@@ -1623,11 +1633,11 @@ static void GreatBallOpenParticleAnimation(u8 taskId)
 
         for (i = 0; i < 8; i++)
         {
-            spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+            spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
             if (spriteId != MAX_SPRITES)
             {
                 sub_8171E20();
-                StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+                StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
                 gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
                 gSprites[spriteId].oam.priority = priority;
                 gSprites[spriteId].data[0] = i * 32;
@@ -1671,13 +1681,13 @@ static void RepeatBallOpenParticleAnimation(u8 taskId)
     priority = gTasks[taskId].data[3];
     subpriority = gTasks[taskId].data[4];
 
-    for (i = 0; i < 12; i++)
+    for (i = 0; i < POKEBALL_COUNT; i++)
     {
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 21;
@@ -1717,11 +1727,11 @@ static void MasterBallOpenParticleAnimation(u8 taskId)
     {
         for (i = 0; i < 8; i++)
         {
-            spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+            spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
             if (spriteId != MAX_SPRITES)
             {
                 sub_8171E20();
-                StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+                StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
                 gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
                 gSprites[spriteId].oam.priority = priority;
                 gSprites[spriteId].data[0] = i * 32;
@@ -1761,11 +1771,11 @@ static void PremierBallOpenParticleAnimation(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority);
+        spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             sub_8171E20();
-            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]);
+            StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]);
             gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
@@ -1792,12 +1802,10 @@ static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 static void DestroyBallOpenAnimationParticle(struct Sprite *sprite)
 {
     int i, j;
-    int temp;
 
     if (!gMain.inBattle)
     {
-        temp = sprite->data[7]; // temp var needed to match
-        if (temp == 1)
+        if (sprite->data[7] == 1)
             DestroySpriteAndFreeResources(sprite);
         else
             DestroySprite(sprite);
@@ -1807,18 +1815,18 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite)
         gBattleSpritesDataPtr->animationData->field_A--;
         if (gBattleSpritesDataPtr->animationData->field_A == 0)
         {
-            for (i = 0; i < 12; i++)
+            for (i = 0; i < POKEBALL_COUNT; i++)
             {
-                if (FuncIsActiveTask(gBallOpenParticleAnimationFuncs[i]) == TRUE)
+                if (FuncIsActiveTask(gBallParticleAnimationFuncs[i]) == TRUE)
                     break;
             }
 
-            if (i == 12)
+            if (i == POKEBALL_COUNT)
             {
-                for (j = 0; j < 12; j++)
+                for (j = 0; j < POKEBALL_COUNT; j++)
                 {
-                    FreeSpriteTilesByTag(gBallOpenParticleSpritesheets[j].tag);
-                    FreeSpritePaletteByTag(gBallOpenParticlePalettes[j].tag);
+                    FreeSpriteTilesByTag(gBallParticleSpritesheets[j].tag);
+                    FreeSpritePaletteByTag(gBallParticlePalettes[j].tag);
                 }
             }
 
@@ -1843,12 +1851,12 @@ u8 LaunchBallFadeMonTask(u8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ba
 
     if (!unfadeLater)
     {
-        BlendPalette(battler * 16 + 0x100, 16, 0, gUnknown_085E5310[ballId]);
+        BlendPalette(battler * 16 + 0x100, 16, 0, gBallOpenFadeColors[ballId]);
         gTasks[taskId].data[1] = 1;
     }
     else
     {
-        BlendPalette(battler * 16 + 0x100, 16, 16, gUnknown_085E5310[ballId]);
+        BlendPalette(battler * 16 + 0x100, 16, 16, gBallOpenFadeColors[ballId]);
         gTasks[taskId].data[0] = 16;
         gTasks[taskId].data[1] = -1;
         gTasks[taskId].func = sub_8172B40;
@@ -1864,7 +1872,7 @@ static void sub_8172AB0(u8 taskId)
 
     if (gTasks[taskId].data[2] <= 16)
     {
-        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_085E5310[ballId]);
+        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]);
         gTasks[taskId].data[0] += gTasks[taskId].data[1];
         gTasks[taskId].data[2]++;
     }
@@ -1892,7 +1900,7 @@ static void sub_8172B90(u8 taskId)
 
     if (gTasks[taskId].data[2] <= 16)
     {
-        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_085E5310[ballId]);
+        BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]);
         gTasks[taskId].data[0] += gTasks[taskId].data[1];
         gTasks[taskId].data[2]++;
     }
@@ -1906,9 +1914,8 @@ void sub_8172BF0(u8 taskId)
 {
     u8 spriteId;
     u32 x;
-    u32 done;
-    
-    done = FALSE;
+    u32 done = FALSE;
+
     spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
     switch (gTasks[taskId].data[10])
     {
@@ -1942,8 +1949,7 @@ void sub_8172BF0(u8 taskId)
             if (gSprites[spriteId].pos2.x <= 0)
             {
                 gSprites[spriteId].pos2.x = 0;
-                // done = FALSE; // fakematching--can't get the tail merge correct
-                goto DONE;
+                done = TRUE;
             }
         }
         else
@@ -1956,10 +1962,8 @@ void sub_8172BF0(u8 taskId)
         }
 
         if (done)
-        {
-            DONE:
             DestroyAnimVisualTask(taskId);
-        }
+
         break;
     }
 }
@@ -1998,13 +2002,13 @@ void sub_8172D98(u8 taskId)
     }
 }
 
-void sub_8172E9C(u8 taskId)
+void AnimTask_IsAttackerBehindSubstitute(u8 taskId)
 {
-    gBattleAnimArgs[7] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].behindSubstitute;
+    gBattleAnimArgs[ARG_RET_ID] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].behindSubstitute;
     DestroyAnimVisualTask(taskId);
 }
 
-void sub_8172ED0(u8 taskId)
+void AnimTask_TargetToEffectBattler(u8 taskId)
 {
     gBattleAnimTarget = gEffectBattler;
     DestroyAnimVisualTask(taskId);
@@ -2030,10 +2034,10 @@ void sub_8172EF0(u8 battler, struct Pokemon *mon)
 
         if (isShiny)
         {
-            if (GetSpriteTileStartByTag(0x27F9) == 0xFFFF)
+            if (GetSpriteTileStartByTag(ANIM_TAG_GOLD_STARS) == 0xFFFF)
             {
-                LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[233]);
-                LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[233]);
+                LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_GOLD_STARS - ANIM_SPRITES_START]);
+                LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_GOLD_STARS - ANIM_SPRITES_START]);
             }
 
             taskId1 = CreateTask(sub_8172FEC, 10);
@@ -2063,7 +2067,7 @@ static void sub_8172FEC(u8 taskId)
         gTasks[taskId].data[13]++;
         return;
     }
-    
+
     if (gBattleSpritesDataPtr->animationData->field_A)
         return;
 
@@ -2103,7 +2107,7 @@ static void sub_8172FEC(u8 taskId)
         if (gTasks[taskId].data[11] == 0)
         {
             if (GetBattlerSide(battler) == B_SIDE_PLAYER)
-                pan = 192;
+                pan = -64;
             else
                 pan = 63;
 
@@ -2169,20 +2173,20 @@ static void sub_8173250(struct Sprite *sprite)
     }
 }
 
-void sub_81732B0(u8 taskId)
+void AnimTask_LoadPokeblockGfx(u8 taskId)
 {
     u8 paletteIndex;
 
-    LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[269]);
-    LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[269]);
-    paletteIndex = IndexOfSpritePaletteTag(0x281D); // unused
+    LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
+    LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
+    paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK); // unused
     DestroyAnimVisualTask(taskId);
 }
 
-void sub_81732E4(u8 taskId)
+void AnimTask_FreePokeblockGfx(u8 taskId)
 {
-    FreeSpriteTilesByTag(0x281D);
-    FreeSpritePaletteByTag(0x281D);
+    FreeSpriteTilesByTag(ANIM_TAG_POKEBLOCK);
+    FreeSpritePaletteByTag(ANIM_TAG_POKEBLOCK);
     DestroyAnimVisualTask(taskId);
 }
 
@@ -2245,21 +2249,21 @@ void sub_817345C(u8 taskId)
 
 void AnimTask_GetTrappedMoveAnimId(u8 taskId)
 {
-    if (gBattleSpritesDataPtr->animationData->animArg == 83)
-        gBattleAnimArgs[0] = 1;
-    else if (gBattleSpritesDataPtr->animationData->animArg == 250)
-        gBattleAnimArgs[0] = 2;
-    else if (gBattleSpritesDataPtr->animationData->animArg == 128)
-        gBattleAnimArgs[0] = 3;
-    else if (gBattleSpritesDataPtr->animationData->animArg == 328)
-        gBattleAnimArgs[0] = 4;
+    if (gBattleSpritesDataPtr->animationData->animArg == MOVE_FIRE_SPIN)
+        gBattleAnimArgs[0] = TRAP_ANIM_FIRE_SPIN;
+    else if (gBattleSpritesDataPtr->animationData->animArg == MOVE_WHIRLPOOL)
+        gBattleAnimArgs[0] = TRAP_ANIM_WHIRLPOOL;
+    else if (gBattleSpritesDataPtr->animationData->animArg == MOVE_CLAMP)
+        gBattleAnimArgs[0] = TRAP_ANIM_CLAMP;
+    else if (gBattleSpritesDataPtr->animationData->animArg == MOVE_SAND_TOMB)
+        gBattleAnimArgs[0] = TRAP_ANIM_SAND_TOMB;
     else
-        gBattleAnimArgs[0] = 0;
+        gBattleAnimArgs[0] = TRAP_ANIM_BIND;
 
     DestroyAnimVisualTask(taskId);
 }
 
-void sub_817351C(u8 taskId)
+void AnimTask_GetBattlersFromArg(u8 taskId)
 {
     gBattleAnimAttacker = gBattleSpritesDataPtr->animationData->animArg;
     gBattleAnimTarget = gBattleSpritesDataPtr->animationData->animArg >> 8;

src/battle_anim_status_effects.c

@@ -44,8 +44,8 @@ static const union AnimCmd *const sSpriteAnimTable_853EDF8[] =
 
 const struct SpriteTemplate gUnknown_0853EDFC =
 {
-    .tileTag = ANIM_TAG_UNUSED_ORB,
-    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .tileTag = ANIM_TAG_ORB,
+    .paletteTag = ANIM_TAG_ORB,
     .oam = &gUnknown_0852490C,
     .anims = sSpriteAnimTable_853EDF8,
     .images = NULL,
@@ -55,8 +55,8 @@ const struct SpriteTemplate gUnknown_0853EDFC =
 
 const struct SpriteTemplate gUnknown_0853EE14 =
 {
-    .tileTag = ANIM_TAG_UNUSED_ORB,
-    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .tileTag = ANIM_TAG_ORB,
+    .paletteTag = ANIM_TAG_ORB,
     .oam = &gUnknown_0852490C,
     .anims = sSpriteAnimTable_853EDF8,
     .images = NULL,
@@ -125,8 +125,8 @@ const struct SpriteTemplate gUnknown_0853EE84 =
 
 const struct SpriteTemplate gUnknown_0853EE9C =
 {
-    .tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
-    .paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
+    .tileTag = ANIM_TAG_MONSTER_FOOT,
+    .paletteTag = ANIM_TAG_MONSTER_FOOT,
     .oam = &gUnknown_08524914,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -195,8 +195,8 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] =
 
 const struct SpriteTemplate gUnknown_0853EF18 =
 {
-    .tileTag = ANIM_TAG_UNUSED_ORB,
-    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .tileTag = ANIM_TAG_ORB,
+    .paletteTag = ANIM_TAG_ORB,
     .oam = &gUnknown_085249CC,
     .anims = sSpriteAnimTable_853EEF8,
     .images = NULL,

src/battle_bg.c

@@ -5,6 +5,7 @@
 #include "battle_message.h"
 #include "battle_setup.h"
 #include "bg.h"
+#include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "graphics.h"
@@ -597,6 +598,7 @@ const struct WindowTemplate * const gBattleWindowTemplates[] =
 
 static const struct BattleBackground gBattleTerrainTable[] =
 {
+    [BATTLE_TERRAIN_GRASS] =
     {
         .tileset = gBattleTerrainTiles_TallGrass,
         .tilemap = gBattleTerrainTilemap_TallGrass,
@@ -604,6 +606,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_TallGrass,
         .palette = gBattleTerrainPalette_TallGrass,
     },
+
+    [BATTLE_TERRAIN_LONG_GRASS] =
     {
         .tileset = gBattleTerrainTiles_LongGrass,
         .tilemap = gBattleTerrainTilemap_LongGrass,
@@ -611,6 +615,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_LongGrass,
         .palette = gBattleTerrainPalette_LongGrass,
     },
+
+    [BATTLE_TERRAIN_SAND] =
     {
         .tileset = gBattleTerrainTiles_Sand,
         .tilemap = gBattleTerrainTilemap_Sand,
@@ -618,6 +624,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Sand,
         .palette = gBattleTerrainPalette_Sand,
     },
+
+    [BATTLE_TERRAIN_UNDERWATER] =
     {
         .tileset = gBattleTerrainTiles_Underwater,
         .tilemap = gBattleTerrainTilemap_Underwater,
@@ -625,6 +633,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Underwater,
         .palette = gBattleTerrainPalette_Underwater,
     },
+
+    [BATTLE_TERRAIN_WATER] =
     {
         .tileset = gBattleTerrainTiles_Water,
         .tilemap = gBattleTerrainTilemap_Water,
@@ -632,6 +642,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Water,
         .palette = gBattleTerrainPalette_Water,
     },
+
+    [BATTLE_TERRAIN_POND] =
     {
         .tileset = gBattleTerrainTiles_PondWater,
         .tilemap = gBattleTerrainTilemap_PondWater,
@@ -639,6 +651,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_PondWater,
         .palette = gBattleTerrainPalette_PondWater,
     },
+
+    [BATTLE_TERRAIN_MOUNTAIN] =
     {
         .tileset = gBattleTerrainTiles_Rock,
         .tilemap = gBattleTerrainTilemap_Rock,
@@ -646,6 +660,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Rock,
         .palette = gBattleTerrainPalette_Rock,
     },
+
+    [BATTLE_TERRAIN_CAVE] =
     {
         .tileset = gBattleTerrainTiles_Cave,
         .tilemap = gBattleTerrainTilemap_Cave,
@@ -653,6 +669,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Cave,
         .palette = gBattleTerrainPalette_Cave,
     },
+
+    [BATTLE_TERRAIN_BUILDING] =
     {
         .tileset = gBattleTerrainTiles_Building,
         .tilemap = gBattleTerrainTilemap_Building,
@@ -660,7 +678,9 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Building,
         .palette = gBattleTerrainPalette_Building,
     },
-    {// plain
+
+    [BATTLE_TERRAIN_PLAIN] =
+    {
         .tileset = gBattleTerrainTiles_Building,
         .tilemap = gBattleTerrainTilemap_Building,
         .entryTileset = gBattleTerrainAnimTiles_Building,

src/battle_controller_link_opponent.c

@@ -9,7 +9,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "main.h"
 #include "m4a.h"
@@ -31,8 +31,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-
 // this file's functions
 static void LinkOpponentHandleGetMonData(void);
 static void LinkOpponentHandleGetRawMonData(void);

src/battle_controller_link_partner.c

@@ -9,7 +9,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "main.h"
 #include "m4a.h"
@@ -29,9 +29,6 @@
 #include "constants/trainers.h"
 #include "recorded_battle.h"
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void LinkPartnerHandleGetMonData(void);
 static void LinkPartnerHandleGetRawMonData(void);

src/battle_controller_opponent.c

@@ -10,7 +10,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "frontier_util.h"
 #include "item.h"
 #include "link.h"
@@ -36,8 +36,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-
 // this file's functions
 static void OpponentHandleGetMonData(void);
 static void OpponentHandleGetRawMonData(void);

src/battle_controller_player.c

@@ -9,7 +9,7 @@
 #include "battle_setup.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
@@ -33,12 +33,10 @@
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "constants/rgb.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void PlayerHandleGetMonData(void);
 static void PlayerHandleSetMonData(void);
@@ -2408,7 +2406,7 @@ static void PlayerHandleFaintAnimation(void)
 
 static void PlayerHandlePaletteFade(void)
 {
-    BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
     PlayerBufferExecCompleted();
 }
 
@@ -2630,7 +2628,7 @@ static void PlayerHandleChooseItem(void)
 {
     s32 i;
 
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
     gBattlerInMenuId = gActiveBattler;
 
@@ -2657,7 +2655,7 @@ static void PlayerHandleChoosePokemon(void)
         *(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4;
         *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
         *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
         gBattlerInMenuId = gActiveBattler;
     }
@@ -2666,7 +2664,7 @@ static void PlayerHandleChoosePokemon(void)
 static void PlayerHandleCmd23(void)
 {
     BattleStopLowHpSound();
-    BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
     PlayerBufferExecCompleted();
 }
 

src/battle_controller_player_partner.c

@@ -8,7 +8,7 @@
 #include "battle_setup.h"
 #include "battle_tower.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -27,9 +27,6 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void PlayerPartnerHandleGetMonData(void);
 static void PlayerPartnerHandleGetRawMonData(void);

src/battle_controller_recorded_opponent.c

@@ -9,7 +9,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -31,8 +31,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-
 // this file's functions
 static void RecordedOpponentHandleGetMonData(void);
 static void RecordedOpponentHandleGetRawMonData(void);

src/battle_controller_recorded_player.c

@@ -6,7 +6,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -27,9 +27,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void RecordedPlayerHandleGetMonData(void);
 static void RecordedPlayerHandleGetRawMonData(void);

src/battle_controller_safari.c

@@ -5,7 +5,7 @@
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_menu.h"
 #include "link.h"
 #include "main.h"
@@ -22,8 +22,7 @@
 #include "window.h"
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
-
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
+#include "constants/rgb.h"
 
 // this file's functions
 static void SafariHandleGetMonData(void);
@@ -473,7 +472,7 @@ static void SafariHandleChooseItem(void)
 {
     s32 i;
 
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
     gBattlerInMenuId = gActiveBattler;
 }

src/battle_controller_wally.c

@@ -7,7 +7,7 @@
 #include "battle_setup.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
@@ -30,8 +30,7 @@
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
-
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
+#include "constants/rgb.h"
 
 // this file's functions
 static void WallyHandleGetMonData(void);
@@ -1244,7 +1243,7 @@ static void WallyHandleChooseMove(void)
 
 static void WallyHandleChooseItem(void)
 {
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
     gBattlerInMenuId = gActiveBattler;
 }

src/battle_data.c

@@ -1,14 +0,0 @@
-#include "global.h"
-#include "battle.h"
-#include "data2.h"
-#include "constants/items.h"
-#include "constants/moves.h"
-#include "constants/species.h"
-#include "constants/trainers.h"
-#include "constants/battle_ai.h"
-
-#include "data/trainer_parties.h"
-#include "data/text/trainer_class_names.h"
-#include "data/trainers.h"
-#include "data/text/species_names.h"
-#include "data/text/move_names.h"

src/battle_dome.c

@@ -24,7 +24,7 @@
 #include "menu.h"
 #include "sound.h"
 #include "pokemon_icon.h"
-#include "data2.h"
+#include "data.h"
 #include "international_string_util.h"
 #include "trainer_pokemon_sprites.h"
 #include "scanline_effect.h"
@@ -59,9 +59,6 @@ struct UnkStruct_860DD10
     u16 src;
 };
 
-// text
-extern const u8 gTrainerClassNames[][13];
-
 // This file's functions.
 static u8 GetDomeTrainerMonIvs(u16 trainerId);
 static void SwapDomeTrainers(int id1, int id2, u16 *statsArray);

src/battle_factory_screen.c

@@ -17,7 +17,7 @@
 #include "string_util.h"
 #include "international_string_util.h"
 #include "window.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "pokemon_summary_screen.h"
 #include "sound.h"
@@ -1166,7 +1166,7 @@ static void CB2_InitSelectScreen(void)
         ShowBg(0);
         ShowBg(1);
         SetVBlankCallback(Select_VblankCb);
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP);
         if (sFactorySelectScreen->fromSummaryScreen == TRUE)
         {
@@ -1405,7 +1405,7 @@ static void Task_FromSelectScreenToSummaryScreen(u8 taskId)
     {
     case 6:
         gPlttBufferUnfaded[228] = gPlttBufferFaded[228];
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         gTasks[taskId].data[0] = 7;
         break;
     case 7:
@@ -1442,7 +1442,7 @@ static void Task_CloseSelectionScreen(u8 taskId)
         switch (gTasks[taskId].data[0])
         {
         case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
             gTasks[taskId].data[0]++;
             break;
         case 1:
@@ -2274,7 +2274,7 @@ static void Task_FromSwapScreenToSummaryScreen(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 6:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         gTasks[taskId].data[0] = 7;
         break;
     case 7:
@@ -2327,7 +2327,7 @@ static void Task_CloseSwapScreen(u8 taskId)
             gTasks[taskId].data[0]++;
             break;
         case 2:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
             gTasks[taskId].data[0]++;
             break;
         case 3:
@@ -3218,7 +3218,7 @@ static void CB2_InitSwapScreen(void)
         gMain.state++;
         break;
     case 14:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
         ShowBg(0);
         ShowBg(1);

src/battle_gfx_sfx_util.c

@@ -19,7 +19,7 @@
 #include "m4a.h"
 #include "constants/species.h"
 #include "decompress.h"
-#include "data2.h"
+#include "data.h"
 #include "palette.h"
 #include "contest.h"
 #include "constants/songs.h"
@@ -32,16 +32,8 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern const u8 gUnknown_0831C604[];
 extern const u8 * const gBattleAnims_General[];
 extern const u8 * const gBattleAnims_Special[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
-extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
-extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-extern const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[];
 extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
 extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
-extern const u8 gEnemyMonElevation[];
 
 // this file's functions
 static u8 sub_805D4A8(u16 move);
@@ -932,7 +924,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform
 
         if (targetSpecies == SPECIES_CASTFORM)
         {
-            gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies];
+            gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonFrontAnimsPtrTable[targetSpecies];
             LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
             LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[battlerDef] * 16, paletteOffset, 32);
         }

src/battle_interface.c

@@ -23,7 +23,8 @@
 #include "battle_anim.h"
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
-#include "data2.h"
+#include "data.h"
+#include "pokemon_summary_screen.h"
 
 struct TestingBar
 {
@@ -157,8 +158,6 @@ enum
     HEALTHBOX_GFX_117, //unknown_D1300C
 };
 
-extern const u8 *const gNatureNamePointers[];
-
 // strings
 extern const u8 gText_Slash[];
 extern const u8 gText_HighlightDarkGrey[];

src/battle_main.c

@@ -13,7 +13,7 @@
 #include "battle_tower.h"
 #include "berry.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "event_data.h"
@@ -977,7 +977,7 @@ static void CB2_HandleStartBattle(void)
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
         if (gWirelessCommType)
-            sub_800E0E8();
+            LoadWirelessStatusIndicatorSpriteGfx();
         break;
     case 1:
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -1172,7 +1172,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
         if (gWirelessCommType)
-            sub_800E0E8();
+            LoadWirelessStatusIndicatorSpriteGfx();
         // fall through
     case 1:
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -1572,7 +1572,7 @@ static void CB2_HandleStartMultiBattle(void)
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
         if (gWirelessCommType)
-            sub_800E0E8();
+            LoadWirelessStatusIndicatorSpriteGfx();
         break;
     case 1:
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)

src/battle_message.c

@@ -5,7 +5,7 @@
 #include "battle_message.h"
 #include "battle_setup.h"
 #include "battle_tower.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "frontier_util.h"
 #include "international_string_util.h"
@@ -38,7 +38,6 @@ struct BattleWindowText
     u8 shadowColor;
 };
 
-extern const u8 gTrainerClassNames[][13];
 extern const u16 gUnknown_08D85620[];
 
 // this file's functions

src/battle_records.c

@@ -22,6 +22,7 @@
 #include "gpu_regs.h"
 #include "constants/game_stat.h"
 #include "trainer_hill.h"
+#include "constants/rgb.h"
 
 // this file's functions
 static void Task_CloseTrainerHillRecordsOnButton(u8 taskId);
@@ -364,7 +365,7 @@ static void Task_CloseTrainerHillRecordsOnButton(u8 taskId)
 
 static void Task_BeginPaletteFade(u8 taskId)
 {
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gTasks[taskId].func = Task_ExitTrainerHillRecords;
 }
 
@@ -511,7 +512,7 @@ static void CB2_ShowTrainerHillRecords(void)
         gMain.state++;
         break;
     case 6:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         gMain.state++;
         break;
     case 7:

src/battle_script_commands.c

@@ -50,6 +50,8 @@
 #include "pokemon_summary_screen.h"
 #include "pokenav.h"
 #include "menu_specialized.h"
+#include "constants/rgb.h"
+#include "data.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
@@ -66,8 +68,8 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8* BS_ptr);
 static bool32 IsMonGettingExpSentOut(void);
 static void sub_804F17C(void);
 static bool8 sub_804F1CC(void);
-static void sub_804F100(void);
-static void sub_804F144(void);
+static void DrawLevelUpWindow1(void);
+static void DrawLevelUpWindow2(void);
 static bool8 sub_804F344(void);
 static void PutMonIconOnLvlUpBox(void);
 static void PutLevelAndGenderOnLvlUpBox(void);
@@ -1274,8 +1276,8 @@ static void atk04_critcalc(void)
                 + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattlerAttacker].species == SPECIES_CHANSEY)
                 + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattlerAttacker].species == SPECIES_FARFETCHD);
 
-    if (critChance > 4)
-        critChance = 4;
+    if (critChance >= ARRAY_COUNT(sCriticalHitChance))
+        critChance = ARRAY_COUNT(sCriticalHitChance) - 1;
 
     if ((gBattleMons[gBattlerTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattlerTarget].ability != ABILITY_SHELL_ARMOR)
      && !(gStatuses3[gBattlerAttacker] & STATUS3_CANT_SCORE_A_CRIT)
@@ -3238,9 +3240,8 @@ static void atk23_getexp(void)
     s32 i; // also used as stringId
     u8 holdEffect;
     s32 sentIn;
-
     s32 viaExpShare = 0;
-    u16* exp = &gBattleStruct->expValue;
+    u16 *exp = &gBattleStruct->expValue;
 
     gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1];
@@ -3391,14 +3392,14 @@ static void atk23_getexp(void)
                         }
                     }
                     else
+                    {
                         gBattleStruct->expGetterBattlerId = 0;
+                    }
 
-                    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId)
-
+                    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId);
                     // buffer 'gained' or 'gained a boosted'
-                    PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
-
-                    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
+                    PREPARE_STRING_BUFFER(gBattleTextBuff2, i);
+                    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage);
 
                     PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBattlerId);
                     MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species);
@@ -3414,12 +3415,12 @@ static void atk23_getexp(void)
             gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0;
             if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_LEVEL)
             {
-                gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
-                gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
-                gBattleResources->statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
-                gBattleResources->statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
-                gBattleResources->statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
-                gBattleResources->statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
+                gBattleResources->beforeLvlUp->stats[STAT_HP]    = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
+                gBattleResources->beforeLvlUp->stats[STAT_ATK]   = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
+                gBattleResources->beforeLvlUp->stats[STAT_DEF]   = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
+                gBattleResources->beforeLvlUp->stats[STAT_SPEED] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
+                gBattleResources->beforeLvlUp->stats[STAT_SPATK] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
+                gBattleResources->beforeLvlUp->stats[STAT_SPDEF] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
 
                 gActiveBattler = gBattleStruct->expGetterBattlerId;
                 BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage);
@@ -3437,9 +3438,8 @@ static void atk23_getexp(void)
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId)
                     HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 
-                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId)
-
-                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL))
+                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId);
+                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL));
 
                 BattleScriptPushCursor();
                 gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterMonId];
@@ -3487,7 +3487,9 @@ static void atk23_getexp(void)
         break;
     case 5: // looper increment
         if (gBattleMoveDamage) // there is exp to give, goto case 3 that gives exp
+        {
             gBattleScripting.atk23_state = 3;
+        }
         else
         {
             gBattleStruct->expGetterMonId++;
@@ -5695,7 +5697,7 @@ static void atk5A_yesnoboxlearnmove(void)
             if (gBattleCommunication[1] == 0)
             {
                 HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
-                BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+                BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
                 gBattleScripting.learnMoveState++;
             }
             else
@@ -5911,8 +5913,7 @@ static void atk5D_getmoneyreward(void)
         moneyReward += GetTrainerMoneyToGive(gTrainerBattleOpponent_B);
 
     AddMoney(&gSaveBlock1Ptr->money, moneyReward);
-
-    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward)
+    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward);
 
     gBattlescriptCurrInstr++;
 }
@@ -6233,7 +6234,7 @@ static void atk6C_drawlvlupbox(void)
         gBattleScripting.atk6C_state = 4;
         break;
     case 4:
-        sub_804F100();
+        DrawLevelUpWindow1();
         PutWindowTilemap(13);
         CopyWindowToVram(13, 3);
         gBattleScripting.atk6C_state++;
@@ -6250,7 +6251,7 @@ static void atk6C_drawlvlupbox(void)
         if (gMain.newKeys != 0)
         {
             PlaySE(SE_SELECT);
-            sub_804F144();
+            DrawLevelUpWindow2();
             CopyWindowToVram(13, 2);
             gBattleScripting.atk6C_state++;
         }
@@ -6291,20 +6292,20 @@ static void atk6C_drawlvlupbox(void)
     }
 }
 
-static void sub_804F100(void)
+static void DrawLevelUpWindow1(void)
 {
-    struct StatsArray currentStats;
+    u16 currStats[NUM_STATS];
 
-    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], (u16*) &currentStats);
-    DrawLevelUpWindowPg1(0xD, (u16*) gBattleResources->statsBeforeLvlUp,(u16*) &currentStats, 0xE, 0xD, 0xF);
+    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
+    DrawLevelUpWindowPg1(0xD, gBattleResources->beforeLvlUp->stats, currStats, 0xE, 0xD, 0xF);
 }
 
-static void sub_804F144(void)
+static void DrawLevelUpWindow2(void)
 {
-    struct StatsArray currentStats;
+    u16 currStats[NUM_STATS];
 
-    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], (u16*) &currentStats);
-    DrawLevelUpWindowPg2(0xD, (u16*) &currentStats, 0xE, 0xD, 0xF);
+    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
+    DrawLevelUpWindowPg2(0xD, currStats, 0xE, 0xD, 0xF);
 }
 
 static void sub_804F17C(void)
@@ -10274,7 +10275,7 @@ static void atkF2_displaydexinfo(void)
     switch (gBattleCommunication[0])
     {
     case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         gBattleCommunication[0]++;
         break;
     case 1:
@@ -10305,7 +10306,7 @@ static void atkF2_displaydexinfo(void)
     case 4:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
-            BeginNormalPaletteFade(0xFFFF, 0, 0x10, 0, 0);
+            BeginNormalPaletteFade(0xFFFF, 0, 0x10, 0, RGB_BLACK);
             ShowBg(0);
             ShowBg(3);
             gBattleCommunication[0]++;

src/battle_setup.c

@@ -45,6 +45,7 @@
 #include "constants/map_types.h"
 #include "constants/battle_frontier.h"
 #include "field_screen_effect.h"
+#include "data.h"
 
 enum
 {
@@ -792,7 +793,7 @@ static u8 GetTrainerBattleTransition(void)
     if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR)
     {
         if (gTrainerBattleOpponent_A == TRAINER_SIDNEY)
-            return B_TRANSITION_SYDNEY;
+            return B_TRANSITION_SIDNEY;
         if (gTrainerBattleOpponent_A == TRAINER_PHOEBE)
             return B_TRANSITION_PHOEBE;
         if (gTrainerBattleOpponent_A == TRAINER_GLACIA)

src/battle_tower.c

@@ -18,7 +18,7 @@
 #include "trainer_see.h"
 #include "new_game.h"
 #include "string_util.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "field_message_box.h"
 #include "tv.h"

src/battle_transition.c

@@ -23,6 +23,7 @@
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "constants/rgb.h"
 
 struct TransitionData
 {
@@ -75,7 +76,7 @@ static void Phase2Task_Slice(u8 taskId);
 static void Phase2Task_WhiteFade(u8 taskId);
 static void Phase2Task_GridSquares(u8 taskId);
 static void Phase2Task_Shards(u8 taskId);
-static void Phase2Task_Sydney(u8 taskId);
+static void Phase2Task_Sidney(u8 taskId);
 static void Phase2Task_Phoebe(u8 taskId);
 static void Phase2Task_Glacia(u8 taskId);
 static void Phase2Task_Drake(u8 taskId);
@@ -330,7 +331,7 @@ static const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
     Phase2Task_WhiteFade,                   // 9
     Phase2Task_GridSquares,                 // 10
     Phase2Task_Shards,                      // 11
-    Phase2Task_Sydney,                      // 12
+    Phase2Task_Sidney,                      // 12
     Phase2Task_Phoebe,                      // 13
     Phase2Task_Glacia,                      // 14
     Phase2Task_Drake,                       // 15
@@ -823,7 +824,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
     gFieldEffectObjectPalette10, 0x1009
 };
 
-static const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
+static const u16 sMugshotPal_Sidney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
 static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal");
 static const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal");
 static const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal");
@@ -833,7 +834,7 @@ static const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may
 
 static const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] =
 {
-    sMugshotPal_Sydney,
+    sMugshotPal_Sidney,
     sMugshotPal_Phoebe,
     sMugshotPal_Glacia,
     sMugshotPal_Drake,
@@ -1076,7 +1077,7 @@ static bool8 Phase2_Blur_Func2(struct Task *task)
     {
         task->tData1 = 4;
         if (++task->tData2 == 10)
-            BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK);
         SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17);
         if (task->tData2 > 14)
             task->tState++;
@@ -1103,7 +1104,7 @@ static bool8 Phase2_Swirl_Func1(struct Task *task)
 {
     sub_8149F08();
     ScanlineEffect_Clear();
-    BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
     sub_8149F98(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_14, 0, 2, 0, 160);
 
     SetVBlankCallback(VBlankCB_Phase2_Swirl);
@@ -1158,7 +1159,7 @@ static bool8 Phase2_Shuffle_Func1(struct Task *task)
     sub_8149F08();
     ScanlineEffect_Clear();
 
-    BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
     memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_16, 0x140);
 
     SetVBlankCallback(VBlankCB_Phase2_Shuffle);
@@ -1461,7 +1462,7 @@ static bool8 Phase2_Kyogre_Func5(struct Task *task)
 
 static bool8 Phase2_WeatherDuo_Func6(struct Task *task)
 {
-    BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, RGB_BLACK);
     task->tState++;
     return FALSE;
 }
@@ -1546,7 +1547,7 @@ static bool8 Phase2_FramesCountdown(struct Task *task)
 
 static bool8 Phase2_WeatherTrio_Func1(struct Task *task)
 {
-    BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, 0);
+    BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, RGB_BLACK);
     task->tState++;
     return FALSE;
 }
@@ -1969,7 +1970,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task)
     if (++task->tData3 == 81)
     {
         task->tData4++;
-        BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 0x10, RGB_BLACK);
     }
 
     if (task->tData4 != 0 && !gPaletteFade.active)
@@ -2072,9 +2073,9 @@ static void VBlankCB_Phase2_Wave(void)
     DmaSet(0, gScanlineEffectRegBuffers[1], &REG_WIN0H, 0xA2400001);
 }
 
-static void Phase2Task_Sydney(u8 taskId)
+static void Phase2Task_Sidney(u8 taskId)
 {
-    gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY;
+    gTasks[taskId].tMugshotId = MUGSHOT_SIDNEY;
     Phase2Task_MugShotTransition(taskId);
 }
 
@@ -3159,7 +3160,7 @@ static bool8 Phase2_Rayquaza_Func6(struct Task *task)
     {
         task->tState++;
         task->tData1 = 0;
-        BeginNormalPaletteFade(0xFFFF8000, 2, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFF8000, 2, 0, 0x10, RGB_BLACK);
     }
 
     return FALSE;
@@ -3978,7 +3979,7 @@ static bool8 Phase2_30_Func4(struct Task *task)
     if (++task->tData3 == 101)
     {
         task->tData4++;
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     }
 
     if (task->tData4 != 0 && !gPaletteFade.active)

src/battle_util.c

@@ -2041,7 +2041,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 case ABILITY_FLASH_FIRE:
                     if (moveType == TYPE_FIRE && !(gBattleMons[battler].status1 & STATUS1_FREEZE))
                     {
-                        if (!(gBattleResources->flags->flags[battler] & UNKNOWN_FLAG_FLASH_FIRE))
+                        if (!(gBattleResources->flags->flags[battler] & RESOURCE_FLAG_FLASH_FIRE))
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                             if (gProtectStructs[gBattlerAttacker].notFirstStrike)
@@ -2049,7 +2049,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
 
-                            gBattleResources->flags->flags[battler] |= UNKNOWN_FLAG_FLASH_FIRE;
+                            gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_FLASH_FIRE;
                             effect = 2;
                         }
                         else

src/battle_util2.c

@@ -25,7 +25,7 @@ void AllocateBattleResources(void)
     gBattleResources->flags = AllocZeroed(sizeof(*gBattleResources->flags));
     gBattleResources->battleScriptsStack = AllocZeroed(sizeof(*gBattleResources->battleScriptsStack));
     gBattleResources->battleCallbackStack = AllocZeroed(sizeof(*gBattleResources->battleCallbackStack));
-    gBattleResources->statsBeforeLvlUp = AllocZeroed(sizeof(*gBattleResources->statsBeforeLvlUp));
+    gBattleResources->beforeLvlUp = AllocZeroed(sizeof(*gBattleResources->beforeLvlUp));
     gBattleResources->ai = AllocZeroed(sizeof(*gBattleResources->ai));
     gBattleResources->battleHistory = AllocZeroed(sizeof(*gBattleResources->battleHistory));
     gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack));
@@ -56,7 +56,7 @@ void FreeBattleResources(void)
         FREE_AND_SET_NULL(gBattleResources->flags);
         FREE_AND_SET_NULL(gBattleResources->battleScriptsStack);
         FREE_AND_SET_NULL(gBattleResources->battleCallbackStack);
-        FREE_AND_SET_NULL(gBattleResources->statsBeforeLvlUp);
+        FREE_AND_SET_NULL(gBattleResources->beforeLvlUp);
         FREE_AND_SET_NULL(gBattleResources->ai);
         FREE_AND_SET_NULL(gBattleResources->battleHistory);
         FREE_AND_SET_NULL(gBattleResources->AI_ScriptsStack);

src/berry.c

@@ -1,6 +1,8 @@
 #include "global.h"
 #include "berry.h"
 #include "event_data.h"
+#include "event_object_movement.h"
+#include "event_scripts.h"
 #include "field_control_avatar.h"
 #include "fieldmap.h"
 #include "item.h"
@@ -11,11 +13,6 @@
 #include "text.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/items.h"
-#include "event_object_movement.h"
-
-
-
-extern const u8 BerryTreeScript[];
 
 static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
 static bool32 BerryTreeGrow(struct BerryTree *tree);
@@ -117,6 +114,7 @@ static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power o
 
 const struct Berry gBerries[] =
 {
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("CHERI"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -133,6 +131,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("CHESTO"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -149,6 +149,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("PECHA"),
         .firmness = BERRY_FIRMNESS_VERY_SOFT,
@@ -165,6 +167,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("RAWST"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -181,6 +185,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("ASPEAR"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -197,6 +203,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 25,
     },
+
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("LEPPA"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -213,6 +221,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("ORAN"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -229,6 +239,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("PERSIM"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -245,6 +257,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("LUM"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -261,6 +275,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("SITRUS"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -277,6 +293,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("FIGY"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -293,6 +311,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("WIKI"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -309,6 +329,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("MAGO"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -325,6 +347,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("AGUAV"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -341,6 +365,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 25,
     },
+
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("IAPAPA"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -357,6 +383,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 25,
     },
+
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("RAZZ"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -373,6 +401,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 20,
     },
+
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("BLUK"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -389,6 +419,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 20,
     },
+
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("NANAB"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -405,6 +437,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 20,
     },
+
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("WEPEAR"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -421,6 +455,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("PINAP"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -437,6 +473,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("POMEG"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -453,6 +491,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 20,
     },
+
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("KELPSY"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -469,6 +509,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("QUALOT"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -485,6 +527,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("HONDEW"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -501,6 +545,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 20,
     },
+
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("GREPA"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -517,6 +563,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 20,
     },
+
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("TAMATO"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -533,6 +581,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 30,
     },
+
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("CORNN"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -549,6 +599,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 30,
     },
+
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("MAGOST"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -565,6 +617,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 30,
     },
+
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("RABUTA"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -581,6 +635,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 30,
     },
+
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("NOMEL"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -597,6 +653,8 @@ const struct Berry gBerries[] =
         .sour = 20,
         .smoothness = 30,
     },
+
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("SPELON"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -613,6 +671,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 70,
     },
+
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("PAMTRE"),
         .firmness = BERRY_FIRMNESS_VERY_SOFT,
@@ -629,6 +689,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 70,
     },
+
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("WATMEL"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -645,6 +707,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 70,
     },
+
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("DURIN"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -661,6 +725,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 70,
     },
+
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("BELUE"),
         .firmness = BERRY_FIRMNESS_VERY_SOFT,
@@ -677,6 +743,8 @@ const struct Berry gBerries[] =
         .sour = 40,
         .smoothness = 70,
     },
+
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("LIECHI"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -693,6 +761,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 80,
     },
+
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("GANLON"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -709,6 +779,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 80,
     },
+
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("SALAC"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -725,6 +797,8 @@ const struct Berry gBerries[] =
         .sour = 40,
         .smoothness = 80,
     },
+
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("PETAYA"),
         .firmness = BERRY_FIRMNESS_VERY_HARD,
@@ -741,6 +815,8 @@ const struct Berry gBerries[] =
         .sour = 0,
         .smoothness = 80,
     },
+
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("APICOT"),
         .firmness = BERRY_FIRMNESS_HARD,
@@ -757,6 +833,8 @@ const struct Berry gBerries[] =
         .sour = 40,
         .smoothness = 80,
     },
+
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("LANSAT"),
         .firmness = BERRY_FIRMNESS_SOFT,
@@ -773,6 +851,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 30,
     },
+
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("STARF"),
         .firmness = BERRY_FIRMNESS_SUPER_HARD,
@@ -789,6 +869,8 @@ const struct Berry gBerries[] =
         .sour = 10,
         .smoothness = 30,
     },
+
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] =
     {
         .name = _("ENIGMA"),
         .firmness = BERRY_FIRMNESS_UNKNOWN,

src/berry_blender.c

@@ -36,6 +36,7 @@
 #include "new_game.h"
 #include "save.h"
 #include "link.h"
+#include "constants/rgb.h"
 
 #define BLENDER_SCORE_BEST      0
 #define BLENDER_SCORE_GOOD      1
@@ -996,7 +997,7 @@ static void sub_807FAC8(void)
             }
             if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType)
             {
-                sub_800E0E8();
+                LoadWirelessStatusIndicatorSpriteGfx();
                 CreateWirelessStatusIndicatorSprite(0, 0);
             }
             SetVBlankCallback(VBlankCB0_BerryBlender);
@@ -1004,7 +1005,7 @@ static void sub_807FAC8(void)
         }
         break;
     case 2:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         sub_8082D28();
         sBerryBlenderData->mainState++;
         break;
@@ -1018,7 +1019,7 @@ static void sub_807FAC8(void)
             sBerryBlenderData->mainState++;
         break;
     case 5:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         sBerryBlenderData->mainState++;
         break;
     case 6:
@@ -1202,13 +1203,13 @@ static void sub_8080018(void)
         }
         if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType)
         {
-            sub_800E0E8();
+            LoadWirelessStatusIndicatorSpriteGfx();
             CreateWirelessStatusIndicatorSprite(0, 0);
         }
         sBerryBlenderData->mainState++;
         break;
     case 3:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         sBerryBlenderData->mainState++;
         break;
     case 4:
@@ -1534,7 +1535,7 @@ static void sub_80808D4(void)
         sBerryBlenderData->mainState++;
         break;
     case 3:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         sBerryBlenderData->mainState++;
         sBerryBlenderData->framesToWait = 0;
         break;
@@ -2037,7 +2038,7 @@ static void sub_8081744(void)
             sBerryBlenderData->field_4C--;
         sBerryBlenderData->field_72 = 0;
     }
-    if (gUnknown_020322D5 && gMain.newKeys & L_BUTTON)
+    if (gEnableContestDebugging && gMain.newKeys & L_BUTTON)
         sBerryBlenderData->field_123 ^= 1;
 }
 
@@ -2700,7 +2701,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
     case 9:
         if (IsLinkTaskFinished())
         {
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
             sBerryBlenderData->gameEndState++;
         }
         break;

src/berry_crush.c

@@ -337,7 +337,7 @@ void sub_8020FC4(struct BerryCrushGame *arg0)
 
     for (i = 0; i < arg0->unk9; i++)
         StringCopy(arg0->unk84.players[i].unk14, gLinkPlayers[i].name);
-    
+
     for (; i < 5; i++)
     {
         memset(arg0->unk84.players[i].unk14, 1, PLAYER_NAME_LENGTH);
@@ -511,7 +511,7 @@ int sub_802104C(void)
         CopyBgTilemapBufferToVram(3);
         break;
     case 8:
-        sub_800E0E8();
+        LoadWirelessStatusIndicatorSpriteGfx();
         CreateWirelessStatusIndicatorSprite(0,  0);
         sub_8022730(var0);
         SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY);

src/berry_tag_screen.c

@@ -28,6 +28,7 @@
 #include "item_menu_icons.h"
 #include "decompress.h"
 #include "international_string_util.h"
+#include "constants/rgb.h"
 
 // There are 4 windows used in berry tag screen.
 enum
@@ -279,7 +280,7 @@ static bool8 InitBerryTagScreen(void)
         gMain.state++;
         break;
     case 15:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         gPaletteFade.bufferTransferDisabled = 0;
         gMain.state++;
         break;
@@ -513,7 +514,7 @@ static void DestroyFlavorCircleSprites(void)
 static void PrepareToCloseBerryTagScreen(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
     gTasks[taskId].func = Task_CloseBerryTagScreen;
 }
 

src/bike.c

@@ -3,7 +3,7 @@
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "global.fieldmap.h"
+#include "field_specials.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "sound.h"
@@ -11,9 +11,6 @@
 #include "constants/map_types.h"
 #include "constants/songs.h"
 
-extern bool8 gBikeCyclingChallenge;
-extern u8 gBikeCollisions;
-
 // this file's functions
 static void MovePlayerOnMachBike(u8, u16, u16);
 static u8 GetMachBikeTransition(u8 *);

src/cable_club.c

@@ -4,7 +4,7 @@
 #include "battle_records.h"
 #include "battle_setup.h"
 #include "cable_club.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "field_message_box.h"
 #include "field_specials.h"

src/clear_save_data_screen.c

@@ -163,7 +163,7 @@ static bool8 SetupClearSaveDataScreen(void)
         ShowBg(3);
         SetGpuReg(REG_OFFSET_BLDCNT, 0);
         InitClearSaveDataScreenWindows();
-        BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, 0xFFFF);
+        BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITEALPHA);
         EnableInterrupts(INTR_FLAG_VBLANK);
         SetVBlankCallback(VBlankCB);
         gMain.state = 1;

src/contest_link_80F57C4.c

@@ -6,6 +6,7 @@
 #include "contest.h"
 #include "contest_link_80F57C4.h"
 #include "contest_link_80FC4F4.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "event_data.h"
@@ -86,7 +87,6 @@ struct ContestLink80F57C4
 
 EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL;
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct BgTemplate gUnknown_0858D888[4];
 extern const struct WindowTemplate gUnknown_0858D898[];
 extern const struct CompressedSpriteSheet gUnknown_0858D878[];
@@ -121,7 +121,7 @@ static void sub_80F5F30(u8);
 static void sub_80F5F74(u8);
 static void sub_80F7144(void);
 static void sub_80F68F0(u8);
-s16 sub_80F6B78(const u8 *, u8);
+s32 sub_80F6B78(const u8 *, u8);
 static void sub_80F6E9C(s16, u16, u16, u16);
 static void sub_80F6058(u8);
 static void sub_80F7A80(u8, u8);
@@ -309,7 +309,7 @@ void sub_80F5B00(void)
     gBattle_WIN1V = 0x80A0;
     CreateTask(sub_80F68B4, 20);
     sub_80F7880();
-    if (gIsLinkContest & 0x2)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
         gPaletteFade.bufferTransferDisabled = 1;
     else
         PlayBGM(MUS_CON_K);
@@ -351,12 +351,12 @@ static void sub_80F5CE4(u8 taskId)
 {
     u16 var;
 
-    if (gIsLinkContest & 1)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
     {
         switch (gTasks[taskId].data[0])
         {
         case 0:
-            sub_80DBED4();
+            SaveLinkContestResults();
             if (gContestFinalStandings[gContestPlayerMonIndex] == 0)
             {
                 IncrementGameStat(GAME_STAT_WON_LINK_CONTEST);
@@ -381,7 +381,7 @@ static void sub_80F5CE4(u8 taskId)
             break;
         case 1:
             gTasks[taskId].data[0]++;
-            if (!(gIsLinkContest & 0x2))
+            if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
                 gTasks[taskId].data[0] = 100;
             break;
         case 2:
@@ -406,7 +406,7 @@ static void sub_80F5CE4(u8 taskId)
     if (!gPaletteFade.active)
     {
         gTasks[taskId].data[0] = 0;
-        if (gIsLinkContest & 0x1)
+        if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
         {
             sub_80F707C(gText_CommunicationStandby);
             gTasks[taskId].func = sub_80F5ED8;
@@ -742,7 +742,7 @@ static void sub_80F66B4(u8 taskId)
 
     if (gMain.newKeys & A_BUTTON)
     {
-        if (!(gIsLinkContest & 0x1))
+        if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
         {
             for (i = 0; i < 4; i++)
             {
@@ -758,7 +758,7 @@ static void sub_80F66B4(u8 taskId)
 
 static void sub_80F671C(u8 taskId)
 {
-    if (gIsLinkContest & 0x1)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
     {
         if (!gTasks[taskId].data[10])
         {
@@ -777,7 +777,7 @@ static void sub_80F677C(u8 taskId)
 {
     if (!gReceivedRemoteLinkPlayers)
     {
-        if (gIsLinkContest & 0x2)
+        if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
             DestroyWirelessStatusIndicatorSprite();
 
         sub_80F7144();
@@ -787,7 +787,7 @@ static void sub_80F677C(u8 taskId)
 
 static void sub_80F67C4(u8 taskId)
 {
-    if (!(gIsLinkContest & 0x1))
+    if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
         BravoTrainerPokemonProfile_BeforeInterview2(gContestFinalStandings[gContestPlayerMonIndex]);
 
     BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
@@ -907,9 +907,9 @@ static void sub_80F6AE8(void)
     u16 sheet;
     u8 spriteId;
 
-    if (gIsLinkContest & 0x2)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
-        sub_800E0E8();
+        LoadWirelessStatusIndicatorSpriteGfx();
         CreateWirelessStatusIndicatorSprite(8, 8);
         gSprites[gWirelessStatusIndicatorSpriteId].subpriority = 1;
         sheet = LoadSpriteSheet(&gUnknown_0858D8E0);
@@ -919,39 +919,76 @@ static void sub_80F6AE8(void)
     }
 }
 
-// s16 sub_80F6B78(const u8 *text, u8 spriteId)
-// {
-//     int i;
-//     int origWidth, strWidth;
-//     const u8 *r8;
-//     u8 sp10[0x10];
-//     struct WindowTemplate windowTemplate;
-//     int spC;
-//     u8 *windowTileData;
-//     u8 windowId;
+// Functionally equivalent, the same except compiler generated variables from
+// src are placed on different stack positions.
 
-//     memset(windowTemplate, 0, sizeof(*windowTemplate));
-//     windowTemplate.width = 30;
-//     windowTemplate.height = 2;
-//     windowId = AddWindow(&windowTemplate);
-//     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
-//     origWidth = GetStringWidth(1, text, 0) + 9;
-//     strWidth = origWidth;
-//     if (strWidth < 0)
-//         strWidth += 7;
+#ifdef NONMATCHING
+s32 sub_80F6B78(const u8 *text, u8 spriteId)
+{
+    u8 *windowTilesPtr;
+    u16 windowId;
+    int origWidth;
+    struct WindowTemplate windowTemplate;
+    int strWidth;
+    u8 *spriteTilePtrs[4];
+    u8 *dst;
+    int i;
+    struct Sprite *sprite;
+    const u8 *src; // The culprit.
 
-//     strWidth >>= 3;
-//     if (strWidth > 30)
-//         strWidth = 30;
+    memset(&windowTemplate, 0, sizeof(windowTemplate));
+    windowTemplate.width = 30;
+    windowTemplate.height = 2;
+    windowId = AddWindow(&windowTemplate);
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
 
-//     AddTextPrinterParameterized3(windowId, 1, (strWidth * 8 - origWidth) / 2, 1, gUnknown_0858D8E8, -1, text);
-//     windowTileData = (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA);
-//     r8 = gUnknown_0858D6D0;
-//     // ....
-// }
+    origWidth = GetStringWidth(1, text, 0);
+    strWidth = (origWidth + 9) / 8;
+    if (strWidth > 30)
+     strWidth = 30;
 
+    AddTextPrinterParameterized3(windowId, 1, (strWidth * 8 - origWidth) / 2, 1, gUnknown_0858D8E8, -1, text);
+    windowTilesPtr = (u8 *)(GetWindowAttribute(windowId, WINDOW_TILE_DATA));
+    src = (u8 *)(gUnknown_0858D6D0);
+
+    sprite = &gSprites[spriteId];
+    spriteTilePtrs[0] = (u8 *)(sprite->oam.tileNum * 32 + VRAM + 0x10000);
+
+    for (i = 1; i < 4; i++)
+        spriteTilePtrs[i] = (void*)(gSprites[sprite->data[i - 1]].oam.tileNum * 32 + VRAM + 0x10000);
+
+    for (i = 0; i < 4; i++)
+        CpuFill32(0, spriteTilePtrs[i], 0x400);
+
+    dst = spriteTilePtrs[0];
+    CpuCopy32(src, dst, 0x20);
+    CpuCopy32(src + 128, dst + 0x100, 0x20);
+    CpuCopy32(src + 128, dst + 0x200, 0x20);
+    CpuCopy32(src + 64,  dst + 0x300, 0x20);
+
+    for (i = 0; i < strWidth; i++)
+    {
+        dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32];
+        CpuCopy32(src + 192, dst, 0x20);
+        CpuCopy32(windowTilesPtr, dst + 0x100, 0x20);
+        CpuCopy32(windowTilesPtr + 960, dst + 0x200, 0x20);
+        CpuCopy32(src + 224, dst + 0x300, 0x20);
+        windowTilesPtr += 0x20;
+    }
+
+    dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32];
+    CpuCopy32(src + 32,  dst, 0x20);
+    CpuCopy32(src + 160, dst + 0x100, 0x20);
+    CpuCopy32(src + 160, dst + 0x200, 0x20);
+    CpuCopy32(src + 96,  dst + 0x300, 0x20);
+    RemoveWindow(windowId);
+
+    return (240 - (strWidth + 2) * 8) / 2;
+}
+
+#else
 NAKED
-s16 sub_80F6B78(const u8 *text, u8 spriteId)
+s32 sub_80F6B78(const u8 *text, u8 spriteId)
 {
     asm_unified("\n\
     push {r4-r7,lr}\n\
@@ -1224,6 +1261,7 @@ _080F6D3E:\n\
     bx r1\n\
     .pool");
 }
+#endif // NONMATCHING
 
 static void sub_80F6DC0(void)
 {
@@ -1392,7 +1430,7 @@ static void sub_80F71C8(void)
 
     x = 5;
     y = 1;
-    if (gIsLinkContest & 0x1)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6498, 5, 1, 5, 2);
         x = 10;
@@ -1630,7 +1668,7 @@ void sub_80F7768(struct Sprite *sprite)
     sprite->pos1.y++;
     if (gUnknown_0203A034->unk0->unk9)
         sprite->invisible = 1;
-    
+
     if (sprite->pos1.x > 248 || sprite->pos1.y > 116)
     {
         DestroySprite(sprite);
@@ -2091,7 +2129,7 @@ _080F7A70:\n\
 
 //     if (spC)
 //         PlaySE(SE_PIN);
-    
+
 //     if (sp8)
 //         PlaySE(SE_BAN);
 // }
@@ -2358,38 +2396,32 @@ _080F7C96:\n\
     bx r0");
 }
 
-#ifdef NONMATCHING
 void sub_80F7CA8(u8 taskId)
 {
-    register int r4 asm("r4");
-    int r9;
-    u8 r6;
-    s16 r7;
-    s16 r12;
     int i;
     u8 var0;
     u16 tileNum;
+    bool32 r4 = FALSE;
+    bool32 endTask = FALSE;
+    u8 r6 = gTasks[taskId].data[0];
+    s16 r7 = gTasks[taskId].data[1];
+    s16 r12 = gTasks[taskId].data[2];
 
-    r4 = 0;
-    r9 = 0;
-    r6 = gTasks[taskId].data[0]; 
-    r7 = gTasks[taskId].data[1];
-    r12 = gTasks[taskId].data[2];
     if (r12)
     {
         if (gUnknown_0203A034->unk0->unkC[r6] <= 0)
-            r4 = 1;
+            r4 = TRUE;
     }
     else
     {
         if (gUnknown_0203A034->unk0->unkC[r6] > 87)
-            r4 = 1;
+            r4 = TRUE;
     }
 
     if (gUnknown_0203A034->unk0->unkC[r6] == r7)
-        r9 = 1;
+        endTask = TRUE;
 
-    if (!r9)
+    if (!endTask)
     {
         if (r4)
             gUnknown_0203A034->unk0->unkC[r6] = r7;
@@ -2399,220 +2431,32 @@ void sub_80F7CA8(u8 taskId)
             gUnknown_0203A034->unk0->unkC[r6] = gUnknown_0203A034->unk0->unkC[r6] + 1;
     }
 
-    if (!r4 && !r9)
+    if (!r4 && !endTask)
     {
         for (i = 0; i < 11; i++)
         {
             if (gUnknown_0203A034->unk0->unkC[r6] >= (i + 1) * 8)
-            {
                 var0 = 8;
-            }
             else if (gUnknown_0203A034->unk0->unkC[r6] >= i * 8)
-            {
-                int var2 = gUnknown_0203A034->unk0->unkC[r6];
-                int var1 = var2;
-                if (var1 < 0)
-                    var1 += 7;
-
-                var0 = var2 - ((var1 >> 3) << 3);
-            }
+                var0 = gUnknown_0203A034->unk0->unkC[r6] % 8;
             else
-            {
                 var0 = 0;
-            }
 
             if (var0 < 4)
-                tileNum = 0x504C;
+                tileNum = 0x504C + var0;
             else
-                tileNum = 0x5057;
+                tileNum = 0x5057 + var0;
 
-            FillBgTilemapBufferRect_Palette0(2, tileNum + var0, i + 7, r6 * 3 + 6, 1, 1);
+            FillBgTilemapBufferRect_Palette0(2, tileNum, i + 7, r6 * 3 + 6, 1, 1);
         }
     }
-    
-    if (r9)
+
+    if (endTask)
     {
         gUnknown_0203A034->unk0->unk14--;
         DestroyTask(taskId);
     }
 }
-#else
-NAKED
-void sub_80F7CA8(u8 taskId)
-{
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r9\n\
-    mov r6, r8\n\
-    push {r6,r7}\n\
-    sub sp, 0x8\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    mov r8, r0\n\
-    movs r4, 0\n\
-    mov r9, r4\n\
-    ldr r1, =gTasks\n\
-    lsls r0, 2\n\
-    add r0, r8\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    ldrb r6, [r0, 0x8]\n\
-    ldrh r7, [r0, 0xA]\n\
-    ldrh r1, [r0, 0xC]\n\
-    mov r12, r1\n\
-    movs r2, 0xC\n\
-    ldrsh r0, [r0, r2]\n\
-    cmp r0, 0\n\
-    beq _080F7CF8\n\
-    ldr r2, =gUnknown_0203A034\n\
-    ldr r0, [r2]\n\
-    ldr r0, [r0]\n\
-    lsls r1, r6, 1\n\
-    adds r0, 0xC\n\
-    adds r0, r1\n\
-    movs r3, 0\n\
-    ldrsh r0, [r0, r3]\n\
-    adds r5, r1, 0\n\
-    cmp r0, 0\n\
-    bgt _080F7D10\n\
-    b _080F7D0E\n\
-    .pool\n\
-_080F7CF8:\n\
-    ldr r2, =gUnknown_0203A034\n\
-    ldr r0, [r2]\n\
-    ldr r0, [r0]\n\
-    lsls r1, r6, 1\n\
-    adds r0, 0xC\n\
-    adds r0, r1\n\
-    movs r3, 0\n\
-    ldrsh r0, [r0, r3]\n\
-    adds r5, r1, 0\n\
-    cmp r0, 0x57\n\
-    ble _080F7D10\n\
-_080F7D0E:\n\
-    movs r4, 0x1\n\
-_080F7D10:\n\
-    ldr r0, [r2]\n\
-    ldr r0, [r0]\n\
-    adds r0, 0xC\n\
-    adds r2, r0, r5\n\
-    ldrh r3, [r2]\n\
-    movs r0, 0\n\
-    ldrsh r1, [r2, r0]\n\
-    lsls r0, r7, 16\n\
-    asrs r0, 16\n\
-    cmp r1, r0\n\
-    bne _080F7D2A\n\
-    movs r1, 0x1\n\
-    mov r9, r1\n\
-_080F7D2A:\n\
-    mov r0, r9\n\
-    cmp r0, 0\n\
-    bne _080F7D4A\n\
-    cmp r4, 0\n\
-    beq _080F7D3C\n\
-    strh r7, [r2]\n\
-    b _080F7D4A\n\
-    .pool\n\
-_080F7D3C:\n\
-    mov r1, r12\n\
-    cmp r1, 0\n\
-    beq _080F7D46\n\
-    subs r0, r3, 0x1\n\
-    b _080F7D48\n\
-_080F7D46:\n\
-    adds r0, r3, 0x1\n\
-_080F7D48:\n\
-    strh r0, [r2]\n\
-_080F7D4A:\n\
-    cmp r4, 0\n\
-    bne _080F7DC4\n\
-    mov r2, r9\n\
-    cmp r2, 0\n\
-    bne _080F7DCA\n\
-    movs r2, 0\n\
-_080F7D56:\n\
-    ldr r0, =gUnknown_0203A034\n\
-    ldr r0, [r0]\n\
-    ldr r0, [r0]\n\
-    adds r0, 0xC\n\
-    adds r0, r5\n\
-    movs r1, 0\n\
-    ldrsh r3, [r0, r1]\n\
-    adds r0, r2, 0x1\n\
-    lsls r1, r0, 3\n\
-    adds r4, r0, 0\n\
-    cmp r3, r1\n\
-    blt _080F7D78\n\
-    movs r0, 0x8\n\
-    b _080F7D94\n\
-    .pool\n\
-_080F7D78:\n\
-    lsls r0, r2, 3\n\
-    cmp r3, r0\n\
-    blt _080F7D92\n\
-    adds r0, r3, 0\n\
-    cmp r3, 0\n\
-    bge _080F7D86\n\
-    adds r0, r3, 0x7\n\
-_080F7D86:\n\
-    asrs r0, 3\n\
-    lsls r0, 3\n\
-    subs r0, r3, r0\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    b _080F7D94\n\
-_080F7D92:\n\
-    movs r0, 0\n\
-_080F7D94:\n\
-    cmp r0, 0x3\n\
-    bhi _080F7DA0\n\
-    ldr r3, =0x0000504c\n\
-    b _080F7DA2\n\
-    .pool\n\
-_080F7DA0:\n\
-    ldr r3, =0x00005057\n\
-_080F7DA2:\n\
-    adds r1, r0, r3\n\
-    adds r2, 0x7\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    adds r3, r5, r6\n\
-    adds r3, 0x6\n\
-    lsls r3, 24\n\
-    movs r0, 0x1\n\
-    str r0, [sp]\n\
-    str r0, [sp, 0x4]\n\
-    movs r0, 0x2\n\
-    lsrs r3, 24\n\
-    bl FillBgTilemapBufferRect_Palette0\n\
-    adds r2, r4, 0\n\
-    cmp r2, 0xA\n\
-    ble _080F7D56\n\
-_080F7DC4:\n\
-    mov r0, r9\n\
-    cmp r0, 0\n\
-    beq _080F7DDC\n\
-_080F7DCA:\n\
-    ldr r0, =gUnknown_0203A034\n\
-    ldr r0, [r0]\n\
-    ldr r1, [r0]\n\
-    ldrb r0, [r1, 0x14]\n\
-    subs r0, 0x1\n\
-    strb r0, [r1, 0x14]\n\
-    mov r0, r8\n\
-    bl DestroyTask\n\
-_080F7DDC:\n\
-    add sp, 0x8\n\
-    pop {r3,r4}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool");
-}
-#endif // NONMATCHING
 
 static void sub_80F7DF4(void)
 {
@@ -2830,7 +2674,7 @@ void sub_80F8390(void)
 
 void sub_80F83D0(void)
 {
-    SetMainCallback2(sub_80D7B24);
+    SetMainCallback2(CB2_StartContest);
 }
 
 static void sub_80F83E0(u8 taskId)
@@ -2886,7 +2730,7 @@ void sub_80F84C4(u8 taskId)
 
 static void sub_80F8508(u8 taskId)
 {
-    if (gIsLinkContest & 0x4)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
     {
         sub_80DA8C8(gContestMonPartyIndex);
         SetTaskFuncWithFollowupFunc(taskId, sub_80FC6BC, sub_80F8568);
@@ -2913,10 +2757,9 @@ static void sub_80F85A0(u8 taskId)
     SetTaskFuncWithFollowupFunc(taskId, sub_80FC894, sub_80F85BC);
 }
 
-#ifdef NONMATCHING
 static void sub_80F85BC(u8 taskId)
 {
-    u32 i;
+    u8 i;
     u8 sp0[4];
     u8 sp4[4];
 
@@ -2926,9 +2769,10 @@ static void sub_80F85BC(u8 taskId)
     for (i = 0; i < gNumLinkContestPlayers; i++)
         sp0[i] = gTasks[taskId].data[i + 1];
 
-    for (i = 0; i < gNumLinkContestPlayers; i++)
+    for (i = 0; i < gNumLinkContestPlayers;)
     {
-        if (sp0[0] != sp0[i + 1])
+        i++;
+        if (i >= gNumLinkContestPlayers || sp0[0] != sp0[i])
             break;
     }
 
@@ -2939,137 +2783,15 @@ static void sub_80F85BC(u8 taskId)
 
     for (i = 0; i < gNumLinkContestPlayers; i++)
         sp4[i] = gTasks[taskId].data[i + 5];
-    
+
     gUnknown_02039F2B = sub_80F86E0(sp4);
     sub_80DB09C(gSpecialVar_ContestCategory);
     SetTaskFuncWithFollowupFunc(taskId, sub_80FCF40, sub_80F86B8);
 }
-#else
-NAKED
-static void sub_80F85BC(u8 taskId)
-{
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r9\n\
-    mov r6, r8\n\
-    push {r6,r7}\n\
-    sub sp, 0x8\n\
-    lsls r0, 24\n\
-    lsrs r6, r0, 24\n\
-    movs r0, 0\n\
-    str r0, [sp]\n\
-    str r0, [sp, 0x4]\n\
-    movs r3, 0\n\
-    ldr r5, =gNumLinkContestPlayers\n\
-    mov r12, r5\n\
-    ldr r0, =gSpecialVar_0x8004\n\
-    mov r9, r0\n\
-    add r1, sp, 0x4\n\
-    mov r8, r1\n\
-    ldrb r0, [r5]\n\
-    cmp r3, r0\n\
-    bcs _080F8606\n\
-    lsls r0, r6, 2\n\
-    adds r0, r6\n\
-    lsls r4, r0, 3\n\
-    ldr r7, =gTasks + 0x8\n\
-_080F85EC:\n\
-    mov r1, sp\n\
-    adds r2, r1, r3\n\
-    adds r1, r3, 0x1\n\
-    lsls r0, r1, 1\n\
-    adds r0, r4\n\
-    adds r0, r7\n\
-    ldrh r0, [r0]\n\
-    strb r0, [r2]\n\
-    lsls r1, 24\n\
-    lsrs r3, r1, 24\n\
-    ldrb r0, [r5]\n\
-    cmp r3, r0\n\
-    bcc _080F85EC\n\
-_080F8606:\n\
-    movs r3, 0\n\
-    mov r1, r12\n\
-    ldrb r0, [r1]\n\
-    cmp r3, r0\n\
-    bcs _080F862A\n\
-    adds r4, r0, 0\n\
-    mov r2, sp\n\
-_080F8614:\n\
-    adds r0, r3, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r3, r0, 24\n\
-    cmp r3, r4\n\
-    bcs _080F862A\n\
-    mov r0, sp\n\
-    adds r1, r0, r3\n\
-    ldrb r0, [r2]\n\
-    ldrb r1, [r1]\n\
-    cmp r0, r1\n\
-    beq _080F8614\n\
-_080F862A:\n\
-    mov r1, r12\n\
-    ldrb r1, [r1]\n\
-    cmp r3, r1\n\
-    bne _080F8644\n\
-    movs r0, 0\n\
-    b _080F8646\n\
-    .pool\n\
-_080F8644:\n\
-    movs r0, 0x1\n\
-_080F8646:\n\
-    mov r1, r9\n\
-    strh r0, [r1]\n\
-    movs r3, 0\n\
-    mov r4, r12\n\
-    ldrb r0, [r4]\n\
-    cmp r3, r0\n\
-    bcs _080F8678\n\
-    mov r5, r8\n\
-    lsls r0, r6, 2\n\
-    adds r0, r6\n\
-    lsls r2, r0, 3\n\
-    ldr r7, =gTasks + 0x8\n\
-_080F865E:\n\
-    adds r1, r5, r3\n\
-    adds r0, r3, 0x5\n\
-    lsls r0, 1\n\
-    adds r0, r2\n\
-    adds r0, r7\n\
-    ldrh r0, [r0]\n\
-    strb r0, [r1]\n\
-    adds r0, r3, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r3, r0, 24\n\
-    ldrb r1, [r4]\n\
-    cmp r3, r1\n\
-    bcc _080F865E\n\
-_080F8678:\n\
-    mov r0, r8\n\
-    bl sub_80F86E0\n\
-    ldr r1, =gUnknown_02039F2B\n\
-    strb r0, [r1]\n\
-    ldr r0, =gSpecialVar_ContestCategory\n\
-    ldrb r0, [r0]\n\
-    bl sub_80DB09C\n\
-    ldr r1, =sub_80FCF40\n\
-    ldr r2, =sub_80F86B8\n\
-    adds r0, r6, 0\n\
-    bl SetTaskFuncWithFollowupFunc\n\
-    add sp, 0x8\n\
-    pop {r3,r4}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool");
-}
-#endif // NONMATCHING
 
 static void sub_80F86B8(u8 taskId)
 {
-    sub_80DCE58(0);
+    SortContestants(FALSE);
     SetTaskFuncWithFollowupFunc(taskId, sub_80FCFD0, sub_80F8714);
 }
 

src/contest_link_80FC4F4.c

@@ -72,22 +72,22 @@ static void sub_80FC5DC(u8 taskId)
 
     gContestPlayerMonIndex = GetMultiplayerId();
     gNumLinkContestPlayers = GetLinkPlayerCount();
-    gIsLinkContest = 1;
+    gLinkContestFlags = LINK_CONTEST_FLAG_IS_LINK;
     if (gWirelessCommType == 1)
-        gIsLinkContest = 3;
+        gLinkContestFlags = LINK_CONTEST_FLAG_IS_LINK | LINK_CONTEST_FLAG_IS_WIRELESS;
 
     for (i = 0; i < gNumLinkContestPlayers && (u32)(gLinkPlayers[i].version & 0xFF) - 1 > VERSION_RUBY - 1; i++)
         ;
 
     if (i < gNumLinkContestPlayers)
-        gIsLinkContest |= 0x4;
+        gLinkContestFlags |= LINK_CONTEST_FLAG_HAS_RS_PLAYER;
 
     SwitchTaskToFollowupFunc(taskId);
 }
 
 bool32 sub_80FC670(s16 *arg0)
 {
-    if (gIsLinkContest & 0x4)
+    if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
         return TRUE;
     
     switch (*arg0)
@@ -269,7 +269,7 @@ void sub_80FC9F8(u8 taskId)
     case 0:
         if (IsLinkTaskFinished())
         {
-            if (sub_80FC4F4(&gContestResources->field_4[gContestPlayerMonIndex].currMove, sizeof(gContestResources->field_4[gContestPlayerMonIndex].currMove)) == TRUE)
+            if (sub_80FC4F4(&eContestantStatus[gContestPlayerMonIndex].currMove, sizeof(eContestantStatus[gContestPlayerMonIndex].currMove)) == TRUE)
                 gTasks[taskId].data[0]++;
         }
         break;
@@ -277,7 +277,7 @@ void sub_80FC9F8(u8 taskId)
         if (sub_80FC55C())
         {
             for (i = 0; i < gNumLinkContestPlayers; i++)
-                gContestResources->field_4[i].currMove = gBlockRecvBuffer[i][0];
+                eContestantStatus[i].currMove = gBlockRecvBuffer[i][0];
 
             gTasks[taskId].data[0]++;
         }
@@ -373,14 +373,14 @@ void sub_80FCC88(u8 taskId)
     case 0:
         if (IsLinkTaskFinished())
         {
-            if (sub_80FC4F4(gContestResources->field_4, 4 * sizeof(struct ContestantStatus)) == 1)
+            if (sub_80FC4F4(eContestantStatus, 4 * sizeof(struct ContestantStatus)) == 1)
                 gTasks[taskId].data[0]++;
         }
         break;
     case 1:
         if (sub_80FC55C())
         {
-            memcpy(gContestResources->field_4, gBlockRecvBuffer[gUnknown_02039F2B], 4 * sizeof(struct ContestantStatus));
+            memcpy(eContestantStatus, gBlockRecvBuffer[gUnknown_02039F2B], 4 * sizeof(struct ContestantStatus));
             gTasks[taskId].data[0]++;
         }
         break;
@@ -425,14 +425,14 @@ void sub_80FCC88(u8 taskId)
     case 9:
         if (IsLinkTaskFinished())
         {
-            if (sub_80FC4F4(gUnknown_02039F26, sizeof(gUnknown_02039F26)) == 1)
+            if (sub_80FC4F4(gContestantTurnOrder, sizeof(gContestantTurnOrder)) == 1)
                 gTasks[taskId].data[0]++;
         }
         break;
     case 10:
         if (sub_80FC55C())
         {
-            memcpy(gUnknown_02039F26, gBlockRecvBuffer[gUnknown_02039F2B], sizeof(gUnknown_02039F26));
+            memcpy(gContestantTurnOrder, gBlockRecvBuffer[gUnknown_02039F2B], sizeof(gContestantTurnOrder));
             gTasks[taskId].data[0]++;
         }
         break;
@@ -528,14 +528,14 @@ void sub_80FCFD0(u8 taskId)
     case 0:
         if (IsLinkTaskFinished())
         {
-            if (sub_80FC4F4(gUnknown_02039F26, sizeof(gUnknown_02039F26)) == 1)
+            if (sub_80FC4F4(gContestantTurnOrder, sizeof(gContestantTurnOrder)) == 1)
                 gTasks[taskId].data[0]++;
         }
         break;
     case 1:
         if (sub_80FC55C())
         {
-            memcpy(gUnknown_02039F26, gBlockRecvBuffer[gUnknown_02039F2B], sizeof(gUnknown_02039F26));
+            memcpy(gContestantTurnOrder, gBlockRecvBuffer[gUnknown_02039F2B], sizeof(gContestantTurnOrder));
             gTasks[taskId].data[0]++;
         }
         break;

src/contest_link_81D9DE4.c

@@ -134,7 +134,7 @@ static void sub_81DA10C(u8 taskId)
 
 static void sub_81DA138(u8 taskId)
 {
-    sub_80DCE58(0);
+    SortContestants(FALSE);
     SetTaskFuncWithFollowupFunc(taskId, sub_80FCFD0, sub_80F8714);
 }
 

src/contest_painting.c

@@ -1,11 +1,12 @@
 #include "global.h"
 #include "alloc.h"
 #include "battle.h"
+#include "battle_gfx_sfx_util.h"
 #include "bg.h"
 #include "contest.h"
 #include "contest_painting.h"
 #include "contest_painting_effects.h"
-#include "battle_gfx_sfx_util.h"
+#include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "international_string_util.h"
@@ -44,8 +45,6 @@ static void VBlankCB_ContestPainting(void);
 static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]);
 
 extern const u8 gUnknown_0827EA0C[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
 extern const u8 gContestCoolness[];
 extern const u8 gContestBeauty[];
 extern const u8 gContestCuteness[];

src/data.c

@@ -1,11 +1,17 @@
 #include "global.h"
-#include "data2.h"
-#include "graphics.h"
 #include "alloc.h"
+#include "battle.h"
+#include "data.h"
+#include "graphics.h"
+#include "constants/items.h"
+#include "constants/moves.h"
 #include "constants/species.h"
+#include "constants/trainers.h"
+#include "constants/battle_ai.h"
 
 const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal");
 const u32 gUnknown_082FF1F8[] = INCBIN_U32("graphics/link/minigame_digits.4bpp.lz");
+// unused
 const u32 gUnknown_082FF2B8[] = INCBIN_U32("graphics/link/minigame_digits2.4bpp.lz");
 
 const struct SpriteFrameImage gUnknown_082FF3A8[] =
@@ -106,45 +112,45 @@ const struct SpriteFrameImage gTrainerBackPicTable_Steven[] =
     gTrainerBackPic_Steven + 0x1800, 0x0800,
 };
 
-const union AnimCmd gAnimCmd_General_Frame0[] =
+static const union AnimCmd sAnim_GeneralFrame0[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_General_Frame3[] =
+static const union AnimCmd sAnim_GeneralFrame3[] =
 {
     ANIMCMD_FRAME(3, 0),
     ANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF548[] =
+static const union AffineAnimCmd gUnknown_082FF548[] =
 {
     AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0x00),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF558[] =
+static const union AffineAnimCmd gUnknown_082FF558[] =
 {
     AFFINEANIMCMD_FRAME(0xff00, 0x0100, 0x00, 0x00),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF568[] =
+static const union AffineAnimCmd gUnknown_082FF568[] =
 {
     AFFINEANIMCMD_FRAME(0x0028, 0x0028, 0x00, 0x00),
     AFFINEANIMCMD_FRAME(0x0012, 0x0012, 0x00, 0x0c),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF580[] =
+static const union AffineAnimCmd gUnknown_082FF580[] =
 {
     AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x12),
     AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x0f),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF598[] =
+static const union AffineAnimCmd gUnknown_082FF598[] =
 {
     AFFINEANIMCMD_FRAME(0x00a0, 0x0100, 0x00, 0x00),
     AFFINEANIMCMD_FRAME(0x0004, 0x0000, 0x00, 0x08),
@@ -152,39 +158,39 @@ const union AffineAnimCmd gUnknown_082FF598[] =
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd gUnknown_082FF5B8[] =
+static const union AffineAnimCmd gUnknown_082FF5B8[] =
 {
     AFFINEANIMCMD_FRAME(0x0002, 0x0002, 0x00, 0x14),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF5C8[] =
+static const union AffineAnimCmd gUnknown_082FF5C8[] =
 {
     AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x14),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF5D8[] =
+static const union AffineAnimCmd gUnknown_082FF5D8[] =
 {
     AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0000),
     AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x09),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF5F0[] =
+static const union AffineAnimCmd gUnknown_082FF5F0[] =
 {
     AFFINEANIMCMD_FRAME(0x0004, 0x0004, 0x00, 0x3f),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF600[] =
+static const union AffineAnimCmd gUnknown_082FF600[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd * const gUnknown_082FF618[] =
+const union AffineAnimCmd *const gUnknown_082FF618[] =
 {
     gUnknown_082FF548,
     gUnknown_082FF568,
@@ -197,20 +203,20 @@ const union AffineAnimCmd * const gUnknown_082FF618[] =
     gUnknown_082FF5D8,
 };
 
-const union AffineAnimCmd gUnknown_082FF63C[] =
+static const union AffineAnimCmd gUnknown_082FF63C[] =
 {
     AFFINEANIMCMD_FRAME(0xfffc, 0xfffc, 0x04, 0x3f),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF64C[] =
+static const union AffineAnimCmd gUnknown_082FF64C[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF664[] =
+static const union AffineAnimCmd gUnknown_082FF664[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfb, 0x14),
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x00, 0x14),
@@ -218,13 +224,13 @@ const union AffineAnimCmd gUnknown_082FF664[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF684[] =
+static const union AffineAnimCmd gUnknown_082FF684[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x09, 0x6e),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd * const gUnknown_082FF694[] =
+const union AffineAnimCmd *const gUnknown_082FF694[] =
 {
     gUnknown_082FF548,
     gUnknown_082FF568,
@@ -239,7 +245,7 @@ const union AffineAnimCmd * const gUnknown_082FF694[] =
     gUnknown_082FF684,
 };
 
-const union AffineAnimCmd * const gUnknown_082FF6C0[] =
+const union AffineAnimCmd *const gUnknown_082FF6C0[] =
 {
     gUnknown_082FF558,
     gUnknown_082FF568,
@@ -254,6 +260,47 @@ const union AffineAnimCmd * const gUnknown_082FF6C0[] =
     gUnknown_082FF684,
 };
 
+static const union AnimCmd gUnknown_082FF6EC[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gUnknown_082FF6F4[] =
+{
+    ANIMCMD_FRAME(1, 0),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gUnknown_082FF6FC[] =
+{
+    ANIMCMD_FRAME(2, 0),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gUnknown_082FF704[] =
+{
+    ANIMCMD_FRAME(3, 0),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gUnknown_082FF70C[] =
+{
+    gUnknown_082FF6EC,
+    gUnknown_082FF6F4,
+    gUnknown_082FF6FC,
+    gUnknown_082FF704,
+};
+
+#define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, SPECIES_##species}
+#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
+#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
+
+#define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic}
+#define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic}
+
+#define TRAINER_BACK_PAL(trainerPic, pal) [TRAINER_BACK_PIC_##trainerPic] = {pal, TRAINER_BACK_PIC_##trainerPic}
+
 #include "data/pokemon_graphics/unknown_anims.h"
 #include "data/pokemon_graphics/front_pic_coordinates.h"
 #include "data/pokemon_graphics/still_front_pic_table.h"
@@ -269,10 +316,11 @@ const union AffineAnimCmd * const gUnknown_082FF6C0[] =
 #include "data/trainer_graphics/back_pic_tables.h"
 
 #include "data/pokemon_graphics/enemy_mon_elevation.h"
-#include "data/pokemon_graphics/front_anims.h"
+#include "data/pokemon_graphics/front_pic_anims.h"
 #include "data/pokemon_graphics/front_pic_table.h"
 
-const u32 gUnknown830AF4C[] = // Potentially part of battle_data.c
+// unused
+const u32 gUnknown830AF4C[] =
 {
     0x00000888, 0x00000888, 0x00000888, 0x00000888,
     0x00000088, 0x00000888, 0x00000888, 0x00000886,
@@ -385,3 +433,9 @@ const u32 gUnknown830AF4C[] = // Potentially part of battle_data.c
     0x00000888, 0x00000888, 0x00000888, 0x00000888,
     0x00000888, 0x00000888, 0x00000888, 0x00000888,
 };
+
+#include "data/trainer_parties.h"
+#include "data/text/trainer_class_names.h"
+#include "data/trainers.h"
+#include "data/text/species_names.h"
+#include "data/text/move_names.h"

src/data/.gitignore

@@ -0,0 +1 @@
+wild_encounters.h

src/data/contest_opponents.h

@@ -183,7 +183,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("POOCHY"),
         .trainerName = _("JIMMY"),
         .trainerGfxId = EVENT_OBJ_GFX_BOY_1,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -212,7 +212,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MUSILLE"),
         .trainerName = _("EDITH"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -241,7 +241,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DUSTER"),
         .trainerName = _("EVAN"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -270,7 +270,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DOTS"),
         .trainerName = _("KELSEY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -299,7 +299,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TATAY"),
         .trainerName = _("MADISON"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -328,7 +328,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NINDA"),
         .trainerName = _("RAYMOND"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -357,7 +357,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SMISH"),
         .trainerName = _("GRANT"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -386,7 +386,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLEAL"),
         .trainerName = _("PAIGE"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -415,7 +415,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLOKTH"),
         .trainerName = _("ALEC"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -444,7 +444,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WHIRIS"),
         .trainerName = _("SYDNEY"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -473,7 +473,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MAHITA"),
         .trainerName = _("MORRIS"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x8010FFF,
+        .aiChecks = 0x8010FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -502,7 +502,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RONAR"),
         .trainerName = _("MARIAH"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x8008FFF,
+        .aiChecks = 0x8008FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -531,7 +531,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BATRO"),
         .trainerName = _("RUSSELL"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x90004FFF,
+        .aiChecks = 0x90004FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -560,7 +560,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GULIN"),
         .trainerName = _("MELANIE"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x40002FFF,
+        .aiChecks = 0x40002FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -589,7 +589,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RIKELEC"),
         .trainerName = _("CHANCE"),
         .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY,
-        .flags = 0x80001FFF,
+        .aiChecks = 0x80001FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -618,7 +618,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BULBY"),
         .trainerName = _("AGATHA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -647,7 +647,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("FUTTERBE"),
         .trainerName = _("BEAU"),
         .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -676,7 +676,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PIDEOT"),
         .trainerName = _("KAY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -705,7 +705,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DIGLE"),
         .trainerName = _("CALE"),
         .trainerGfxId = EVENT_OBJ_GFX_HIKER,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -734,7 +734,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WAGIL"),
         .trainerName = _("CAITLIN"),
         .trainerGfxId = EVENT_OBJ_GFX_TUBER_F,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -763,7 +763,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TOTDIL"),
         .trainerName = _("COLBY"),
         .trainerGfxId = EVENT_OBJ_GFX_NINJA_BOY,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -792,7 +792,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BALEDY"),
         .trainerName = _("KYLIE"),
         .trainerGfxId = EVENT_OBJ_GFX_BEAUTY,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -821,7 +821,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BIRDLY"),
         .trainerName = _("LIAM"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_5,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -850,7 +850,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TARVITAR"),
         .trainerName = _("MILO"),
         .trainerGfxId = EVENT_OBJ_GFX_MANIAC,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -879,7 +879,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RELIA"),
         .trainerName = _("KARINA"),
         .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
-        .flags = 0x24000FFF,
+        .aiChecks = 0x24000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -908,7 +908,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DUODO"),
         .trainerName = _("BOBBY"),
         .trainerGfxId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -937,7 +937,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PINCHIN"),
         .trainerName = _("CLAIRE"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x81000FFF,
+        .aiChecks = 0x81000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -966,7 +966,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NACAC"),
         .trainerName = _("WILLIE"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x80800FFF,
+        .aiChecks = 0x80800FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -995,7 +995,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SHRAND"),
         .trainerName = _("CASSIDY"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x10400FFF,
+        .aiChecks = 0x10400FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1024,7 +1024,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TOYBAL"),
         .trainerName = _("MORGAN"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x8200FFF,
+        .aiChecks = 0x8200FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1053,7 +1053,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CHAMCHAM"),
         .trainerName = _("SUMMER"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x10100FFF,
+        .aiChecks = 0x10100FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1082,7 +1082,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SPININ"),
         .trainerName = _("MILES"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x80080FFF,
+        .aiChecks = 0x80080FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1111,7 +1111,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SWABY"),
         .trainerName = _("AUDREY"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0xA0040FFF,
+        .aiChecks = 0xA0040FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1140,7 +1140,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("POINKER"),
         .trainerName = _("AVERY"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1169,7 +1169,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KECON"),
         .trainerName = _("ARIANA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x80010FFF,
+        .aiChecks = 0x80010FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1198,7 +1198,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GOLDEN"),
         .trainerName = _("ASHTON"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x80008FFF,
+        .aiChecks = 0x80008FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1227,7 +1227,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BOBOACH"),
         .trainerName = _("SANDRA"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x80004FFF,
+        .aiChecks = 0x80004FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1256,7 +1256,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CORPY"),
         .trainerName = _("CARSON"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x8002FFF,
+        .aiChecks = 0x8002FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1285,7 +1285,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TADO"),
         .trainerName = _("KATRINA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x8001FFF,
+        .aiChecks = 0x8001FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1314,7 +1314,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BROWLO"),
         .trainerName = _("LUKE"),
         .trainerGfxId = EVENT_OBJ_GFX_FAT_MAN,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1343,7 +1343,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("FETCHIN"),
         .trainerName = _("RAUL"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_5,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1372,7 +1372,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SEELEY"),
         .trainerName = _("JADA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1401,7 +1401,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DROWZIN"),
         .trainerName = _("ZEEK"),
         .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1430,7 +1430,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("HITEMON"),
         .trainerName = _("DIEGO"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1459,7 +1459,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BLISS"),
         .trainerName = _("ALIYAH"),
         .trainerGfxId = EVENT_OBJ_GFX_TEALA,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1488,7 +1488,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KIDLEK"),
         .trainerName = _("NATALIA"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1517,7 +1517,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SNUBBINS"),
         .trainerName = _("DEVIN"),
         .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1546,7 +1546,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DREAVIS"),
         .trainerName = _("TYLOR"),
         .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1575,7 +1575,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LAIRN"),
         .trainerName = _("RONNIE"),
         .trainerGfxId = EVENT_OBJ_GFX_HIKER,
-        .flags = 0x84000FFF,
+        .aiChecks = 0x84000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1604,7 +1604,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SHIFTY"),
         .trainerName = _("CLAUDIA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1633,7 +1633,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NINAS"),
         .trainerName = _("ELIAS"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x81000FFF,
+        .aiChecks = 0x81000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1662,7 +1662,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WELOW"),
         .trainerName = _("JADE"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x80800FFF,
+        .aiChecks = 0x80800FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1691,7 +1691,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("YENA"),
         .trainerName = _("FRANCIS"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1720,7 +1720,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TIFLY"),
         .trainerName = _("ALISHA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x80200FFF,
+        .aiChecks = 0x80200FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1749,7 +1749,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KINGSEA"),
         .trainerName = _("SAUL"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x80100FFF,
+        .aiChecks = 0x80100FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1778,7 +1778,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CASTER"),
         .trainerName = _("FELICIA"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0x80080FFF,
+        .aiChecks = 0x80080FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1807,7 +1807,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CHOKEM"),
         .trainerName = _("EMILIO"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x80040FFF,
+        .aiChecks = 0x80040FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1836,7 +1836,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LOMBE"),
         .trainerName = _("KARLA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1865,7 +1865,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("VIPES"),
         .trainerName = _("DARRYL"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x80010FFF,
+        .aiChecks = 0x80010FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1894,7 +1894,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MERAIL"),
         .trainerName = _("SELENA"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F,
-        .flags = 0x80008FFF,
+        .aiChecks = 0x80008FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1923,7 +1923,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KARPAG"),
         .trainerName = _("NOEL"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x80004FFF,
+        .aiChecks = 0x80004FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1952,7 +1952,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LUNONE"),
         .trainerName = _("LACEY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x80002FFF,
+        .aiChecks = 0x80002FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1981,7 +1981,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("ABSO"),
         .trainerName = _("CORBIN"),
         .trainerGfxId = EVENT_OBJ_GFX_MANIAC,
-        .flags = 0x80001FFF,
+        .aiChecks = 0x80001FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2010,7 +2010,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("EGGSOR"),
         .trainerName = _("GRACIE"),
         .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2039,7 +2039,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CUBIN"),
         .trainerName = _("COLTIN"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_4, 
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2068,7 +2068,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("HITMON"),
         .trainerName = _("ELLIE"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2097,7 +2097,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SURTLE"),
         .trainerName = _("MARCUS"),
         .trainerGfxId = EVENT_OBJ_GFX_SAILOR,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2126,7 +2126,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KHANKAN"),
         .trainerName = _("KIARA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_3,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2155,7 +2155,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PINOC"),
         .trainerName = _("BRYCE"),
         .trainerGfxId = EVENT_OBJ_GFX_BUG_CATCHER,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2184,7 +2184,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DILTOT"),
         .trainerName = _("JAMIE"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2213,7 +2213,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DOOMOND"),
         .trainerName = _("JORGE"),
         .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2242,7 +2242,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MILKAN"),
         .trainerName = _("DEVON"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_M,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2271,7 +2271,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RADOS"),
         .trainerName = _("JUSTINA"),
         .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
-        .flags = 0x84000FFF,
+        .aiChecks = 0x84000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2300,7 +2300,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LOUDERD"),
         .trainerName = _("RALPH"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2329,7 +2329,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SITTY"),
         .trainerName = _("ROSA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x81000FFF,
+        .aiChecks = 0x81000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2358,7 +2358,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLING"),
         .trainerName = _("KEATON"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x80800FFF,
+        .aiChecks = 0x80800FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2387,7 +2387,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TARIA"),
         .trainerName = _("MAYRA"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2416,7 +2416,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LIRKI"),
         .trainerName = _("LAMAR"),
         .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY,
-        .flags = 0x80200FFF,
+        .aiChecks = 0x80200FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2445,7 +2445,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BLOSSOM"),
         .trainerName = _("AUBREY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x80100FFF,
+        .aiChecks = 0x80100FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2474,7 +2474,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("EYESAB"),
         .trainerName = _("NIGEL"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x80080FFF,
+        .aiChecks = 0x80080FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2503,7 +2503,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("UTAN"),
         .trainerName = _("CAMILLE"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0x80040FFF,
+        .aiChecks = 0x80040FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2532,7 +2532,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PEDOS"),
         .trainerName = _("DEON"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2561,7 +2561,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LUVIS"),
         .trainerName = _("JANELLE"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x80010FFF,
+        .aiChecks = 0x80010FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2590,7 +2590,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("HEROSS"),
         .trainerName = _("HEATH"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x80008FFF,
+        .aiChecks = 0x80008FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2619,7 +2619,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RODLECT"),
         .trainerName = _("SASHA"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x80004FFF,
+        .aiChecks = 0x80004FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2648,7 +2648,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CHUPY"),
         .trainerName = _("FRANKIE"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x80002FFF,
+        .aiChecks = 0x80002FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2677,7 +2677,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WOBET"),
         .trainerName = _("HELEN"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x80001FFF,
+        .aiChecks = 0x80001FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2706,7 +2706,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GAREN"),
         .trainerName = _("CAMILE"),
         .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2735,7 +2735,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GONPOR"),
         .trainerName = _("MARTIN"),
         .trainerGfxId = EVENT_OBJ_GFX_SCIENTIST_1,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2764,7 +2764,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DRITE"),
         .trainerName = _("SERGIO"),
         .trainerGfxId = EVENT_OBJ_GFX_BOY_1,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2793,7 +2793,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MEOWY"),
         .trainerName = _("KAILEY"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2822,7 +2822,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NYX"),
         .trainerName = _("PERLA"),
         .trainerGfxId = EVENT_OBJ_GFX_BEAUTY,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2851,7 +2851,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GEPITO"),
         .trainerName = _("CLARA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2880,7 +2880,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SPEON"),
         .trainerName = _("JAKOB"),
         .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2909,7 +2909,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLOWGO"),
         .trainerName = _("TREY"),
         .trainerGfxId = EVENT_OBJ_GFX_SAILOR,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2938,7 +2938,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("URSING"),
         .trainerName = _("LANE"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,

src/data/decoration/header.h

@@ -686,7 +686,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_PICHU_DOLL,
         _("PICHU DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -695,7 +695,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_PIKACHU_DOLL,
         _("PIKACHU DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -704,7 +704,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_MARILL_DOLL,
         _("MARILL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -713,7 +713,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TOGEPI_DOLL,
         _("TOGEPI DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -722,7 +722,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CYNDAQUIL_DOLL,
         _("CYNDAQUIL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -731,7 +731,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CHIKORITA_DOLL,
         _("CHIKORITA DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -740,7 +740,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TOTODILE_DOLL,
         _("TOTODILE DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -749,7 +749,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_JIGGLYPUFF_DOLL,
         _("JIGGLYPUFF DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -758,7 +758,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_MEOWTH_DOLL,
         _("MEOWTH DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -767,7 +767,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CLEFAIRY_DOLL,
         _("CLEFAIRY DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -776,7 +776,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_DITTO_DOLL,
         _("DITTO DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -785,7 +785,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SMOOCHUM_DOLL,
         _("SMOOCHUM DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -794,7 +794,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TREECKO_DOLL,
         _("TREECKO DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -803,7 +803,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TORCHIC_DOLL,
         _("TORCHIC DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -812,7 +812,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_MUDKIP_DOLL,
         _("MUDKIP DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -821,7 +821,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_DUSKULL_DOLL,
         _("DUSKULL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -830,7 +830,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_WYNAUT_DOLL,
         _("WYNAUT DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -839,7 +839,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_BALTOY_DOLL,
         _("BALTOY DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -848,7 +848,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_KECLEON_DOLL,
         _("KECLEON DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -857,7 +857,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_AZURILL_DOLL,
         _("AZURILL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -866,7 +866,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SKITTY_DOLL,
         _("SKITTY DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -875,7 +875,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SWABLU_DOLL,
         _("SWABLU DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -884,7 +884,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_GULPIN_DOLL,
         _("GULPIN DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -893,7 +893,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_LOTAD_DOLL,
         _("LOTAD DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -902,7 +902,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SEEDOT_DOLL,
         _("SEEDOT DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -911,7 +911,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_PIKA_CUSHION,
         _("PIKA CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -920,7 +920,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_ROUND_CUSHION,
         _("ROUND CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -929,7 +929,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_KISS_CUSHION,
         _("KISS CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -938,7 +938,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_ZIGZAG_CUSHION,
         _("ZIGZAG CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -947,7 +947,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SPIN_CUSHION,
         _("SPIN CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -956,7 +956,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_DIAMOND_CUSHION,
         _("DIAMOND CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -965,7 +965,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_BALL_CUSHION,
         _("BALL CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -974,7 +974,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_GRASS_CUSHION,
         _("GRASS CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -983,7 +983,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_FIRE_CUSHION,
         _("FIRE CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -992,7 +992,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_WATER_CUSHION,
         _("WATER CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -1001,7 +1001,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SNORLAX_DOLL,
         _("SNORLAX DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1010,7 +1010,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_RHYDON_DOLL,
         _("RHYDON DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1019,7 +1019,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_LAPRAS_DOLL,
         _("LAPRAS DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1028,7 +1028,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_VENUSAUR_DOLL,
         _("VENUSAUR DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1037,7 +1037,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CHARIZARD_DOLL,
         _("CHARIZARD DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1046,7 +1046,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_BLASTOISE_DOLL,
         _("BLASTOISE DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1055,7 +1055,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_WAILMER_DOLL,
         _("WAILMER DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1064,7 +1064,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_REGIROCK_DOLL,
         _("REGIROCK DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1073,7 +1073,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_REGICE_DOLL,
         _("REGICE DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1082,7 +1082,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_REGISTEEL_DOLL,
         _("REGISTEEL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,

src/data/field_event_obj/berry_tree_graphics_tables.h

@@ -423,142 +423,143 @@ const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_
 const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
 
 const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
-    gEventObjectPicTable_CheriBerryTree,
-    gEventObjectPicTable_ChestoBerryTree,
-    gEventObjectPicTable_PechaBerryTree,
-    gEventObjectPicTable_RawstBerryTree,
-    gEventObjectPicTable_AspearBerryTree,
-    gEventObjectPicTable_LeppaBerryTree,
-    gEventObjectPicTable_OranBerryTree,
-    gEventObjectPicTable_PersimBerryTree,
-    gEventObjectPicTable_LumBerryTree,
-    gEventObjectPicTable_SitrusBerryTree,
-    gEventObjectPicTable_FigyBerryTree,
-    gEventObjectPicTable_WikiBerryTree,
-    gEventObjectPicTable_MagoBerryTree,
-    gEventObjectPicTable_AguavBerryTree,
-    gEventObjectPicTable_IapapaBerryTree,
-    gEventObjectPicTable_RazzBerryTree,
-    gEventObjectPicTable_RazzBerryTree,
-    gEventObjectPicTable_MagoBerryTree,
-    gEventObjectPicTable_WepearBerryTree,
-    gEventObjectPicTable_IapapaBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_KelpsyBerryTree,
-    gEventObjectPicTable_WepearBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_GrepaBerryTree,
-    gEventObjectPicTable_TamatoBerryTree,
-    gEventObjectPicTable_CornnBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_RabutaBerryTree,
-    gEventObjectPicTable_NomelBerryTree,
-    gEventObjectPicTable_SpelonBerryTree,
-    gEventObjectPicTable_PamtreBerryTree,
-    gEventObjectPicTable_RabutaBerryTree,
-    gEventObjectPicTable_DurinBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_LiechiBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_AguavBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_GrepaBerryTree,
-    gEventObjectPicTable_LansatBerryTree,
-    gEventObjectPicTable_CornnBerryTree,
-    gEventObjectPicTable_DurinBerryTree,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
 };
 
 const u8 *const gBerryTreePaletteSlotTablePointers[] = {
-    gBerryTreePaletteSlotTable_Cheri,
-    gBerryTreePaletteSlotTable_Chesto,
-    gBerryTreePaletteSlotTable_Pecha,
-    gBerryTreePaletteSlotTable_Rawst,
-    gBerryTreePaletteSlotTable_Aspear,
-    gBerryTreePaletteSlotTable_Leppa,
-    gBerryTreePaletteSlotTable_Oran,
-    gBerryTreePaletteSlotTable_Persim,
-    gBerryTreePaletteSlotTable_Lum,
-    gBerryTreePaletteSlotTable_Sitrus,
-    gBerryTreePaletteSlotTable_Figy,
-    gBerryTreePaletteSlotTable_Wiki,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Kelpsy,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Tamato,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Nomel,
-    gBerryTreePaletteSlotTable_Spelon,
-    gBerryTreePaletteSlotTable_Pamtre,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Durin,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Liechi,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Lansat,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Durin,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
 };
 
 const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    // 3 unused berries.
+    [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
 };

src/data/pokemon/item_effects.h

@@ -1,236 +1,476 @@
-const u8 gItemEffect_Potion[]       = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20};
-const u8 gItemEffect_Antidote[]     = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00};
-const u8 gItemEffect_BurnHeal[]     = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00};
-const u8 gItemEffect_IceHeal[]      = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
-const u8 gItemEffect_Awakening[]    = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
-const u8 gItemEffect_ParalyzeHeal[] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00};
-const u8 gItemEffect_FullRestore[]  = {0x00, 0x00, 0x00, 0x3f, 0x04, 0x00, 0xff};
-const u8 gItemEffect_MaxPotion[]    = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xff};
-const u8 gItemEffect_HyperPotion[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 200};
-const u8 gItemEffect_SuperPotion[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50};
-const u8 gItemEffect_FullHeal[]     = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
-const u8 gItemEffect_Revive[]       = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xfe};
-const u8 gItemEffect_MaxRevive[]    = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff};
-const u8 gItemEffect_FreshWater[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50};
-const u8 gItemEffect_SodaPop[]      = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 60};
-const u8 gItemEffect_Lemonade[]     = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 80};
-const u8 gItemEffect_MoomooMilk[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 100};
-const u8 gItemEffect_EnergyPowder[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 50, 0xfb, 0xfb, 0xf6};
-const u8 gItemEffect_EnergyRoot[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 200, 0xf6, 0xf6, 0xf1};
-const u8 gItemEffect_HealPowder[]   = {0x00, 0x00, 0x00, 0x3f, 0x00, 0xe0, 0xfb, 0xfb, 0xf6};
-const u8 gItemEffect_RevivalHerb[]  = {0x00, 0x00, 0x00, 0x00, 0x44, 0xe0, 0xff, 0xf1, 0xf1, 0xec};
-const u8 gItemEffect_Ether[]        = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a};
-const u8 gItemEffect_MaxEther[]     = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7f};
-const u8 gItemEffect_Elixir[]       = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a};
-const u8 gItemEffect_MaxElixir[]    = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x7f};
-const u8 gItemEffect_LavaCookie[]   = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
-const u8 gItemEffect_BlueFlute[]    = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
-const u8 gItemEffect_YellowFlute[]  = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-const u8 gItemEffect_RedFlute[]     = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00};
-const u8 gItemEffect_BerryJuice[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20};
-const u8 gItemEffect_SacredAsh[]    = {0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff};
-const u8 gItemEffect_HPUp[]         = {0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Protein[]      = {0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Iron[]         = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Carbos[]       = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Calcium[]      = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_RareCandy[]    = {0x00, 0x00, 0x00, 0x40, 0x44, 0xe0,  253, 0x05, 0x03, 0x02};
-const u8 gItemEffect_PPUp[]         = {0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Zinc[]         = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_PPMax[]        = {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x05, 0x03, 0x02};
-const u8 gItemEffect_GuardSpec[]    = {0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_DireHit[]      = {0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XAttack[]      = {0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XDefend[]      = {0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XSpeed[]       = {0x00, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XAccuracy[]    = {0x00, 0x00, 0x10, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XSpecial[]     = {0x00, 0x00, 0x01, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_SunStone[]     = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_MoonStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_FireStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_ThunderStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_WaterStone[]   = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_LeafStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_CheriBerry[]   = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00};
-const u8 gItemEffect_ChestoBerry[]  = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
-const u8 gItemEffect_PechaBerry[]   = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00};
-const u8 gItemEffect_RawstBerry[]   = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00};
-const u8 gItemEffect_AspearBerry[]  = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
-const u8 gItemEffect_LeppaBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a};
-const u8 gItemEffect_OranBerry[]    = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 10};
-const u8 gItemEffect_PersimBerry[]  = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-const u8 gItemEffect_LumBerry[]     = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
-const u8 gItemEffect_SitrusBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 30};
-const u8 gItemEffect_PomegBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_KelpsyBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_QualotBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_HondrewBerry[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_GrepaBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_TamatoBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0xf6, 0x0a, 0x05, 0x02};
+const u8 gItemEffect_Potion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 20,
+};
+
+const u8 gItemEffect_Antidote[6] = {
+    [3] = ITEM3_POISON,
+};
+
+const u8 gItemEffect_BurnHeal[6] = {
+    [3] = ITEM3_BURN,
+};
+
+const u8 gItemEffect_IceHeal[6] = {
+    [3] = ITEM3_FREEZE,
+};
+
+const u8 gItemEffect_Awakening[6] = {
+    [3] = ITEM3_SLEEP,
+};
+
+const u8 gItemEffect_ParalyzeHeal[6] = {
+    [3] = ITEM3_PARALYSIS,
+};
+
+const u8 gItemEffect_FullRestore[7] = {
+    [3] = ITEM3_STATUS_ALL,
+    [4] = ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_MaxPotion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_HyperPotion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 200,
+};
+
+const u8 gItemEffect_SuperPotion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 50,
+};
+
+const u8 gItemEffect_FullHeal[6] = {
+    [3] = ITEM3_STATUS_ALL,
+};
+
+const u8 gItemEffect_Revive[7] = {
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [6] = -2,
+};
+
+const u8 gItemEffect_MaxRevive[7] = {
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_FreshWater[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 50,
+};
+
+const u8 gItemEffect_SodaPop[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 60,
+};
+
+const u8 gItemEffect_Lemonade[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 80,
+};
+
+const u8 gItemEffect_MoomooMilk[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 100,
+};
+
+const u8 gItemEffect_EnergyPowder[10] = {
+    [4] = ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 50,
+    [7] = -5,
+    [8] = -5,
+    [9] = -10,
+};
+
+const u8 gItemEffect_EnergyRoot[10] = {
+    [4] = ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 200,
+    [7] = -10,
+    [8] = -10,
+    [9] = -15,
+};
+
+const u8 gItemEffect_HealPowder[9] = {
+    [3] = ITEM3_STATUS_ALL,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -5,
+    [7] = -5,
+    [8] = -10,
+};
+
+const u8 gItemEffect_RevivalHerb[10] = {
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -1,
+    [7] = -15,
+    [8] = -15,
+    [9] = -20,
+};
+
+const u8 gItemEffect_Ether[7] = {
+    [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+    [6] = 10,
+};
+
+const u8 gItemEffect_MaxEther[7] = {
+    [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+    [6] = 0x7F,
+};
+
+const u8 gItemEffect_Elixir[7] = {
+    [4] = ITEM4_HEAL_PP_ALL,
+    [6] = 10,
+};
+
+const u8 gItemEffect_MaxElixir[7] = {
+    [4] = ITEM4_HEAL_PP_ALL,
+    [6] = 0x7F,
+};
+
+const u8 gItemEffect_LavaCookie[6] = {
+    [3] = ITEM3_STATUS_ALL,
+};
+
+const u8 gItemEffect_BlueFlute[6] = {
+    [3] = ITEM3_SLEEP,
+};
+
+const u8 gItemEffect_YellowFlute[6] = {
+    [3] = ITEM3_CONFUSION,
+};
+
+const u8 gItemEffect_RedFlute[6] = {
+    [0] = ITEM0_INFATUATION,
+};
+
+const u8 gItemEffect_BerryJuice[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 20,
+};
+
+const u8 gItemEffect_SacredAsh[7] = {
+    [0] = ITEM0_SACRED_ASH,
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_HPUp[10] = {
+    [4] = ITEM4_EV_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Protein[10] = {
+    [4] = ITEM4_EV_ATK,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Iron[10] = {
+    [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Carbos[10] = {
+    [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Calcium[10] = {
+    [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_RareCandy[10] = {
+    [3] = ITEM3_LEVEL_UP,
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 0xFD,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_PPUp[9] = {
+    [4] = ITEM4_PP_UP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 5,
+    [7] = 3,
+    [8] = 2,
+};
+
+const u8 gItemEffect_Zinc[10] = {
+    [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_PPMax[9] = {
+    [5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL,
+    [6] = 5,
+    [7] = 3,
+    [8] = 2,
+};
+
+const u8 gItemEffect_GuardSpec[8] = {
+    [3] = ITEM3_MIST,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_DireHit[8] = {
+    [0] = 2 << 4,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XAttack[8] = {
+    [0] = 1,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XDefend[8] = {
+    [1] = 1 << 4,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XSpeed[8] = {
+    [1] = 1,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XAccuracy[8] = {
+    [2] = 1 << 4,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XSpecial[8] = {
+    [2] = 1,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_SunStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_MoonStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_FireStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_ThunderStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_WaterStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_LeafStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_CheriBerry[6] = {
+    [3] = ITEM3_PARALYSIS,
+};
+
+const u8 gItemEffect_ChestoBerry[6] = {
+    [3] = ITEM3_SLEEP,
+};
+
+const u8 gItemEffect_PechaBerry[6] = {
+    [3] = ITEM3_POISON,
+};
+
+const u8 gItemEffect_RawstBerry[6] = {
+    [3] = ITEM3_BURN,
+};
+
+const u8 gItemEffect_AspearBerry[6] = {
+    [3] = ITEM3_FREEZE,
+};
+
+const u8 gItemEffect_LeppaBerry[7] = {
+    [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+    [6] = 10,
+};
+
+const u8 gItemEffect_OranBerry[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 10,
+};
+
+const u8 gItemEffect_PersimBerry[6] = {
+    [3] = ITEM3_CONFUSION,
+};
+
+const u8 gItemEffect_LumBerry[6] = {
+    [3] = ITEM3_STATUS_ALL,
+};
+
+const u8 gItemEffect_SitrusBerry[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 30,
+};
+
+const u8 gItemEffect_PomegBerry[10] = {
+    [4] = ITEM4_EV_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_KelpsyBerry[10] = {
+    [4] = ITEM4_EV_ATK,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_QualotBerry[10] = {
+    [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_HondrewBerry[10] = {
+    [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_GrepaBerry[10] = {
+    [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_TamatoBerry[10] = {
+    [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
 
 const u8 *const gItemEffectTable[] =
 {
-    gItemEffect_Potion,
-    gItemEffect_Antidote,
-    gItemEffect_BurnHeal,
-    gItemEffect_IceHeal,
-    gItemEffect_Awakening,
-    gItemEffect_ParalyzeHeal,
-    gItemEffect_FullRestore,
-    gItemEffect_MaxPotion,
-    gItemEffect_HyperPotion,
-    gItemEffect_SuperPotion,
-    gItemEffect_FullHeal,
-    gItemEffect_Revive,
-    gItemEffect_MaxRevive,
-    gItemEffect_FreshWater,
-    gItemEffect_SodaPop,
-    gItemEffect_Lemonade,
-    gItemEffect_MoomooMilk,
-    gItemEffect_EnergyPowder,
-    gItemEffect_EnergyRoot,
-    gItemEffect_HealPowder,
-    gItemEffect_RevivalHerb,
-    gItemEffect_Ether,
-    gItemEffect_MaxEther,
-    gItemEffect_Elixir,
-    gItemEffect_MaxElixir,
-    gItemEffect_LavaCookie,
-    gItemEffect_BlueFlute,
-    gItemEffect_YellowFlute,
-    gItemEffect_RedFlute,
-    NULL,
-    NULL,
-    gItemEffect_BerryJuice,
-    gItemEffect_SacredAsh,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_HPUp,
-    gItemEffect_Protein,
-    gItemEffect_Iron,
-    gItemEffect_Carbos,
-    gItemEffect_Calcium,
-    gItemEffect_RareCandy,
-    gItemEffect_PPUp,
-    gItemEffect_Zinc,
-    gItemEffect_PPMax,
-    NULL,
-    gItemEffect_GuardSpec,
-    gItemEffect_DireHit,
-    gItemEffect_XAttack,
-    gItemEffect_XDefend,
-    gItemEffect_XSpeed,
-    gItemEffect_XAccuracy,
-    gItemEffect_XSpecial,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_SunStone,
-    gItemEffect_MoonStone,
-    gItemEffect_FireStone,
-    gItemEffect_ThunderStone,
-    gItemEffect_WaterStone,
-    gItemEffect_LeafStone,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_CheriBerry,
-    gItemEffect_ChestoBerry,
-    gItemEffect_PechaBerry,
-    gItemEffect_RawstBerry,
-    gItemEffect_AspearBerry,
-    gItemEffect_LeppaBerry,
-    gItemEffect_OranBerry,
-    gItemEffect_PersimBerry,
-    gItemEffect_LumBerry,
-    gItemEffect_SitrusBerry,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_PomegBerry,
-    gItemEffect_KelpsyBerry,
-    gItemEffect_QualotBerry,
-    gItemEffect_HondrewBerry,
-    gItemEffect_GrepaBerry,
-    gItemEffect_TamatoBerry,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion,
+    [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote,
+    [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal,
+    [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal,
+    [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening,
+    [ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal,
+    [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore,
+    [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion,
+    [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion,
+    [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion,
+    [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal,
+    [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive,
+    [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive,
+    [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater,
+    [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop,
+    [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade,
+    [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk,
+    [ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder,
+    [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot,
+    [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder,
+    [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb,
+    [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether,
+    [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther,
+    [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir,
+    [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir,
+    [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie,
+    [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute,
+    [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute,
+    [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute,
+    [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
+    [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
+    [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
+    [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
+    [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron,
+    [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos,
+    [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium,
+    [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy,
+    [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp,
+    [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc,
+    [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax,
+    [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec,
+    [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit,
+    [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack,
+    [ITEM_X_DEFEND - ITEM_POTION] = gItemEffect_XDefend,
+    [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
+    [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
+    [ITEM_X_SPECIAL - ITEM_POTION] = gItemEffect_XSpecial,
+    [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_SunStone,
+    [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_MoonStone,
+    [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_FireStone,
+    [ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_ThunderStone,
+    [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_WaterStone,
+    [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_LeafStone,
+    [ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry,
+    [ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry,
+    [ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry,
+    [ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry,
+    [ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry,
+    [ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry,
+    [ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry,
+    [ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry,
+    [ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry,
+    [ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry,
+    [ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry,
+    [ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry,
+    [ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry,
+    [ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondrewBerry,
+    [ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry,
+    [ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry,
+    [LAST_BERRY_INDEX - ITEM_POTION] = NULL
 };

src/data/pokemon_graphics/back_pic_coordinates.h

@@ -1,5 +1,3 @@
-#include "constants/species.h"
-
 const struct MonCoords gMonBackPicCoords[] =
 {
     [SPECIES_NONE] =

src/data/pokemon_graphics/back_pic_table.h

@@ -1,444 +1,443 @@
 const struct CompressedSpriteSheet gMonBackPicTable[] =
 {
-    [SPECIES_NONE] = {gMonBackPic_CircledQuestionMark, 0x800, SPECIES_NONE},
-    [SPECIES_BULBASAUR] = {gMonBackPic_Bulbasaur, 0x800, SPECIES_BULBASAUR},
-    [SPECIES_IVYSAUR] = {gMonBackPic_Ivysaur, 0x800, SPECIES_IVYSAUR},
-    [SPECIES_VENUSAUR] = {gMonBackPic_Venusaur, 0x800, SPECIES_VENUSAUR},
-    [SPECIES_CHARMANDER] = {gMonBackPic_Charmander, 0x800, SPECIES_CHARMANDER},
-    [SPECIES_CHARMELEON] = {gMonBackPic_Charmeleon, 0x800, SPECIES_CHARMELEON},
-    [SPECIES_CHARIZARD] = {gMonBackPic_Charizard, 0x800, SPECIES_CHARIZARD},
-    [SPECIES_SQUIRTLE] = {gMonBackPic_Squirtle, 0x800, SPECIES_SQUIRTLE},
-    [SPECIES_WARTORTLE] = {gMonBackPic_Wartortle, 0x800, SPECIES_WARTORTLE},
-    [SPECIES_BLASTOISE] = {gMonBackPic_Blastoise, 0x800, SPECIES_BLASTOISE},
-    [SPECIES_CATERPIE] = {gMonBackPic_Caterpie, 0x800, SPECIES_CATERPIE},
-    [SPECIES_METAPOD] = {gMonBackPic_Metapod, 0x800, SPECIES_METAPOD},
-    [SPECIES_BUTTERFREE] = {gMonBackPic_Butterfree, 0x800, SPECIES_BUTTERFREE},
-    [SPECIES_WEEDLE] = {gMonBackPic_Weedle, 0x800, SPECIES_WEEDLE},
-    [SPECIES_KAKUNA] = {gMonBackPic_Kakuna, 0x800, SPECIES_KAKUNA},
-    [SPECIES_BEEDRILL] = {gMonBackPic_Beedrill, 0x800, SPECIES_BEEDRILL},
-    [SPECIES_PIDGEY] = {gMonBackPic_Pidgey, 0x800, SPECIES_PIDGEY},
-    [SPECIES_PIDGEOTTO] = {gMonBackPic_Pidgeotto, 0x800, SPECIES_PIDGEOTTO},
-    [SPECIES_PIDGEOT] = {gMonBackPic_Pidgeot, 0x800, SPECIES_PIDGEOT},
-    [SPECIES_RATTATA] = {gMonBackPic_Rattata, 0x800, SPECIES_RATTATA},
-    [SPECIES_RATICATE] = {gMonBackPic_Raticate, 0x800, SPECIES_RATICATE},
-    [SPECIES_SPEAROW] = {gMonBackPic_Spearow, 0x800, SPECIES_SPEAROW},
-    [SPECIES_FEAROW] = {gMonBackPic_Fearow, 0x800, SPECIES_FEAROW},
-    [SPECIES_EKANS] = {gMonBackPic_Ekans, 0x800, SPECIES_EKANS},
-    [SPECIES_ARBOK] = {gMonBackPic_Arbok, 0x800, SPECIES_ARBOK},
-    [SPECIES_PIKACHU] = {gMonBackPic_Pikachu, 0x800, SPECIES_PIKACHU},
-    [SPECIES_RAICHU] = {gMonBackPic_Raichu, 0x800, SPECIES_RAICHU},
-    [SPECIES_SANDSHREW] = {gMonBackPic_Sandshrew, 0x800, SPECIES_SANDSHREW},
-    [SPECIES_SANDSLASH] = {gMonBackPic_Sandslash, 0x800, SPECIES_SANDSLASH},
-    [SPECIES_NIDORAN_F] = {gMonBackPic_NidoranF, 0x800, SPECIES_NIDORAN_F},
-    [SPECIES_NIDORINA] = {gMonBackPic_Nidorina, 0x800, SPECIES_NIDORINA},
-    [SPECIES_NIDOQUEEN] = {gMonBackPic_Nidoqueen, 0x800, SPECIES_NIDOQUEEN},
-    [SPECIES_NIDORAN_M] = {gMonBackPic_NidoranM, 0x800, SPECIES_NIDORAN_M},
-    [SPECIES_NIDORINO] = {gMonBackPic_Nidorino, 0x800, SPECIES_NIDORINO},
-    [SPECIES_NIDOKING] = {gMonBackPic_Nidoking, 0x800, SPECIES_NIDOKING},
-    [SPECIES_CLEFAIRY] = {gMonBackPic_Clefairy, 0x800, SPECIES_CLEFAIRY},
-    [SPECIES_CLEFABLE] = {gMonBackPic_Clefable, 0x800, SPECIES_CLEFABLE},
-    [SPECIES_VULPIX] = {gMonBackPic_Vulpix, 0x800, SPECIES_VULPIX},
-    [SPECIES_NINETALES] = {gMonBackPic_Ninetales, 0x800, SPECIES_NINETALES},
-    [SPECIES_JIGGLYPUFF] = {gMonBackPic_Jigglypuff, 0x800, SPECIES_JIGGLYPUFF},
-    [SPECIES_WIGGLYTUFF] = {gMonBackPic_Wigglytuff, 0x800, SPECIES_WIGGLYTUFF},
-    [SPECIES_ZUBAT] = {gMonBackPic_Zubat, 0x800, SPECIES_ZUBAT},
-    [SPECIES_GOLBAT] = {gMonBackPic_Golbat, 0x800, SPECIES_GOLBAT},
-    [SPECIES_ODDISH] = {gMonBackPic_Oddish, 0x800, SPECIES_ODDISH},
-    [SPECIES_GLOOM] = {gMonBackPic_Gloom, 0x800, SPECIES_GLOOM},
-    [SPECIES_VILEPLUME] = {gMonBackPic_Vileplume, 0x800, SPECIES_VILEPLUME},
-    [SPECIES_PARAS] = {gMonBackPic_Paras, 0x800, SPECIES_PARAS},
-    [SPECIES_PARASECT] = {gMonBackPic_Parasect, 0x800, SPECIES_PARASECT},
-    [SPECIES_VENONAT] = {gMonBackPic_Venonat, 0x800, SPECIES_VENONAT},
-    [SPECIES_VENOMOTH] = {gMonBackPic_Venomoth, 0x800, SPECIES_VENOMOTH},
-    [SPECIES_DIGLETT] = {gMonBackPic_Diglett, 0x800, SPECIES_DIGLETT},
-    [SPECIES_DUGTRIO] = {gMonBackPic_Dugtrio, 0x800, SPECIES_DUGTRIO},
-    [SPECIES_MEOWTH] = {gMonBackPic_Meowth, 0x800, SPECIES_MEOWTH},
-    [SPECIES_PERSIAN] = {gMonBackPic_Persian, 0x800, SPECIES_PERSIAN},
-    [SPECIES_PSYDUCK] = {gMonBackPic_Psyduck, 0x800, SPECIES_PSYDUCK},
-    [SPECIES_GOLDUCK] = {gMonBackPic_Golduck, 0x800, SPECIES_GOLDUCK},
-    [SPECIES_MANKEY] = {gMonBackPic_Mankey, 0x800, SPECIES_MANKEY},
-    [SPECIES_PRIMEAPE] = {gMonBackPic_Primeape, 0x800, SPECIES_PRIMEAPE},
-    [SPECIES_GROWLITHE] = {gMonBackPic_Growlithe, 0x800, SPECIES_GROWLITHE},
-    [SPECIES_ARCANINE] = {gMonBackPic_Arcanine, 0x800, SPECIES_ARCANINE},
-    [SPECIES_POLIWAG] = {gMonBackPic_Poliwag, 0x800, SPECIES_POLIWAG},
-    [SPECIES_POLIWHIRL] = {gMonBackPic_Poliwhirl, 0x800, SPECIES_POLIWHIRL},
-    [SPECIES_POLIWRATH] = {gMonBackPic_Poliwrath, 0x800, SPECIES_POLIWRATH},
-    [SPECIES_ABRA] = {gMonBackPic_Abra, 0x800, SPECIES_ABRA},
-    [SPECIES_KADABRA] = {gMonBackPic_Kadabra, 0x800, SPECIES_KADABRA},
-    [SPECIES_ALAKAZAM] = {gMonBackPic_Alakazam, 0x800, SPECIES_ALAKAZAM},
-    [SPECIES_MACHOP] = {gMonBackPic_Machop, 0x800, SPECIES_MACHOP},
-    [SPECIES_MACHOKE] = {gMonBackPic_Machoke, 0x800, SPECIES_MACHOKE},
-    [SPECIES_MACHAMP] = {gMonBackPic_Machamp, 0x800, SPECIES_MACHAMP},
-    [SPECIES_BELLSPROUT] = {gMonBackPic_Bellsprout, 0x800, SPECIES_BELLSPROUT},
-    [SPECIES_WEEPINBELL] = {gMonBackPic_Weepinbell, 0x800, SPECIES_WEEPINBELL},
-    [SPECIES_VICTREEBEL] = {gMonBackPic_Victreebel, 0x800, SPECIES_VICTREEBEL},
-    [SPECIES_TENTACOOL] = {gMonBackPic_Tentacool, 0x800, SPECIES_TENTACOOL},
-    [SPECIES_TENTACRUEL] = {gMonBackPic_Tentacruel, 0x800, SPECIES_TENTACRUEL},
-    [SPECIES_GEODUDE] = {gMonBackPic_Geodude, 0x800, SPECIES_GEODUDE},
-    [SPECIES_GRAVELER] = {gMonBackPic_Graveler, 0x800, SPECIES_GRAVELER},
-    [SPECIES_GOLEM] = {gMonBackPic_Golem, 0x800, SPECIES_GOLEM},
-    [SPECIES_PONYTA] = {gMonBackPic_Ponyta, 0x800, SPECIES_PONYTA},
-    [SPECIES_RAPIDASH] = {gMonBackPic_Rapidash, 0x800, SPECIES_RAPIDASH},
-    [SPECIES_SLOWPOKE] = {gMonBackPic_Slowpoke, 0x800, SPECIES_SLOWPOKE},
-    [SPECIES_SLOWBRO] = {gMonBackPic_Slowbro, 0x800, SPECIES_SLOWBRO},
-    [SPECIES_MAGNEMITE] = {gMonBackPic_Magnemite, 0x800, SPECIES_MAGNEMITE},
-    [SPECIES_MAGNETON] = {gMonBackPic_Magneton, 0x800, SPECIES_MAGNETON},
-    [SPECIES_FARFETCHD] = {gMonBackPic_Farfetchd, 0x800, SPECIES_FARFETCHD},
-    [SPECIES_DODUO] = {gMonBackPic_Doduo, 0x800, SPECIES_DODUO},
-    [SPECIES_DODRIO] = {gMonBackPic_Dodrio, 0x800, SPECIES_DODRIO},
-    [SPECIES_SEEL] = {gMonBackPic_Seel, 0x800, SPECIES_SEEL},
-    [SPECIES_DEWGONG] = {gMonBackPic_Dewgong, 0x800, SPECIES_DEWGONG},
-    [SPECIES_GRIMER] = {gMonBackPic_Grimer, 0x800, SPECIES_GRIMER},
-    [SPECIES_MUK] = {gMonBackPic_Muk, 0x800, SPECIES_MUK},
-    [SPECIES_SHELLDER] = {gMonBackPic_Shellder, 0x800, SPECIES_SHELLDER},
-    [SPECIES_CLOYSTER] = {gMonBackPic_Cloyster, 0x800, SPECIES_CLOYSTER},
-    [SPECIES_GASTLY] = {gMonBackPic_Gastly, 0x800, SPECIES_GASTLY},
-    [SPECIES_HAUNTER] = {gMonBackPic_Haunter, 0x800, SPECIES_HAUNTER},
-    [SPECIES_GENGAR] = {gMonBackPic_Gengar, 0x800, SPECIES_GENGAR},
-    [SPECIES_ONIX] = {gMonBackPic_Onix, 0x800, SPECIES_ONIX},
-    [SPECIES_DROWZEE] = {gMonBackPic_Drowzee, 0x800, SPECIES_DROWZEE},
-    [SPECIES_HYPNO] = {gMonBackPic_Hypno, 0x800, SPECIES_HYPNO},
-    [SPECIES_KRABBY] = {gMonBackPic_Krabby, 0x800, SPECIES_KRABBY},
-    [SPECIES_KINGLER] = {gMonBackPic_Kingler, 0x800, SPECIES_KINGLER},
-    [SPECIES_VOLTORB] = {gMonBackPic_Voltorb, 0x800, SPECIES_VOLTORB},
-    [SPECIES_ELECTRODE] = {gMonBackPic_Electrode, 0x800, SPECIES_ELECTRODE},
-    [SPECIES_EXEGGCUTE] = {gMonBackPic_Exeggcute, 0x800, SPECIES_EXEGGCUTE},
-    [SPECIES_EXEGGUTOR] = {gMonBackPic_Exeggutor, 0x800, SPECIES_EXEGGUTOR},
-    [SPECIES_CUBONE] = {gMonBackPic_Cubone, 0x800, SPECIES_CUBONE},
-    [SPECIES_MAROWAK] = {gMonBackPic_Marowak, 0x800, SPECIES_MAROWAK},
-    [SPECIES_HITMONLEE] = {gMonBackPic_Hitmonlee, 0x800, SPECIES_HITMONLEE},
-    [SPECIES_HITMONCHAN] = {gMonBackPic_Hitmonchan, 0x800, SPECIES_HITMONCHAN},
-    [SPECIES_LICKITUNG] = {gMonBackPic_Lickitung, 0x800, SPECIES_LICKITUNG},
-    [SPECIES_KOFFING] = {gMonBackPic_Koffing, 0x800, SPECIES_KOFFING},
-    [SPECIES_WEEZING] = {gMonBackPic_Weezing, 0x800, SPECIES_WEEZING},
-    [SPECIES_RHYHORN] = {gMonBackPic_Rhyhorn, 0x800, SPECIES_RHYHORN},
-    [SPECIES_RHYDON] = {gMonBackPic_Rhydon, 0x800, SPECIES_RHYDON},
-    [SPECIES_CHANSEY] = {gMonBackPic_Chansey, 0x800, SPECIES_CHANSEY},
-    [SPECIES_TANGELA] = {gMonBackPic_Tangela, 0x800, SPECIES_TANGELA},
-    [SPECIES_KANGASKHAN] = {gMonBackPic_Kangaskhan, 0x800, SPECIES_KANGASKHAN},
-    [SPECIES_HORSEA] = {gMonBackPic_Horsea, 0x800, SPECIES_HORSEA},
-    [SPECIES_SEADRA] = {gMonBackPic_Seadra, 0x800, SPECIES_SEADRA},
-    [SPECIES_GOLDEEN] = {gMonBackPic_Goldeen, 0x800, SPECIES_GOLDEEN},
-    [SPECIES_SEAKING] = {gMonBackPic_Seaking, 0x800, SPECIES_SEAKING},
-    [SPECIES_STARYU] = {gMonBackPic_Staryu, 0x800, SPECIES_STARYU},
-    [SPECIES_STARMIE] = {gMonBackPic_Starmie, 0x800, SPECIES_STARMIE},
-    [SPECIES_MR_MIME] = {gMonBackPic_Mrmime, 0x800, SPECIES_MR_MIME},
-    [SPECIES_SCYTHER] = {gMonBackPic_Scyther, 0x800, SPECIES_SCYTHER},
-    [SPECIES_JYNX] = {gMonBackPic_Jynx, 0x800, SPECIES_JYNX},
-    [SPECIES_ELECTABUZZ] = {gMonBackPic_Electabuzz, 0x800, SPECIES_ELECTABUZZ},
-    [SPECIES_MAGMAR] = {gMonBackPic_Magmar, 0x800, SPECIES_MAGMAR},
-    [SPECIES_PINSIR] = {gMonBackPic_Pinsir, 0x800, SPECIES_PINSIR},
-    [SPECIES_TAUROS] = {gMonBackPic_Tauros, 0x800, SPECIES_TAUROS},
-    [SPECIES_MAGIKARP] = {gMonBackPic_Magikarp, 0x800, SPECIES_MAGIKARP},
-    [SPECIES_GYARADOS] = {gMonBackPic_Gyarados, 0x800, SPECIES_GYARADOS},
-    [SPECIES_LAPRAS] = {gMonBackPic_Lapras, 0x800, SPECIES_LAPRAS},
-    [SPECIES_DITTO] = {gMonBackPic_Ditto, 0x800, SPECIES_DITTO},
-    [SPECIES_EEVEE] = {gMonBackPic_Eevee, 0x800, SPECIES_EEVEE},
-    [SPECIES_VAPOREON] = {gMonBackPic_Vaporeon, 0x800, SPECIES_VAPOREON},
-    [SPECIES_JOLTEON] = {gMonBackPic_Jolteon, 0x800, SPECIES_JOLTEON},
-    [SPECIES_FLAREON] = {gMonBackPic_Flareon, 0x800, SPECIES_FLAREON},
-    [SPECIES_PORYGON] = {gMonBackPic_Porygon, 0x800, SPECIES_PORYGON},
-    [SPECIES_OMANYTE] = {gMonBackPic_Omanyte, 0x800, SPECIES_OMANYTE},
-    [SPECIES_OMASTAR] = {gMonBackPic_Omastar, 0x800, SPECIES_OMASTAR},
-    [SPECIES_KABUTO] = {gMonBackPic_Kabuto, 0x800, SPECIES_KABUTO},
-    [SPECIES_KABUTOPS] = {gMonBackPic_Kabutops, 0x800, SPECIES_KABUTOPS},
-    [SPECIES_AERODACTYL] = {gMonBackPic_Aerodactyl, 0x800, SPECIES_AERODACTYL},
-    [SPECIES_SNORLAX] = {gMonBackPic_Snorlax, 0x800, SPECIES_SNORLAX},
-    [SPECIES_ARTICUNO] = {gMonBackPic_Articuno, 0x800, SPECIES_ARTICUNO},
-    [SPECIES_ZAPDOS] = {gMonBackPic_Zapdos, 0x800, SPECIES_ZAPDOS},
-    [SPECIES_MOLTRES] = {gMonBackPic_Moltres, 0x800, SPECIES_MOLTRES},
-    [SPECIES_DRATINI] = {gMonBackPic_Dratini, 0x800, SPECIES_DRATINI},
-    [SPECIES_DRAGONAIR] = {gMonBackPic_Dragonair, 0x800, SPECIES_DRAGONAIR},
-    [SPECIES_DRAGONITE] = {gMonBackPic_Dragonite, 0x800, SPECIES_DRAGONITE},
-    [SPECIES_MEWTWO] = {gMonBackPic_Mewtwo, 0x800, SPECIES_MEWTWO},
-    [SPECIES_MEW] = {gMonBackPic_Mew, 0x800, SPECIES_MEW},
-    [SPECIES_CHIKORITA] = {gMonBackPic_Chikorita, 0x800, SPECIES_CHIKORITA},
-    [SPECIES_BAYLEEF] = {gMonBackPic_Bayleef, 0x800, SPECIES_BAYLEEF},
-    [SPECIES_MEGANIUM] = {gMonBackPic_Meganium, 0x800, SPECIES_MEGANIUM},
-    [SPECIES_CYNDAQUIL] = {gMonBackPic_Cyndaquil, 0x800, SPECIES_CYNDAQUIL},
-    [SPECIES_QUILAVA] = {gMonBackPic_Quilava, 0x800, SPECIES_QUILAVA},
-    [SPECIES_TYPHLOSION] = {gMonBackPic_Typhlosion, 0x800, SPECIES_TYPHLOSION},
-    [SPECIES_TOTODILE] = {gMonBackPic_Totodile, 0x800, SPECIES_TOTODILE},
-    [SPECIES_CROCONAW] = {gMonBackPic_Croconaw, 0x800, SPECIES_CROCONAW},
-    [SPECIES_FERALIGATR] = {gMonBackPic_Feraligatr, 0x800, SPECIES_FERALIGATR},
-    [SPECIES_SENTRET] = {gMonBackPic_Sentret, 0x800, SPECIES_SENTRET},
-    [SPECIES_FURRET] = {gMonBackPic_Furret, 0x800, SPECIES_FURRET},
-    [SPECIES_HOOTHOOT] = {gMonBackPic_Hoothoot, 0x800, SPECIES_HOOTHOOT},
-    [SPECIES_NOCTOWL] = {gMonBackPic_Noctowl, 0x800, SPECIES_NOCTOWL},
-    [SPECIES_LEDYBA] = {gMonBackPic_Ledyba, 0x800, SPECIES_LEDYBA},
-    [SPECIES_LEDIAN] = {gMonBackPic_Ledian, 0x800, SPECIES_LEDIAN},
-    [SPECIES_SPINARAK] = {gMonBackPic_Spinarak, 0x800, SPECIES_SPINARAK},
-    [SPECIES_ARIADOS] = {gMonBackPic_Ariados, 0x800, SPECIES_ARIADOS},
-    [SPECIES_CROBAT] = {gMonBackPic_Crobat, 0x800, SPECIES_CROBAT},
-    [SPECIES_CHINCHOU] = {gMonBackPic_Chinchou, 0x800, SPECIES_CHINCHOU},
-    [SPECIES_LANTURN] = {gMonBackPic_Lanturn, 0x800, SPECIES_LANTURN},
-    [SPECIES_PICHU] = {gMonBackPic_Pichu, 0x800, SPECIES_PICHU},
-    [SPECIES_CLEFFA] = {gMonBackPic_Cleffa, 0x800, SPECIES_CLEFFA},
-    [SPECIES_IGGLYBUFF] = {gMonBackPic_Igglybuff, 0x800, SPECIES_IGGLYBUFF},
-    [SPECIES_TOGEPI] = {gMonBackPic_Togepi, 0x800, SPECIES_TOGEPI},
-    [SPECIES_TOGETIC] = {gMonBackPic_Togetic, 0x800, SPECIES_TOGETIC},
-    [SPECIES_NATU] = {gMonBackPic_Natu, 0x800, SPECIES_NATU},
-    [SPECIES_XATU] = {gMonBackPic_Xatu, 0x800, SPECIES_XATU},
-    [SPECIES_MAREEP] = {gMonBackPic_Mareep, 0x800, SPECIES_MAREEP},
-    [SPECIES_FLAAFFY] = {gMonBackPic_Flaaffy, 0x800, SPECIES_FLAAFFY},
-    [SPECIES_AMPHAROS] = {gMonBackPic_Ampharos, 0x800, SPECIES_AMPHAROS},
-    [SPECIES_BELLOSSOM] = {gMonBackPic_Bellossom, 0x800, SPECIES_BELLOSSOM},
-    [SPECIES_MARILL] = {gMonBackPic_Marill, 0x800, SPECIES_MARILL},
-    [SPECIES_AZUMARILL] = {gMonBackPic_Azumarill, 0x800, SPECIES_AZUMARILL},
-    [SPECIES_SUDOWOODO] = {gMonBackPic_Sudowoodo, 0x800, SPECIES_SUDOWOODO},
-    [SPECIES_POLITOED] = {gMonBackPic_Politoed, 0x800, SPECIES_POLITOED},
-    [SPECIES_HOPPIP] = {gMonBackPic_Hoppip, 0x800, SPECIES_HOPPIP},
-    [SPECIES_SKIPLOOM] = {gMonBackPic_Skiploom, 0x800, SPECIES_SKIPLOOM},
-    [SPECIES_JUMPLUFF] = {gMonBackPic_Jumpluff, 0x800, SPECIES_JUMPLUFF},
-    [SPECIES_AIPOM] = {gMonBackPic_Aipom, 0x800, SPECIES_AIPOM},
-    [SPECIES_SUNKERN] = {gMonBackPic_Sunkern, 0x800, SPECIES_SUNKERN},
-    [SPECIES_SUNFLORA] = {gMonBackPic_Sunflora, 0x800, SPECIES_SUNFLORA},
-    [SPECIES_YANMA] = {gMonBackPic_Yanma, 0x800, SPECIES_YANMA},
-    [SPECIES_WOOPER] = {gMonBackPic_Wooper, 0x800, SPECIES_WOOPER},
-    [SPECIES_QUAGSIRE] = {gMonBackPic_Quagsire, 0x800, SPECIES_QUAGSIRE},
-    [SPECIES_ESPEON] = {gMonBackPic_Espeon, 0x800, SPECIES_ESPEON},
-    [SPECIES_UMBREON] = {gMonBackPic_Umbreon, 0x800, SPECIES_UMBREON},
-    [SPECIES_MURKROW] = {gMonBackPic_Murkrow, 0x800, SPECIES_MURKROW},
-    [SPECIES_SLOWKING] = {gMonBackPic_Slowking, 0x800, SPECIES_SLOWKING},
-    [SPECIES_MISDREAVUS] = {gMonBackPic_Misdreavus, 0x800, SPECIES_MISDREAVUS},
-    [SPECIES_UNOWN] = {gMonBackPic_UnownA, 0x800, SPECIES_UNOWN},
-    [SPECIES_WOBBUFFET] = {gMonBackPic_Wobbuffet, 0x800, SPECIES_WOBBUFFET},
-    [SPECIES_GIRAFARIG] = {gMonBackPic_Girafarig, 0x800, SPECIES_GIRAFARIG},
-    [SPECIES_PINECO] = {gMonBackPic_Pineco, 0x800, SPECIES_PINECO},
-    [SPECIES_FORRETRESS] = {gMonBackPic_Forretress, 0x800, SPECIES_FORRETRESS},
-    [SPECIES_DUNSPARCE] = {gMonBackPic_Dunsparce, 0x800, SPECIES_DUNSPARCE},
-    [SPECIES_GLIGAR] = {gMonBackPic_Gligar, 0x800, SPECIES_GLIGAR},
-    [SPECIES_STEELIX] = {gMonBackPic_Steelix, 0x800, SPECIES_STEELIX},
-    [SPECIES_SNUBBULL] = {gMonBackPic_Snubbull, 0x800, SPECIES_SNUBBULL},
-    [SPECIES_GRANBULL] = {gMonBackPic_Granbull, 0x800, SPECIES_GRANBULL},
-    [SPECIES_QWILFISH] = {gMonBackPic_Qwilfish, 0x800, SPECIES_QWILFISH},
-    [SPECIES_SCIZOR] = {gMonBackPic_Scizor, 0x800, SPECIES_SCIZOR},
-    [SPECIES_SHUCKLE] = {gMonBackPic_Shuckle, 0x800, SPECIES_SHUCKLE},
-    [SPECIES_HERACROSS] = {gMonBackPic_Heracross, 0x800, SPECIES_HERACROSS},
-    [SPECIES_SNEASEL] = {gMonBackPic_Sneasel, 0x800, SPECIES_SNEASEL},
-    [SPECIES_TEDDIURSA] = {gMonBackPic_Teddiursa, 0x800, SPECIES_TEDDIURSA},
-    [SPECIES_URSARING] = {gMonBackPic_Ursaring, 0x800, SPECIES_URSARING},
-    [SPECIES_SLUGMA] = {gMonBackPic_Slugma, 0x800, SPECIES_SLUGMA},
-    [SPECIES_MAGCARGO] = {gMonBackPic_Magcargo, 0x800, SPECIES_MAGCARGO},
-    [SPECIES_SWINUB] = {gMonBackPic_Swinub, 0x800, SPECIES_SWINUB},
-    [SPECIES_PILOSWINE] = {gMonBackPic_Piloswine, 0x800, SPECIES_PILOSWINE},
-    [SPECIES_CORSOLA] = {gMonBackPic_Corsola, 0x800, SPECIES_CORSOLA},
-    [SPECIES_REMORAID] = {gMonBackPic_Remoraid, 0x800, SPECIES_REMORAID},
-    [SPECIES_OCTILLERY] = {gMonBackPic_Octillery, 0x800, SPECIES_OCTILLERY},
-    [SPECIES_DELIBIRD] = {gMonBackPic_Delibird, 0x800, SPECIES_DELIBIRD},
-    [SPECIES_MANTINE] = {gMonBackPic_Mantine, 0x800, SPECIES_MANTINE},
-    [SPECIES_SKARMORY] = {gMonBackPic_Skarmory, 0x800, SPECIES_SKARMORY},
-    [SPECIES_HOUNDOUR] = {gMonBackPic_Houndour, 0x800, SPECIES_HOUNDOUR},
-    [SPECIES_HOUNDOOM] = {gMonBackPic_Houndoom, 0x800, SPECIES_HOUNDOOM},
-    [SPECIES_KINGDRA] = {gMonBackPic_Kingdra, 0x800, SPECIES_KINGDRA},
-    [SPECIES_PHANPY] = {gMonBackPic_Phanpy, 0x800, SPECIES_PHANPY},
-    [SPECIES_DONPHAN] = {gMonBackPic_Donphan, 0x800, SPECIES_DONPHAN},
-    [SPECIES_PORYGON2] = {gMonBackPic_Porygon2, 0x800, SPECIES_PORYGON2},
-    [SPECIES_STANTLER] = {gMonBackPic_Stantler, 0x800, SPECIES_STANTLER},
-    [SPECIES_SMEARGLE] = {gMonBackPic_Smeargle, 0x800, SPECIES_SMEARGLE},
-    [SPECIES_TYROGUE] = {gMonBackPic_Tyrogue, 0x800, SPECIES_TYROGUE},
-    [SPECIES_HITMONTOP] = {gMonBackPic_Hitmontop, 0x800, SPECIES_HITMONTOP},
-    [SPECIES_SMOOCHUM] = {gMonBackPic_Smoochum, 0x800, SPECIES_SMOOCHUM},
-    [SPECIES_ELEKID] = {gMonBackPic_Elekid, 0x800, SPECIES_ELEKID},
-    [SPECIES_MAGBY] = {gMonBackPic_Magby, 0x800, SPECIES_MAGBY},
-    [SPECIES_MILTANK] = {gMonBackPic_Miltank, 0x800, SPECIES_MILTANK},
-    [SPECIES_BLISSEY] = {gMonBackPic_Blissey, 0x800, SPECIES_BLISSEY},
-    [SPECIES_RAIKOU] = {gMonBackPic_Raikou, 0x800, SPECIES_RAIKOU},
-    [SPECIES_ENTEI] = {gMonBackPic_Entei, 0x800, SPECIES_ENTEI},
-    [SPECIES_SUICUNE] = {gMonBackPic_Suicune, 0x800, SPECIES_SUICUNE},
-    [SPECIES_LARVITAR] = {gMonBackPic_Larvitar, 0x800, SPECIES_LARVITAR},
-    [SPECIES_PUPITAR] = {gMonBackPic_Pupitar, 0x800, SPECIES_PUPITAR},
-    [SPECIES_TYRANITAR] = {gMonBackPic_Tyranitar, 0x800, SPECIES_TYRANITAR},
-    [SPECIES_LUGIA] = {gMonBackPic_Lugia, 0x800, SPECIES_LUGIA},
-    [SPECIES_HO_OH] = {gMonBackPic_HoOh, 0x800, SPECIES_HO_OH},
-    [SPECIES_CELEBI] = {gMonBackPic_Celebi, 0x800, SPECIES_CELEBI},
-    [SPECIES_OLD_UNOWN_B] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_B},
-    [SPECIES_OLD_UNOWN_C] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_C},
-    [SPECIES_OLD_UNOWN_D] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_D},
-    [SPECIES_OLD_UNOWN_E] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_E},
-    [SPECIES_OLD_UNOWN_F] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_F},
-    [SPECIES_OLD_UNOWN_G] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_G},
-    [SPECIES_OLD_UNOWN_H] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_H},
-    [SPECIES_OLD_UNOWN_I] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_I},
-    [SPECIES_OLD_UNOWN_J] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_J},
-    [SPECIES_OLD_UNOWN_K] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_K},
-    [SPECIES_OLD_UNOWN_L] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_L},
-    [SPECIES_OLD_UNOWN_M] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_M},
-    [SPECIES_OLD_UNOWN_N] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_N},
-    [SPECIES_OLD_UNOWN_O] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_O},
-    [SPECIES_OLD_UNOWN_P] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_P},
-    [SPECIES_OLD_UNOWN_Q] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Q},
-    [SPECIES_OLD_UNOWN_R] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_R},
-    [SPECIES_OLD_UNOWN_S] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_S},
-    [SPECIES_OLD_UNOWN_T] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_T},
-    [SPECIES_OLD_UNOWN_U] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_U},
-    [SPECIES_OLD_UNOWN_V] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_V},
-    [SPECIES_OLD_UNOWN_W] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_W},
-    [SPECIES_OLD_UNOWN_X] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_X},
-    [SPECIES_OLD_UNOWN_Y] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Y},
-    [SPECIES_OLD_UNOWN_Z] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Z},
-    [SPECIES_TREECKO] = {gMonBackPic_Treecko, 0x800, SPECIES_TREECKO},
-    [SPECIES_GROVYLE] = {gMonBackPic_Grovyle, 0x800, SPECIES_GROVYLE},
-    [SPECIES_SCEPTILE] = {gMonBackPic_Sceptile, 0x800, SPECIES_SCEPTILE},
-    [SPECIES_TORCHIC] = {gMonBackPic_Torchic, 0x800, SPECIES_TORCHIC},
-    [SPECIES_COMBUSKEN] = {gMonBackPic_Combusken, 0x800, SPECIES_COMBUSKEN},
-    [SPECIES_BLAZIKEN] = {gMonBackPic_Blaziken, 0x800, SPECIES_BLAZIKEN},
-    [SPECIES_MUDKIP] = {gMonBackPic_Mudkip, 0x800, SPECIES_MUDKIP},
-    [SPECIES_MARSHTOMP] = {gMonBackPic_Marshtomp, 0x800, SPECIES_MARSHTOMP},
-    [SPECIES_SWAMPERT] = {gMonBackPic_Swampert, 0x800, SPECIES_SWAMPERT},
-    [SPECIES_POOCHYENA] = {gMonBackPic_Poochyena, 0x800, SPECIES_POOCHYENA},
-    [SPECIES_MIGHTYENA] = {gMonBackPic_Mightyena, 0x800, SPECIES_MIGHTYENA},
-    [SPECIES_ZIGZAGOON] = {gMonBackPic_Zigzagoon, 0x800, SPECIES_ZIGZAGOON},
-    [SPECIES_LINOONE] = {gMonBackPic_Linoone, 0x800, SPECIES_LINOONE},
-    [SPECIES_WURMPLE] = {gMonBackPic_Wurmple, 0x800, SPECIES_WURMPLE},
-    [SPECIES_SILCOON] = {gMonBackPic_Silcoon, 0x800, SPECIES_SILCOON},
-    [SPECIES_BEAUTIFLY] = {gMonBackPic_Beautifly, 0x800, SPECIES_BEAUTIFLY},
-    [SPECIES_CASCOON] = {gMonBackPic_Cascoon, 0x800, SPECIES_CASCOON},
-    [SPECIES_DUSTOX] = {gMonBackPic_Dustox, 0x800, SPECIES_DUSTOX},
-    [SPECIES_LOTAD] = {gMonBackPic_Lotad, 0x800, SPECIES_LOTAD},
-    [SPECIES_LOMBRE] = {gMonBackPic_Lombre, 0x800, SPECIES_LOMBRE},
-    [SPECIES_LUDICOLO] = {gMonBackPic_Ludicolo, 0x800, SPECIES_LUDICOLO},
-    [SPECIES_SEEDOT] = {gMonBackPic_Seedot, 0x800, SPECIES_SEEDOT},
-    [SPECIES_NUZLEAF] = {gMonBackPic_Nuzleaf, 0x800, SPECIES_NUZLEAF},
-    [SPECIES_SHIFTRY] = {gMonBackPic_Shiftry, 0x800, SPECIES_SHIFTRY},
-    [SPECIES_NINCADA] = {gMonBackPic_Nincada, 0x800, SPECIES_NINCADA},
-    [SPECIES_NINJASK] = {gMonBackPic_Ninjask, 0x800, SPECIES_NINJASK},
-    [SPECIES_SHEDINJA] = {gMonBackPic_Shedinja, 0x800, SPECIES_SHEDINJA},
-    [SPECIES_TAILLOW] = {gMonBackPic_Taillow, 0x800, SPECIES_TAILLOW},
-    [SPECIES_SWELLOW] = {gMonBackPic_Swellow, 0x800, SPECIES_SWELLOW},
-    [SPECIES_SHROOMISH] = {gMonBackPic_Shroomish, 0x800, SPECIES_SHROOMISH},
-    [SPECIES_BRELOOM] = {gMonBackPic_Breloom, 0x800, SPECIES_BRELOOM},
-    [SPECIES_SPINDA] = {gMonBackPic_Spinda, 0x800, SPECIES_SPINDA},
-    [SPECIES_WINGULL] = {gMonBackPic_Wingull, 0x800, SPECIES_WINGULL},
-    [SPECIES_PELIPPER] = {gMonBackPic_Pelipper, 0x800, SPECIES_PELIPPER},
-    [SPECIES_SURSKIT] = {gMonBackPic_Surskit, 0x800, SPECIES_SURSKIT},
-    [SPECIES_MASQUERAIN] = {gMonBackPic_Masquerain, 0x800, SPECIES_MASQUERAIN},
-    [SPECIES_WAILMER] = {gMonBackPic_Wailmer, 0x800, SPECIES_WAILMER},
-    [SPECIES_WAILORD] = {gMonBackPic_Wailord, 0x800, SPECIES_WAILORD},
-    [SPECIES_SKITTY] = {gMonBackPic_Skitty, 0x800, SPECIES_SKITTY},
-    [SPECIES_DELCATTY] = {gMonBackPic_Delcatty, 0x800, SPECIES_DELCATTY},
-    [SPECIES_KECLEON] = {gMonBackPic_Kecleon, 0x800, SPECIES_KECLEON},
-    [SPECIES_BALTOY] = {gMonBackPic_Baltoy, 0x800, SPECIES_BALTOY},
-    [SPECIES_CLAYDOL] = {gMonBackPic_Claydol, 0x800, SPECIES_CLAYDOL},
-    [SPECIES_NOSEPASS] = {gMonBackPic_Nosepass, 0x800, SPECIES_NOSEPASS},
-    [SPECIES_TORKOAL] = {gMonBackPic_Torkoal, 0x800, SPECIES_TORKOAL},
-    [SPECIES_SABLEYE] = {gMonBackPic_Sableye, 0x800, SPECIES_SABLEYE},
-    [SPECIES_BARBOACH] = {gMonBackPic_Barboach, 0x800, SPECIES_BARBOACH},
-    [SPECIES_WHISCASH] = {gMonBackPic_Whiscash, 0x800, SPECIES_WHISCASH},
-    [SPECIES_LUVDISC] = {gMonBackPic_Luvdisc, 0x800, SPECIES_LUVDISC},
-    [SPECIES_CORPHISH] = {gMonBackPic_Corphish, 0x800, SPECIES_CORPHISH},
-    [SPECIES_CRAWDAUNT] = {gMonBackPic_Crawdaunt, 0x800, SPECIES_CRAWDAUNT},
-    [SPECIES_FEEBAS] = {gMonBackPic_Feebas, 0x800, SPECIES_FEEBAS},
-    [SPECIES_MILOTIC] = {gMonBackPic_Milotic, 0x800, SPECIES_MILOTIC},
-    [SPECIES_CARVANHA] = {gMonBackPic_Carvanha, 0x800, SPECIES_CARVANHA},
-    [SPECIES_SHARPEDO] = {gMonBackPic_Sharpedo, 0x800, SPECIES_SHARPEDO},
-    [SPECIES_TRAPINCH] = {gMonBackPic_Trapinch, 0x800, SPECIES_TRAPINCH},
-    [SPECIES_VIBRAVA] = {gMonBackPic_Vibrava, 0x800, SPECIES_VIBRAVA},
-    [SPECIES_FLYGON] = {gMonBackPic_Flygon, 0x800, SPECIES_FLYGON},
-    [SPECIES_MAKUHITA] = {gMonBackPic_Makuhita, 0x800, SPECIES_MAKUHITA},
-    [SPECIES_HARIYAMA] = {gMonBackPic_Hariyama, 0x800, SPECIES_HARIYAMA},
-    [SPECIES_ELECTRIKE] = {gMonBackPic_Electrike, 0x800, SPECIES_ELECTRIKE},
-    [SPECIES_MANECTRIC] = {gMonBackPic_Manectric, 0x800, SPECIES_MANECTRIC},
-    [SPECIES_NUMEL] = {gMonBackPic_Numel, 0x800, SPECIES_NUMEL},
-    [SPECIES_CAMERUPT] = {gMonBackPic_Camerupt, 0x800, SPECIES_CAMERUPT},
-    [SPECIES_SPHEAL] = {gMonBackPic_Spheal, 0x800, SPECIES_SPHEAL},
-    [SPECIES_SEALEO] = {gMonBackPic_Sealeo, 0x800, SPECIES_SEALEO},
-    [SPECIES_WALREIN] = {gMonBackPic_Walrein, 0x800, SPECIES_WALREIN},
-    [SPECIES_CACNEA] = {gMonBackPic_Cacnea, 0x800, SPECIES_CACNEA},
-    [SPECIES_CACTURNE] = {gMonBackPic_Cacturne, 0x800, SPECIES_CACTURNE},
-    [SPECIES_SNORUNT] = {gMonBackPic_Snorunt, 0x800, SPECIES_SNORUNT},
-    [SPECIES_GLALIE] = {gMonBackPic_Glalie, 0x800, SPECIES_GLALIE},
-    [SPECIES_LUNATONE] = {gMonBackPic_Lunatone, 0x800, SPECIES_LUNATONE},
-    [SPECIES_SOLROCK] = {gMonBackPic_Solrock, 0x800, SPECIES_SOLROCK},
-    [SPECIES_AZURILL] = {gMonBackPic_Azurill, 0x800, SPECIES_AZURILL},
-    [SPECIES_SPOINK] = {gMonBackPic_Spoink, 0x800, SPECIES_SPOINK},
-    [SPECIES_GRUMPIG] = {gMonBackPic_Grumpig, 0x800, SPECIES_GRUMPIG},
-    [SPECIES_PLUSLE] = {gMonBackPic_Plusle, 0x800, SPECIES_PLUSLE},
-    [SPECIES_MINUN] = {gMonBackPic_Minun, 0x800, SPECIES_MINUN},
-    [SPECIES_MAWILE] = {gMonBackPic_Mawile, 0x800, SPECIES_MAWILE},
-    [SPECIES_MEDITITE] = {gMonBackPic_Meditite, 0x800, SPECIES_MEDITITE},
-    [SPECIES_MEDICHAM] = {gMonBackPic_Medicham, 0x800, SPECIES_MEDICHAM},
-    [SPECIES_SWABLU] = {gMonBackPic_Swablu, 0x800, SPECIES_SWABLU},
-    [SPECIES_ALTARIA] = {gMonBackPic_Altaria, 0x800, SPECIES_ALTARIA},
-    [SPECIES_WYNAUT] = {gMonBackPic_Wynaut, 0x800, SPECIES_WYNAUT},
-    [SPECIES_DUSKULL] = {gMonBackPic_Duskull, 0x800, SPECIES_DUSKULL},
-    [SPECIES_DUSCLOPS] = {gMonBackPic_Dusclops, 0x800, SPECIES_DUSCLOPS},
-    [SPECIES_ROSELIA] = {gMonBackPic_Roselia, 0x800, SPECIES_ROSELIA},
-    [SPECIES_SLAKOTH] = {gMonBackPic_Slakoth, 0x800, SPECIES_SLAKOTH},
-    [SPECIES_VIGOROTH] = {gMonBackPic_Vigoroth, 0x800, SPECIES_VIGOROTH},
-    [SPECIES_SLAKING] = {gMonBackPic_Slaking, 0x800, SPECIES_SLAKING},
-    [SPECIES_GULPIN] = {gMonBackPic_Gulpin, 0x800, SPECIES_GULPIN},
-    [SPECIES_SWALOT] = {gMonBackPic_Swalot, 0x800, SPECIES_SWALOT},
-    [SPECIES_TROPIUS] = {gMonBackPic_Tropius, 0x800, SPECIES_TROPIUS},
-    [SPECIES_WHISMUR] = {gMonBackPic_Whismur, 0x800, SPECIES_WHISMUR},
-    [SPECIES_LOUDRED] = {gMonBackPic_Loudred, 0x800, SPECIES_LOUDRED},
-    [SPECIES_EXPLOUD] = {gMonBackPic_Exploud, 0x800, SPECIES_EXPLOUD},
-    [SPECIES_CLAMPERL] = {gMonBackPic_Clamperl, 0x800, SPECIES_CLAMPERL},
-    [SPECIES_HUNTAIL] = {gMonBackPic_Huntail, 0x800, SPECIES_HUNTAIL},
-    [SPECIES_GOREBYSS] = {gMonBackPic_Gorebyss, 0x800, SPECIES_GOREBYSS},
-    [SPECIES_ABSOL] = {gMonBackPic_Absol, 0x800, SPECIES_ABSOL},
-    [SPECIES_SHUPPET] = {gMonBackPic_Shuppet, 0x800, SPECIES_SHUPPET},
-    [SPECIES_BANETTE] = {gMonBackPic_Banette, 0x800, SPECIES_BANETTE},
-    [SPECIES_SEVIPER] = {gMonBackPic_Seviper, 0x800, SPECIES_SEVIPER},
-    [SPECIES_ZANGOOSE] = {gMonBackPic_Zangoose, 0x800, SPECIES_ZANGOOSE},
-    [SPECIES_RELICANTH] = {gMonBackPic_Relicanth, 0x800, SPECIES_RELICANTH},
-    [SPECIES_ARON] = {gMonBackPic_Aron, 0x800, SPECIES_ARON},
-    [SPECIES_LAIRON] = {gMonBackPic_Lairon, 0x800, SPECIES_LAIRON},
-    [SPECIES_AGGRON] = {gMonBackPic_Aggron, 0x800, SPECIES_AGGRON},
-    [SPECIES_CASTFORM] = {gMonBackPic_Castform, 0x800, SPECIES_CASTFORM},
-    [SPECIES_VOLBEAT] = {gMonBackPic_Volbeat, 0x800, SPECIES_VOLBEAT},
-    [SPECIES_ILLUMISE] = {gMonBackPic_Illumise, 0x800, SPECIES_ILLUMISE},
-    [SPECIES_LILEEP] = {gMonBackPic_Lileep, 0x800, SPECIES_LILEEP},
-    [SPECIES_CRADILY] = {gMonBackPic_Cradily, 0x800, SPECIES_CRADILY},
-    [SPECIES_ANORITH] = {gMonBackPic_Anorith, 0x800, SPECIES_ANORITH},
-    [SPECIES_ARMALDO] = {gMonBackPic_Armaldo, 0x800, SPECIES_ARMALDO},
-    [SPECIES_RALTS] = {gMonBackPic_Ralts, 0x800, SPECIES_RALTS},
-    [SPECIES_KIRLIA] = {gMonBackPic_Kirlia, 0x800, SPECIES_KIRLIA},
-    [SPECIES_GARDEVOIR] = {gMonBackPic_Gardevoir, 0x800, SPECIES_GARDEVOIR},
-    [SPECIES_BAGON] = {gMonBackPic_Bagon, 0x800, SPECIES_BAGON},
-    [SPECIES_SHELGON] = {gMonBackPic_Shelgon, 0x800, SPECIES_SHELGON},
-    [SPECIES_SALAMENCE] = {gMonBackPic_Salamence, 0x800, SPECIES_SALAMENCE},
-    [SPECIES_BELDUM] = {gMonBackPic_Beldum, 0x800, SPECIES_BELDUM},
-    [SPECIES_METANG] = {gMonBackPic_Metang, 0x800, SPECIES_METANG},
-    [SPECIES_METAGROSS] = {gMonBackPic_Metagross, 0x800, SPECIES_METAGROSS},
-    [SPECIES_REGIROCK] = {gMonBackPic_Regirock, 0x800, SPECIES_REGIROCK},
-    [SPECIES_REGICE] = {gMonBackPic_Regice, 0x800, SPECIES_REGICE},
-    [SPECIES_REGISTEEL] = {gMonBackPic_Registeel, 0x800, SPECIES_REGISTEEL},
-    [SPECIES_KYOGRE] = {gMonBackPic_Kyogre, 0x800, SPECIES_KYOGRE},
-    [SPECIES_GROUDON] = {gMonBackPic_Groudon, 0x800, SPECIES_GROUDON},
-    [SPECIES_RAYQUAZA] = {gMonBackPic_Rayquaza, 0x800, SPECIES_RAYQUAZA},
-    [SPECIES_LATIAS] = {gMonBackPic_Latias, 0x800, SPECIES_LATIAS},
-    [SPECIES_LATIOS] = {gMonBackPic_Latios, 0x800, SPECIES_LATIOS},
-    [SPECIES_JIRACHI] = {gMonBackPic_Jirachi, 0x800, SPECIES_JIRACHI},
-    [SPECIES_DEOXYS] = {gMonBackPic_Deoxys, 0x800, SPECIES_DEOXYS},
-    [SPECIES_CHIMECHO] = {gMonBackPic_Chimecho, 0x800, SPECIES_CHIMECHO},
-    [SPECIES_EGG] = {gMonStillFrontPic_Egg, 0x800, SPECIES_EGG},
-    [SPECIES_UNOWN_B] = {gMonBackPic_UnownB, 0x800, SPECIES_UNOWN_B},
-    [SPECIES_UNOWN_C] = {gMonBackPic_UnownC, 0x800, SPECIES_UNOWN_C},
-    [SPECIES_UNOWN_D] = {gMonBackPic_UnownD, 0x800, SPECIES_UNOWN_D},
-    [SPECIES_UNOWN_E] = {gMonBackPic_UnownE, 0x800, SPECIES_UNOWN_E},
-    [SPECIES_UNOWN_F] = {gMonBackPic_UnownF, 0x800, SPECIES_UNOWN_F},
-    [SPECIES_UNOWN_G] = {gMonBackPic_UnownG, 0x800, SPECIES_UNOWN_G},
-    [SPECIES_UNOWN_H] = {gMonBackPic_UnownH, 0x800, SPECIES_UNOWN_H},
-    [SPECIES_UNOWN_I] = {gMonBackPic_UnownI, 0x800, SPECIES_UNOWN_I},
-    [SPECIES_UNOWN_J] = {gMonBackPic_UnownJ, 0x800, SPECIES_UNOWN_J},
-    [SPECIES_UNOWN_K] = {gMonBackPic_UnownK, 0x800, SPECIES_UNOWN_K},
-    [SPECIES_UNOWN_L] = {gMonBackPic_UnownL, 0x800, SPECIES_UNOWN_L},
-    [SPECIES_UNOWN_M] = {gMonBackPic_UnownM, 0x800, SPECIES_UNOWN_M},
-    [SPECIES_UNOWN_N] = {gMonBackPic_UnownN, 0x800, SPECIES_UNOWN_N},
-    [SPECIES_UNOWN_O] = {gMonBackPic_UnownO, 0x800, SPECIES_UNOWN_O},
-    [SPECIES_UNOWN_P] = {gMonBackPic_UnownP, 0x800, SPECIES_UNOWN_P},
-    [SPECIES_UNOWN_Q] = {gMonBackPic_UnownQ, 0x800, SPECIES_UNOWN_Q},
-    [SPECIES_UNOWN_R] = {gMonBackPic_UnownR, 0x800, SPECIES_UNOWN_R},
-    [SPECIES_UNOWN_S] = {gMonBackPic_UnownS, 0x800, SPECIES_UNOWN_S},
-    [SPECIES_UNOWN_T] = {gMonBackPic_UnownT, 0x800, SPECIES_UNOWN_T},
-    [SPECIES_UNOWN_U] = {gMonBackPic_UnownU, 0x800, SPECIES_UNOWN_U},
-    [SPECIES_UNOWN_V] = {gMonBackPic_UnownV, 0x800, SPECIES_UNOWN_V},
-    [SPECIES_UNOWN_W] = {gMonBackPic_UnownW, 0x800, SPECIES_UNOWN_W},
-    [SPECIES_UNOWN_X] = {gMonBackPic_UnownX, 0x800, SPECIES_UNOWN_X},
-    [SPECIES_UNOWN_Y] = {gMonBackPic_UnownY, 0x800, SPECIES_UNOWN_Y},
-    [SPECIES_UNOWN_Z] = {gMonBackPic_UnownZ, 0x800, SPECIES_UNOWN_Z},
-    [SPECIES_UNOWN_EMARK] = {gMonBackPic_UnownExclamationMark, 0x800, SPECIES_UNOWN_EMARK},
-    [SPECIES_UNOWN_QMARK] = {gMonBackPic_UnownQuestionMark, 0x800, SPECIES_UNOWN_QMARK},
+    SPECIES_SPRITE(NONE, gMonBackPic_CircledQuestionMark),
+    SPECIES_SPRITE(BULBASAUR, gMonBackPic_Bulbasaur),
+    SPECIES_SPRITE(IVYSAUR, gMonBackPic_Ivysaur),
+    SPECIES_SPRITE(VENUSAUR, gMonBackPic_Venusaur),
+    SPECIES_SPRITE(CHARMANDER, gMonBackPic_Charmander),
+    SPECIES_SPRITE(CHARMELEON, gMonBackPic_Charmeleon),
+    SPECIES_SPRITE(CHARIZARD, gMonBackPic_Charizard),
+    SPECIES_SPRITE(SQUIRTLE, gMonBackPic_Squirtle),
+    SPECIES_SPRITE(WARTORTLE, gMonBackPic_Wartortle),
+    SPECIES_SPRITE(BLASTOISE, gMonBackPic_Blastoise),
+    SPECIES_SPRITE(CATERPIE, gMonBackPic_Caterpie),
+    SPECIES_SPRITE(METAPOD, gMonBackPic_Metapod),
+    SPECIES_SPRITE(BUTTERFREE, gMonBackPic_Butterfree),
+    SPECIES_SPRITE(WEEDLE, gMonBackPic_Weedle),
+    SPECIES_SPRITE(KAKUNA, gMonBackPic_Kakuna),
+    SPECIES_SPRITE(BEEDRILL, gMonBackPic_Beedrill),
+    SPECIES_SPRITE(PIDGEY, gMonBackPic_Pidgey),
+    SPECIES_SPRITE(PIDGEOTTO, gMonBackPic_Pidgeotto),
+    SPECIES_SPRITE(PIDGEOT, gMonBackPic_Pidgeot),
+    SPECIES_SPRITE(RATTATA, gMonBackPic_Rattata),
+    SPECIES_SPRITE(RATICATE, gMonBackPic_Raticate),
+    SPECIES_SPRITE(SPEAROW, gMonBackPic_Spearow),
+    SPECIES_SPRITE(FEAROW, gMonBackPic_Fearow),
+    SPECIES_SPRITE(EKANS, gMonBackPic_Ekans),
+    SPECIES_SPRITE(ARBOK, gMonBackPic_Arbok),
+    SPECIES_SPRITE(PIKACHU, gMonBackPic_Pikachu),
+    SPECIES_SPRITE(RAICHU, gMonBackPic_Raichu),
+    SPECIES_SPRITE(SANDSHREW, gMonBackPic_Sandshrew),
+    SPECIES_SPRITE(SANDSLASH, gMonBackPic_Sandslash),
+    SPECIES_SPRITE(NIDORAN_F, gMonBackPic_NidoranF),
+    SPECIES_SPRITE(NIDORINA, gMonBackPic_Nidorina),
+    SPECIES_SPRITE(NIDOQUEEN, gMonBackPic_Nidoqueen),
+    SPECIES_SPRITE(NIDORAN_M, gMonBackPic_NidoranM),
+    SPECIES_SPRITE(NIDORINO, gMonBackPic_Nidorino),
+    SPECIES_SPRITE(NIDOKING, gMonBackPic_Nidoking),
+    SPECIES_SPRITE(CLEFAIRY, gMonBackPic_Clefairy),
+    SPECIES_SPRITE(CLEFABLE, gMonBackPic_Clefable),
+    SPECIES_SPRITE(VULPIX, gMonBackPic_Vulpix),
+    SPECIES_SPRITE(NINETALES, gMonBackPic_Ninetales),
+    SPECIES_SPRITE(JIGGLYPUFF, gMonBackPic_Jigglypuff),
+    SPECIES_SPRITE(WIGGLYTUFF, gMonBackPic_Wigglytuff),
+    SPECIES_SPRITE(ZUBAT, gMonBackPic_Zubat),
+    SPECIES_SPRITE(GOLBAT, gMonBackPic_Golbat),
+    SPECIES_SPRITE(ODDISH, gMonBackPic_Oddish),
+    SPECIES_SPRITE(GLOOM, gMonBackPic_Gloom),
+    SPECIES_SPRITE(VILEPLUME, gMonBackPic_Vileplume),
+    SPECIES_SPRITE(PARAS, gMonBackPic_Paras),
+    SPECIES_SPRITE(PARASECT, gMonBackPic_Parasect),
+    SPECIES_SPRITE(VENONAT, gMonBackPic_Venonat),
+    SPECIES_SPRITE(VENOMOTH, gMonBackPic_Venomoth),
+    SPECIES_SPRITE(DIGLETT, gMonBackPic_Diglett),
+    SPECIES_SPRITE(DUGTRIO, gMonBackPic_Dugtrio),
+    SPECIES_SPRITE(MEOWTH, gMonBackPic_Meowth),
+    SPECIES_SPRITE(PERSIAN, gMonBackPic_Persian),
+    SPECIES_SPRITE(PSYDUCK, gMonBackPic_Psyduck),
+    SPECIES_SPRITE(GOLDUCK, gMonBackPic_Golduck),
+    SPECIES_SPRITE(MANKEY, gMonBackPic_Mankey),
+    SPECIES_SPRITE(PRIMEAPE, gMonBackPic_Primeape),
+    SPECIES_SPRITE(GROWLITHE, gMonBackPic_Growlithe),
+    SPECIES_SPRITE(ARCANINE, gMonBackPic_Arcanine),
+    SPECIES_SPRITE(POLIWAG, gMonBackPic_Poliwag),
+    SPECIES_SPRITE(POLIWHIRL, gMonBackPic_Poliwhirl),
+    SPECIES_SPRITE(POLIWRATH, gMonBackPic_Poliwrath),
+    SPECIES_SPRITE(ABRA, gMonBackPic_Abra),
+    SPECIES_SPRITE(KADABRA, gMonBackPic_Kadabra),
+    SPECIES_SPRITE(ALAKAZAM, gMonBackPic_Alakazam),
+    SPECIES_SPRITE(MACHOP, gMonBackPic_Machop),
+    SPECIES_SPRITE(MACHOKE, gMonBackPic_Machoke),
+    SPECIES_SPRITE(MACHAMP, gMonBackPic_Machamp),
+    SPECIES_SPRITE(BELLSPROUT, gMonBackPic_Bellsprout),
+    SPECIES_SPRITE(WEEPINBELL, gMonBackPic_Weepinbell),
+    SPECIES_SPRITE(VICTREEBEL, gMonBackPic_Victreebel),
+    SPECIES_SPRITE(TENTACOOL, gMonBackPic_Tentacool),
+    SPECIES_SPRITE(TENTACRUEL, gMonBackPic_Tentacruel),
+    SPECIES_SPRITE(GEODUDE, gMonBackPic_Geodude),
+    SPECIES_SPRITE(GRAVELER, gMonBackPic_Graveler),
+    SPECIES_SPRITE(GOLEM, gMonBackPic_Golem),
+    SPECIES_SPRITE(PONYTA, gMonBackPic_Ponyta),
+    SPECIES_SPRITE(RAPIDASH, gMonBackPic_Rapidash),
+    SPECIES_SPRITE(SLOWPOKE, gMonBackPic_Slowpoke),
+    SPECIES_SPRITE(SLOWBRO, gMonBackPic_Slowbro),
+    SPECIES_SPRITE(MAGNEMITE, gMonBackPic_Magnemite),
+    SPECIES_SPRITE(MAGNETON, gMonBackPic_Magneton),
+    SPECIES_SPRITE(FARFETCHD, gMonBackPic_Farfetchd),
+    SPECIES_SPRITE(DODUO, gMonBackPic_Doduo),
+    SPECIES_SPRITE(DODRIO, gMonBackPic_Dodrio),
+    SPECIES_SPRITE(SEEL, gMonBackPic_Seel),
+    SPECIES_SPRITE(DEWGONG, gMonBackPic_Dewgong),
+    SPECIES_SPRITE(GRIMER, gMonBackPic_Grimer),
+    SPECIES_SPRITE(MUK, gMonBackPic_Muk),
+    SPECIES_SPRITE(SHELLDER, gMonBackPic_Shellder),
+    SPECIES_SPRITE(CLOYSTER, gMonBackPic_Cloyster),
+    SPECIES_SPRITE(GASTLY, gMonBackPic_Gastly),
+    SPECIES_SPRITE(HAUNTER, gMonBackPic_Haunter),
+    SPECIES_SPRITE(GENGAR, gMonBackPic_Gengar),
+    SPECIES_SPRITE(ONIX, gMonBackPic_Onix),
+    SPECIES_SPRITE(DROWZEE, gMonBackPic_Drowzee),
+    SPECIES_SPRITE(HYPNO, gMonBackPic_Hypno),
+    SPECIES_SPRITE(KRABBY, gMonBackPic_Krabby),
+    SPECIES_SPRITE(KINGLER, gMonBackPic_Kingler),
+    SPECIES_SPRITE(VOLTORB, gMonBackPic_Voltorb),
+    SPECIES_SPRITE(ELECTRODE, gMonBackPic_Electrode),
+    SPECIES_SPRITE(EXEGGCUTE, gMonBackPic_Exeggcute),
+    SPECIES_SPRITE(EXEGGUTOR, gMonBackPic_Exeggutor),
+    SPECIES_SPRITE(CUBONE, gMonBackPic_Cubone),
+    SPECIES_SPRITE(MAROWAK, gMonBackPic_Marowak),
+    SPECIES_SPRITE(HITMONLEE, gMonBackPic_Hitmonlee),
+    SPECIES_SPRITE(HITMONCHAN, gMonBackPic_Hitmonchan),
+    SPECIES_SPRITE(LICKITUNG, gMonBackPic_Lickitung),
+    SPECIES_SPRITE(KOFFING, gMonBackPic_Koffing),
+    SPECIES_SPRITE(WEEZING, gMonBackPic_Weezing),
+    SPECIES_SPRITE(RHYHORN, gMonBackPic_Rhyhorn),
+    SPECIES_SPRITE(RHYDON, gMonBackPic_Rhydon),
+    SPECIES_SPRITE(CHANSEY, gMonBackPic_Chansey),
+    SPECIES_SPRITE(TANGELA, gMonBackPic_Tangela),
+    SPECIES_SPRITE(KANGASKHAN, gMonBackPic_Kangaskhan),
+    SPECIES_SPRITE(HORSEA, gMonBackPic_Horsea),
+    SPECIES_SPRITE(SEADRA, gMonBackPic_Seadra),
+    SPECIES_SPRITE(GOLDEEN, gMonBackPic_Goldeen),
+    SPECIES_SPRITE(SEAKING, gMonBackPic_Seaking),
+    SPECIES_SPRITE(STARYU, gMonBackPic_Staryu),
+    SPECIES_SPRITE(STARMIE, gMonBackPic_Starmie),
+    SPECIES_SPRITE(MR_MIME, gMonBackPic_Mrmime),
+    SPECIES_SPRITE(SCYTHER, gMonBackPic_Scyther),
+    SPECIES_SPRITE(JYNX, gMonBackPic_Jynx),
+    SPECIES_SPRITE(ELECTABUZZ, gMonBackPic_Electabuzz),
+    SPECIES_SPRITE(MAGMAR, gMonBackPic_Magmar),
+    SPECIES_SPRITE(PINSIR, gMonBackPic_Pinsir),
+    SPECIES_SPRITE(TAUROS, gMonBackPic_Tauros),
+    SPECIES_SPRITE(MAGIKARP, gMonBackPic_Magikarp),
+    SPECIES_SPRITE(GYARADOS, gMonBackPic_Gyarados),
+    SPECIES_SPRITE(LAPRAS, gMonBackPic_Lapras),
+    SPECIES_SPRITE(DITTO, gMonBackPic_Ditto),
+    SPECIES_SPRITE(EEVEE, gMonBackPic_Eevee),
+    SPECIES_SPRITE(VAPOREON, gMonBackPic_Vaporeon),
+    SPECIES_SPRITE(JOLTEON, gMonBackPic_Jolteon),
+    SPECIES_SPRITE(FLAREON, gMonBackPic_Flareon),
+    SPECIES_SPRITE(PORYGON, gMonBackPic_Porygon),
+    SPECIES_SPRITE(OMANYTE, gMonBackPic_Omanyte),
+    SPECIES_SPRITE(OMASTAR, gMonBackPic_Omastar),
+    SPECIES_SPRITE(KABUTO, gMonBackPic_Kabuto),
+    SPECIES_SPRITE(KABUTOPS, gMonBackPic_Kabutops),
+    SPECIES_SPRITE(AERODACTYL, gMonBackPic_Aerodactyl),
+    SPECIES_SPRITE(SNORLAX, gMonBackPic_Snorlax),
+    SPECIES_SPRITE(ARTICUNO, gMonBackPic_Articuno),
+    SPECIES_SPRITE(ZAPDOS, gMonBackPic_Zapdos),
+    SPECIES_SPRITE(MOLTRES, gMonBackPic_Moltres),
+    SPECIES_SPRITE(DRATINI, gMonBackPic_Dratini),
+    SPECIES_SPRITE(DRAGONAIR, gMonBackPic_Dragonair),
+    SPECIES_SPRITE(DRAGONITE, gMonBackPic_Dragonite),
+    SPECIES_SPRITE(MEWTWO, gMonBackPic_Mewtwo),
+    SPECIES_SPRITE(MEW, gMonBackPic_Mew),
+    SPECIES_SPRITE(CHIKORITA, gMonBackPic_Chikorita),
+    SPECIES_SPRITE(BAYLEEF, gMonBackPic_Bayleef),
+    SPECIES_SPRITE(MEGANIUM, gMonBackPic_Meganium),
+    SPECIES_SPRITE(CYNDAQUIL, gMonBackPic_Cyndaquil),
+    SPECIES_SPRITE(QUILAVA, gMonBackPic_Quilava),
+    SPECIES_SPRITE(TYPHLOSION, gMonBackPic_Typhlosion),
+    SPECIES_SPRITE(TOTODILE, gMonBackPic_Totodile),
+    SPECIES_SPRITE(CROCONAW, gMonBackPic_Croconaw),
+    SPECIES_SPRITE(FERALIGATR, gMonBackPic_Feraligatr),
+    SPECIES_SPRITE(SENTRET, gMonBackPic_Sentret),
+    SPECIES_SPRITE(FURRET, gMonBackPic_Furret),
+    SPECIES_SPRITE(HOOTHOOT, gMonBackPic_Hoothoot),
+    SPECIES_SPRITE(NOCTOWL, gMonBackPic_Noctowl),
+    SPECIES_SPRITE(LEDYBA, gMonBackPic_Ledyba),
+    SPECIES_SPRITE(LEDIAN, gMonBackPic_Ledian),
+    SPECIES_SPRITE(SPINARAK, gMonBackPic_Spinarak),
+    SPECIES_SPRITE(ARIADOS, gMonBackPic_Ariados),
+    SPECIES_SPRITE(CROBAT, gMonBackPic_Crobat),
+    SPECIES_SPRITE(CHINCHOU, gMonBackPic_Chinchou),
+    SPECIES_SPRITE(LANTURN, gMonBackPic_Lanturn),
+    SPECIES_SPRITE(PICHU, gMonBackPic_Pichu),
+    SPECIES_SPRITE(CLEFFA, gMonBackPic_Cleffa),
+    SPECIES_SPRITE(IGGLYBUFF, gMonBackPic_Igglybuff),
+    SPECIES_SPRITE(TOGEPI, gMonBackPic_Togepi),
+    SPECIES_SPRITE(TOGETIC, gMonBackPic_Togetic),
+    SPECIES_SPRITE(NATU, gMonBackPic_Natu),
+    SPECIES_SPRITE(XATU, gMonBackPic_Xatu),
+    SPECIES_SPRITE(MAREEP, gMonBackPic_Mareep),
+    SPECIES_SPRITE(FLAAFFY, gMonBackPic_Flaaffy),
+    SPECIES_SPRITE(AMPHAROS, gMonBackPic_Ampharos),
+    SPECIES_SPRITE(BELLOSSOM, gMonBackPic_Bellossom),
+    SPECIES_SPRITE(MARILL, gMonBackPic_Marill),
+    SPECIES_SPRITE(AZUMARILL, gMonBackPic_Azumarill),
+    SPECIES_SPRITE(SUDOWOODO, gMonBackPic_Sudowoodo),
+    SPECIES_SPRITE(POLITOED, gMonBackPic_Politoed),
+    SPECIES_SPRITE(HOPPIP, gMonBackPic_Hoppip),
+    SPECIES_SPRITE(SKIPLOOM, gMonBackPic_Skiploom),
+    SPECIES_SPRITE(JUMPLUFF, gMonBackPic_Jumpluff),
+    SPECIES_SPRITE(AIPOM, gMonBackPic_Aipom),
+    SPECIES_SPRITE(SUNKERN, gMonBackPic_Sunkern),
+    SPECIES_SPRITE(SUNFLORA, gMonBackPic_Sunflora),
+    SPECIES_SPRITE(YANMA, gMonBackPic_Yanma),
+    SPECIES_SPRITE(WOOPER, gMonBackPic_Wooper),
+    SPECIES_SPRITE(QUAGSIRE, gMonBackPic_Quagsire),
+    SPECIES_SPRITE(ESPEON, gMonBackPic_Espeon),
+    SPECIES_SPRITE(UMBREON, gMonBackPic_Umbreon),
+    SPECIES_SPRITE(MURKROW, gMonBackPic_Murkrow),
+    SPECIES_SPRITE(SLOWKING, gMonBackPic_Slowking),
+    SPECIES_SPRITE(MISDREAVUS, gMonBackPic_Misdreavus),
+    SPECIES_SPRITE(UNOWN, gMonBackPic_UnownA),
+    SPECIES_SPRITE(WOBBUFFET, gMonBackPic_Wobbuffet),
+    SPECIES_SPRITE(GIRAFARIG, gMonBackPic_Girafarig),
+    SPECIES_SPRITE(PINECO, gMonBackPic_Pineco),
+    SPECIES_SPRITE(FORRETRESS, gMonBackPic_Forretress),
+    SPECIES_SPRITE(DUNSPARCE, gMonBackPic_Dunsparce),
+    SPECIES_SPRITE(GLIGAR, gMonBackPic_Gligar),
+    SPECIES_SPRITE(STEELIX, gMonBackPic_Steelix),
+    SPECIES_SPRITE(SNUBBULL, gMonBackPic_Snubbull),
+    SPECIES_SPRITE(GRANBULL, gMonBackPic_Granbull),
+    SPECIES_SPRITE(QWILFISH, gMonBackPic_Qwilfish),
+    SPECIES_SPRITE(SCIZOR, gMonBackPic_Scizor),
+    SPECIES_SPRITE(SHUCKLE, gMonBackPic_Shuckle),
+    SPECIES_SPRITE(HERACROSS, gMonBackPic_Heracross),
+    SPECIES_SPRITE(SNEASEL, gMonBackPic_Sneasel),
+    SPECIES_SPRITE(TEDDIURSA, gMonBackPic_Teddiursa),
+    SPECIES_SPRITE(URSARING, gMonBackPic_Ursaring),
+    SPECIES_SPRITE(SLUGMA, gMonBackPic_Slugma),
+    SPECIES_SPRITE(MAGCARGO, gMonBackPic_Magcargo),
+    SPECIES_SPRITE(SWINUB, gMonBackPic_Swinub),
+    SPECIES_SPRITE(PILOSWINE, gMonBackPic_Piloswine),
+    SPECIES_SPRITE(CORSOLA, gMonBackPic_Corsola),
+    SPECIES_SPRITE(REMORAID, gMonBackPic_Remoraid),
+    SPECIES_SPRITE(OCTILLERY, gMonBackPic_Octillery),
+    SPECIES_SPRITE(DELIBIRD, gMonBackPic_Delibird),
+    SPECIES_SPRITE(MANTINE, gMonBackPic_Mantine),
+    SPECIES_SPRITE(SKARMORY, gMonBackPic_Skarmory),
+    SPECIES_SPRITE(HOUNDOUR, gMonBackPic_Houndour),
+    SPECIES_SPRITE(HOUNDOOM, gMonBackPic_Houndoom),
+    SPECIES_SPRITE(KINGDRA, gMonBackPic_Kingdra),
+    SPECIES_SPRITE(PHANPY, gMonBackPic_Phanpy),
+    SPECIES_SPRITE(DONPHAN, gMonBackPic_Donphan),
+    SPECIES_SPRITE(PORYGON2, gMonBackPic_Porygon2),
+    SPECIES_SPRITE(STANTLER, gMonBackPic_Stantler),
+    SPECIES_SPRITE(SMEARGLE, gMonBackPic_Smeargle),
+    SPECIES_SPRITE(TYROGUE, gMonBackPic_Tyrogue),
+    SPECIES_SPRITE(HITMONTOP, gMonBackPic_Hitmontop),
+    SPECIES_SPRITE(SMOOCHUM, gMonBackPic_Smoochum),
+    SPECIES_SPRITE(ELEKID, gMonBackPic_Elekid),
+    SPECIES_SPRITE(MAGBY, gMonBackPic_Magby),
+    SPECIES_SPRITE(MILTANK, gMonBackPic_Miltank),
+    SPECIES_SPRITE(BLISSEY, gMonBackPic_Blissey),
+    SPECIES_SPRITE(RAIKOU, gMonBackPic_Raikou),
+    SPECIES_SPRITE(ENTEI, gMonBackPic_Entei),
+    SPECIES_SPRITE(SUICUNE, gMonBackPic_Suicune),
+    SPECIES_SPRITE(LARVITAR, gMonBackPic_Larvitar),
+    SPECIES_SPRITE(PUPITAR, gMonBackPic_Pupitar),
+    SPECIES_SPRITE(TYRANITAR, gMonBackPic_Tyranitar),
+    SPECIES_SPRITE(LUGIA, gMonBackPic_Lugia),
+    SPECIES_SPRITE(HO_OH, gMonBackPic_HoOh),
+    SPECIES_SPRITE(CELEBI, gMonBackPic_Celebi),
+    SPECIES_SPRITE(OLD_UNOWN_B, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_C, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_D, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_E, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_F, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_G, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_H, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_I, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_J, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_K, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_L, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_M, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_N, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_O, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_P, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Q, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_R, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_S, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_T, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_U, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_V, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_W, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_X, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Y, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Z, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(TREECKO, gMonBackPic_Treecko),
+    SPECIES_SPRITE(GROVYLE, gMonBackPic_Grovyle),
+    SPECIES_SPRITE(SCEPTILE, gMonBackPic_Sceptile),
+    SPECIES_SPRITE(TORCHIC, gMonBackPic_Torchic),
+    SPECIES_SPRITE(COMBUSKEN, gMonBackPic_Combusken),
+    SPECIES_SPRITE(BLAZIKEN, gMonBackPic_Blaziken),
+    SPECIES_SPRITE(MUDKIP, gMonBackPic_Mudkip),
+    SPECIES_SPRITE(MARSHTOMP, gMonBackPic_Marshtomp),
+    SPECIES_SPRITE(SWAMPERT, gMonBackPic_Swampert),
+    SPECIES_SPRITE(POOCHYENA, gMonBackPic_Poochyena),
+    SPECIES_SPRITE(MIGHTYENA, gMonBackPic_Mightyena),
+    SPECIES_SPRITE(ZIGZAGOON, gMonBackPic_Zigzagoon),
+    SPECIES_SPRITE(LINOONE, gMonBackPic_Linoone),
+    SPECIES_SPRITE(WURMPLE, gMonBackPic_Wurmple),
+    SPECIES_SPRITE(SILCOON, gMonBackPic_Silcoon),
+    SPECIES_SPRITE(BEAUTIFLY, gMonBackPic_Beautifly),
+    SPECIES_SPRITE(CASCOON, gMonBackPic_Cascoon),
+    SPECIES_SPRITE(DUSTOX, gMonBackPic_Dustox),
+    SPECIES_SPRITE(LOTAD, gMonBackPic_Lotad),
+    SPECIES_SPRITE(LOMBRE, gMonBackPic_Lombre),
+    SPECIES_SPRITE(LUDICOLO, gMonBackPic_Ludicolo),
+    SPECIES_SPRITE(SEEDOT, gMonBackPic_Seedot),
+    SPECIES_SPRITE(NUZLEAF, gMonBackPic_Nuzleaf),
+    SPECIES_SPRITE(SHIFTRY, gMonBackPic_Shiftry),
+    SPECIES_SPRITE(NINCADA, gMonBackPic_Nincada),
+    SPECIES_SPRITE(NINJASK, gMonBackPic_Ninjask),
+    SPECIES_SPRITE(SHEDINJA, gMonBackPic_Shedinja),
+    SPECIES_SPRITE(TAILLOW, gMonBackPic_Taillow),
+    SPECIES_SPRITE(SWELLOW, gMonBackPic_Swellow),
+    SPECIES_SPRITE(SHROOMISH, gMonBackPic_Shroomish),
+    SPECIES_SPRITE(BRELOOM, gMonBackPic_Breloom),
+    SPECIES_SPRITE(SPINDA, gMonBackPic_Spinda),
+    SPECIES_SPRITE(WINGULL, gMonBackPic_Wingull),
+    SPECIES_SPRITE(PELIPPER, gMonBackPic_Pelipper),
+    SPECIES_SPRITE(SURSKIT, gMonBackPic_Surskit),
+    SPECIES_SPRITE(MASQUERAIN, gMonBackPic_Masquerain),
+    SPECIES_SPRITE(WAILMER, gMonBackPic_Wailmer),
+    SPECIES_SPRITE(WAILORD, gMonBackPic_Wailord),
+    SPECIES_SPRITE(SKITTY, gMonBackPic_Skitty),
+    SPECIES_SPRITE(DELCATTY, gMonBackPic_Delcatty),
+    SPECIES_SPRITE(KECLEON, gMonBackPic_Kecleon),
+    SPECIES_SPRITE(BALTOY, gMonBackPic_Baltoy),
+    SPECIES_SPRITE(CLAYDOL, gMonBackPic_Claydol),
+    SPECIES_SPRITE(NOSEPASS, gMonBackPic_Nosepass),
+    SPECIES_SPRITE(TORKOAL, gMonBackPic_Torkoal),
+    SPECIES_SPRITE(SABLEYE, gMonBackPic_Sableye),
+    SPECIES_SPRITE(BARBOACH, gMonBackPic_Barboach),
+    SPECIES_SPRITE(WHISCASH, gMonBackPic_Whiscash),
+    SPECIES_SPRITE(LUVDISC, gMonBackPic_Luvdisc),
+    SPECIES_SPRITE(CORPHISH, gMonBackPic_Corphish),
+    SPECIES_SPRITE(CRAWDAUNT, gMonBackPic_Crawdaunt),
+    SPECIES_SPRITE(FEEBAS, gMonBackPic_Feebas),
+    SPECIES_SPRITE(MILOTIC, gMonBackPic_Milotic),
+    SPECIES_SPRITE(CARVANHA, gMonBackPic_Carvanha),
+    SPECIES_SPRITE(SHARPEDO, gMonBackPic_Sharpedo),
+    SPECIES_SPRITE(TRAPINCH, gMonBackPic_Trapinch),
+    SPECIES_SPRITE(VIBRAVA, gMonBackPic_Vibrava),
+    SPECIES_SPRITE(FLYGON, gMonBackPic_Flygon),
+    SPECIES_SPRITE(MAKUHITA, gMonBackPic_Makuhita),
+    SPECIES_SPRITE(HARIYAMA, gMonBackPic_Hariyama),
+    SPECIES_SPRITE(ELECTRIKE, gMonBackPic_Electrike),
+    SPECIES_SPRITE(MANECTRIC, gMonBackPic_Manectric),
+    SPECIES_SPRITE(NUMEL, gMonBackPic_Numel),
+    SPECIES_SPRITE(CAMERUPT, gMonBackPic_Camerupt),
+    SPECIES_SPRITE(SPHEAL, gMonBackPic_Spheal),
+    SPECIES_SPRITE(SEALEO, gMonBackPic_Sealeo),
+    SPECIES_SPRITE(WALREIN, gMonBackPic_Walrein),
+    SPECIES_SPRITE(CACNEA, gMonBackPic_Cacnea),
+    SPECIES_SPRITE(CACTURNE, gMonBackPic_Cacturne),
+    SPECIES_SPRITE(SNORUNT, gMonBackPic_Snorunt),
+    SPECIES_SPRITE(GLALIE, gMonBackPic_Glalie),
+    SPECIES_SPRITE(LUNATONE, gMonBackPic_Lunatone),
+    SPECIES_SPRITE(SOLROCK, gMonBackPic_Solrock),
+    SPECIES_SPRITE(AZURILL, gMonBackPic_Azurill),
+    SPECIES_SPRITE(SPOINK, gMonBackPic_Spoink),
+    SPECIES_SPRITE(GRUMPIG, gMonBackPic_Grumpig),
+    SPECIES_SPRITE(PLUSLE, gMonBackPic_Plusle),
+    SPECIES_SPRITE(MINUN, gMonBackPic_Minun),
+    SPECIES_SPRITE(MAWILE, gMonBackPic_Mawile),
+    SPECIES_SPRITE(MEDITITE, gMonBackPic_Meditite),
+    SPECIES_SPRITE(MEDICHAM, gMonBackPic_Medicham),
+    SPECIES_SPRITE(SWABLU, gMonBackPic_Swablu),
+    SPECIES_SPRITE(ALTARIA, gMonBackPic_Altaria),
+    SPECIES_SPRITE(WYNAUT, gMonBackPic_Wynaut),
+    SPECIES_SPRITE(DUSKULL, gMonBackPic_Duskull),
+    SPECIES_SPRITE(DUSCLOPS, gMonBackPic_Dusclops),
+    SPECIES_SPRITE(ROSELIA, gMonBackPic_Roselia),
+    SPECIES_SPRITE(SLAKOTH, gMonBackPic_Slakoth),
+    SPECIES_SPRITE(VIGOROTH, gMonBackPic_Vigoroth),
+    SPECIES_SPRITE(SLAKING, gMonBackPic_Slaking),
+    SPECIES_SPRITE(GULPIN, gMonBackPic_Gulpin),
+    SPECIES_SPRITE(SWALOT, gMonBackPic_Swalot),
+    SPECIES_SPRITE(TROPIUS, gMonBackPic_Tropius),
+    SPECIES_SPRITE(WHISMUR, gMonBackPic_Whismur),
+    SPECIES_SPRITE(LOUDRED, gMonBackPic_Loudred),
+    SPECIES_SPRITE(EXPLOUD, gMonBackPic_Exploud),
+    SPECIES_SPRITE(CLAMPERL, gMonBackPic_Clamperl),
+    SPECIES_SPRITE(HUNTAIL, gMonBackPic_Huntail),
+    SPECIES_SPRITE(GOREBYSS, gMonBackPic_Gorebyss),
+    SPECIES_SPRITE(ABSOL, gMonBackPic_Absol),
+    SPECIES_SPRITE(SHUPPET, gMonBackPic_Shuppet),
+    SPECIES_SPRITE(BANETTE, gMonBackPic_Banette),
+    SPECIES_SPRITE(SEVIPER, gMonBackPic_Seviper),
+    SPECIES_SPRITE(ZANGOOSE, gMonBackPic_Zangoose),
+    SPECIES_SPRITE(RELICANTH, gMonBackPic_Relicanth),
+    SPECIES_SPRITE(ARON, gMonBackPic_Aron),
+    SPECIES_SPRITE(LAIRON, gMonBackPic_Lairon),
+    SPECIES_SPRITE(AGGRON, gMonBackPic_Aggron),
+    SPECIES_SPRITE(CASTFORM, gMonBackPic_Castform),
+    SPECIES_SPRITE(VOLBEAT, gMonBackPic_Volbeat),
+    SPECIES_SPRITE(ILLUMISE, gMonBackPic_Illumise),
+    SPECIES_SPRITE(LILEEP, gMonBackPic_Lileep),
+    SPECIES_SPRITE(CRADILY, gMonBackPic_Cradily),
+    SPECIES_SPRITE(ANORITH, gMonBackPic_Anorith),
+    SPECIES_SPRITE(ARMALDO, gMonBackPic_Armaldo),
+    SPECIES_SPRITE(RALTS, gMonBackPic_Ralts),
+    SPECIES_SPRITE(KIRLIA, gMonBackPic_Kirlia),
+    SPECIES_SPRITE(GARDEVOIR, gMonBackPic_Gardevoir),
+    SPECIES_SPRITE(BAGON, gMonBackPic_Bagon),
+    SPECIES_SPRITE(SHELGON, gMonBackPic_Shelgon),
+    SPECIES_SPRITE(SALAMENCE, gMonBackPic_Salamence),
+    SPECIES_SPRITE(BELDUM, gMonBackPic_Beldum),
+    SPECIES_SPRITE(METANG, gMonBackPic_Metang),
+    SPECIES_SPRITE(METAGROSS, gMonBackPic_Metagross),
+    SPECIES_SPRITE(REGIROCK, gMonBackPic_Regirock),
+    SPECIES_SPRITE(REGICE, gMonBackPic_Regice),
+    SPECIES_SPRITE(REGISTEEL, gMonBackPic_Registeel),
+    SPECIES_SPRITE(KYOGRE, gMonBackPic_Kyogre),
+    SPECIES_SPRITE(GROUDON, gMonBackPic_Groudon),
+    SPECIES_SPRITE(RAYQUAZA, gMonBackPic_Rayquaza),
+    SPECIES_SPRITE(LATIAS, gMonBackPic_Latias),
+    SPECIES_SPRITE(LATIOS, gMonBackPic_Latios),
+    SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi),
+    SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys),
+    SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho),
+    SPECIES_SPRITE(EGG, gMonStillFrontPic_Egg),
+    SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB),
+    SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC),
+    SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD),
+    SPECIES_SPRITE(UNOWN_E, gMonBackPic_UnownE),
+    SPECIES_SPRITE(UNOWN_F, gMonBackPic_UnownF),
+    SPECIES_SPRITE(UNOWN_G, gMonBackPic_UnownG),
+    SPECIES_SPRITE(UNOWN_H, gMonBackPic_UnownH),
+    SPECIES_SPRITE(UNOWN_I, gMonBackPic_UnownI),
+    SPECIES_SPRITE(UNOWN_J, gMonBackPic_UnownJ),
+    SPECIES_SPRITE(UNOWN_K, gMonBackPic_UnownK),
+    SPECIES_SPRITE(UNOWN_L, gMonBackPic_UnownL),
+    SPECIES_SPRITE(UNOWN_M, gMonBackPic_UnownM),
+    SPECIES_SPRITE(UNOWN_N, gMonBackPic_UnownN),
+    SPECIES_SPRITE(UNOWN_O, gMonBackPic_UnownO),
+    SPECIES_SPRITE(UNOWN_P, gMonBackPic_UnownP),
+    SPECIES_SPRITE(UNOWN_Q, gMonBackPic_UnownQ),
+    SPECIES_SPRITE(UNOWN_R, gMonBackPic_UnownR),
+    SPECIES_SPRITE(UNOWN_S, gMonBackPic_UnownS),
+    SPECIES_SPRITE(UNOWN_T, gMonBackPic_UnownT),
+    SPECIES_SPRITE(UNOWN_U, gMonBackPic_UnownU),
+    SPECIES_SPRITE(UNOWN_V, gMonBackPic_UnownV),
+    SPECIES_SPRITE(UNOWN_W, gMonBackPic_UnownW),
+    SPECIES_SPRITE(UNOWN_X, gMonBackPic_UnownX),
+    SPECIES_SPRITE(UNOWN_Y, gMonBackPic_UnownY),
+    SPECIES_SPRITE(UNOWN_Z, gMonBackPic_UnownZ),
+    SPECIES_SPRITE(UNOWN_EMARK, gMonBackPic_UnownExclamationMark),
+    SPECIES_SPRITE(UNOWN_QMARK, gMonBackPic_UnownQuestionMark),
 };
-

src/data/pokemon_graphics/enemy_mon_elevation.h

@@ -1,415 +1,62 @@
-#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[] =
+const u8 gEnemyMonElevation[NUM_SPECIES] =
 {
-    [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,
-    [SPECIES_OLD_UNOWN_B] = 0,
-    [SPECIES_OLD_UNOWN_C] = 0,
-    [SPECIES_OLD_UNOWN_D] = 0,
-    [SPECIES_OLD_UNOWN_E] = 0,
-    [SPECIES_OLD_UNOWN_F] = 0,
-    [SPECIES_OLD_UNOWN_G] = 0,
-    [SPECIES_OLD_UNOWN_H] = 0,
-    [SPECIES_OLD_UNOWN_I] = 0,
-    [SPECIES_OLD_UNOWN_J] = 0,
-    [SPECIES_OLD_UNOWN_K] = 0,
-    [SPECIES_OLD_UNOWN_L] = 0,
-    [SPECIES_OLD_UNOWN_M] = 0,
-    [SPECIES_OLD_UNOWN_N] = 0,
-    [SPECIES_OLD_UNOWN_O] = 0,
-    [SPECIES_OLD_UNOWN_P] = 0,
-    [SPECIES_OLD_UNOWN_Q] = 0,
-    [SPECIES_OLD_UNOWN_R] = 0,
-    [SPECIES_OLD_UNOWN_S] = 0,
-    [SPECIES_OLD_UNOWN_T] = 0,
-    [SPECIES_OLD_UNOWN_U] = 0,
-    [SPECIES_OLD_UNOWN_V] = 0,
-    [SPECIES_OLD_UNOWN_W] = 0,
-    [SPECIES_OLD_UNOWN_X] = 0,
-    [SPECIES_OLD_UNOWN_Y] = 0,
-    [SPECIES_OLD_UNOWN_Z] = 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,

src/data/pokemon_graphics/footprint_table.h

@@ -1,416 +1,416 @@
 const u8 *const gMonFootprintTable[] =
 {
-    gMonFootprint_Bulbasaur,
-    gMonFootprint_Bulbasaur,
-    gMonFootprint_Ivysaur,
-    gMonFootprint_Venusaur,
-    gMonFootprint_Charmander,
-    gMonFootprint_Charmeleon,
-    gMonFootprint_Charizard,
-    gMonFootprint_Squirtle,
-    gMonFootprint_Wartortle,
-    gMonFootprint_Blastoise,
-    gMonFootprint_Caterpie,
-    gMonFootprint_Metapod,
-    gMonFootprint_Butterfree,
-    gMonFootprint_Weedle,
-    gMonFootprint_Kakuna,
-    gMonFootprint_Beedrill,
-    gMonFootprint_Pidgey,
-    gMonFootprint_Pidgeotto,
-    gMonFootprint_Pidgeot,
-    gMonFootprint_Rattata,
-    gMonFootprint_Raticate,
-    gMonFootprint_Spearow,
-    gMonFootprint_Fearow,
-    gMonFootprint_Ekans,
-    gMonFootprint_Arbok,
-    gMonFootprint_Pikachu,
-    gMonFootprint_Raichu,
-    gMonFootprint_Sandshrew,
-    gMonFootprint_Sandslash,
-    gMonFootprint_NidoranF,
-    gMonFootprint_Nidorina,
-    gMonFootprint_Nidoqueen,
-    gMonFootprint_NidoranM,
-    gMonFootprint_Nidorino,
-    gMonFootprint_Nidoking,
-    gMonFootprint_Clefairy,
-    gMonFootprint_Clefable,
-    gMonFootprint_Vulpix,
-    gMonFootprint_Ninetales,
-    gMonFootprint_Jigglypuff,
-    gMonFootprint_Wigglytuff,
-    gMonFootprint_Zubat,
-    gMonFootprint_Golbat,
-    gMonFootprint_Oddish,
-    gMonFootprint_Gloom,
-    gMonFootprint_Vileplume,
-    gMonFootprint_Paras,
-    gMonFootprint_Parasect,
-    gMonFootprint_Venonat,
-    gMonFootprint_Venomoth,
-    gMonFootprint_Diglett,
-    gMonFootprint_Dugtrio,
-    gMonFootprint_Meowth,
-    gMonFootprint_Persian,
-    gMonFootprint_Psyduck,
-    gMonFootprint_Golduck,
-    gMonFootprint_Mankey,
-    gMonFootprint_Primeape,
-    gMonFootprint_Growlithe,
-    gMonFootprint_Arcanine,
-    gMonFootprint_Poliwag,
-    gMonFootprint_Poliwhirl,
-    gMonFootprint_Poliwrath,
-    gMonFootprint_Abra,
-    gMonFootprint_Kadabra,
-    gMonFootprint_Alakazam,
-    gMonFootprint_Machop,
-    gMonFootprint_Machoke,
-    gMonFootprint_Machamp,
-    gMonFootprint_Bellsprout,
-    gMonFootprint_Weepinbell,
-    gMonFootprint_Victreebel,
-    gMonFootprint_Tentacool,
-    gMonFootprint_Tentacruel,
-    gMonFootprint_Geodude,
-    gMonFootprint_Graveler,
-    gMonFootprint_Golem,
-    gMonFootprint_Ponyta,
-    gMonFootprint_Rapidash,
-    gMonFootprint_Slowpoke,
-    gMonFootprint_Slowbro,
-    gMonFootprint_Magnemite,
-    gMonFootprint_Magneton,
-    gMonFootprint_Farfetchd,
-    gMonFootprint_Doduo,
-    gMonFootprint_Dodrio,
-    gMonFootprint_Seel,
-    gMonFootprint_Dewgong,
-    gMonFootprint_Grimer,
-    gMonFootprint_Muk,
-    gMonFootprint_Shellder,
-    gMonFootprint_Cloyster,
-    gMonFootprint_Gastly,
-    gMonFootprint_Haunter,
-    gMonFootprint_Gengar,
-    gMonFootprint_Onix,
-    gMonFootprint_Drowzee,
-    gMonFootprint_Hypno,
-    gMonFootprint_Krabby,
-    gMonFootprint_Kingler,
-    gMonFootprint_Voltorb,
-    gMonFootprint_Electrode,
-    gMonFootprint_Exeggcute,
-    gMonFootprint_Exeggutor,
-    gMonFootprint_Cubone,
-    gMonFootprint_Marowak,
-    gMonFootprint_Hitmonlee,
-    gMonFootprint_Hitmonchan,
-    gMonFootprint_Lickitung,
-    gMonFootprint_Koffing,
-    gMonFootprint_Weezing,
-    gMonFootprint_Rhyhorn,
-    gMonFootprint_Rhydon,
-    gMonFootprint_Chansey,
-    gMonFootprint_Tangela,
-    gMonFootprint_Kangaskhan,
-    gMonFootprint_Horsea,
-    gMonFootprint_Seadra,
-    gMonFootprint_Goldeen,
-    gMonFootprint_Seaking,
-    gMonFootprint_Staryu,
-    gMonFootprint_Starmie,
-    gMonFootprint_Mrmime,
-    gMonFootprint_Scyther,
-    gMonFootprint_Jynx,
-    gMonFootprint_Electabuzz,
-    gMonFootprint_Magmar,
-    gMonFootprint_Pinsir,
-    gMonFootprint_Tauros,
-    gMonFootprint_Magikarp,
-    gMonFootprint_Gyarados,
-    gMonFootprint_Lapras,
-    gMonFootprint_Ditto,
-    gMonFootprint_Eevee,
-    gMonFootprint_Vaporeon,
-    gMonFootprint_Jolteon,
-    gMonFootprint_Flareon,
-    gMonFootprint_Porygon,
-    gMonFootprint_Omanyte,
-    gMonFootprint_Omastar,
-    gMonFootprint_Kabuto,
-    gMonFootprint_Kabutops,
-    gMonFootprint_Aerodactyl,
-    gMonFootprint_Snorlax,
-    gMonFootprint_Articuno,
-    gMonFootprint_Zapdos,
-    gMonFootprint_Moltres,
-    gMonFootprint_Dratini,
-    gMonFootprint_Dragonair,
-    gMonFootprint_Dragonite,
-    gMonFootprint_Mewtwo,
-    gMonFootprint_Mew,
-    gMonFootprint_Chikorita,
-    gMonFootprint_Bayleef,
-    gMonFootprint_Meganium,
-    gMonFootprint_Cyndaquil,
-    gMonFootprint_Quilava,
-    gMonFootprint_Typhlosion,
-    gMonFootprint_Totodile,
-    gMonFootprint_Croconaw,
-    gMonFootprint_Feraligatr,
-    gMonFootprint_Sentret,
-    gMonFootprint_Furret,
-    gMonFootprint_Hoothoot,
-    gMonFootprint_Noctowl,
-    gMonFootprint_Ledyba,
-    gMonFootprint_Ledian,
-    gMonFootprint_Spinarak,
-    gMonFootprint_Ariados,
-    gMonFootprint_Crobat,
-    gMonFootprint_Chinchou,
-    gMonFootprint_Lanturn,
-    gMonFootprint_Pichu,
-    gMonFootprint_Cleffa,
-    gMonFootprint_Igglybuff,
-    gMonFootprint_Togepi,
-    gMonFootprint_Togetic,
-    gMonFootprint_Natu,
-    gMonFootprint_Xatu,
-    gMonFootprint_Mareep,
-    gMonFootprint_Flaaffy,
-    gMonFootprint_Ampharos,
-    gMonFootprint_Bellossom,
-    gMonFootprint_Marill,
-    gMonFootprint_Azumarill,
-    gMonFootprint_Sudowoodo,
-    gMonFootprint_Politoed,
-    gMonFootprint_Hoppip,
-    gMonFootprint_Skiploom,
-    gMonFootprint_Jumpluff,
-    gMonFootprint_Aipom,
-    gMonFootprint_Sunkern,
-    gMonFootprint_Sunflora,
-    gMonFootprint_Yanma,
-    gMonFootprint_Wooper,
-    gMonFootprint_Quagsire,
-    gMonFootprint_Espeon,
-    gMonFootprint_Umbreon,
-    gMonFootprint_Murkrow,
-    gMonFootprint_Slowking,
-    gMonFootprint_Misdreavus,
-    gMonFootprint_Unown,
-    gMonFootprint_Wobbuffet,
-    gMonFootprint_Girafarig,
-    gMonFootprint_Pineco,
-    gMonFootprint_Forretress,
-    gMonFootprint_Dunsparce,
-    gMonFootprint_Gligar,
-    gMonFootprint_Steelix,
-    gMonFootprint_Snubbull,
-    gMonFootprint_Granbull,
-    gMonFootprint_Qwilfish,
-    gMonFootprint_Scizor,
-    gMonFootprint_Shuckle,
-    gMonFootprint_Heracross,
-    gMonFootprint_Sneasel,
-    gMonFootprint_Teddiursa,
-    gMonFootprint_Ursaring,
-    gMonFootprint_Slugma,
-    gMonFootprint_Magcargo,
-    gMonFootprint_Swinub,
-    gMonFootprint_Piloswine,
-    gMonFootprint_Corsola,
-    gMonFootprint_Remoraid,
-    gMonFootprint_Octillery,
-    gMonFootprint_Delibird,
-    gMonFootprint_Mantine,
-    gMonFootprint_Skarmory,
-    gMonFootprint_Houndour,
-    gMonFootprint_Houndoom,
-    gMonFootprint_Kingdra,
-    gMonFootprint_Phanpy,
-    gMonFootprint_Donphan,
-    gMonFootprint_Porygon2,
-    gMonFootprint_Stantler,
-    gMonFootprint_Smeargle,
-    gMonFootprint_Tyrogue,
-    gMonFootprint_Hitmontop,
-    gMonFootprint_Smoochum,
-    gMonFootprint_Elekid,
-    gMonFootprint_Magby,
-    gMonFootprint_Miltank,
-    gMonFootprint_Blissey,
-    gMonFootprint_Raikou,
-    gMonFootprint_Entei,
-    gMonFootprint_Suicune,
-    gMonFootprint_Larvitar,
-    gMonFootprint_Pupitar,
-    gMonFootprint_Tyranitar,
-    gMonFootprint_Lugia,
-    gMonFootprint_HoOh,
-    gMonFootprint_Celebi,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_Treecko,
-    gMonFootprint_Grovyle,
-    gMonFootprint_Sceptile,
-    gMonFootprint_Torchic,
-    gMonFootprint_Combusken,
-    gMonFootprint_Blaziken,
-    gMonFootprint_Mudkip,
-    gMonFootprint_Marshtomp,
-    gMonFootprint_Swampert,
-    gMonFootprint_Poochyena,
-    gMonFootprint_Mightyena,
-    gMonFootprint_Zigzagoon,
-    gMonFootprint_Linoone,
-    gMonFootprint_Wurmple,
-    gMonFootprint_Silcoon,
-    gMonFootprint_Beautifly,
-    gMonFootprint_Cascoon,
-    gMonFootprint_Dustox,
-    gMonFootprint_Lotad,
-    gMonFootprint_Lombre,
-    gMonFootprint_Ludicolo,
-    gMonFootprint_Seedot,
-    gMonFootprint_Nuzleaf,
-    gMonFootprint_Shiftry,
-    gMonFootprint_Nincada,
-    gMonFootprint_Ninjask,
-    gMonFootprint_Shedinja,
-    gMonFootprint_Taillow,
-    gMonFootprint_Swellow,
-    gMonFootprint_Shroomish,
-    gMonFootprint_Breloom,
-    gMonFootprint_Spinda,
-    gMonFootprint_Wingull,
-    gMonFootprint_Pelipper,
-    gMonFootprint_Surskit,
-    gMonFootprint_Masquerain,
-    gMonFootprint_Wailmer,
-    gMonFootprint_Wailord,
-    gMonFootprint_Skitty,
-    gMonFootprint_Delcatty,
-    gMonFootprint_Kecleon,
-    gMonFootprint_Baltoy,
-    gMonFootprint_Claydol,
-    gMonFootprint_Nosepass,
-    gMonFootprint_Torkoal,
-    gMonFootprint_Sableye,
-    gMonFootprint_Barboach,
-    gMonFootprint_Whiscash,
-    gMonFootprint_Luvdisc,
-    gMonFootprint_Corphish,
-    gMonFootprint_Crawdaunt,
-    gMonFootprint_Feebas,
-    gMonFootprint_Milotic,
-    gMonFootprint_Carvanha,
-    gMonFootprint_Sharpedo,
-    gMonFootprint_Trapinch,
-    gMonFootprint_Vibrava,
-    gMonFootprint_Flygon,
-    gMonFootprint_Makuhita,
-    gMonFootprint_Hariyama,
-    gMonFootprint_Electrike,
-    gMonFootprint_Manectric,
-    gMonFootprint_Numel,
-    gMonFootprint_Camerupt,
-    gMonFootprint_Spheal,
-    gMonFootprint_Sealeo,
-    gMonFootprint_Walrein,
-    gMonFootprint_Cacnea,
-    gMonFootprint_Cacturne,
-    gMonFootprint_Snorunt,
-    gMonFootprint_Glalie,
-    gMonFootprint_Lunatone,
-    gMonFootprint_Solrock,
-    gMonFootprint_Azurill,
-    gMonFootprint_Spoink,
-    gMonFootprint_Grumpig,
-    gMonFootprint_Plusle,
-    gMonFootprint_Minun,
-    gMonFootprint_Mawile,
-    gMonFootprint_Meditite,
-    gMonFootprint_Medicham,
-    gMonFootprint_Swablu,
-    gMonFootprint_Altaria,
-    gMonFootprint_Wynaut,
-    gMonFootprint_Duskull,
-    gMonFootprint_Dusclops,
-    gMonFootprint_Roselia,
-    gMonFootprint_Slakoth,
-    gMonFootprint_Vigoroth,
-    gMonFootprint_Slaking,
-    gMonFootprint_Gulpin,
-    gMonFootprint_Swalot,
-    gMonFootprint_Tropius,
-    gMonFootprint_Whismur,
-    gMonFootprint_Loudred,
-    gMonFootprint_Exploud,
-    gMonFootprint_Clamperl,
-    gMonFootprint_Huntail,
-    gMonFootprint_Gorebyss,
-    gMonFootprint_Absol,
-    gMonFootprint_Shuppet,
-    gMonFootprint_Banette,
-    gMonFootprint_Seviper,
-    gMonFootprint_Zangoose,
-    gMonFootprint_Relicanth,
-    gMonFootprint_Aron,
-    gMonFootprint_Lairon,
-    gMonFootprint_Aggron,
-    gMonFootprint_Castform,
-    gMonFootprint_Volbeat,
-    gMonFootprint_Illumise,
-    gMonFootprint_Lileep,
-    gMonFootprint_Cradily,
-    gMonFootprint_Anorith,
-    gMonFootprint_Armaldo,
-    gMonFootprint_Ralts,
-    gMonFootprint_Kirlia,
-    gMonFootprint_Gardevoir,
-    gMonFootprint_Bagon,
-    gMonFootprint_Shelgon,
-    gMonFootprint_Salamence,
-    gMonFootprint_Beldum,
-    gMonFootprint_Metang,
-    gMonFootprint_Metagross,
-    gMonFootprint_Regirock,
-    gMonFootprint_Regice,
-    gMonFootprint_Registeel,
-    gMonFootprint_Kyogre,
-    gMonFootprint_Groudon,
-    gMonFootprint_Rayquaza,
-    gMonFootprint_Latias,
-    gMonFootprint_Latios,
-    gMonFootprint_Jirachi,
-    gMonFootprint_Deoxys,
-    gMonFootprint_Chimecho,
-    gMonFootprint_Bulbasaur,
+    [SPECIES_NONE] = gMonFootprint_Bulbasaur,
+    [SPECIES_BULBASAUR] = gMonFootprint_Bulbasaur,
+    [SPECIES_IVYSAUR] = gMonFootprint_Ivysaur,
+    [SPECIES_VENUSAUR] = gMonFootprint_Venusaur,
+    [SPECIES_CHARMANDER] = gMonFootprint_Charmander,
+    [SPECIES_CHARMELEON] = gMonFootprint_Charmeleon,
+    [SPECIES_CHARIZARD] = gMonFootprint_Charizard,
+    [SPECIES_SQUIRTLE] = gMonFootprint_Squirtle,
+    [SPECIES_WARTORTLE] = gMonFootprint_Wartortle,
+    [SPECIES_BLASTOISE] = gMonFootprint_Blastoise,
+    [SPECIES_CATERPIE] = gMonFootprint_Caterpie,
+    [SPECIES_METAPOD] = gMonFootprint_Metapod,
+    [SPECIES_BUTTERFREE] = gMonFootprint_Butterfree,
+    [SPECIES_WEEDLE] = gMonFootprint_Weedle,
+    [SPECIES_KAKUNA] = gMonFootprint_Kakuna,
+    [SPECIES_BEEDRILL] = gMonFootprint_Beedrill,
+    [SPECIES_PIDGEY] = gMonFootprint_Pidgey,
+    [SPECIES_PIDGEOTTO] = gMonFootprint_Pidgeotto,
+    [SPECIES_PIDGEOT] = gMonFootprint_Pidgeot,
+    [SPECIES_RATTATA] = gMonFootprint_Rattata,
+    [SPECIES_RATICATE] = gMonFootprint_Raticate,
+    [SPECIES_SPEAROW] = gMonFootprint_Spearow,
+    [SPECIES_FEAROW] = gMonFootprint_Fearow,
+    [SPECIES_EKANS] = gMonFootprint_Ekans,
+    [SPECIES_ARBOK] = gMonFootprint_Arbok,
+    [SPECIES_PIKACHU] = gMonFootprint_Pikachu,
+    [SPECIES_RAICHU] = gMonFootprint_Raichu,
+    [SPECIES_SANDSHREW] = gMonFootprint_Sandshrew,
+    [SPECIES_SANDSLASH] = gMonFootprint_Sandslash,
+    [SPECIES_NIDORAN_F] = gMonFootprint_NidoranF,
+    [SPECIES_NIDORINA] = gMonFootprint_Nidorina,
+    [SPECIES_NIDOQUEEN] = gMonFootprint_Nidoqueen,
+    [SPECIES_NIDORAN_M] = gMonFootprint_NidoranM,
+    [SPECIES_NIDORINO] = gMonFootprint_Nidorino,
+    [SPECIES_NIDOKING] = gMonFootprint_Nidoking,
+    [SPECIES_CLEFAIRY] = gMonFootprint_Clefairy,
+    [SPECIES_CLEFABLE] = gMonFootprint_Clefable,
+    [SPECIES_VULPIX] = gMonFootprint_Vulpix,
+    [SPECIES_NINETALES] = gMonFootprint_Ninetales,
+    [SPECIES_JIGGLYPUFF] = gMonFootprint_Jigglypuff,
+    [SPECIES_WIGGLYTUFF] = gMonFootprint_Wigglytuff,
+    [SPECIES_ZUBAT] = gMonFootprint_Zubat,
+    [SPECIES_GOLBAT] = gMonFootprint_Golbat,
+    [SPECIES_ODDISH] = gMonFootprint_Oddish,
+    [SPECIES_GLOOM] = gMonFootprint_Gloom,
+    [SPECIES_VILEPLUME] = gMonFootprint_Vileplume,
+    [SPECIES_PARAS] = gMonFootprint_Paras,
+    [SPECIES_PARASECT] = gMonFootprint_Parasect,
+    [SPECIES_VENONAT] = gMonFootprint_Venonat,
+    [SPECIES_VENOMOTH] = gMonFootprint_Venomoth,
+    [SPECIES_DIGLETT] = gMonFootprint_Diglett,
+    [SPECIES_DUGTRIO] = gMonFootprint_Dugtrio,
+    [SPECIES_MEOWTH] = gMonFootprint_Meowth,
+    [SPECIES_PERSIAN] = gMonFootprint_Persian,
+    [SPECIES_PSYDUCK] = gMonFootprint_Psyduck,
+    [SPECIES_GOLDUCK] = gMonFootprint_Golduck,
+    [SPECIES_MANKEY] = gMonFootprint_Mankey,
+    [SPECIES_PRIMEAPE] = gMonFootprint_Primeape,
+    [SPECIES_GROWLITHE] = gMonFootprint_Growlithe,
+    [SPECIES_ARCANINE] = gMonFootprint_Arcanine,
+    [SPECIES_POLIWAG] = gMonFootprint_Poliwag,
+    [SPECIES_POLIWHIRL] = gMonFootprint_Poliwhirl,
+    [SPECIES_POLIWRATH] = gMonFootprint_Poliwrath,
+    [SPECIES_ABRA] = gMonFootprint_Abra,
+    [SPECIES_KADABRA] = gMonFootprint_Kadabra,
+    [SPECIES_ALAKAZAM] = gMonFootprint_Alakazam,
+    [SPECIES_MACHOP] = gMonFootprint_Machop,
+    [SPECIES_MACHOKE] = gMonFootprint_Machoke,
+    [SPECIES_MACHAMP] = gMonFootprint_Machamp,
+    [SPECIES_BELLSPROUT] = gMonFootprint_Bellsprout,
+    [SPECIES_WEEPINBELL] = gMonFootprint_Weepinbell,
+    [SPECIES_VICTREEBEL] = gMonFootprint_Victreebel,
+    [SPECIES_TENTACOOL] = gMonFootprint_Tentacool,
+    [SPECIES_TENTACRUEL] = gMonFootprint_Tentacruel,
+    [SPECIES_GEODUDE] = gMonFootprint_Geodude,
+    [SPECIES_GRAVELER] = gMonFootprint_Graveler,
+    [SPECIES_GOLEM] = gMonFootprint_Golem,
+    [SPECIES_PONYTA] = gMonFootprint_Ponyta,
+    [SPECIES_RAPIDASH] = gMonFootprint_Rapidash,
+    [SPECIES_SLOWPOKE] = gMonFootprint_Slowpoke,
+    [SPECIES_SLOWBRO] = gMonFootprint_Slowbro,
+    [SPECIES_MAGNEMITE] = gMonFootprint_Magnemite,
+    [SPECIES_MAGNETON] = gMonFootprint_Magneton,
+    [SPECIES_FARFETCHD] = gMonFootprint_Farfetchd,
+    [SPECIES_DODUO] = gMonFootprint_Doduo,
+    [SPECIES_DODRIO] = gMonFootprint_Dodrio,
+    [SPECIES_SEEL] = gMonFootprint_Seel,
+    [SPECIES_DEWGONG] = gMonFootprint_Dewgong,
+    [SPECIES_GRIMER] = gMonFootprint_Grimer,
+    [SPECIES_MUK] = gMonFootprint_Muk,
+    [SPECIES_SHELLDER] = gMonFootprint_Shellder,
+    [SPECIES_CLOYSTER] = gMonFootprint_Cloyster,
+    [SPECIES_GASTLY] = gMonFootprint_Gastly,
+    [SPECIES_HAUNTER] = gMonFootprint_Haunter,
+    [SPECIES_GENGAR] = gMonFootprint_Gengar,
+    [SPECIES_ONIX] = gMonFootprint_Onix,
+    [SPECIES_DROWZEE] = gMonFootprint_Drowzee,
+    [SPECIES_HYPNO] = gMonFootprint_Hypno,
+    [SPECIES_KRABBY] = gMonFootprint_Krabby,
+    [SPECIES_KINGLER] = gMonFootprint_Kingler,
+    [SPECIES_VOLTORB] = gMonFootprint_Voltorb,
+    [SPECIES_ELECTRODE] = gMonFootprint_Electrode,
+    [SPECIES_EXEGGCUTE] = gMonFootprint_Exeggcute,
+    [SPECIES_EXEGGUTOR] = gMonFootprint_Exeggutor,
+    [SPECIES_CUBONE] = gMonFootprint_Cubone,
+    [SPECIES_MAROWAK] = gMonFootprint_Marowak,
+    [SPECIES_HITMONLEE] = gMonFootprint_Hitmonlee,
+    [SPECIES_HITMONCHAN] = gMonFootprint_Hitmonchan,
+    [SPECIES_LICKITUNG] = gMonFootprint_Lickitung,
+    [SPECIES_KOFFING] = gMonFootprint_Koffing,
+    [SPECIES_WEEZING] = gMonFootprint_Weezing,
+    [SPECIES_RHYHORN] = gMonFootprint_Rhyhorn,
+    [SPECIES_RHYDON] = gMonFootprint_Rhydon,
+    [SPECIES_CHANSEY] = gMonFootprint_Chansey,
+    [SPECIES_TANGELA] = gMonFootprint_Tangela,
+    [SPECIES_KANGASKHAN] = gMonFootprint_Kangaskhan,
+    [SPECIES_HORSEA] = gMonFootprint_Horsea,
+    [SPECIES_SEADRA] = gMonFootprint_Seadra,
+    [SPECIES_GOLDEEN] = gMonFootprint_Goldeen,
+    [SPECIES_SEAKING] = gMonFootprint_Seaking,
+    [SPECIES_STARYU] = gMonFootprint_Staryu,
+    [SPECIES_STARMIE] = gMonFootprint_Starmie,
+    [SPECIES_MR_MIME] = gMonFootprint_Mrmime,
+    [SPECIES_SCYTHER] = gMonFootprint_Scyther,
+    [SPECIES_JYNX] = gMonFootprint_Jynx,
+    [SPECIES_ELECTABUZZ] = gMonFootprint_Electabuzz,
+    [SPECIES_MAGMAR] = gMonFootprint_Magmar,
+    [SPECIES_PINSIR] = gMonFootprint_Pinsir,
+    [SPECIES_TAUROS] = gMonFootprint_Tauros,
+    [SPECIES_MAGIKARP] = gMonFootprint_Magikarp,
+    [SPECIES_GYARADOS] = gMonFootprint_Gyarados,
+    [SPECIES_LAPRAS] = gMonFootprint_Lapras,
+    [SPECIES_DITTO] = gMonFootprint_Ditto,
+    [SPECIES_EEVEE] = gMonFootprint_Eevee,
+    [SPECIES_VAPOREON] = gMonFootprint_Vaporeon,
+    [SPECIES_JOLTEON] = gMonFootprint_Jolteon,
+    [SPECIES_FLAREON] = gMonFootprint_Flareon,
+    [SPECIES_PORYGON] = gMonFootprint_Porygon,
+    [SPECIES_OMANYTE] = gMonFootprint_Omanyte,
+    [SPECIES_OMASTAR] = gMonFootprint_Omastar,
+    [SPECIES_KABUTO] = gMonFootprint_Kabuto,
+    [SPECIES_KABUTOPS] = gMonFootprint_Kabutops,
+    [SPECIES_AERODACTYL] = gMonFootprint_Aerodactyl,
+    [SPECIES_SNORLAX] = gMonFootprint_Snorlax,
+    [SPECIES_ARTICUNO] = gMonFootprint_Articuno,
+    [SPECIES_ZAPDOS] = gMonFootprint_Zapdos,
+    [SPECIES_MOLTRES] = gMonFootprint_Moltres,
+    [SPECIES_DRATINI] = gMonFootprint_Dratini,
+    [SPECIES_DRAGONAIR] = gMonFootprint_Dragonair,
+    [SPECIES_DRAGONITE] = gMonFootprint_Dragonite,
+    [SPECIES_MEWTWO] = gMonFootprint_Mewtwo,
+    [SPECIES_MEW] = gMonFootprint_Mew,
+    [SPECIES_CHIKORITA] = gMonFootprint_Chikorita,
+    [SPECIES_BAYLEEF] = gMonFootprint_Bayleef,
+    [SPECIES_MEGANIUM] = gMonFootprint_Meganium,
+    [SPECIES_CYNDAQUIL] = gMonFootprint_Cyndaquil,
+    [SPECIES_QUILAVA] = gMonFootprint_Quilava,
+    [SPECIES_TYPHLOSION] = gMonFootprint_Typhlosion,
+    [SPECIES_TOTODILE] = gMonFootprint_Totodile,
+    [SPECIES_CROCONAW] = gMonFootprint_Croconaw,
+    [SPECIES_FERALIGATR] = gMonFootprint_Feraligatr,
+    [SPECIES_SENTRET] = gMonFootprint_Sentret,
+    [SPECIES_FURRET] = gMonFootprint_Furret,
+    [SPECIES_HOOTHOOT] = gMonFootprint_Hoothoot,
+    [SPECIES_NOCTOWL] = gMonFootprint_Noctowl,
+    [SPECIES_LEDYBA] = gMonFootprint_Ledyba,
+    [SPECIES_LEDIAN] = gMonFootprint_Ledian,
+    [SPECIES_SPINARAK] = gMonFootprint_Spinarak,
+    [SPECIES_ARIADOS] = gMonFootprint_Ariados,
+    [SPECIES_CROBAT] = gMonFootprint_Crobat,
+    [SPECIES_CHINCHOU] = gMonFootprint_Chinchou,
+    [SPECIES_LANTURN] = gMonFootprint_Lanturn,
+    [SPECIES_PICHU] = gMonFootprint_Pichu,
+    [SPECIES_CLEFFA] = gMonFootprint_Cleffa,
+    [SPECIES_IGGLYBUFF] = gMonFootprint_Igglybuff,
+    [SPECIES_TOGEPI] = gMonFootprint_Togepi,
+    [SPECIES_TOGETIC] = gMonFootprint_Togetic,
+    [SPECIES_NATU] = gMonFootprint_Natu,
+    [SPECIES_XATU] = gMonFootprint_Xatu,
+    [SPECIES_MAREEP] = gMonFootprint_Mareep,
+    [SPECIES_FLAAFFY] = gMonFootprint_Flaaffy,
+    [SPECIES_AMPHAROS] = gMonFootprint_Ampharos,
+    [SPECIES_BELLOSSOM] = gMonFootprint_Bellossom,
+    [SPECIES_MARILL] = gMonFootprint_Marill,
+    [SPECIES_AZUMARILL] = gMonFootprint_Azumarill,
+    [SPECIES_SUDOWOODO] = gMonFootprint_Sudowoodo,
+    [SPECIES_POLITOED] = gMonFootprint_Politoed,
+    [SPECIES_HOPPIP] = gMonFootprint_Hoppip,
+    [SPECIES_SKIPLOOM] = gMonFootprint_Skiploom,
+    [SPECIES_JUMPLUFF] = gMonFootprint_Jumpluff,
+    [SPECIES_AIPOM] = gMonFootprint_Aipom,
+    [SPECIES_SUNKERN] = gMonFootprint_Sunkern,
+    [SPECIES_SUNFLORA] = gMonFootprint_Sunflora,
+    [SPECIES_YANMA] = gMonFootprint_Yanma,
+    [SPECIES_WOOPER] = gMonFootprint_Wooper,
+    [SPECIES_QUAGSIRE] = gMonFootprint_Quagsire,
+    [SPECIES_ESPEON] = gMonFootprint_Espeon,
+    [SPECIES_UMBREON] = gMonFootprint_Umbreon,
+    [SPECIES_MURKROW] = gMonFootprint_Murkrow,
+    [SPECIES_SLOWKING] = gMonFootprint_Slowking,
+    [SPECIES_MISDREAVUS] = gMonFootprint_Misdreavus,
+    [SPECIES_UNOWN] = gMonFootprint_Unown,
+    [SPECIES_WOBBUFFET] = gMonFootprint_Wobbuffet,
+    [SPECIES_GIRAFARIG] = gMonFootprint_Girafarig,
+    [SPECIES_PINECO] = gMonFootprint_Pineco,
+    [SPECIES_FORRETRESS] = gMonFootprint_Forretress,
+    [SPECIES_DUNSPARCE] = gMonFootprint_Dunsparce,
+    [SPECIES_GLIGAR] = gMonFootprint_Gligar,
+    [SPECIES_STEELIX] = gMonFootprint_Steelix,
+    [SPECIES_SNUBBULL] = gMonFootprint_Snubbull,
+    [SPECIES_GRANBULL] = gMonFootprint_Granbull,
+    [SPECIES_QWILFISH] = gMonFootprint_Qwilfish,
+    [SPECIES_SCIZOR] = gMonFootprint_Scizor,
+    [SPECIES_SHUCKLE] = gMonFootprint_Shuckle,
+    [SPECIES_HERACROSS] = gMonFootprint_Heracross,
+    [SPECIES_SNEASEL] = gMonFootprint_Sneasel,
+    [SPECIES_TEDDIURSA] = gMonFootprint_Teddiursa,
+    [SPECIES_URSARING] = gMonFootprint_Ursaring,
+    [SPECIES_SLUGMA] = gMonFootprint_Slugma,
+    [SPECIES_MAGCARGO] = gMonFootprint_Magcargo,
+    [SPECIES_SWINUB] = gMonFootprint_Swinub,
+    [SPECIES_PILOSWINE] = gMonFootprint_Piloswine,
+    [SPECIES_CORSOLA] = gMonFootprint_Corsola,
+    [SPECIES_REMORAID] = gMonFootprint_Remoraid,
+    [SPECIES_OCTILLERY] = gMonFootprint_Octillery,
+    [SPECIES_DELIBIRD] = gMonFootprint_Delibird,
+    [SPECIES_MANTINE] = gMonFootprint_Mantine,
+    [SPECIES_SKARMORY] = gMonFootprint_Skarmory,
+    [SPECIES_HOUNDOUR] = gMonFootprint_Houndour,
+    [SPECIES_HOUNDOOM] = gMonFootprint_Houndoom,
+    [SPECIES_KINGDRA] = gMonFootprint_Kingdra,
+    [SPECIES_PHANPY] = gMonFootprint_Phanpy,
+    [SPECIES_DONPHAN] = gMonFootprint_Donphan,
+    [SPECIES_PORYGON2] = gMonFootprint_Porygon2,
+    [SPECIES_STANTLER] = gMonFootprint_Stantler,
+    [SPECIES_SMEARGLE] = gMonFootprint_Smeargle,
+    [SPECIES_TYROGUE] = gMonFootprint_Tyrogue,
+    [SPECIES_HITMONTOP] = gMonFootprint_Hitmontop,
+    [SPECIES_SMOOCHUM] = gMonFootprint_Smoochum,
+    [SPECIES_ELEKID] = gMonFootprint_Elekid,
+    [SPECIES_MAGBY] = gMonFootprint_Magby,
+    [SPECIES_MILTANK] = gMonFootprint_Miltank,
+    [SPECIES_BLISSEY] = gMonFootprint_Blissey,
+    [SPECIES_RAIKOU] = gMonFootprint_Raikou,
+    [SPECIES_ENTEI] = gMonFootprint_Entei,
+    [SPECIES_SUICUNE] = gMonFootprint_Suicune,
+    [SPECIES_LARVITAR] = gMonFootprint_Larvitar,
+    [SPECIES_PUPITAR] = gMonFootprint_Pupitar,
+    [SPECIES_TYRANITAR] = gMonFootprint_Tyranitar,
+    [SPECIES_LUGIA] = gMonFootprint_Lugia,
+    [SPECIES_HO_OH] = gMonFootprint_HoOh,
+    [SPECIES_CELEBI] = gMonFootprint_Celebi,
+    [SPECIES_OLD_UNOWN_B] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_C] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_D] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_E] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_F] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_G] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_H] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_I] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_J] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_K] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_L] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_M] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_N] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_O] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_P] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_Q] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_R] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_S] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_T] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_U] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_V] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_W] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_X] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_Y] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_Z] = gMonFootprint_QuestionMark,
+    [SPECIES_TREECKO] = gMonFootprint_Treecko,
+    [SPECIES_GROVYLE] = gMonFootprint_Grovyle,
+    [SPECIES_SCEPTILE] = gMonFootprint_Sceptile,
+    [SPECIES_TORCHIC] = gMonFootprint_Torchic,
+    [SPECIES_COMBUSKEN] = gMonFootprint_Combusken,
+    [SPECIES_BLAZIKEN] = gMonFootprint_Blaziken,
+    [SPECIES_MUDKIP] = gMonFootprint_Mudkip,
+    [SPECIES_MARSHTOMP] = gMonFootprint_Marshtomp,
+    [SPECIES_SWAMPERT] = gMonFootprint_Swampert,
+    [SPECIES_POOCHYENA] = gMonFootprint_Poochyena,
+    [SPECIES_MIGHTYENA] = gMonFootprint_Mightyena,
+    [SPECIES_ZIGZAGOON] = gMonFootprint_Zigzagoon,
+    [SPECIES_LINOONE] = gMonFootprint_Linoone,
+    [SPECIES_WURMPLE] = gMonFootprint_Wurmple,
+    [SPECIES_SILCOON] = gMonFootprint_Silcoon,
+    [SPECIES_BEAUTIFLY] = gMonFootprint_Beautifly,
+    [SPECIES_CASCOON] = gMonFootprint_Cascoon,
+    [SPECIES_DUSTOX] = gMonFootprint_Dustox,
+    [SPECIES_LOTAD] = gMonFootprint_Lotad,
+    [SPECIES_LOMBRE] = gMonFootprint_Lombre,
+    [SPECIES_LUDICOLO] = gMonFootprint_Ludicolo,
+    [SPECIES_SEEDOT] = gMonFootprint_Seedot,
+    [SPECIES_NUZLEAF] = gMonFootprint_Nuzleaf,
+    [SPECIES_SHIFTRY] = gMonFootprint_Shiftry,
+    [SPECIES_NINCADA] = gMonFootprint_Nincada,
+    [SPECIES_NINJASK] = gMonFootprint_Ninjask,
+    [SPECIES_SHEDINJA] = gMonFootprint_Shedinja,
+    [SPECIES_TAILLOW] = gMonFootprint_Taillow,
+    [SPECIES_SWELLOW] = gMonFootprint_Swellow,
+    [SPECIES_SHROOMISH] = gMonFootprint_Shroomish,
+    [SPECIES_BRELOOM] = gMonFootprint_Breloom,
+    [SPECIES_SPINDA] = gMonFootprint_Spinda,
+    [SPECIES_WINGULL] = gMonFootprint_Wingull,
+    [SPECIES_PELIPPER] = gMonFootprint_Pelipper,
+    [SPECIES_SURSKIT] = gMonFootprint_Surskit,
+    [SPECIES_MASQUERAIN] = gMonFootprint_Masquerain,
+    [SPECIES_WAILMER] = gMonFootprint_Wailmer,
+    [SPECIES_WAILORD] = gMonFootprint_Wailord,
+    [SPECIES_SKITTY] = gMonFootprint_Skitty,
+    [SPECIES_DELCATTY] = gMonFootprint_Delcatty,
+    [SPECIES_KECLEON] = gMonFootprint_Kecleon,
+    [SPECIES_BALTOY] = gMonFootprint_Baltoy,
+    [SPECIES_CLAYDOL] = gMonFootprint_Claydol,
+    [SPECIES_NOSEPASS] = gMonFootprint_Nosepass,
+    [SPECIES_TORKOAL] = gMonFootprint_Torkoal,
+    [SPECIES_SABLEYE] = gMonFootprint_Sableye,
+    [SPECIES_BARBOACH] = gMonFootprint_Barboach,
+    [SPECIES_WHISCASH] = gMonFootprint_Whiscash,
+    [SPECIES_LUVDISC] = gMonFootprint_Luvdisc,
+    [SPECIES_CORPHISH] = gMonFootprint_Corphish,
+    [SPECIES_CRAWDAUNT] = gMonFootprint_Crawdaunt,
+    [SPECIES_FEEBAS] = gMonFootprint_Feebas,
+    [SPECIES_MILOTIC] = gMonFootprint_Milotic,
+    [SPECIES_CARVANHA] = gMonFootprint_Carvanha,
+    [SPECIES_SHARPEDO] = gMonFootprint_Sharpedo,
+    [SPECIES_TRAPINCH] = gMonFootprint_Trapinch,
+    [SPECIES_VIBRAVA] = gMonFootprint_Vibrava,
+    [SPECIES_FLYGON] = gMonFootprint_Flygon,
+    [SPECIES_MAKUHITA] = gMonFootprint_Makuhita,
+    [SPECIES_HARIYAMA] = gMonFootprint_Hariyama,
+    [SPECIES_ELECTRIKE] = gMonFootprint_Electrike,
+    [SPECIES_MANECTRIC] = gMonFootprint_Manectric,
+    [SPECIES_NUMEL] = gMonFootprint_Numel,
+    [SPECIES_CAMERUPT] = gMonFootprint_Camerupt,
+    [SPECIES_SPHEAL] = gMonFootprint_Spheal,
+    [SPECIES_SEALEO] = gMonFootprint_Sealeo,
+    [SPECIES_WALREIN] = gMonFootprint_Walrein,
+    [SPECIES_CACNEA] = gMonFootprint_Cacnea,
+    [SPECIES_CACTURNE] = gMonFootprint_Cacturne,
+    [SPECIES_SNORUNT] = gMonFootprint_Snorunt,
+    [SPECIES_GLALIE] = gMonFootprint_Glalie,
+    [SPECIES_LUNATONE] = gMonFootprint_Lunatone,
+    [SPECIES_SOLROCK] = gMonFootprint_Solrock,
+    [SPECIES_AZURILL] = gMonFootprint_Azurill,
+    [SPECIES_SPOINK] = gMonFootprint_Spoink,
+    [SPECIES_GRUMPIG] = gMonFootprint_Grumpig,
+    [SPECIES_PLUSLE] = gMonFootprint_Plusle,
+    [SPECIES_MINUN] = gMonFootprint_Minun,
+    [SPECIES_MAWILE] = gMonFootprint_Mawile,
+    [SPECIES_MEDITITE] = gMonFootprint_Meditite,
+    [SPECIES_MEDICHAM] = gMonFootprint_Medicham,
+    [SPECIES_SWABLU] = gMonFootprint_Swablu,
+    [SPECIES_ALTARIA] = gMonFootprint_Altaria,
+    [SPECIES_WYNAUT] = gMonFootprint_Wynaut,
+    [SPECIES_DUSKULL] = gMonFootprint_Duskull,
+    [SPECIES_DUSCLOPS] = gMonFootprint_Dusclops,
+    [SPECIES_ROSELIA] = gMonFootprint_Roselia,
+    [SPECIES_SLAKOTH] = gMonFootprint_Slakoth,
+    [SPECIES_VIGOROTH] = gMonFootprint_Vigoroth,
+    [SPECIES_SLAKING] = gMonFootprint_Slaking,
+    [SPECIES_GULPIN] = gMonFootprint_Gulpin,
+    [SPECIES_SWALOT] = gMonFootprint_Swalot,
+    [SPECIES_TROPIUS] = gMonFootprint_Tropius,
+    [SPECIES_WHISMUR] = gMonFootprint_Whismur,
+    [SPECIES_LOUDRED] = gMonFootprint_Loudred,
+    [SPECIES_EXPLOUD] = gMonFootprint_Exploud,
+    [SPECIES_CLAMPERL] = gMonFootprint_Clamperl,
+    [SPECIES_HUNTAIL] = gMonFootprint_Huntail,
+    [SPECIES_GOREBYSS] = gMonFootprint_Gorebyss,
+    [SPECIES_ABSOL] = gMonFootprint_Absol,
+    [SPECIES_SHUPPET] = gMonFootprint_Shuppet,
+    [SPECIES_BANETTE] = gMonFootprint_Banette,
+    [SPECIES_SEVIPER] = gMonFootprint_Seviper,
+    [SPECIES_ZANGOOSE] = gMonFootprint_Zangoose,
+    [SPECIES_RELICANTH] = gMonFootprint_Relicanth,
+    [SPECIES_ARON] = gMonFootprint_Aron,
+    [SPECIES_LAIRON] = gMonFootprint_Lairon,
+    [SPECIES_AGGRON] = gMonFootprint_Aggron,
+    [SPECIES_CASTFORM] = gMonFootprint_Castform,
+    [SPECIES_VOLBEAT] = gMonFootprint_Volbeat,
+    [SPECIES_ILLUMISE] = gMonFootprint_Illumise,
+    [SPECIES_LILEEP] = gMonFootprint_Lileep,
+    [SPECIES_CRADILY] = gMonFootprint_Cradily,
+    [SPECIES_ANORITH] = gMonFootprint_Anorith,
+    [SPECIES_ARMALDO] = gMonFootprint_Armaldo,
+    [SPECIES_RALTS] = gMonFootprint_Ralts,
+    [SPECIES_KIRLIA] = gMonFootprint_Kirlia,
+    [SPECIES_GARDEVOIR] = gMonFootprint_Gardevoir,
+    [SPECIES_BAGON] = gMonFootprint_Bagon,
+    [SPECIES_SHELGON] = gMonFootprint_Shelgon,
+    [SPECIES_SALAMENCE] = gMonFootprint_Salamence,
+    [SPECIES_BELDUM] = gMonFootprint_Beldum,
+    [SPECIES_METANG] = gMonFootprint_Metang,
+    [SPECIES_METAGROSS] = gMonFootprint_Metagross,
+    [SPECIES_REGIROCK] = gMonFootprint_Regirock,
+    [SPECIES_REGICE] = gMonFootprint_Regice,
+    [SPECIES_REGISTEEL] = gMonFootprint_Registeel,
+    [SPECIES_KYOGRE] = gMonFootprint_Kyogre,
+    [SPECIES_GROUDON] = gMonFootprint_Groudon,
+    [SPECIES_RAYQUAZA] = gMonFootprint_Rayquaza,
+    [SPECIES_LATIAS] = gMonFootprint_Latias,
+    [SPECIES_LATIOS] = gMonFootprint_Latios,
+    [SPECIES_JIRACHI] = gMonFootprint_Jirachi,
+    [SPECIES_DEOXYS] = gMonFootprint_Deoxys,
+    [SPECIES_CHIMECHO] = gMonFootprint_Chimecho,
+    [SPECIES_EGG] = gMonFootprint_Bulbasaur,
 };

src/data/pokemon_graphics/front_pic_coordinates.h

@@ -1,5 +1,3 @@
-#include "constants/species.h"
-
 const struct MonCoords gMonFrontPicCoords[] =
 {
     [SPECIES_NONE] =

src/data/pokemon_graphics/front_pic_table.h

@@ -1,443 +1,443 @@
 const struct CompressedSpriteSheet gMonFrontPicTable[] =
 {
-    [SPECIES_NONE] = {gMonFrontPic_CircledQuestionMark, 0x800, SPECIES_NONE},
-    [SPECIES_BULBASAUR] = {gMonFrontPic_Bulbasaur, 0x800, SPECIES_BULBASAUR},
-    [SPECIES_IVYSAUR] = {gMonFrontPic_Ivysaur, 0x800, SPECIES_IVYSAUR},
-    [SPECIES_VENUSAUR] = {gMonFrontPic_Venusaur, 0x800, SPECIES_VENUSAUR},
-    [SPECIES_CHARMANDER] = {gMonFrontPic_Charmander, 0x800, SPECIES_CHARMANDER},
-    [SPECIES_CHARMELEON] = {gMonFrontPic_Charmeleon, 0x800, SPECIES_CHARMELEON},
-    [SPECIES_CHARIZARD] = {gMonFrontPic_Charizard, 0x800, SPECIES_CHARIZARD},
-    [SPECIES_SQUIRTLE] = {gMonFrontPic_Squirtle, 0x800, SPECIES_SQUIRTLE},
-    [SPECIES_WARTORTLE] = {gMonFrontPic_Wartortle, 0x800, SPECIES_WARTORTLE},
-    [SPECIES_BLASTOISE] = {gMonFrontPic_Blastoise, 0x800, SPECIES_BLASTOISE},
-    [SPECIES_CATERPIE] = {gMonFrontPic_Caterpie, 0x800, SPECIES_CATERPIE},
-    [SPECIES_METAPOD] = {gMonFrontPic_Metapod, 0x800, SPECIES_METAPOD},
-    [SPECIES_BUTTERFREE] = {gMonFrontPic_Butterfree, 0x800, SPECIES_BUTTERFREE},
-    [SPECIES_WEEDLE] = {gMonFrontPic_Weedle, 0x800, SPECIES_WEEDLE},
-    [SPECIES_KAKUNA] = {gMonFrontPic_Kakuna, 0x800, SPECIES_KAKUNA},
-    [SPECIES_BEEDRILL] = {gMonFrontPic_Beedrill, 0x800, SPECIES_BEEDRILL},
-    [SPECIES_PIDGEY] = {gMonFrontPic_Pidgey, 0x800, SPECIES_PIDGEY},
-    [SPECIES_PIDGEOTTO] = {gMonFrontPic_Pidgeotto, 0x800, SPECIES_PIDGEOTTO},
-    [SPECIES_PIDGEOT] = {gMonFrontPic_Pidgeot, 0x800, SPECIES_PIDGEOT},
-    [SPECIES_RATTATA] = {gMonFrontPic_Rattata, 0x800, SPECIES_RATTATA},
-    [SPECIES_RATICATE] = {gMonFrontPic_Raticate, 0x800, SPECIES_RATICATE},
-    [SPECIES_SPEAROW] = {gMonFrontPic_Spearow, 0x800, SPECIES_SPEAROW},
-    [SPECIES_FEAROW] = {gMonFrontPic_Fearow, 0x800, SPECIES_FEAROW},
-    [SPECIES_EKANS] = {gMonFrontPic_Ekans, 0x800, SPECIES_EKANS},
-    [SPECIES_ARBOK] = {gMonFrontPic_Arbok, 0x800, SPECIES_ARBOK},
-    [SPECIES_PIKACHU] = {gMonFrontPic_Pikachu, 0x800, SPECIES_PIKACHU},
-    [SPECIES_RAICHU] = {gMonFrontPic_Raichu, 0x800, SPECIES_RAICHU},
-    [SPECIES_SANDSHREW] = {gMonFrontPic_Sandshrew, 0x800, SPECIES_SANDSHREW},
-    [SPECIES_SANDSLASH] = {gMonFrontPic_Sandslash, 0x800, SPECIES_SANDSLASH},
-    [SPECIES_NIDORAN_F] = {gMonFrontPic_NidoranF, 0x800, SPECIES_NIDORAN_F},
-    [SPECIES_NIDORINA] = {gMonFrontPic_Nidorina, 0x800, SPECIES_NIDORINA},
-    [SPECIES_NIDOQUEEN] = {gMonFrontPic_Nidoqueen, 0x800, SPECIES_NIDOQUEEN},
-    [SPECIES_NIDORAN_M] = {gMonFrontPic_NidoranM, 0x800, SPECIES_NIDORAN_M},
-    [SPECIES_NIDORINO] = {gMonFrontPic_Nidorino, 0x800, SPECIES_NIDORINO},
-    [SPECIES_NIDOKING] = {gMonFrontPic_Nidoking, 0x800, SPECIES_NIDOKING},
-    [SPECIES_CLEFAIRY] = {gMonFrontPic_Clefairy, 0x800, SPECIES_CLEFAIRY},
-    [SPECIES_CLEFABLE] = {gMonFrontPic_Clefable, 0x800, SPECIES_CLEFABLE},
-    [SPECIES_VULPIX] = {gMonFrontPic_Vulpix, 0x800, SPECIES_VULPIX},
-    [SPECIES_NINETALES] = {gMonFrontPic_Ninetales, 0x800, SPECIES_NINETALES},
-    [SPECIES_JIGGLYPUFF] = {gMonFrontPic_Jigglypuff, 0x800, SPECIES_JIGGLYPUFF},
-    [SPECIES_WIGGLYTUFF] = {gMonFrontPic_Wigglytuff, 0x800, SPECIES_WIGGLYTUFF},
-    [SPECIES_ZUBAT] = {gMonFrontPic_Zubat, 0x800, SPECIES_ZUBAT},
-    [SPECIES_GOLBAT] = {gMonFrontPic_Golbat, 0x800, SPECIES_GOLBAT},
-    [SPECIES_ODDISH] = {gMonFrontPic_Oddish, 0x800, SPECIES_ODDISH},
-    [SPECIES_GLOOM] = {gMonFrontPic_Gloom, 0x800, SPECIES_GLOOM},
-    [SPECIES_VILEPLUME] = {gMonFrontPic_Vileplume, 0x800, SPECIES_VILEPLUME},
-    [SPECIES_PARAS] = {gMonFrontPic_Paras, 0x800, SPECIES_PARAS},
-    [SPECIES_PARASECT] = {gMonFrontPic_Parasect, 0x800, SPECIES_PARASECT},
-    [SPECIES_VENONAT] = {gMonFrontPic_Venonat, 0x800, SPECIES_VENONAT},
-    [SPECIES_VENOMOTH] = {gMonFrontPic_Venomoth, 0x800, SPECIES_VENOMOTH},
-    [SPECIES_DIGLETT] = {gMonFrontPic_Diglett, 0x800, SPECIES_DIGLETT},
-    [SPECIES_DUGTRIO] = {gMonFrontPic_Dugtrio, 0x800, SPECIES_DUGTRIO},
-    [SPECIES_MEOWTH] = {gMonFrontPic_Meowth, 0x800, SPECIES_MEOWTH},
-    [SPECIES_PERSIAN] = {gMonFrontPic_Persian, 0x800, SPECIES_PERSIAN},
-    [SPECIES_PSYDUCK] = {gMonFrontPic_Psyduck, 0x800, SPECIES_PSYDUCK},
-    [SPECIES_GOLDUCK] = {gMonFrontPic_Golduck, 0x800, SPECIES_GOLDUCK},
-    [SPECIES_MANKEY] = {gMonFrontPic_Mankey, 0x800, SPECIES_MANKEY},
-    [SPECIES_PRIMEAPE] = {gMonFrontPic_Primeape, 0x800, SPECIES_PRIMEAPE},
-    [SPECIES_GROWLITHE] = {gMonFrontPic_Growlithe, 0x800, SPECIES_GROWLITHE},
-    [SPECIES_ARCANINE] = {gMonFrontPic_Arcanine, 0x800, SPECIES_ARCANINE},
-    [SPECIES_POLIWAG] = {gMonFrontPic_Poliwag, 0x800, SPECIES_POLIWAG},
-    [SPECIES_POLIWHIRL] = {gMonFrontPic_Poliwhirl, 0x800, SPECIES_POLIWHIRL},
-    [SPECIES_POLIWRATH] = {gMonFrontPic_Poliwrath, 0x800, SPECIES_POLIWRATH},
-    [SPECIES_ABRA] = {gMonFrontPic_Abra, 0x800, SPECIES_ABRA},
-    [SPECIES_KADABRA] = {gMonFrontPic_Kadabra, 0x800, SPECIES_KADABRA},
-    [SPECIES_ALAKAZAM] = {gMonFrontPic_Alakazam, 0x800, SPECIES_ALAKAZAM},
-    [SPECIES_MACHOP] = {gMonFrontPic_Machop, 0x800, SPECIES_MACHOP},
-    [SPECIES_MACHOKE] = {gMonFrontPic_Machoke, 0x800, SPECIES_MACHOKE},
-    [SPECIES_MACHAMP] = {gMonFrontPic_Machamp, 0x800, SPECIES_MACHAMP},
-    [SPECIES_BELLSPROUT] = {gMonFrontPic_Bellsprout, 0x800, SPECIES_BELLSPROUT},
-    [SPECIES_WEEPINBELL] = {gMonFrontPic_Weepinbell, 0x800, SPECIES_WEEPINBELL},
-    [SPECIES_VICTREEBEL] = {gMonFrontPic_Victreebel, 0x800, SPECIES_VICTREEBEL},
-    [SPECIES_TENTACOOL] = {gMonFrontPic_Tentacool, 0x800, SPECIES_TENTACOOL},
-    [SPECIES_TENTACRUEL] = {gMonFrontPic_Tentacruel, 0x800, SPECIES_TENTACRUEL},
-    [SPECIES_GEODUDE] = {gMonFrontPic_Geodude, 0x800, SPECIES_GEODUDE},
-    [SPECIES_GRAVELER] = {gMonFrontPic_Graveler, 0x800, SPECIES_GRAVELER},
-    [SPECIES_GOLEM] = {gMonFrontPic_Golem, 0x800, SPECIES_GOLEM},
-    [SPECIES_PONYTA] = {gMonFrontPic_Ponyta, 0x800, SPECIES_PONYTA},
-    [SPECIES_RAPIDASH] = {gMonFrontPic_Rapidash, 0x800, SPECIES_RAPIDASH},
-    [SPECIES_SLOWPOKE] = {gMonFrontPic_Slowpoke, 0x800, SPECIES_SLOWPOKE},
-    [SPECIES_SLOWBRO] = {gMonFrontPic_Slowbro, 0x800, SPECIES_SLOWBRO},
-    [SPECIES_MAGNEMITE] = {gMonFrontPic_Magnemite, 0x800, SPECIES_MAGNEMITE},
-    [SPECIES_MAGNETON] = {gMonFrontPic_Magneton, 0x800, SPECIES_MAGNETON},
-    [SPECIES_FARFETCHD] = {gMonFrontPic_Farfetchd, 0x800, SPECIES_FARFETCHD},
-    [SPECIES_DODUO] = {gMonFrontPic_Doduo, 0x800, SPECIES_DODUO},
-    [SPECIES_DODRIO] = {gMonFrontPic_Dodrio, 0x800, SPECIES_DODRIO},
-    [SPECIES_SEEL] = {gMonFrontPic_Seel, 0x800, SPECIES_SEEL},
-    [SPECIES_DEWGONG] = {gMonFrontPic_Dewgong, 0x800, SPECIES_DEWGONG},
-    [SPECIES_GRIMER] = {gMonFrontPic_Grimer, 0x800, SPECIES_GRIMER},
-    [SPECIES_MUK] = {gMonFrontPic_Muk, 0x800, SPECIES_MUK},
-    [SPECIES_SHELLDER] = {gMonFrontPic_Shellder, 0x800, SPECIES_SHELLDER},
-    [SPECIES_CLOYSTER] = {gMonFrontPic_Cloyster, 0x800, SPECIES_CLOYSTER},
-    [SPECIES_GASTLY] = {gMonFrontPic_Gastly, 0x800, SPECIES_GASTLY},
-    [SPECIES_HAUNTER] = {gMonFrontPic_Haunter, 0x800, SPECIES_HAUNTER},
-    [SPECIES_GENGAR] = {gMonFrontPic_Gengar, 0x800, SPECIES_GENGAR},
-    [SPECIES_ONIX] = {gMonFrontPic_Onix, 0x800, SPECIES_ONIX},
-    [SPECIES_DROWZEE] = {gMonFrontPic_Drowzee, 0x800, SPECIES_DROWZEE},
-    [SPECIES_HYPNO] = {gMonFrontPic_Hypno, 0x800, SPECIES_HYPNO},
-    [SPECIES_KRABBY] = {gMonFrontPic_Krabby, 0x800, SPECIES_KRABBY},
-    [SPECIES_KINGLER] = {gMonFrontPic_Kingler, 0x800, SPECIES_KINGLER},
-    [SPECIES_VOLTORB] = {gMonFrontPic_Voltorb, 0x800, SPECIES_VOLTORB},
-    [SPECIES_ELECTRODE] = {gMonFrontPic_Electrode, 0x800, SPECIES_ELECTRODE},
-    [SPECIES_EXEGGCUTE] = {gMonFrontPic_Exeggcute, 0x800, SPECIES_EXEGGCUTE},
-    [SPECIES_EXEGGUTOR] = {gMonFrontPic_Exeggutor, 0x800, SPECIES_EXEGGUTOR},
-    [SPECIES_CUBONE] = {gMonFrontPic_Cubone, 0x800, SPECIES_CUBONE},
-    [SPECIES_MAROWAK] = {gMonFrontPic_Marowak, 0x800, SPECIES_MAROWAK},
-    [SPECIES_HITMONLEE] = {gMonFrontPic_Hitmonlee, 0x800, SPECIES_HITMONLEE},
-    [SPECIES_HITMONCHAN] = {gMonFrontPic_Hitmonchan, 0x800, SPECIES_HITMONCHAN},
-    [SPECIES_LICKITUNG] = {gMonFrontPic_Lickitung, 0x800, SPECIES_LICKITUNG},
-    [SPECIES_KOFFING] = {gMonFrontPic_Koffing, 0x800, SPECIES_KOFFING},
-    [SPECIES_WEEZING] = {gMonFrontPic_Weezing, 0x800, SPECIES_WEEZING},
-    [SPECIES_RHYHORN] = {gMonFrontPic_Rhyhorn, 0x800, SPECIES_RHYHORN},
-    [SPECIES_RHYDON] = {gMonFrontPic_Rhydon, 0x800, SPECIES_RHYDON},
-    [SPECIES_CHANSEY] = {gMonFrontPic_Chansey, 0x800, SPECIES_CHANSEY},
-    [SPECIES_TANGELA] = {gMonFrontPic_Tangela, 0x800, SPECIES_TANGELA},
-    [SPECIES_KANGASKHAN] = {gMonFrontPic_Kangaskhan, 0x800, SPECIES_KANGASKHAN},
-    [SPECIES_HORSEA] = {gMonFrontPic_Horsea, 0x800, SPECIES_HORSEA},
-    [SPECIES_SEADRA] = {gMonFrontPic_Seadra, 0x800, SPECIES_SEADRA},
-    [SPECIES_GOLDEEN] = {gMonFrontPic_Goldeen, 0x800, SPECIES_GOLDEEN},
-    [SPECIES_SEAKING] = {gMonFrontPic_Seaking, 0x800, SPECIES_SEAKING},
-    [SPECIES_STARYU] = {gMonFrontPic_Staryu, 0x800, SPECIES_STARYU},
-    [SPECIES_STARMIE] = {gMonFrontPic_Starmie, 0x800, SPECIES_STARMIE},
-    [SPECIES_MR_MIME] = {gMonFrontPic_Mrmime, 0x800, SPECIES_MR_MIME},
-    [SPECIES_SCYTHER] = {gMonFrontPic_Scyther, 0x800, SPECIES_SCYTHER},
-    [SPECIES_JYNX] = {gMonFrontPic_Jynx, 0x800, SPECIES_JYNX},
-    [SPECIES_ELECTABUZZ] = {gMonFrontPic_Electabuzz, 0x800, SPECIES_ELECTABUZZ},
-    [SPECIES_MAGMAR] = {gMonFrontPic_Magmar, 0x800, SPECIES_MAGMAR},
-    [SPECIES_PINSIR] = {gMonFrontPic_Pinsir, 0x800, SPECIES_PINSIR},
-    [SPECIES_TAUROS] = {gMonFrontPic_Tauros, 0x800, SPECIES_TAUROS},
-    [SPECIES_MAGIKARP] = {gMonFrontPic_Magikarp, 0x800, SPECIES_MAGIKARP},
-    [SPECIES_GYARADOS] = {gMonFrontPic_Gyarados, 0x800, SPECIES_GYARADOS},
-    [SPECIES_LAPRAS] = {gMonFrontPic_Lapras, 0x800, SPECIES_LAPRAS},
-    [SPECIES_DITTO] = {gMonFrontPic_Ditto, 0x800, SPECIES_DITTO},
-    [SPECIES_EEVEE] = {gMonFrontPic_Eevee, 0x800, SPECIES_EEVEE},
-    [SPECIES_VAPOREON] = {gMonFrontPic_Vaporeon, 0x800, SPECIES_VAPOREON},
-    [SPECIES_JOLTEON] = {gMonFrontPic_Jolteon, 0x800, SPECIES_JOLTEON},
-    [SPECIES_FLAREON] = {gMonFrontPic_Flareon, 0x800, SPECIES_FLAREON},
-    [SPECIES_PORYGON] = {gMonFrontPic_Porygon, 0x800, SPECIES_PORYGON},
-    [SPECIES_OMANYTE] = {gMonFrontPic_Omanyte, 0x800, SPECIES_OMANYTE},
-    [SPECIES_OMASTAR] = {gMonFrontPic_Omastar, 0x800, SPECIES_OMASTAR},
-    [SPECIES_KABUTO] = {gMonFrontPic_Kabuto, 0x800, SPECIES_KABUTO},
-    [SPECIES_KABUTOPS] = {gMonFrontPic_Kabutops, 0x800, SPECIES_KABUTOPS},
-    [SPECIES_AERODACTYL] = {gMonFrontPic_Aerodactyl, 0x800, SPECIES_AERODACTYL},
-    [SPECIES_SNORLAX] = {gMonFrontPic_Snorlax, 0x800, SPECIES_SNORLAX},
-    [SPECIES_ARTICUNO] = {gMonFrontPic_Articuno, 0x800, SPECIES_ARTICUNO},
-    [SPECIES_ZAPDOS] = {gMonFrontPic_Zapdos, 0x800, SPECIES_ZAPDOS},
-    [SPECIES_MOLTRES] = {gMonFrontPic_Moltres, 0x800, SPECIES_MOLTRES},
-    [SPECIES_DRATINI] = {gMonFrontPic_Dratini, 0x800, SPECIES_DRATINI},
-    [SPECIES_DRAGONAIR] = {gMonFrontPic_Dragonair, 0x800, SPECIES_DRAGONAIR},
-    [SPECIES_DRAGONITE] = {gMonFrontPic_Dragonite, 0x800, SPECIES_DRAGONITE},
-    [SPECIES_MEWTWO] = {gMonFrontPic_Mewtwo, 0x800, SPECIES_MEWTWO},
-    [SPECIES_MEW] = {gMonFrontPic_Mew, 0x800, SPECIES_MEW},
-    [SPECIES_CHIKORITA] = {gMonFrontPic_Chikorita, 0x800, SPECIES_CHIKORITA},
-    [SPECIES_BAYLEEF] = {gMonFrontPic_Bayleef, 0x800, SPECIES_BAYLEEF},
-    [SPECIES_MEGANIUM] = {gMonFrontPic_Meganium, 0x800, SPECIES_MEGANIUM},
-    [SPECIES_CYNDAQUIL] = {gMonFrontPic_Cyndaquil, 0x800, SPECIES_CYNDAQUIL},
-    [SPECIES_QUILAVA] = {gMonFrontPic_Quilava, 0x800, SPECIES_QUILAVA},
-    [SPECIES_TYPHLOSION] = {gMonFrontPic_Typhlosion, 0x800, SPECIES_TYPHLOSION},
-    [SPECIES_TOTODILE] = {gMonFrontPic_Totodile, 0x800, SPECIES_TOTODILE},
-    [SPECIES_CROCONAW] = {gMonFrontPic_Croconaw, 0x800, SPECIES_CROCONAW},
-    [SPECIES_FERALIGATR] = {gMonFrontPic_Feraligatr, 0x800, SPECIES_FERALIGATR},
-    [SPECIES_SENTRET] = {gMonFrontPic_Sentret, 0x800, SPECIES_SENTRET},
-    [SPECIES_FURRET] = {gMonFrontPic_Furret, 0x800, SPECIES_FURRET},
-    [SPECIES_HOOTHOOT] = {gMonFrontPic_Hoothoot, 0x800, SPECIES_HOOTHOOT},
-    [SPECIES_NOCTOWL] = {gMonFrontPic_Noctowl, 0x800, SPECIES_NOCTOWL},
-    [SPECIES_LEDYBA] = {gMonFrontPic_Ledyba, 0x800, SPECIES_LEDYBA},
-    [SPECIES_LEDIAN] = {gMonFrontPic_Ledian, 0x800, SPECIES_LEDIAN},
-    [SPECIES_SPINARAK] = {gMonFrontPic_Spinarak, 0x800, SPECIES_SPINARAK},
-    [SPECIES_ARIADOS] = {gMonFrontPic_Ariados, 0x800, SPECIES_ARIADOS},
-    [SPECIES_CROBAT] = {gMonFrontPic_Crobat, 0x800, SPECIES_CROBAT},
-    [SPECIES_CHINCHOU] = {gMonFrontPic_Chinchou, 0x800, SPECIES_CHINCHOU},
-    [SPECIES_LANTURN] = {gMonFrontPic_Lanturn, 0x800, SPECIES_LANTURN},
-    [SPECIES_PICHU] = {gMonFrontPic_Pichu, 0x800, SPECIES_PICHU},
-    [SPECIES_CLEFFA] = {gMonFrontPic_Cleffa, 0x800, SPECIES_CLEFFA},
-    [SPECIES_IGGLYBUFF] = {gMonFrontPic_Igglybuff, 0x800, SPECIES_IGGLYBUFF},
-    [SPECIES_TOGEPI] = {gMonFrontPic_Togepi, 0x800, SPECIES_TOGEPI},
-    [SPECIES_TOGETIC] = {gMonFrontPic_Togetic, 0x800, SPECIES_TOGETIC},
-    [SPECIES_NATU] = {gMonFrontPic_Natu, 0x800, SPECIES_NATU},
-    [SPECIES_XATU] = {gMonFrontPic_Xatu, 0x800, SPECIES_XATU},
-    [SPECIES_MAREEP] = {gMonFrontPic_Mareep, 0x800, SPECIES_MAREEP},
-    [SPECIES_FLAAFFY] = {gMonFrontPic_Flaaffy, 0x800, SPECIES_FLAAFFY},
-    [SPECIES_AMPHAROS] = {gMonFrontPic_Ampharos, 0x800, SPECIES_AMPHAROS},
-    [SPECIES_BELLOSSOM] = {gMonFrontPic_Bellossom, 0x800, SPECIES_BELLOSSOM},
-    [SPECIES_MARILL] = {gMonFrontPic_Marill, 0x800, SPECIES_MARILL},
-    [SPECIES_AZUMARILL] = {gMonFrontPic_Azumarill, 0x800, SPECIES_AZUMARILL},
-    [SPECIES_SUDOWOODO] = {gMonFrontPic_Sudowoodo, 0x800, SPECIES_SUDOWOODO},
-    [SPECIES_POLITOED] = {gMonFrontPic_Politoed, 0x800, SPECIES_POLITOED},
-    [SPECIES_HOPPIP] = {gMonFrontPic_Hoppip, 0x800, SPECIES_HOPPIP},
-    [SPECIES_SKIPLOOM] = {gMonFrontPic_Skiploom, 0x800, SPECIES_SKIPLOOM},
-    [SPECIES_JUMPLUFF] = {gMonFrontPic_Jumpluff, 0x800, SPECIES_JUMPLUFF},
-    [SPECIES_AIPOM] = {gMonFrontPic_Aipom, 0x800, SPECIES_AIPOM},
-    [SPECIES_SUNKERN] = {gMonFrontPic_Sunkern, 0x800, SPECIES_SUNKERN},
-    [SPECIES_SUNFLORA] = {gMonFrontPic_Sunflora, 0x800, SPECIES_SUNFLORA},
-    [SPECIES_YANMA] = {gMonFrontPic_Yanma, 0x800, SPECIES_YANMA},
-    [SPECIES_WOOPER] = {gMonFrontPic_Wooper, 0x800, SPECIES_WOOPER},
-    [SPECIES_QUAGSIRE] = {gMonFrontPic_Quagsire, 0x800, SPECIES_QUAGSIRE},
-    [SPECIES_ESPEON] = {gMonFrontPic_Espeon, 0x800, SPECIES_ESPEON},
-    [SPECIES_UMBREON] = {gMonFrontPic_Umbreon, 0x800, SPECIES_UMBREON},
-    [SPECIES_MURKROW] = {gMonFrontPic_Murkrow, 0x800, SPECIES_MURKROW},
-    [SPECIES_SLOWKING] = {gMonFrontPic_Slowking, 0x800, SPECIES_SLOWKING},
-    [SPECIES_MISDREAVUS] = {gMonFrontPic_Misdreavus, 0x800, SPECIES_MISDREAVUS},
-    [SPECIES_UNOWN] = {gMonFrontPic_UnownA, 0x800, SPECIES_UNOWN},
-    [SPECIES_WOBBUFFET] = {gMonFrontPic_Wobbuffet, 0x800, SPECIES_WOBBUFFET},
-    [SPECIES_GIRAFARIG] = {gMonFrontPic_Girafarig, 0x800, SPECIES_GIRAFARIG},
-    [SPECIES_PINECO] = {gMonFrontPic_Pineco, 0x800, SPECIES_PINECO},
-    [SPECIES_FORRETRESS] = {gMonFrontPic_Forretress, 0x800, SPECIES_FORRETRESS},
-    [SPECIES_DUNSPARCE] = {gMonFrontPic_Dunsparce, 0x800, SPECIES_DUNSPARCE},
-    [SPECIES_GLIGAR] = {gMonFrontPic_Gligar, 0x800, SPECIES_GLIGAR},
-    [SPECIES_STEELIX] = {gMonFrontPic_Steelix, 0x800, SPECIES_STEELIX},
-    [SPECIES_SNUBBULL] = {gMonFrontPic_Snubbull, 0x800, SPECIES_SNUBBULL},
-    [SPECIES_GRANBULL] = {gMonFrontPic_Granbull, 0x800, SPECIES_GRANBULL},
-    [SPECIES_QWILFISH] = {gMonFrontPic_Qwilfish, 0x800, SPECIES_QWILFISH},
-    [SPECIES_SCIZOR] = {gMonFrontPic_Scizor, 0x800, SPECIES_SCIZOR},
-    [SPECIES_SHUCKLE] = {gMonFrontPic_Shuckle, 0x800, SPECIES_SHUCKLE},
-    [SPECIES_HERACROSS] = {gMonFrontPic_Heracross, 0x800, SPECIES_HERACROSS},
-    [SPECIES_SNEASEL] = {gMonFrontPic_Sneasel, 0x800, SPECIES_SNEASEL},
-    [SPECIES_TEDDIURSA] = {gMonFrontPic_Teddiursa, 0x800, SPECIES_TEDDIURSA},
-    [SPECIES_URSARING] = {gMonFrontPic_Ursaring, 0x800, SPECIES_URSARING},
-    [SPECIES_SLUGMA] = {gMonFrontPic_Slugma, 0x800, SPECIES_SLUGMA},
-    [SPECIES_MAGCARGO] = {gMonFrontPic_Magcargo, 0x800, SPECIES_MAGCARGO},
-    [SPECIES_SWINUB] = {gMonFrontPic_Swinub, 0x800, SPECIES_SWINUB},
-    [SPECIES_PILOSWINE] = {gMonFrontPic_Piloswine, 0x800, SPECIES_PILOSWINE},
-    [SPECIES_CORSOLA] = {gMonFrontPic_Corsola, 0x800, SPECIES_CORSOLA},
-    [SPECIES_REMORAID] = {gMonFrontPic_Remoraid, 0x800, SPECIES_REMORAID},
-    [SPECIES_OCTILLERY] = {gMonFrontPic_Octillery, 0x800, SPECIES_OCTILLERY},
-    [SPECIES_DELIBIRD] = {gMonFrontPic_Delibird, 0x800, SPECIES_DELIBIRD},
-    [SPECIES_MANTINE] = {gMonFrontPic_Mantine, 0x800, SPECIES_MANTINE},
-    [SPECIES_SKARMORY] = {gMonFrontPic_Skarmory, 0x800, SPECIES_SKARMORY},
-    [SPECIES_HOUNDOUR] = {gMonFrontPic_Houndour, 0x800, SPECIES_HOUNDOUR},
-    [SPECIES_HOUNDOOM] = {gMonFrontPic_Houndoom, 0x800, SPECIES_HOUNDOOM},
-    [SPECIES_KINGDRA] = {gMonFrontPic_Kingdra, 0x800, SPECIES_KINGDRA},
-    [SPECIES_PHANPY] = {gMonFrontPic_Phanpy, 0x800, SPECIES_PHANPY},
-    [SPECIES_DONPHAN] = {gMonFrontPic_Donphan, 0x800, SPECIES_DONPHAN},
-    [SPECIES_PORYGON2] = {gMonFrontPic_Porygon2, 0x800, SPECIES_PORYGON2},
-    [SPECIES_STANTLER] = {gMonFrontPic_Stantler, 0x800, SPECIES_STANTLER},
-    [SPECIES_SMEARGLE] = {gMonFrontPic_Smeargle, 0x800, SPECIES_SMEARGLE},
-    [SPECIES_TYROGUE] = {gMonFrontPic_Tyrogue, 0x800, SPECIES_TYROGUE},
-    [SPECIES_HITMONTOP] = {gMonFrontPic_Hitmontop, 0x800, SPECIES_HITMONTOP},
-    [SPECIES_SMOOCHUM] = {gMonFrontPic_Smoochum, 0x800, SPECIES_SMOOCHUM},
-    [SPECIES_ELEKID] = {gMonFrontPic_Elekid, 0x800, SPECIES_ELEKID},
-    [SPECIES_MAGBY] = {gMonFrontPic_Magby, 0x800, SPECIES_MAGBY},
-    [SPECIES_MILTANK] = {gMonFrontPic_Miltank, 0x800, SPECIES_MILTANK},
-    [SPECIES_BLISSEY] = {gMonFrontPic_Blissey, 0x800, SPECIES_BLISSEY},
-    [SPECIES_RAIKOU] = {gMonFrontPic_Raikou, 0x800, SPECIES_RAIKOU},
-    [SPECIES_ENTEI] = {gMonFrontPic_Entei, 0x800, SPECIES_ENTEI},
-    [SPECIES_SUICUNE] = {gMonFrontPic_Suicune, 0x800, SPECIES_SUICUNE},
-    [SPECIES_LARVITAR] = {gMonFrontPic_Larvitar, 0x800, SPECIES_LARVITAR},
-    [SPECIES_PUPITAR] = {gMonFrontPic_Pupitar, 0x800, SPECIES_PUPITAR},
-    [SPECIES_TYRANITAR] = {gMonFrontPic_Tyranitar, 0x800, SPECIES_TYRANITAR},
-    [SPECIES_LUGIA] = {gMonFrontPic_Lugia, 0x800, SPECIES_LUGIA},
-    [SPECIES_HO_OH] = {gMonFrontPic_HoOh, 0x800, SPECIES_HO_OH},
-    [SPECIES_CELEBI] = {gMonFrontPic_Celebi, 0x800, SPECIES_CELEBI},
-    [SPECIES_OLD_UNOWN_B] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_B},
-    [SPECIES_OLD_UNOWN_C] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_C},
-    [SPECIES_OLD_UNOWN_D] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_D},
-    [SPECIES_OLD_UNOWN_E] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_E},
-    [SPECIES_OLD_UNOWN_F] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_F},
-    [SPECIES_OLD_UNOWN_G] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_G},
-    [SPECIES_OLD_UNOWN_H] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_H},
-    [SPECIES_OLD_UNOWN_I] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_I},
-    [SPECIES_OLD_UNOWN_J] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_J},
-    [SPECIES_OLD_UNOWN_K] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_K},
-    [SPECIES_OLD_UNOWN_L] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_L},
-    [SPECIES_OLD_UNOWN_M] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_M},
-    [SPECIES_OLD_UNOWN_N] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_N},
-    [SPECIES_OLD_UNOWN_O] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_O},
-    [SPECIES_OLD_UNOWN_P] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_P},
-    [SPECIES_OLD_UNOWN_Q] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Q},
-    [SPECIES_OLD_UNOWN_R] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_R},
-    [SPECIES_OLD_UNOWN_S] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_S},
-    [SPECIES_OLD_UNOWN_T] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_T},
-    [SPECIES_OLD_UNOWN_U] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_U},
-    [SPECIES_OLD_UNOWN_V] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_V},
-    [SPECIES_OLD_UNOWN_W] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_W},
-    [SPECIES_OLD_UNOWN_X] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_X},
-    [SPECIES_OLD_UNOWN_Y] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Y},
-    [SPECIES_OLD_UNOWN_Z] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Z},
-    [SPECIES_TREECKO] = {gMonFrontPic_Treecko, 0x800, SPECIES_TREECKO},
-    [SPECIES_GROVYLE] = {gMonFrontPic_Grovyle, 0x800, SPECIES_GROVYLE},
-    [SPECIES_SCEPTILE] = {gMonFrontPic_Sceptile, 0x800, SPECIES_SCEPTILE},
-    [SPECIES_TORCHIC] = {gMonFrontPic_Torchic, 0x800, SPECIES_TORCHIC},
-    [SPECIES_COMBUSKEN] = {gMonFrontPic_Combusken, 0x800, SPECIES_COMBUSKEN},
-    [SPECIES_BLAZIKEN] = {gMonFrontPic_Blaziken, 0x800, SPECIES_BLAZIKEN},
-    [SPECIES_MUDKIP] = {gMonFrontPic_Mudkip, 0x800, SPECIES_MUDKIP},
-    [SPECIES_MARSHTOMP] = {gMonFrontPic_Marshtomp, 0x800, SPECIES_MARSHTOMP},
-    [SPECIES_SWAMPERT] = {gMonFrontPic_Swampert, 0x800, SPECIES_SWAMPERT},
-    [SPECIES_POOCHYENA] = {gMonFrontPic_Poochyena, 0x800, SPECIES_POOCHYENA},
-    [SPECIES_MIGHTYENA] = {gMonFrontPic_Mightyena, 0x800, SPECIES_MIGHTYENA},
-    [SPECIES_ZIGZAGOON] = {gMonFrontPic_Zigzagoon, 0x800, SPECIES_ZIGZAGOON},
-    [SPECIES_LINOONE] = {gMonFrontPic_Linoone, 0x800, SPECIES_LINOONE},
-    [SPECIES_WURMPLE] = {gMonFrontPic_Wurmple, 0x800, SPECIES_WURMPLE},
-    [SPECIES_SILCOON] = {gMonFrontPic_Silcoon, 0x800, SPECIES_SILCOON},
-    [SPECIES_BEAUTIFLY] = {gMonFrontPic_Beautifly, 0x800, SPECIES_BEAUTIFLY},
-    [SPECIES_CASCOON] = {gMonFrontPic_Cascoon, 0x800, SPECIES_CASCOON},
-    [SPECIES_DUSTOX] = {gMonFrontPic_Dustox, 0x800, SPECIES_DUSTOX},
-    [SPECIES_LOTAD] = {gMonFrontPic_Lotad, 0x800, SPECIES_LOTAD},
-    [SPECIES_LOMBRE] = {gMonFrontPic_Lombre, 0x800, SPECIES_LOMBRE},
-    [SPECIES_LUDICOLO] = {gMonFrontPic_Ludicolo, 0x800, SPECIES_LUDICOLO},
-    [SPECIES_SEEDOT] = {gMonFrontPic_Seedot, 0x800, SPECIES_SEEDOT},
-    [SPECIES_NUZLEAF] = {gMonFrontPic_Nuzleaf, 0x800, SPECIES_NUZLEAF},
-    [SPECIES_SHIFTRY] = {gMonFrontPic_Shiftry, 0x800, SPECIES_SHIFTRY},
-    [SPECIES_NINCADA] = {gMonFrontPic_Nincada, 0x800, SPECIES_NINCADA},
-    [SPECIES_NINJASK] = {gMonFrontPic_Ninjask, 0x800, SPECIES_NINJASK},
-    [SPECIES_SHEDINJA] = {gMonFrontPic_Shedinja, 0x800, SPECIES_SHEDINJA},
-    [SPECIES_TAILLOW] = {gMonFrontPic_Taillow, 0x800, SPECIES_TAILLOW},
-    [SPECIES_SWELLOW] = {gMonFrontPic_Swellow, 0x800, SPECIES_SWELLOW},
-    [SPECIES_SHROOMISH] = {gMonFrontPic_Shroomish, 0x800, SPECIES_SHROOMISH},
-    [SPECIES_BRELOOM] = {gMonFrontPic_Breloom, 0x800, SPECIES_BRELOOM},
-    [SPECIES_SPINDA] = {gMonFrontPic_Spinda, 0x800, SPECIES_SPINDA},
-    [SPECIES_WINGULL] = {gMonFrontPic_Wingull, 0x800, SPECIES_WINGULL},
-    [SPECIES_PELIPPER] = {gMonFrontPic_Pelipper, 0x800, SPECIES_PELIPPER},
-    [SPECIES_SURSKIT] = {gMonFrontPic_Surskit, 0x800, SPECIES_SURSKIT},
-    [SPECIES_MASQUERAIN] = {gMonFrontPic_Masquerain, 0x800, SPECIES_MASQUERAIN},
-    [SPECIES_WAILMER] = {gMonFrontPic_Wailmer, 0x800, SPECIES_WAILMER},
-    [SPECIES_WAILORD] = {gMonFrontPic_Wailord, 0x800, SPECIES_WAILORD},
-    [SPECIES_SKITTY] = {gMonFrontPic_Skitty, 0x800, SPECIES_SKITTY},
-    [SPECIES_DELCATTY] = {gMonFrontPic_Delcatty, 0x800, SPECIES_DELCATTY},
-    [SPECIES_KECLEON] = {gMonFrontPic_Kecleon, 0x800, SPECIES_KECLEON},
-    [SPECIES_BALTOY] = {gMonFrontPic_Baltoy, 0x800, SPECIES_BALTOY},
-    [SPECIES_CLAYDOL] = {gMonFrontPic_Claydol, 0x800, SPECIES_CLAYDOL},
-    [SPECIES_NOSEPASS] = {gMonFrontPic_Nosepass, 0x800, SPECIES_NOSEPASS},
-    [SPECIES_TORKOAL] = {gMonFrontPic_Torkoal, 0x800, SPECIES_TORKOAL},
-    [SPECIES_SABLEYE] = {gMonFrontPic_Sableye, 0x800, SPECIES_SABLEYE},
-    [SPECIES_BARBOACH] = {gMonFrontPic_Barboach, 0x800, SPECIES_BARBOACH},
-    [SPECIES_WHISCASH] = {gMonFrontPic_Whiscash, 0x800, SPECIES_WHISCASH},
-    [SPECIES_LUVDISC] = {gMonFrontPic_Luvdisc, 0x800, SPECIES_LUVDISC},
-    [SPECIES_CORPHISH] = {gMonFrontPic_Corphish, 0x800, SPECIES_CORPHISH},
-    [SPECIES_CRAWDAUNT] = {gMonFrontPic_Crawdaunt, 0x800, SPECIES_CRAWDAUNT},
-    [SPECIES_FEEBAS] = {gMonFrontPic_Feebas, 0x800, SPECIES_FEEBAS},
-    [SPECIES_MILOTIC] = {gMonFrontPic_Milotic, 0x800, SPECIES_MILOTIC},
-    [SPECIES_CARVANHA] = {gMonFrontPic_Carvanha, 0x800, SPECIES_CARVANHA},
-    [SPECIES_SHARPEDO] = {gMonFrontPic_Sharpedo, 0x800, SPECIES_SHARPEDO},
-    [SPECIES_TRAPINCH] = {gMonFrontPic_Trapinch, 0x800, SPECIES_TRAPINCH},
-    [SPECIES_VIBRAVA] = {gMonFrontPic_Vibrava, 0x800, SPECIES_VIBRAVA},
-    [SPECIES_FLYGON] = {gMonFrontPic_Flygon, 0x800, SPECIES_FLYGON},
-    [SPECIES_MAKUHITA] = {gMonFrontPic_Makuhita, 0x800, SPECIES_MAKUHITA},
-    [SPECIES_HARIYAMA] = {gMonFrontPic_Hariyama, 0x800, SPECIES_HARIYAMA},
-    [SPECIES_ELECTRIKE] = {gMonFrontPic_Electrike, 0x800, SPECIES_ELECTRIKE},
-    [SPECIES_MANECTRIC] = {gMonFrontPic_Manectric, 0x800, SPECIES_MANECTRIC},
-    [SPECIES_NUMEL] = {gMonFrontPic_Numel, 0x800, SPECIES_NUMEL},
-    [SPECIES_CAMERUPT] = {gMonFrontPic_Camerupt, 0x800, SPECIES_CAMERUPT},
-    [SPECIES_SPHEAL] = {gMonFrontPic_Spheal, 0x800, SPECIES_SPHEAL},
-    [SPECIES_SEALEO] = {gMonFrontPic_Sealeo, 0x800, SPECIES_SEALEO},
-    [SPECIES_WALREIN] = {gMonFrontPic_Walrein, 0x800, SPECIES_WALREIN},
-    [SPECIES_CACNEA] = {gMonFrontPic_Cacnea, 0x800, SPECIES_CACNEA},
-    [SPECIES_CACTURNE] = {gMonFrontPic_Cacturne, 0x800, SPECIES_CACTURNE},
-    [SPECIES_SNORUNT] = {gMonFrontPic_Snorunt, 0x800, SPECIES_SNORUNT},
-    [SPECIES_GLALIE] = {gMonFrontPic_Glalie, 0x800, SPECIES_GLALIE},
-    [SPECIES_LUNATONE] = {gMonFrontPic_Lunatone, 0x800, SPECIES_LUNATONE},
-    [SPECIES_SOLROCK] = {gMonFrontPic_Solrock, 0x800, SPECIES_SOLROCK},
-    [SPECIES_AZURILL] = {gMonFrontPic_Azurill, 0x800, SPECIES_AZURILL},
-    [SPECIES_SPOINK] = {gMonFrontPic_Spoink, 0x800, SPECIES_SPOINK},
-    [SPECIES_GRUMPIG] = {gMonFrontPic_Grumpig, 0x800, SPECIES_GRUMPIG},
-    [SPECIES_PLUSLE] = {gMonFrontPic_Plusle, 0x800, SPECIES_PLUSLE},
-    [SPECIES_MINUN] = {gMonFrontPic_Minun, 0x800, SPECIES_MINUN},
-    [SPECIES_MAWILE] = {gMonFrontPic_Mawile, 0x800, SPECIES_MAWILE},
-    [SPECIES_MEDITITE] = {gMonFrontPic_Meditite, 0x800, SPECIES_MEDITITE},
-    [SPECIES_MEDICHAM] = {gMonFrontPic_Medicham, 0x800, SPECIES_MEDICHAM},
-    [SPECIES_SWABLU] = {gMonFrontPic_Swablu, 0x800, SPECIES_SWABLU},
-    [SPECIES_ALTARIA] = {gMonFrontPic_Altaria, 0x800, SPECIES_ALTARIA},
-    [SPECIES_WYNAUT] = {gMonFrontPic_Wynaut, 0x800, SPECIES_WYNAUT},
-    [SPECIES_DUSKULL] = {gMonFrontPic_Duskull, 0x800, SPECIES_DUSKULL},
-    [SPECIES_DUSCLOPS] = {gMonFrontPic_Dusclops, 0x800, SPECIES_DUSCLOPS},
-    [SPECIES_ROSELIA] = {gMonFrontPic_Roselia, 0x800, SPECIES_ROSELIA},
-    [SPECIES_SLAKOTH] = {gMonFrontPic_Slakoth, 0x800, SPECIES_SLAKOTH},
-    [SPECIES_VIGOROTH] = {gMonFrontPic_Vigoroth, 0x800, SPECIES_VIGOROTH},
-    [SPECIES_SLAKING] = {gMonFrontPic_Slaking, 0x800, SPECIES_SLAKING},
-    [SPECIES_GULPIN] = {gMonFrontPic_Gulpin, 0x800, SPECIES_GULPIN},
-    [SPECIES_SWALOT] = {gMonFrontPic_Swalot, 0x800, SPECIES_SWALOT},
-    [SPECIES_TROPIUS] = {gMonFrontPic_Tropius, 0x800, SPECIES_TROPIUS},
-    [SPECIES_WHISMUR] = {gMonFrontPic_Whismur, 0x800, SPECIES_WHISMUR},
-    [SPECIES_LOUDRED] = {gMonFrontPic_Loudred, 0x800, SPECIES_LOUDRED},
-    [SPECIES_EXPLOUD] = {gMonFrontPic_Exploud, 0x800, SPECIES_EXPLOUD},
-    [SPECIES_CLAMPERL] = {gMonFrontPic_Clamperl, 0x800, SPECIES_CLAMPERL},
-    [SPECIES_HUNTAIL] = {gMonFrontPic_Huntail, 0x800, SPECIES_HUNTAIL},
-    [SPECIES_GOREBYSS] = {gMonFrontPic_Gorebyss, 0x800, SPECIES_GOREBYSS},
-    [SPECIES_ABSOL] = {gMonFrontPic_Absol, 0x800, SPECIES_ABSOL},
-    [SPECIES_SHUPPET] = {gMonFrontPic_Shuppet, 0x800, SPECIES_SHUPPET},
-    [SPECIES_BANETTE] = {gMonFrontPic_Banette, 0x800, SPECIES_BANETTE},
-    [SPECIES_SEVIPER] = {gMonFrontPic_Seviper, 0x800, SPECIES_SEVIPER},
-    [SPECIES_ZANGOOSE] = {gMonFrontPic_Zangoose, 0x800, SPECIES_ZANGOOSE},
-    [SPECIES_RELICANTH] = {gMonFrontPic_Relicanth, 0x800, SPECIES_RELICANTH},
-    [SPECIES_ARON] = {gMonFrontPic_Aron, 0x800, SPECIES_ARON},
-    [SPECIES_LAIRON] = {gMonFrontPic_Lairon, 0x800, SPECIES_LAIRON},
-    [SPECIES_AGGRON] = {gMonFrontPic_Aggron, 0x800, SPECIES_AGGRON},
-    [SPECIES_CASTFORM] = {gMonFrontPic_Castform, 0x800, SPECIES_CASTFORM},
-    [SPECIES_VOLBEAT] = {gMonFrontPic_Volbeat, 0x800, SPECIES_VOLBEAT},
-    [SPECIES_ILLUMISE] = {gMonFrontPic_Illumise, 0x800, SPECIES_ILLUMISE},
-    [SPECIES_LILEEP] = {gMonFrontPic_Lileep, 0x800, SPECIES_LILEEP},
-    [SPECIES_CRADILY] = {gMonFrontPic_Cradily, 0x800, SPECIES_CRADILY},
-    [SPECIES_ANORITH] = {gMonFrontPic_Anorith, 0x800, SPECIES_ANORITH},
-    [SPECIES_ARMALDO] = {gMonFrontPic_Armaldo, 0x800, SPECIES_ARMALDO},
-    [SPECIES_RALTS] = {gMonFrontPic_Ralts, 0x800, SPECIES_RALTS},
-    [SPECIES_KIRLIA] = {gMonFrontPic_Kirlia, 0x800, SPECIES_KIRLIA},
-    [SPECIES_GARDEVOIR] = {gMonFrontPic_Gardevoir, 0x800, SPECIES_GARDEVOIR},
-    [SPECIES_BAGON] = {gMonFrontPic_Bagon, 0x800, SPECIES_BAGON},
-    [SPECIES_SHELGON] = {gMonFrontPic_Shelgon, 0x800, SPECIES_SHELGON},
-    [SPECIES_SALAMENCE] = {gMonFrontPic_Salamence, 0x800, SPECIES_SALAMENCE},
-    [SPECIES_BELDUM] = {gMonFrontPic_Beldum, 0x800, SPECIES_BELDUM},
-    [SPECIES_METANG] = {gMonFrontPic_Metang, 0x800, SPECIES_METANG},
-    [SPECIES_METAGROSS] = {gMonFrontPic_Metagross, 0x800, SPECIES_METAGROSS},
-    [SPECIES_REGIROCK] = {gMonFrontPic_Regirock, 0x800, SPECIES_REGIROCK},
-    [SPECIES_REGICE] = {gMonFrontPic_Regice, 0x800, SPECIES_REGICE},
-    [SPECIES_REGISTEEL] = {gMonFrontPic_Registeel, 0x800, SPECIES_REGISTEEL},
-    [SPECIES_KYOGRE] = {gMonFrontPic_Kyogre, 0x800, SPECIES_KYOGRE},
-    [SPECIES_GROUDON] = {gMonFrontPic_Groudon, 0x800, SPECIES_GROUDON},
-    [SPECIES_RAYQUAZA] = {gMonFrontPic_Rayquaza, 0x800, SPECIES_RAYQUAZA},
-    [SPECIES_LATIAS] = {gMonFrontPic_Latias, 0x800, SPECIES_LATIAS},
-    [SPECIES_LATIOS] = {gMonFrontPic_Latios, 0x800, SPECIES_LATIOS},
-    [SPECIES_JIRACHI] = {gMonFrontPic_Jirachi, 0x800, SPECIES_JIRACHI},
-    [SPECIES_DEOXYS] = {gMonFrontPic_Deoxys, 0x800, SPECIES_DEOXYS},
-    [SPECIES_CHIMECHO] = {gMonFrontPic_Chimecho, 0x800, SPECIES_CHIMECHO},
-    [SPECIES_EGG] = {gMonFrontPic_Egg, 0x800, SPECIES_EGG},
-    [SPECIES_UNOWN_B] = {gMonFrontPic_UnownB, 0x800, SPECIES_UNOWN_B},
-    [SPECIES_UNOWN_C] = {gMonFrontPic_UnownC, 0x800, SPECIES_UNOWN_C},
-    [SPECIES_UNOWN_D] = {gMonFrontPic_UnownD, 0x800, SPECIES_UNOWN_D},
-    [SPECIES_UNOWN_E] = {gMonFrontPic_UnownE, 0x800, SPECIES_UNOWN_E},
-    [SPECIES_UNOWN_F] = {gMonFrontPic_UnownF, 0x800, SPECIES_UNOWN_F},
-    [SPECIES_UNOWN_G] = {gMonFrontPic_UnownG, 0x800, SPECIES_UNOWN_G},
-    [SPECIES_UNOWN_H] = {gMonFrontPic_UnownH, 0x800, SPECIES_UNOWN_H},
-    [SPECIES_UNOWN_I] = {gMonFrontPic_UnownI, 0x800, SPECIES_UNOWN_I},
-    [SPECIES_UNOWN_J] = {gMonFrontPic_UnownJ, 0x800, SPECIES_UNOWN_J},
-    [SPECIES_UNOWN_K] = {gMonFrontPic_UnownK, 0x800, SPECIES_UNOWN_K},
-    [SPECIES_UNOWN_L] = {gMonFrontPic_UnownL, 0x800, SPECIES_UNOWN_L},
-    [SPECIES_UNOWN_M] = {gMonFrontPic_UnownM, 0x800, SPECIES_UNOWN_M},
-    [SPECIES_UNOWN_N] = {gMonFrontPic_UnownN, 0x800, SPECIES_UNOWN_N},
-    [SPECIES_UNOWN_O] = {gMonFrontPic_UnownO, 0x800, SPECIES_UNOWN_O},
-    [SPECIES_UNOWN_P] = {gMonFrontPic_UnownP, 0x800, SPECIES_UNOWN_P},
-    [SPECIES_UNOWN_Q] = {gMonFrontPic_UnownQ, 0x800, SPECIES_UNOWN_Q},
-    [SPECIES_UNOWN_R] = {gMonFrontPic_UnownR, 0x800, SPECIES_UNOWN_R},
-    [SPECIES_UNOWN_S] = {gMonFrontPic_UnownS, 0x800, SPECIES_UNOWN_S},
-    [SPECIES_UNOWN_T] = {gMonFrontPic_UnownT, 0x800, SPECIES_UNOWN_T},
-    [SPECIES_UNOWN_U] = {gMonFrontPic_UnownU, 0x800, SPECIES_UNOWN_U},
-    [SPECIES_UNOWN_V] = {gMonFrontPic_UnownV, 0x800, SPECIES_UNOWN_V},
-    [SPECIES_UNOWN_W] = {gMonFrontPic_UnownW, 0x800, SPECIES_UNOWN_W},
-    [SPECIES_UNOWN_X] = {gMonFrontPic_UnownX, 0x800, SPECIES_UNOWN_X},
-    [SPECIES_UNOWN_Y] = {gMonFrontPic_UnownY, 0x800, SPECIES_UNOWN_Y},
-    [SPECIES_UNOWN_Z] = {gMonFrontPic_UnownZ, 0x800, SPECIES_UNOWN_Z},
-    [SPECIES_UNOWN_EMARK] = {gMonFrontPic_UnownExclamationMark, 0x800, SPECIES_UNOWN_EMARK},
-    [SPECIES_UNOWN_QMARK] = {gMonFrontPic_UnownQuestionMark, 0x800, SPECIES_UNOWN_QMARK},
+    SPECIES_SPRITE(NONE, gMonFrontPic_CircledQuestionMark),
+    SPECIES_SPRITE(BULBASAUR, gMonFrontPic_Bulbasaur),
+    SPECIES_SPRITE(IVYSAUR, gMonFrontPic_Ivysaur),
+    SPECIES_SPRITE(VENUSAUR, gMonFrontPic_Venusaur),
+    SPECIES_SPRITE(CHARMANDER, gMonFrontPic_Charmander),
+    SPECIES_SPRITE(CHARMELEON, gMonFrontPic_Charmeleon),
+    SPECIES_SPRITE(CHARIZARD, gMonFrontPic_Charizard),
+    SPECIES_SPRITE(SQUIRTLE, gMonFrontPic_Squirtle),
+    SPECIES_SPRITE(WARTORTLE, gMonFrontPic_Wartortle),
+    SPECIES_SPRITE(BLASTOISE, gMonFrontPic_Blastoise),
+    SPECIES_SPRITE(CATERPIE, gMonFrontPic_Caterpie),
+    SPECIES_SPRITE(METAPOD, gMonFrontPic_Metapod),
+    SPECIES_SPRITE(BUTTERFREE, gMonFrontPic_Butterfree),
+    SPECIES_SPRITE(WEEDLE, gMonFrontPic_Weedle),
+    SPECIES_SPRITE(KAKUNA, gMonFrontPic_Kakuna),
+    SPECIES_SPRITE(BEEDRILL, gMonFrontPic_Beedrill),
+    SPECIES_SPRITE(PIDGEY, gMonFrontPic_Pidgey),
+    SPECIES_SPRITE(PIDGEOTTO, gMonFrontPic_Pidgeotto),
+    SPECIES_SPRITE(PIDGEOT, gMonFrontPic_Pidgeot),
+    SPECIES_SPRITE(RATTATA, gMonFrontPic_Rattata),
+    SPECIES_SPRITE(RATICATE, gMonFrontPic_Raticate),
+    SPECIES_SPRITE(SPEAROW, gMonFrontPic_Spearow),
+    SPECIES_SPRITE(FEAROW, gMonFrontPic_Fearow),
+    SPECIES_SPRITE(EKANS, gMonFrontPic_Ekans),
+    SPECIES_SPRITE(ARBOK, gMonFrontPic_Arbok),
+    SPECIES_SPRITE(PIKACHU, gMonFrontPic_Pikachu),
+    SPECIES_SPRITE(RAICHU, gMonFrontPic_Raichu),
+    SPECIES_SPRITE(SANDSHREW, gMonFrontPic_Sandshrew),
+    SPECIES_SPRITE(SANDSLASH, gMonFrontPic_Sandslash),
+    SPECIES_SPRITE(NIDORAN_F, gMonFrontPic_NidoranF),
+    SPECIES_SPRITE(NIDORINA, gMonFrontPic_Nidorina),
+    SPECIES_SPRITE(NIDOQUEEN, gMonFrontPic_Nidoqueen),
+    SPECIES_SPRITE(NIDORAN_M, gMonFrontPic_NidoranM),
+    SPECIES_SPRITE(NIDORINO, gMonFrontPic_Nidorino),
+    SPECIES_SPRITE(NIDOKING, gMonFrontPic_Nidoking),
+    SPECIES_SPRITE(CLEFAIRY, gMonFrontPic_Clefairy),
+    SPECIES_SPRITE(CLEFABLE, gMonFrontPic_Clefable),
+    SPECIES_SPRITE(VULPIX, gMonFrontPic_Vulpix),
+    SPECIES_SPRITE(NINETALES, gMonFrontPic_Ninetales),
+    SPECIES_SPRITE(JIGGLYPUFF, gMonFrontPic_Jigglypuff),
+    SPECIES_SPRITE(WIGGLYTUFF, gMonFrontPic_Wigglytuff),
+    SPECIES_SPRITE(ZUBAT, gMonFrontPic_Zubat),
+    SPECIES_SPRITE(GOLBAT, gMonFrontPic_Golbat),
+    SPECIES_SPRITE(ODDISH, gMonFrontPic_Oddish),
+    SPECIES_SPRITE(GLOOM, gMonFrontPic_Gloom),
+    SPECIES_SPRITE(VILEPLUME, gMonFrontPic_Vileplume),
+    SPECIES_SPRITE(PARAS, gMonFrontPic_Paras),
+    SPECIES_SPRITE(PARASECT, gMonFrontPic_Parasect),
+    SPECIES_SPRITE(VENONAT, gMonFrontPic_Venonat),
+    SPECIES_SPRITE(VENOMOTH, gMonFrontPic_Venomoth),
+    SPECIES_SPRITE(DIGLETT, gMonFrontPic_Diglett),
+    SPECIES_SPRITE(DUGTRIO, gMonFrontPic_Dugtrio),
+    SPECIES_SPRITE(MEOWTH, gMonFrontPic_Meowth),
+    SPECIES_SPRITE(PERSIAN, gMonFrontPic_Persian),
+    SPECIES_SPRITE(PSYDUCK, gMonFrontPic_Psyduck),
+    SPECIES_SPRITE(GOLDUCK, gMonFrontPic_Golduck),
+    SPECIES_SPRITE(MANKEY, gMonFrontPic_Mankey),
+    SPECIES_SPRITE(PRIMEAPE, gMonFrontPic_Primeape),
+    SPECIES_SPRITE(GROWLITHE, gMonFrontPic_Growlithe),
+    SPECIES_SPRITE(ARCANINE, gMonFrontPic_Arcanine),
+    SPECIES_SPRITE(POLIWAG, gMonFrontPic_Poliwag),
+    SPECIES_SPRITE(POLIWHIRL, gMonFrontPic_Poliwhirl),
+    SPECIES_SPRITE(POLIWRATH, gMonFrontPic_Poliwrath),
+    SPECIES_SPRITE(ABRA, gMonFrontPic_Abra),
+    SPECIES_SPRITE(KADABRA, gMonFrontPic_Kadabra),
+    SPECIES_SPRITE(ALAKAZAM, gMonFrontPic_Alakazam),
+    SPECIES_SPRITE(MACHOP, gMonFrontPic_Machop),
+    SPECIES_SPRITE(MACHOKE, gMonFrontPic_Machoke),
+    SPECIES_SPRITE(MACHAMP, gMonFrontPic_Machamp),
+    SPECIES_SPRITE(BELLSPROUT, gMonFrontPic_Bellsprout),
+    SPECIES_SPRITE(WEEPINBELL, gMonFrontPic_Weepinbell),
+    SPECIES_SPRITE(VICTREEBEL, gMonFrontPic_Victreebel),
+    SPECIES_SPRITE(TENTACOOL, gMonFrontPic_Tentacool),
+    SPECIES_SPRITE(TENTACRUEL, gMonFrontPic_Tentacruel),
+    SPECIES_SPRITE(GEODUDE, gMonFrontPic_Geodude),
+    SPECIES_SPRITE(GRAVELER, gMonFrontPic_Graveler),
+    SPECIES_SPRITE(GOLEM, gMonFrontPic_Golem),
+    SPECIES_SPRITE(PONYTA, gMonFrontPic_Ponyta),
+    SPECIES_SPRITE(RAPIDASH, gMonFrontPic_Rapidash),
+    SPECIES_SPRITE(SLOWPOKE, gMonFrontPic_Slowpoke),
+    SPECIES_SPRITE(SLOWBRO, gMonFrontPic_Slowbro),
+    SPECIES_SPRITE(MAGNEMITE, gMonFrontPic_Magnemite),
+    SPECIES_SPRITE(MAGNETON, gMonFrontPic_Magneton),
+    SPECIES_SPRITE(FARFETCHD, gMonFrontPic_Farfetchd),
+    SPECIES_SPRITE(DODUO, gMonFrontPic_Doduo),
+    SPECIES_SPRITE(DODRIO, gMonFrontPic_Dodrio),
+    SPECIES_SPRITE(SEEL, gMonFrontPic_Seel),
+    SPECIES_SPRITE(DEWGONG, gMonFrontPic_Dewgong),
+    SPECIES_SPRITE(GRIMER, gMonFrontPic_Grimer),
+    SPECIES_SPRITE(MUK, gMonFrontPic_Muk),
+    SPECIES_SPRITE(SHELLDER, gMonFrontPic_Shellder),
+    SPECIES_SPRITE(CLOYSTER, gMonFrontPic_Cloyster),
+    SPECIES_SPRITE(GASTLY, gMonFrontPic_Gastly),
+    SPECIES_SPRITE(HAUNTER, gMonFrontPic_Haunter),
+    SPECIES_SPRITE(GENGAR, gMonFrontPic_Gengar),
+    SPECIES_SPRITE(ONIX, gMonFrontPic_Onix),
+    SPECIES_SPRITE(DROWZEE, gMonFrontPic_Drowzee),
+    SPECIES_SPRITE(HYPNO, gMonFrontPic_Hypno),
+    SPECIES_SPRITE(KRABBY, gMonFrontPic_Krabby),
+    SPECIES_SPRITE(KINGLER, gMonFrontPic_Kingler),
+    SPECIES_SPRITE(VOLTORB, gMonFrontPic_Voltorb),
+    SPECIES_SPRITE(ELECTRODE, gMonFrontPic_Electrode),
+    SPECIES_SPRITE(EXEGGCUTE, gMonFrontPic_Exeggcute),
+    SPECIES_SPRITE(EXEGGUTOR, gMonFrontPic_Exeggutor),
+    SPECIES_SPRITE(CUBONE, gMonFrontPic_Cubone),
+    SPECIES_SPRITE(MAROWAK, gMonFrontPic_Marowak),
+    SPECIES_SPRITE(HITMONLEE, gMonFrontPic_Hitmonlee),
+    SPECIES_SPRITE(HITMONCHAN, gMonFrontPic_Hitmonchan),
+    SPECIES_SPRITE(LICKITUNG, gMonFrontPic_Lickitung),
+    SPECIES_SPRITE(KOFFING, gMonFrontPic_Koffing),
+    SPECIES_SPRITE(WEEZING, gMonFrontPic_Weezing),
+    SPECIES_SPRITE(RHYHORN, gMonFrontPic_Rhyhorn),
+    SPECIES_SPRITE(RHYDON, gMonFrontPic_Rhydon),
+    SPECIES_SPRITE(CHANSEY, gMonFrontPic_Chansey),
+    SPECIES_SPRITE(TANGELA, gMonFrontPic_Tangela),
+    SPECIES_SPRITE(KANGASKHAN, gMonFrontPic_Kangaskhan),
+    SPECIES_SPRITE(HORSEA, gMonFrontPic_Horsea),
+    SPECIES_SPRITE(SEADRA, gMonFrontPic_Seadra),
+    SPECIES_SPRITE(GOLDEEN, gMonFrontPic_Goldeen),
+    SPECIES_SPRITE(SEAKING, gMonFrontPic_Seaking),
+    SPECIES_SPRITE(STARYU, gMonFrontPic_Staryu),
+    SPECIES_SPRITE(STARMIE, gMonFrontPic_Starmie),
+    SPECIES_SPRITE(MR_MIME, gMonFrontPic_Mrmime),
+    SPECIES_SPRITE(SCYTHER, gMonFrontPic_Scyther),
+    SPECIES_SPRITE(JYNX, gMonFrontPic_Jynx),
+    SPECIES_SPRITE(ELECTABUZZ, gMonFrontPic_Electabuzz),
+    SPECIES_SPRITE(MAGMAR, gMonFrontPic_Magmar),
+    SPECIES_SPRITE(PINSIR, gMonFrontPic_Pinsir),
+    SPECIES_SPRITE(TAUROS, gMonFrontPic_Tauros),
+    SPECIES_SPRITE(MAGIKARP, gMonFrontPic_Magikarp),
+    SPECIES_SPRITE(GYARADOS, gMonFrontPic_Gyarados),
+    SPECIES_SPRITE(LAPRAS, gMonFrontPic_Lapras),
+    SPECIES_SPRITE(DITTO, gMonFrontPic_Ditto),
+    SPECIES_SPRITE(EEVEE, gMonFrontPic_Eevee),
+    SPECIES_SPRITE(VAPOREON, gMonFrontPic_Vaporeon),
+    SPECIES_SPRITE(JOLTEON, gMonFrontPic_Jolteon),
+    SPECIES_SPRITE(FLAREON, gMonFrontPic_Flareon),
+    SPECIES_SPRITE(PORYGON, gMonFrontPic_Porygon),
+    SPECIES_SPRITE(OMANYTE, gMonFrontPic_Omanyte),
+    SPECIES_SPRITE(OMASTAR, gMonFrontPic_Omastar),
+    SPECIES_SPRITE(KABUTO, gMonFrontPic_Kabuto),
+    SPECIES_SPRITE(KABUTOPS, gMonFrontPic_Kabutops),
+    SPECIES_SPRITE(AERODACTYL, gMonFrontPic_Aerodactyl),
+    SPECIES_SPRITE(SNORLAX, gMonFrontPic_Snorlax),
+    SPECIES_SPRITE(ARTICUNO, gMonFrontPic_Articuno),
+    SPECIES_SPRITE(ZAPDOS, gMonFrontPic_Zapdos),
+    SPECIES_SPRITE(MOLTRES, gMonFrontPic_Moltres),
+    SPECIES_SPRITE(DRATINI, gMonFrontPic_Dratini),
+    SPECIES_SPRITE(DRAGONAIR, gMonFrontPic_Dragonair),
+    SPECIES_SPRITE(DRAGONITE, gMonFrontPic_Dragonite),
+    SPECIES_SPRITE(MEWTWO, gMonFrontPic_Mewtwo),
+    SPECIES_SPRITE(MEW, gMonFrontPic_Mew),
+    SPECIES_SPRITE(CHIKORITA, gMonFrontPic_Chikorita),
+    SPECIES_SPRITE(BAYLEEF, gMonFrontPic_Bayleef),
+    SPECIES_SPRITE(MEGANIUM, gMonFrontPic_Meganium),
+    SPECIES_SPRITE(CYNDAQUIL, gMonFrontPic_Cyndaquil),
+    SPECIES_SPRITE(QUILAVA, gMonFrontPic_Quilava),
+    SPECIES_SPRITE(TYPHLOSION, gMonFrontPic_Typhlosion),
+    SPECIES_SPRITE(TOTODILE, gMonFrontPic_Totodile),
+    SPECIES_SPRITE(CROCONAW, gMonFrontPic_Croconaw),
+    SPECIES_SPRITE(FERALIGATR, gMonFrontPic_Feraligatr),
+    SPECIES_SPRITE(SENTRET, gMonFrontPic_Sentret),
+    SPECIES_SPRITE(FURRET, gMonFrontPic_Furret),
+    SPECIES_SPRITE(HOOTHOOT, gMonFrontPic_Hoothoot),
+    SPECIES_SPRITE(NOCTOWL, gMonFrontPic_Noctowl),
+    SPECIES_SPRITE(LEDYBA, gMonFrontPic_Ledyba),
+    SPECIES_SPRITE(LEDIAN, gMonFrontPic_Ledian),
+    SPECIES_SPRITE(SPINARAK, gMonFrontPic_Spinarak),
+    SPECIES_SPRITE(ARIADOS, gMonFrontPic_Ariados),
+    SPECIES_SPRITE(CROBAT, gMonFrontPic_Crobat),
+    SPECIES_SPRITE(CHINCHOU, gMonFrontPic_Chinchou),
+    SPECIES_SPRITE(LANTURN, gMonFrontPic_Lanturn),
+    SPECIES_SPRITE(PICHU, gMonFrontPic_Pichu),
+    SPECIES_SPRITE(CLEFFA, gMonFrontPic_Cleffa),
+    SPECIES_SPRITE(IGGLYBUFF, gMonFrontPic_Igglybuff),
+    SPECIES_SPRITE(TOGEPI, gMonFrontPic_Togepi),
+    SPECIES_SPRITE(TOGETIC, gMonFrontPic_Togetic),
+    SPECIES_SPRITE(NATU, gMonFrontPic_Natu),
+    SPECIES_SPRITE(XATU, gMonFrontPic_Xatu),
+    SPECIES_SPRITE(MAREEP, gMonFrontPic_Mareep),
+    SPECIES_SPRITE(FLAAFFY, gMonFrontPic_Flaaffy),
+    SPECIES_SPRITE(AMPHAROS, gMonFrontPic_Ampharos),
+    SPECIES_SPRITE(BELLOSSOM, gMonFrontPic_Bellossom),
+    SPECIES_SPRITE(MARILL, gMonFrontPic_Marill),
+    SPECIES_SPRITE(AZUMARILL, gMonFrontPic_Azumarill),
+    SPECIES_SPRITE(SUDOWOODO, gMonFrontPic_Sudowoodo),
+    SPECIES_SPRITE(POLITOED, gMonFrontPic_Politoed),
+    SPECIES_SPRITE(HOPPIP, gMonFrontPic_Hoppip),
+    SPECIES_SPRITE(SKIPLOOM, gMonFrontPic_Skiploom),
+    SPECIES_SPRITE(JUMPLUFF, gMonFrontPic_Jumpluff),
+    SPECIES_SPRITE(AIPOM, gMonFrontPic_Aipom),
+    SPECIES_SPRITE(SUNKERN, gMonFrontPic_Sunkern),
+    SPECIES_SPRITE(SUNFLORA, gMonFrontPic_Sunflora),
+    SPECIES_SPRITE(YANMA, gMonFrontPic_Yanma),
+    SPECIES_SPRITE(WOOPER, gMonFrontPic_Wooper),
+    SPECIES_SPRITE(QUAGSIRE, gMonFrontPic_Quagsire),
+    SPECIES_SPRITE(ESPEON, gMonFrontPic_Espeon),
+    SPECIES_SPRITE(UMBREON, gMonFrontPic_Umbreon),
+    SPECIES_SPRITE(MURKROW, gMonFrontPic_Murkrow),
+    SPECIES_SPRITE(SLOWKING, gMonFrontPic_Slowking),
+    SPECIES_SPRITE(MISDREAVUS, gMonFrontPic_Misdreavus),
+    SPECIES_SPRITE(UNOWN, gMonFrontPic_UnownA),
+    SPECIES_SPRITE(WOBBUFFET, gMonFrontPic_Wobbuffet),
+    SPECIES_SPRITE(GIRAFARIG, gMonFrontPic_Girafarig),
+    SPECIES_SPRITE(PINECO, gMonFrontPic_Pineco),
+    SPECIES_SPRITE(FORRETRESS, gMonFrontPic_Forretress),
+    SPECIES_SPRITE(DUNSPARCE, gMonFrontPic_Dunsparce),
+    SPECIES_SPRITE(GLIGAR, gMonFrontPic_Gligar),
+    SPECIES_SPRITE(STEELIX, gMonFrontPic_Steelix),
+    SPECIES_SPRITE(SNUBBULL, gMonFrontPic_Snubbull),
+    SPECIES_SPRITE(GRANBULL, gMonFrontPic_Granbull),
+    SPECIES_SPRITE(QWILFISH, gMonFrontPic_Qwilfish),
+    SPECIES_SPRITE(SCIZOR, gMonFrontPic_Scizor),
+    SPECIES_SPRITE(SHUCKLE, gMonFrontPic_Shuckle),
+    SPECIES_SPRITE(HERACROSS, gMonFrontPic_Heracross),
+    SPECIES_SPRITE(SNEASEL, gMonFrontPic_Sneasel),
+    SPECIES_SPRITE(TEDDIURSA, gMonFrontPic_Teddiursa),
+    SPECIES_SPRITE(URSARING, gMonFrontPic_Ursaring),
+    SPECIES_SPRITE(SLUGMA, gMonFrontPic_Slugma),
+    SPECIES_SPRITE(MAGCARGO, gMonFrontPic_Magcargo),
+    SPECIES_SPRITE(SWINUB, gMonFrontPic_Swinub),
+    SPECIES_SPRITE(PILOSWINE, gMonFrontPic_Piloswine),
+    SPECIES_SPRITE(CORSOLA, gMonFrontPic_Corsola),
+    SPECIES_SPRITE(REMORAID, gMonFrontPic_Remoraid),
+    SPECIES_SPRITE(OCTILLERY, gMonFrontPic_Octillery),
+    SPECIES_SPRITE(DELIBIRD, gMonFrontPic_Delibird),
+    SPECIES_SPRITE(MANTINE, gMonFrontPic_Mantine),
+    SPECIES_SPRITE(SKARMORY, gMonFrontPic_Skarmory),
+    SPECIES_SPRITE(HOUNDOUR, gMonFrontPic_Houndour),
+    SPECIES_SPRITE(HOUNDOOM, gMonFrontPic_Houndoom),
+    SPECIES_SPRITE(KINGDRA, gMonFrontPic_Kingdra),
+    SPECIES_SPRITE(PHANPY, gMonFrontPic_Phanpy),
+    SPECIES_SPRITE(DONPHAN, gMonFrontPic_Donphan),
+    SPECIES_SPRITE(PORYGON2, gMonFrontPic_Porygon2),
+    SPECIES_SPRITE(STANTLER, gMonFrontPic_Stantler),
+    SPECIES_SPRITE(SMEARGLE, gMonFrontPic_Smeargle),
+    SPECIES_SPRITE(TYROGUE, gMonFrontPic_Tyrogue),
+    SPECIES_SPRITE(HITMONTOP, gMonFrontPic_Hitmontop),
+    SPECIES_SPRITE(SMOOCHUM, gMonFrontPic_Smoochum),
+    SPECIES_SPRITE(ELEKID, gMonFrontPic_Elekid),
+    SPECIES_SPRITE(MAGBY, gMonFrontPic_Magby),
+    SPECIES_SPRITE(MILTANK, gMonFrontPic_Miltank),
+    SPECIES_SPRITE(BLISSEY, gMonFrontPic_Blissey),
+    SPECIES_SPRITE(RAIKOU, gMonFrontPic_Raikou),
+    SPECIES_SPRITE(ENTEI, gMonFrontPic_Entei),
+    SPECIES_SPRITE(SUICUNE, gMonFrontPic_Suicune),
+    SPECIES_SPRITE(LARVITAR, gMonFrontPic_Larvitar),
+    SPECIES_SPRITE(PUPITAR, gMonFrontPic_Pupitar),
+    SPECIES_SPRITE(TYRANITAR, gMonFrontPic_Tyranitar),
+    SPECIES_SPRITE(LUGIA, gMonFrontPic_Lugia),
+    SPECIES_SPRITE(HO_OH, gMonFrontPic_HoOh),
+    SPECIES_SPRITE(CELEBI, gMonFrontPic_Celebi),
+    SPECIES_SPRITE(OLD_UNOWN_B, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_C, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_D, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_E, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_F, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_G, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_H, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_I, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_J, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_K, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_L, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_M, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_N, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_O, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_P, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Q, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_R, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_S, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_T, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_U, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_V, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_W, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_X, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Y, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Z, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(TREECKO, gMonFrontPic_Treecko),
+    SPECIES_SPRITE(GROVYLE, gMonFrontPic_Grovyle),
+    SPECIES_SPRITE(SCEPTILE, gMonFrontPic_Sceptile),
+    SPECIES_SPRITE(TORCHIC, gMonFrontPic_Torchic),
+    SPECIES_SPRITE(COMBUSKEN, gMonFrontPic_Combusken),
+    SPECIES_SPRITE(BLAZIKEN, gMonFrontPic_Blaziken),
+    SPECIES_SPRITE(MUDKIP, gMonFrontPic_Mudkip),
+    SPECIES_SPRITE(MARSHTOMP, gMonFrontPic_Marshtomp),
+    SPECIES_SPRITE(SWAMPERT, gMonFrontPic_Swampert),
+    SPECIES_SPRITE(POOCHYENA, gMonFrontPic_Poochyena),
+    SPECIES_SPRITE(MIGHTYENA, gMonFrontPic_Mightyena),
+    SPECIES_SPRITE(ZIGZAGOON, gMonFrontPic_Zigzagoon),
+    SPECIES_SPRITE(LINOONE, gMonFrontPic_Linoone),
+    SPECIES_SPRITE(WURMPLE, gMonFrontPic_Wurmple),
+    SPECIES_SPRITE(SILCOON, gMonFrontPic_Silcoon),
+    SPECIES_SPRITE(BEAUTIFLY, gMonFrontPic_Beautifly),
+    SPECIES_SPRITE(CASCOON, gMonFrontPic_Cascoon),
+    SPECIES_SPRITE(DUSTOX, gMonFrontPic_Dustox),
+    SPECIES_SPRITE(LOTAD, gMonFrontPic_Lotad),
+    SPECIES_SPRITE(LOMBRE, gMonFrontPic_Lombre),
+    SPECIES_SPRITE(LUDICOLO, gMonFrontPic_Ludicolo),
+    SPECIES_SPRITE(SEEDOT, gMonFrontPic_Seedot),
+    SPECIES_SPRITE(NUZLEAF, gMonFrontPic_Nuzleaf),
+    SPECIES_SPRITE(SHIFTRY, gMonFrontPic_Shiftry),
+    SPECIES_SPRITE(NINCADA, gMonFrontPic_Nincada),
+    SPECIES_SPRITE(NINJASK, gMonFrontPic_Ninjask),
+    SPECIES_SPRITE(SHEDINJA, gMonFrontPic_Shedinja),
+    SPECIES_SPRITE(TAILLOW, gMonFrontPic_Taillow),
+    SPECIES_SPRITE(SWELLOW, gMonFrontPic_Swellow),
+    SPECIES_SPRITE(SHROOMISH, gMonFrontPic_Shroomish),
+    SPECIES_SPRITE(BRELOOM, gMonFrontPic_Breloom),
+    SPECIES_SPRITE(SPINDA, gMonFrontPic_Spinda),
+    SPECIES_SPRITE(WINGULL, gMonFrontPic_Wingull),
+    SPECIES_SPRITE(PELIPPER, gMonFrontPic_Pelipper),
+    SPECIES_SPRITE(SURSKIT, gMonFrontPic_Surskit),
+    SPECIES_SPRITE(MASQUERAIN, gMonFrontPic_Masquerain),
+    SPECIES_SPRITE(WAILMER, gMonFrontPic_Wailmer),
+    SPECIES_SPRITE(WAILORD, gMonFrontPic_Wailord),
+    SPECIES_SPRITE(SKITTY, gMonFrontPic_Skitty),
+    SPECIES_SPRITE(DELCATTY, gMonFrontPic_Delcatty),
+    SPECIES_SPRITE(KECLEON, gMonFrontPic_Kecleon),
+    SPECIES_SPRITE(BALTOY, gMonFrontPic_Baltoy),
+    SPECIES_SPRITE(CLAYDOL, gMonFrontPic_Claydol),
+    SPECIES_SPRITE(NOSEPASS, gMonFrontPic_Nosepass),
+    SPECIES_SPRITE(TORKOAL, gMonFrontPic_Torkoal),
+    SPECIES_SPRITE(SABLEYE, gMonFrontPic_Sableye),
+    SPECIES_SPRITE(BARBOACH, gMonFrontPic_Barboach),
+    SPECIES_SPRITE(WHISCASH, gMonFrontPic_Whiscash),
+    SPECIES_SPRITE(LUVDISC, gMonFrontPic_Luvdisc),
+    SPECIES_SPRITE(CORPHISH, gMonFrontPic_Corphish),
+    SPECIES_SPRITE(CRAWDAUNT, gMonFrontPic_Crawdaunt),
+    SPECIES_SPRITE(FEEBAS, gMonFrontPic_Feebas),
+    SPECIES_SPRITE(MILOTIC, gMonFrontPic_Milotic),
+    SPECIES_SPRITE(CARVANHA, gMonFrontPic_Carvanha),
+    SPECIES_SPRITE(SHARPEDO, gMonFrontPic_Sharpedo),
+    SPECIES_SPRITE(TRAPINCH, gMonFrontPic_Trapinch),
+    SPECIES_SPRITE(VIBRAVA, gMonFrontPic_Vibrava),
+    SPECIES_SPRITE(FLYGON, gMonFrontPic_Flygon),
+    SPECIES_SPRITE(MAKUHITA, gMonFrontPic_Makuhita),
+    SPECIES_SPRITE(HARIYAMA, gMonFrontPic_Hariyama),
+    SPECIES_SPRITE(ELECTRIKE, gMonFrontPic_Electrike),
+    SPECIES_SPRITE(MANECTRIC, gMonFrontPic_Manectric),
+    SPECIES_SPRITE(NUMEL, gMonFrontPic_Numel),
+    SPECIES_SPRITE(CAMERUPT, gMonFrontPic_Camerupt),
+    SPECIES_SPRITE(SPHEAL, gMonFrontPic_Spheal),
+    SPECIES_SPRITE(SEALEO, gMonFrontPic_Sealeo),
+    SPECIES_SPRITE(WALREIN, gMonFrontPic_Walrein),
+    SPECIES_SPRITE(CACNEA, gMonFrontPic_Cacnea),
+    SPECIES_SPRITE(CACTURNE, gMonFrontPic_Cacturne),
+    SPECIES_SPRITE(SNORUNT, gMonFrontPic_Snorunt),
+    SPECIES_SPRITE(GLALIE, gMonFrontPic_Glalie),
+    SPECIES_SPRITE(LUNATONE, gMonFrontPic_Lunatone),
+    SPECIES_SPRITE(SOLROCK, gMonFrontPic_Solrock),
+    SPECIES_SPRITE(AZURILL, gMonFrontPic_Azurill),
+    SPECIES_SPRITE(SPOINK, gMonFrontPic_Spoink),
+    SPECIES_SPRITE(GRUMPIG, gMonFrontPic_Grumpig),
+    SPECIES_SPRITE(PLUSLE, gMonFrontPic_Plusle),
+    SPECIES_SPRITE(MINUN, gMonFrontPic_Minun),
+    SPECIES_SPRITE(MAWILE, gMonFrontPic_Mawile),
+    SPECIES_SPRITE(MEDITITE, gMonFrontPic_Meditite),
+    SPECIES_SPRITE(MEDICHAM, gMonFrontPic_Medicham),
+    SPECIES_SPRITE(SWABLU, gMonFrontPic_Swablu),
+    SPECIES_SPRITE(ALTARIA, gMonFrontPic_Altaria),
+    SPECIES_SPRITE(WYNAUT, gMonFrontPic_Wynaut),
+    SPECIES_SPRITE(DUSKULL, gMonFrontPic_Duskull),
+    SPECIES_SPRITE(DUSCLOPS, gMonFrontPic_Dusclops),
+    SPECIES_SPRITE(ROSELIA, gMonFrontPic_Roselia),
+    SPECIES_SPRITE(SLAKOTH, gMonFrontPic_Slakoth),
+    SPECIES_SPRITE(VIGOROTH, gMonFrontPic_Vigoroth),
+    SPECIES_SPRITE(SLAKING, gMonFrontPic_Slaking),
+    SPECIES_SPRITE(GULPIN, gMonFrontPic_Gulpin),
+    SPECIES_SPRITE(SWALOT, gMonFrontPic_Swalot),
+    SPECIES_SPRITE(TROPIUS, gMonFrontPic_Tropius),
+    SPECIES_SPRITE(WHISMUR, gMonFrontPic_Whismur),
+    SPECIES_SPRITE(LOUDRED, gMonFrontPic_Loudred),
+    SPECIES_SPRITE(EXPLOUD, gMonFrontPic_Exploud),
+    SPECIES_SPRITE(CLAMPERL, gMonFrontPic_Clamperl),
+    SPECIES_SPRITE(HUNTAIL, gMonFrontPic_Huntail),
+    SPECIES_SPRITE(GOREBYSS, gMonFrontPic_Gorebyss),
+    SPECIES_SPRITE(ABSOL, gMonFrontPic_Absol),
+    SPECIES_SPRITE(SHUPPET, gMonFrontPic_Shuppet),
+    SPECIES_SPRITE(BANETTE, gMonFrontPic_Banette),
+    SPECIES_SPRITE(SEVIPER, gMonFrontPic_Seviper),
+    SPECIES_SPRITE(ZANGOOSE, gMonFrontPic_Zangoose),
+    SPECIES_SPRITE(RELICANTH, gMonFrontPic_Relicanth),
+    SPECIES_SPRITE(ARON, gMonFrontPic_Aron),
+    SPECIES_SPRITE(LAIRON, gMonFrontPic_Lairon),
+    SPECIES_SPRITE(AGGRON, gMonFrontPic_Aggron),
+    SPECIES_SPRITE(CASTFORM, gMonFrontPic_Castform),
+    SPECIES_SPRITE(VOLBEAT, gMonFrontPic_Volbeat),
+    SPECIES_SPRITE(ILLUMISE, gMonFrontPic_Illumise),
+    SPECIES_SPRITE(LILEEP, gMonFrontPic_Lileep),
+    SPECIES_SPRITE(CRADILY, gMonFrontPic_Cradily),
+    SPECIES_SPRITE(ANORITH, gMonFrontPic_Anorith),
+    SPECIES_SPRITE(ARMALDO, gMonFrontPic_Armaldo),
+    SPECIES_SPRITE(RALTS, gMonFrontPic_Ralts),
+    SPECIES_SPRITE(KIRLIA, gMonFrontPic_Kirlia),
+    SPECIES_SPRITE(GARDEVOIR, gMonFrontPic_Gardevoir),
+    SPECIES_SPRITE(BAGON, gMonFrontPic_Bagon),
+    SPECIES_SPRITE(SHELGON, gMonFrontPic_Shelgon),
+    SPECIES_SPRITE(SALAMENCE, gMonFrontPic_Salamence),
+    SPECIES_SPRITE(BELDUM, gMonFrontPic_Beldum),
+    SPECIES_SPRITE(METANG, gMonFrontPic_Metang),
+    SPECIES_SPRITE(METAGROSS, gMonFrontPic_Metagross),
+    SPECIES_SPRITE(REGIROCK, gMonFrontPic_Regirock),
+    SPECIES_SPRITE(REGICE, gMonFrontPic_Regice),
+    SPECIES_SPRITE(REGISTEEL, gMonFrontPic_Registeel),
+    SPECIES_SPRITE(KYOGRE, gMonFrontPic_Kyogre),
+    SPECIES_SPRITE(GROUDON, gMonFrontPic_Groudon),
+    SPECIES_SPRITE(RAYQUAZA, gMonFrontPic_Rayquaza),
+    SPECIES_SPRITE(LATIAS, gMonFrontPic_Latias),
+    SPECIES_SPRITE(LATIOS, gMonFrontPic_Latios),
+    SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi),
+    SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys),
+    SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho),
+    SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
+    SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB),
+    SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC),
+    SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD),
+    SPECIES_SPRITE(UNOWN_E, gMonFrontPic_UnownE),
+    SPECIES_SPRITE(UNOWN_F, gMonFrontPic_UnownF),
+    SPECIES_SPRITE(UNOWN_G, gMonFrontPic_UnownG),
+    SPECIES_SPRITE(UNOWN_H, gMonFrontPic_UnownH),
+    SPECIES_SPRITE(UNOWN_I, gMonFrontPic_UnownI),
+    SPECIES_SPRITE(UNOWN_J, gMonFrontPic_UnownJ),
+    SPECIES_SPRITE(UNOWN_K, gMonFrontPic_UnownK),
+    SPECIES_SPRITE(UNOWN_L, gMonFrontPic_UnownL),
+    SPECIES_SPRITE(UNOWN_M, gMonFrontPic_UnownM),
+    SPECIES_SPRITE(UNOWN_N, gMonFrontPic_UnownN),
+    SPECIES_SPRITE(UNOWN_O, gMonFrontPic_UnownO),
+    SPECIES_SPRITE(UNOWN_P, gMonFrontPic_UnownP),
+    SPECIES_SPRITE(UNOWN_Q, gMonFrontPic_UnownQ),
+    SPECIES_SPRITE(UNOWN_R, gMonFrontPic_UnownR),
+    SPECIES_SPRITE(UNOWN_S, gMonFrontPic_UnownS),
+    SPECIES_SPRITE(UNOWN_T, gMonFrontPic_UnownT),
+    SPECIES_SPRITE(UNOWN_U, gMonFrontPic_UnownU),
+    SPECIES_SPRITE(UNOWN_V, gMonFrontPic_UnownV),
+    SPECIES_SPRITE(UNOWN_W, gMonFrontPic_UnownW),
+    SPECIES_SPRITE(UNOWN_X, gMonFrontPic_UnownX),
+    SPECIES_SPRITE(UNOWN_Y, gMonFrontPic_UnownY),
+    SPECIES_SPRITE(UNOWN_Z, gMonFrontPic_UnownZ),
+    SPECIES_SPRITE(UNOWN_EMARK, gMonFrontPic_UnownExclamationMark),
+    SPECIES_SPRITE(UNOWN_QMARK, gMonFrontPic_UnownQuestionMark),
 };

src/data/pokemon_graphics/palette_table.h

@@ -1,443 +1,443 @@
 const struct CompressedSpritePalette gMonPaletteTable[] =
 {
-    [SPECIES_NONE] = {gMonPalette_CircledQuestionMark, SPECIES_NONE},
-    [SPECIES_BULBASAUR] = {gMonPalette_Bulbasaur, SPECIES_BULBASAUR},
-    [SPECIES_IVYSAUR] = {gMonPalette_Ivysaur, SPECIES_IVYSAUR},
-    [SPECIES_VENUSAUR] = {gMonPalette_Venusaur, SPECIES_VENUSAUR},
-    [SPECIES_CHARMANDER] = {gMonPalette_Charmander, SPECIES_CHARMANDER},
-    [SPECIES_CHARMELEON] = {gMonPalette_Charmeleon, SPECIES_CHARMELEON},
-    [SPECIES_CHARIZARD] = {gMonPalette_Charizard, SPECIES_CHARIZARD},
-    [SPECIES_SQUIRTLE] = {gMonPalette_Squirtle, SPECIES_SQUIRTLE},
-    [SPECIES_WARTORTLE] = {gMonPalette_Wartortle, SPECIES_WARTORTLE},
-    [SPECIES_BLASTOISE] = {gMonPalette_Blastoise, SPECIES_BLASTOISE},
-    [SPECIES_CATERPIE] = {gMonPalette_Caterpie, SPECIES_CATERPIE},
-    [SPECIES_METAPOD] = {gMonPalette_Metapod, SPECIES_METAPOD},
-    [SPECIES_BUTTERFREE] = {gMonPalette_Butterfree, SPECIES_BUTTERFREE},
-    [SPECIES_WEEDLE] = {gMonPalette_Weedle, SPECIES_WEEDLE},
-    [SPECIES_KAKUNA] = {gMonPalette_Kakuna, SPECIES_KAKUNA},
-    [SPECIES_BEEDRILL] = {gMonPalette_Beedrill, SPECIES_BEEDRILL},
-    [SPECIES_PIDGEY] = {gMonPalette_Pidgey, SPECIES_PIDGEY},
-    [SPECIES_PIDGEOTTO] = {gMonPalette_Pidgeotto, SPECIES_PIDGEOTTO},
-    [SPECIES_PIDGEOT] = {gMonPalette_Pidgeot, SPECIES_PIDGEOT},
-    [SPECIES_RATTATA] = {gMonPalette_Rattata, SPECIES_RATTATA},
-    [SPECIES_RATICATE] = {gMonPalette_Raticate, SPECIES_RATICATE},
-    [SPECIES_SPEAROW] = {gMonPalette_Spearow, SPECIES_SPEAROW},
-    [SPECIES_FEAROW] = {gMonPalette_Fearow, SPECIES_FEAROW},
-    [SPECIES_EKANS] = {gMonPalette_Ekans, SPECIES_EKANS},
-    [SPECIES_ARBOK] = {gMonPalette_Arbok, SPECIES_ARBOK},
-    [SPECIES_PIKACHU] = {gMonPalette_Pikachu, SPECIES_PIKACHU},
-    [SPECIES_RAICHU] = {gMonPalette_Raichu, SPECIES_RAICHU},
-    [SPECIES_SANDSHREW] = {gMonPalette_Sandshrew, SPECIES_SANDSHREW},
-    [SPECIES_SANDSLASH] = {gMonPalette_Sandslash, SPECIES_SANDSLASH},
-    [SPECIES_NIDORAN_F] = {gMonPalette_NidoranF, SPECIES_NIDORAN_F},
-    [SPECIES_NIDORINA] = {gMonPalette_Nidorina, SPECIES_NIDORINA},
-    [SPECIES_NIDOQUEEN] = {gMonPalette_Nidoqueen, SPECIES_NIDOQUEEN},
-    [SPECIES_NIDORAN_M] = {gMonPalette_NidoranM, SPECIES_NIDORAN_M},
-    [SPECIES_NIDORINO] = {gMonPalette_Nidorino, SPECIES_NIDORINO},
-    [SPECIES_NIDOKING] = {gMonPalette_Nidoking, SPECIES_NIDOKING},
-    [SPECIES_CLEFAIRY] = {gMonPalette_Clefairy, SPECIES_CLEFAIRY},
-    [SPECIES_CLEFABLE] = {gMonPalette_Clefable, SPECIES_CLEFABLE},
-    [SPECIES_VULPIX] = {gMonPalette_Vulpix, SPECIES_VULPIX},
-    [SPECIES_NINETALES] = {gMonPalette_Ninetales, SPECIES_NINETALES},
-    [SPECIES_JIGGLYPUFF] = {gMonPalette_Jigglypuff, SPECIES_JIGGLYPUFF},
-    [SPECIES_WIGGLYTUFF] = {gMonPalette_Wigglytuff, SPECIES_WIGGLYTUFF},
-    [SPECIES_ZUBAT] = {gMonPalette_Zubat, SPECIES_ZUBAT},
-    [SPECIES_GOLBAT] = {gMonPalette_Golbat, SPECIES_GOLBAT},
-    [SPECIES_ODDISH] = {gMonPalette_Oddish, SPECIES_ODDISH},
-    [SPECIES_GLOOM] = {gMonPalette_Gloom, SPECIES_GLOOM},
-    [SPECIES_VILEPLUME] = {gMonPalette_Vileplume, SPECIES_VILEPLUME},
-    [SPECIES_PARAS] = {gMonPalette_Paras, SPECIES_PARAS},
-    [SPECIES_PARASECT] = {gMonPalette_Parasect, SPECIES_PARASECT},
-    [SPECIES_VENONAT] = {gMonPalette_Venonat, SPECIES_VENONAT},
-    [SPECIES_VENOMOTH] = {gMonPalette_Venomoth, SPECIES_VENOMOTH},
-    [SPECIES_DIGLETT] = {gMonPalette_Diglett, SPECIES_DIGLETT},
-    [SPECIES_DUGTRIO] = {gMonPalette_Dugtrio, SPECIES_DUGTRIO},
-    [SPECIES_MEOWTH] = {gMonPalette_Meowth, SPECIES_MEOWTH},
-    [SPECIES_PERSIAN] = {gMonPalette_Persian, SPECIES_PERSIAN},
-    [SPECIES_PSYDUCK] = {gMonPalette_Psyduck, SPECIES_PSYDUCK},
-    [SPECIES_GOLDUCK] = {gMonPalette_Golduck, SPECIES_GOLDUCK},
-    [SPECIES_MANKEY] = {gMonPalette_Mankey, SPECIES_MANKEY},
-    [SPECIES_PRIMEAPE] = {gMonPalette_Primeape, SPECIES_PRIMEAPE},
-    [SPECIES_GROWLITHE] = {gMonPalette_Growlithe, SPECIES_GROWLITHE},
-    [SPECIES_ARCANINE] = {gMonPalette_Arcanine, SPECIES_ARCANINE},
-    [SPECIES_POLIWAG] = {gMonPalette_Poliwag, SPECIES_POLIWAG},
-    [SPECIES_POLIWHIRL] = {gMonPalette_Poliwhirl, SPECIES_POLIWHIRL},
-    [SPECIES_POLIWRATH] = {gMonPalette_Poliwrath, SPECIES_POLIWRATH},
-    [SPECIES_ABRA] = {gMonPalette_Abra, SPECIES_ABRA},
-    [SPECIES_KADABRA] = {gMonPalette_Kadabra, SPECIES_KADABRA},
-    [SPECIES_ALAKAZAM] = {gMonPalette_Alakazam, SPECIES_ALAKAZAM},
-    [SPECIES_MACHOP] = {gMonPalette_Machop, SPECIES_MACHOP},
-    [SPECIES_MACHOKE] = {gMonPalette_Machoke, SPECIES_MACHOKE},
-    [SPECIES_MACHAMP] = {gMonPalette_Machamp, SPECIES_MACHAMP},
-    [SPECIES_BELLSPROUT] = {gMonPalette_Bellsprout, SPECIES_BELLSPROUT},
-    [SPECIES_WEEPINBELL] = {gMonPalette_Weepinbell, SPECIES_WEEPINBELL},
-    [SPECIES_VICTREEBEL] = {gMonPalette_Victreebel, SPECIES_VICTREEBEL},
-    [SPECIES_TENTACOOL] = {gMonPalette_Tentacool, SPECIES_TENTACOOL},
-    [SPECIES_TENTACRUEL] = {gMonPalette_Tentacruel, SPECIES_TENTACRUEL},
-    [SPECIES_GEODUDE] = {gMonPalette_Geodude, SPECIES_GEODUDE},
-    [SPECIES_GRAVELER] = {gMonPalette_Graveler, SPECIES_GRAVELER},
-    [SPECIES_GOLEM] = {gMonPalette_Golem, SPECIES_GOLEM},
-    [SPECIES_PONYTA] = {gMonPalette_Ponyta, SPECIES_PONYTA},
-    [SPECIES_RAPIDASH] = {gMonPalette_Rapidash, SPECIES_RAPIDASH},
-    [SPECIES_SLOWPOKE] = {gMonPalette_Slowpoke, SPECIES_SLOWPOKE},
-    [SPECIES_SLOWBRO] = {gMonPalette_Slowbro, SPECIES_SLOWBRO},
-    [SPECIES_MAGNEMITE] = {gMonPalette_Magnemite, SPECIES_MAGNEMITE},
-    [SPECIES_MAGNETON] = {gMonPalette_Magneton, SPECIES_MAGNETON},
-    [SPECIES_FARFETCHD] = {gMonPalette_Farfetchd, SPECIES_FARFETCHD},
-    [SPECIES_DODUO] = {gMonPalette_Doduo, SPECIES_DODUO},
-    [SPECIES_DODRIO] = {gMonPalette_Dodrio, SPECIES_DODRIO},
-    [SPECIES_SEEL] = {gMonPalette_Seel, SPECIES_SEEL},
-    [SPECIES_DEWGONG] = {gMonPalette_Dewgong, SPECIES_DEWGONG},
-    [SPECIES_GRIMER] = {gMonPalette_Grimer, SPECIES_GRIMER},
-    [SPECIES_MUK] = {gMonPalette_Muk, SPECIES_MUK},
-    [SPECIES_SHELLDER] = {gMonPalette_Shellder, SPECIES_SHELLDER},
-    [SPECIES_CLOYSTER] = {gMonPalette_Cloyster, SPECIES_CLOYSTER},
-    [SPECIES_GASTLY] = {gMonPalette_Gastly, SPECIES_GASTLY},
-    [SPECIES_HAUNTER] = {gMonPalette_Haunter, SPECIES_HAUNTER},
-    [SPECIES_GENGAR] = {gMonPalette_Gengar, SPECIES_GENGAR},
-    [SPECIES_ONIX] = {gMonPalette_Onix, SPECIES_ONIX},
-    [SPECIES_DROWZEE] = {gMonPalette_Drowzee, SPECIES_DROWZEE},
-    [SPECIES_HYPNO] = {gMonPalette_Hypno, SPECIES_HYPNO},
-    [SPECIES_KRABBY] = {gMonPalette_Krabby, SPECIES_KRABBY},
-    [SPECIES_KINGLER] = {gMonPalette_Kingler, SPECIES_KINGLER},
-    [SPECIES_VOLTORB] = {gMonPalette_Voltorb, SPECIES_VOLTORB},
-    [SPECIES_ELECTRODE] = {gMonPalette_Electrode, SPECIES_ELECTRODE},
-    [SPECIES_EXEGGCUTE] = {gMonPalette_Exeggcute, SPECIES_EXEGGCUTE},
-    [SPECIES_EXEGGUTOR] = {gMonPalette_Exeggutor, SPECIES_EXEGGUTOR},
-    [SPECIES_CUBONE] = {gMonPalette_Cubone, SPECIES_CUBONE},
-    [SPECIES_MAROWAK] = {gMonPalette_Marowak, SPECIES_MAROWAK},
-    [SPECIES_HITMONLEE] = {gMonPalette_Hitmonlee, SPECIES_HITMONLEE},
-    [SPECIES_HITMONCHAN] = {gMonPalette_Hitmonchan, SPECIES_HITMONCHAN},
-    [SPECIES_LICKITUNG] = {gMonPalette_Lickitung, SPECIES_LICKITUNG},
-    [SPECIES_KOFFING] = {gMonPalette_Koffing, SPECIES_KOFFING},
-    [SPECIES_WEEZING] = {gMonPalette_Weezing, SPECIES_WEEZING},
-    [SPECIES_RHYHORN] = {gMonPalette_Rhyhorn, SPECIES_RHYHORN},
-    [SPECIES_RHYDON] = {gMonPalette_Rhydon, SPECIES_RHYDON},
-    [SPECIES_CHANSEY] = {gMonPalette_Chansey, SPECIES_CHANSEY},
-    [SPECIES_TANGELA] = {gMonPalette_Tangela, SPECIES_TANGELA},
-    [SPECIES_KANGASKHAN] = {gMonPalette_Kangaskhan, SPECIES_KANGASKHAN},
-    [SPECIES_HORSEA] = {gMonPalette_Horsea, SPECIES_HORSEA},
-    [SPECIES_SEADRA] = {gMonPalette_Seadra, SPECIES_SEADRA},
-    [SPECIES_GOLDEEN] = {gMonPalette_Goldeen, SPECIES_GOLDEEN},
-    [SPECIES_SEAKING] = {gMonPalette_Seaking, SPECIES_SEAKING},
-    [SPECIES_STARYU] = {gMonPalette_Staryu, SPECIES_STARYU},
-    [SPECIES_STARMIE] = {gMonPalette_Starmie, SPECIES_STARMIE},
-    [SPECIES_MR_MIME] = {gMonPalette_Mrmime, SPECIES_MR_MIME},
-    [SPECIES_SCYTHER] = {gMonPalette_Scyther, SPECIES_SCYTHER},
-    [SPECIES_JYNX] = {gMonPalette_Jynx, SPECIES_JYNX},
-    [SPECIES_ELECTABUZZ] = {gMonPalette_Electabuzz, SPECIES_ELECTABUZZ},
-    [SPECIES_MAGMAR] = {gMonPalette_Magmar, SPECIES_MAGMAR},
-    [SPECIES_PINSIR] = {gMonPalette_Pinsir, SPECIES_PINSIR},
-    [SPECIES_TAUROS] = {gMonPalette_Tauros, SPECIES_TAUROS},
-    [SPECIES_MAGIKARP] = {gMonPalette_Magikarp, SPECIES_MAGIKARP},
-    [SPECIES_GYARADOS] = {gMonPalette_Gyarados, SPECIES_GYARADOS},
-    [SPECIES_LAPRAS] = {gMonPalette_Lapras, SPECIES_LAPRAS},
-    [SPECIES_DITTO] = {gMonPalette_Ditto, SPECIES_DITTO},
-    [SPECIES_EEVEE] = {gMonPalette_Eevee, SPECIES_EEVEE},
-    [SPECIES_VAPOREON] = {gMonPalette_Vaporeon, SPECIES_VAPOREON},
-    [SPECIES_JOLTEON] = {gMonPalette_Jolteon, SPECIES_JOLTEON},
-    [SPECIES_FLAREON] = {gMonPalette_Flareon, SPECIES_FLAREON},
-    [SPECIES_PORYGON] = {gMonPalette_Porygon, SPECIES_PORYGON},
-    [SPECIES_OMANYTE] = {gMonPalette_Omanyte, SPECIES_OMANYTE},
-    [SPECIES_OMASTAR] = {gMonPalette_Omastar, SPECIES_OMASTAR},
-    [SPECIES_KABUTO] = {gMonPalette_Kabuto, SPECIES_KABUTO},
-    [SPECIES_KABUTOPS] = {gMonPalette_Kabutops, SPECIES_KABUTOPS},
-    [SPECIES_AERODACTYL] = {gMonPalette_Aerodactyl, SPECIES_AERODACTYL},
-    [SPECIES_SNORLAX] = {gMonPalette_Snorlax, SPECIES_SNORLAX},
-    [SPECIES_ARTICUNO] = {gMonPalette_Articuno, SPECIES_ARTICUNO},
-    [SPECIES_ZAPDOS] = {gMonPalette_Zapdos, SPECIES_ZAPDOS},
-    [SPECIES_MOLTRES] = {gMonPalette_Moltres, SPECIES_MOLTRES},
-    [SPECIES_DRATINI] = {gMonPalette_Dratini, SPECIES_DRATINI},
-    [SPECIES_DRAGONAIR] = {gMonPalette_Dragonair, SPECIES_DRAGONAIR},
-    [SPECIES_DRAGONITE] = {gMonPalette_Dragonite, SPECIES_DRAGONITE},
-    [SPECIES_MEWTWO] = {gMonPalette_Mewtwo, SPECIES_MEWTWO},
-    [SPECIES_MEW] = {gMonPalette_Mew, SPECIES_MEW},
-    [SPECIES_CHIKORITA] = {gMonPalette_Chikorita, SPECIES_CHIKORITA},
-    [SPECIES_BAYLEEF] = {gMonPalette_Bayleef, SPECIES_BAYLEEF},
-    [SPECIES_MEGANIUM] = {gMonPalette_Meganium, SPECIES_MEGANIUM},
-    [SPECIES_CYNDAQUIL] = {gMonPalette_Cyndaquil, SPECIES_CYNDAQUIL},
-    [SPECIES_QUILAVA] = {gMonPalette_Quilava, SPECIES_QUILAVA},
-    [SPECIES_TYPHLOSION] = {gMonPalette_Typhlosion, SPECIES_TYPHLOSION},
-    [SPECIES_TOTODILE] = {gMonPalette_Totodile, SPECIES_TOTODILE},
-    [SPECIES_CROCONAW] = {gMonPalette_Croconaw, SPECIES_CROCONAW},
-    [SPECIES_FERALIGATR] = {gMonPalette_Feraligatr, SPECIES_FERALIGATR},
-    [SPECIES_SENTRET] = {gMonPalette_Sentret, SPECIES_SENTRET},
-    [SPECIES_FURRET] = {gMonPalette_Furret, SPECIES_FURRET},
-    [SPECIES_HOOTHOOT] = {gMonPalette_Hoothoot, SPECIES_HOOTHOOT},
-    [SPECIES_NOCTOWL] = {gMonPalette_Noctowl, SPECIES_NOCTOWL},
-    [SPECIES_LEDYBA] = {gMonPalette_Ledyba, SPECIES_LEDYBA},
-    [SPECIES_LEDIAN] = {gMonPalette_Ledian, SPECIES_LEDIAN},
-    [SPECIES_SPINARAK] = {gMonPalette_Spinarak, SPECIES_SPINARAK},
-    [SPECIES_ARIADOS] = {gMonPalette_Ariados, SPECIES_ARIADOS},
-    [SPECIES_CROBAT] = {gMonPalette_Crobat, SPECIES_CROBAT},
-    [SPECIES_CHINCHOU] = {gMonPalette_Chinchou, SPECIES_CHINCHOU},
-    [SPECIES_LANTURN] = {gMonPalette_Lanturn, SPECIES_LANTURN},
-    [SPECIES_PICHU] = {gMonPalette_Pichu, SPECIES_PICHU},
-    [SPECIES_CLEFFA] = {gMonPalette_Cleffa, SPECIES_CLEFFA},
-    [SPECIES_IGGLYBUFF] = {gMonPalette_Igglybuff, SPECIES_IGGLYBUFF},
-    [SPECIES_TOGEPI] = {gMonPalette_Togepi, SPECIES_TOGEPI},
-    [SPECIES_TOGETIC] = {gMonPalette_Togetic, SPECIES_TOGETIC},
-    [SPECIES_NATU] = {gMonPalette_Natu, SPECIES_NATU},
-    [SPECIES_XATU] = {gMonPalette_Xatu, SPECIES_XATU},
-    [SPECIES_MAREEP] = {gMonPalette_Mareep, SPECIES_MAREEP},
-    [SPECIES_FLAAFFY] = {gMonPalette_Flaaffy, SPECIES_FLAAFFY},
-    [SPECIES_AMPHAROS] = {gMonPalette_Ampharos, SPECIES_AMPHAROS},
-    [SPECIES_BELLOSSOM] = {gMonPalette_Bellossom, SPECIES_BELLOSSOM},
-    [SPECIES_MARILL] = {gMonPalette_Marill, SPECIES_MARILL},
-    [SPECIES_AZUMARILL] = {gMonPalette_Azumarill, SPECIES_AZUMARILL},
-    [SPECIES_SUDOWOODO] = {gMonPalette_Sudowoodo, SPECIES_SUDOWOODO},
-    [SPECIES_POLITOED] = {gMonPalette_Politoed, SPECIES_POLITOED},
-    [SPECIES_HOPPIP] = {gMonPalette_Hoppip, SPECIES_HOPPIP},
-    [SPECIES_SKIPLOOM] = {gMonPalette_Skiploom, SPECIES_SKIPLOOM},
-    [SPECIES_JUMPLUFF] = {gMonPalette_Jumpluff, SPECIES_JUMPLUFF},
-    [SPECIES_AIPOM] = {gMonPalette_Aipom, SPECIES_AIPOM},
-    [SPECIES_SUNKERN] = {gMonPalette_Sunkern, SPECIES_SUNKERN},
-    [SPECIES_SUNFLORA] = {gMonPalette_Sunflora, SPECIES_SUNFLORA},
-    [SPECIES_YANMA] = {gMonPalette_Yanma, SPECIES_YANMA},
-    [SPECIES_WOOPER] = {gMonPalette_Wooper, SPECIES_WOOPER},
-    [SPECIES_QUAGSIRE] = {gMonPalette_Quagsire, SPECIES_QUAGSIRE},
-    [SPECIES_ESPEON] = {gMonPalette_Espeon, SPECIES_ESPEON},
-    [SPECIES_UMBREON] = {gMonPalette_Umbreon, SPECIES_UMBREON},
-    [SPECIES_MURKROW] = {gMonPalette_Murkrow, SPECIES_MURKROW},
-    [SPECIES_SLOWKING] = {gMonPalette_Slowking, SPECIES_SLOWKING},
-    [SPECIES_MISDREAVUS] = {gMonPalette_Misdreavus, SPECIES_MISDREAVUS},
-    [SPECIES_UNOWN] = {gMonPalette_Unown, SPECIES_UNOWN},
-    [SPECIES_WOBBUFFET] = {gMonPalette_Wobbuffet, SPECIES_WOBBUFFET},
-    [SPECIES_GIRAFARIG] = {gMonPalette_Girafarig, SPECIES_GIRAFARIG},
-    [SPECIES_PINECO] = {gMonPalette_Pineco, SPECIES_PINECO},
-    [SPECIES_FORRETRESS] = {gMonPalette_Forretress, SPECIES_FORRETRESS},
-    [SPECIES_DUNSPARCE] = {gMonPalette_Dunsparce, SPECIES_DUNSPARCE},
-    [SPECIES_GLIGAR] = {gMonPalette_Gligar, SPECIES_GLIGAR},
-    [SPECIES_STEELIX] = {gMonPalette_Steelix, SPECIES_STEELIX},
-    [SPECIES_SNUBBULL] = {gMonPalette_Snubbull, SPECIES_SNUBBULL},
-    [SPECIES_GRANBULL] = {gMonPalette_Granbull, SPECIES_GRANBULL},
-    [SPECIES_QWILFISH] = {gMonPalette_Qwilfish, SPECIES_QWILFISH},
-    [SPECIES_SCIZOR] = {gMonPalette_Scizor, SPECIES_SCIZOR},
-    [SPECIES_SHUCKLE] = {gMonPalette_Shuckle, SPECIES_SHUCKLE},
-    [SPECIES_HERACROSS] = {gMonPalette_Heracross, SPECIES_HERACROSS},
-    [SPECIES_SNEASEL] = {gMonPalette_Sneasel, SPECIES_SNEASEL},
-    [SPECIES_TEDDIURSA] = {gMonPalette_Teddiursa, SPECIES_TEDDIURSA},
-    [SPECIES_URSARING] = {gMonPalette_Ursaring, SPECIES_URSARING},
-    [SPECIES_SLUGMA] = {gMonPalette_Slugma, SPECIES_SLUGMA},
-    [SPECIES_MAGCARGO] = {gMonPalette_Magcargo, SPECIES_MAGCARGO},
-    [SPECIES_SWINUB] = {gMonPalette_Swinub, SPECIES_SWINUB},
-    [SPECIES_PILOSWINE] = {gMonPalette_Piloswine, SPECIES_PILOSWINE},
-    [SPECIES_CORSOLA] = {gMonPalette_Corsola, SPECIES_CORSOLA},
-    [SPECIES_REMORAID] = {gMonPalette_Remoraid, SPECIES_REMORAID},
-    [SPECIES_OCTILLERY] = {gMonPalette_Octillery, SPECIES_OCTILLERY},
-    [SPECIES_DELIBIRD] = {gMonPalette_Delibird, SPECIES_DELIBIRD},
-    [SPECIES_MANTINE] = {gMonPalette_Mantine, SPECIES_MANTINE},
-    [SPECIES_SKARMORY] = {gMonPalette_Skarmory, SPECIES_SKARMORY},
-    [SPECIES_HOUNDOUR] = {gMonPalette_Houndour, SPECIES_HOUNDOUR},
-    [SPECIES_HOUNDOOM] = {gMonPalette_Houndoom, SPECIES_HOUNDOOM},
-    [SPECIES_KINGDRA] = {gMonPalette_Kingdra, SPECIES_KINGDRA},
-    [SPECIES_PHANPY] = {gMonPalette_Phanpy, SPECIES_PHANPY},
-    [SPECIES_DONPHAN] = {gMonPalette_Donphan, SPECIES_DONPHAN},
-    [SPECIES_PORYGON2] = {gMonPalette_Porygon2, SPECIES_PORYGON2},
-    [SPECIES_STANTLER] = {gMonPalette_Stantler, SPECIES_STANTLER},
-    [SPECIES_SMEARGLE] = {gMonPalette_Smeargle, SPECIES_SMEARGLE},
-    [SPECIES_TYROGUE] = {gMonPalette_Tyrogue, SPECIES_TYROGUE},
-    [SPECIES_HITMONTOP] = {gMonPalette_Hitmontop, SPECIES_HITMONTOP},
-    [SPECIES_SMOOCHUM] = {gMonPalette_Smoochum, SPECIES_SMOOCHUM},
-    [SPECIES_ELEKID] = {gMonPalette_Elekid, SPECIES_ELEKID},
-    [SPECIES_MAGBY] = {gMonPalette_Magby, SPECIES_MAGBY},
-    [SPECIES_MILTANK] = {gMonPalette_Miltank, SPECIES_MILTANK},
-    [SPECIES_BLISSEY] = {gMonPalette_Blissey, SPECIES_BLISSEY},
-    [SPECIES_RAIKOU] = {gMonPalette_Raikou, SPECIES_RAIKOU},
-    [SPECIES_ENTEI] = {gMonPalette_Entei, SPECIES_ENTEI},
-    [SPECIES_SUICUNE] = {gMonPalette_Suicune, SPECIES_SUICUNE},
-    [SPECIES_LARVITAR] = {gMonPalette_Larvitar, SPECIES_LARVITAR},
-    [SPECIES_PUPITAR] = {gMonPalette_Pupitar, SPECIES_PUPITAR},
-    [SPECIES_TYRANITAR] = {gMonPalette_Tyranitar, SPECIES_TYRANITAR},
-    [SPECIES_LUGIA] = {gMonPalette_Lugia, SPECIES_LUGIA},
-    [SPECIES_HO_OH] = {gMonPalette_HoOh, SPECIES_HO_OH},
-    [SPECIES_CELEBI] = {gMonPalette_Celebi, SPECIES_CELEBI},
-    [SPECIES_OLD_UNOWN_B] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_B},
-    [SPECIES_OLD_UNOWN_C] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_C},
-    [SPECIES_OLD_UNOWN_D] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_D},
-    [SPECIES_OLD_UNOWN_E] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_E},
-    [SPECIES_OLD_UNOWN_F] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_F},
-    [SPECIES_OLD_UNOWN_G] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_G},
-    [SPECIES_OLD_UNOWN_H] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_H},
-    [SPECIES_OLD_UNOWN_I] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_I},
-    [SPECIES_OLD_UNOWN_J] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_J},
-    [SPECIES_OLD_UNOWN_K] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_K},
-    [SPECIES_OLD_UNOWN_L] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_L},
-    [SPECIES_OLD_UNOWN_M] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_M},
-    [SPECIES_OLD_UNOWN_N] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_N},
-    [SPECIES_OLD_UNOWN_O] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_O},
-    [SPECIES_OLD_UNOWN_P] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_P},
-    [SPECIES_OLD_UNOWN_Q] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Q},
-    [SPECIES_OLD_UNOWN_R] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_R},
-    [SPECIES_OLD_UNOWN_S] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_S},
-    [SPECIES_OLD_UNOWN_T] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_T},
-    [SPECIES_OLD_UNOWN_U] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_U},
-    [SPECIES_OLD_UNOWN_V] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_V},
-    [SPECIES_OLD_UNOWN_W] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_W},
-    [SPECIES_OLD_UNOWN_X] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_X},
-    [SPECIES_OLD_UNOWN_Y] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Y},
-    [SPECIES_OLD_UNOWN_Z] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Z},
-    [SPECIES_TREECKO] = {gMonPalette_Treecko, SPECIES_TREECKO},
-    [SPECIES_GROVYLE] = {gMonPalette_Grovyle, SPECIES_GROVYLE},
-    [SPECIES_SCEPTILE] = {gMonPalette_Sceptile, SPECIES_SCEPTILE},
-    [SPECIES_TORCHIC] = {gMonPalette_Torchic, SPECIES_TORCHIC},
-    [SPECIES_COMBUSKEN] = {gMonPalette_Combusken, SPECIES_COMBUSKEN},
-    [SPECIES_BLAZIKEN] = {gMonPalette_Blaziken, SPECIES_BLAZIKEN},
-    [SPECIES_MUDKIP] = {gMonPalette_Mudkip, SPECIES_MUDKIP},
-    [SPECIES_MARSHTOMP] = {gMonPalette_Marshtomp, SPECIES_MARSHTOMP},
-    [SPECIES_SWAMPERT] = {gMonPalette_Swampert, SPECIES_SWAMPERT},
-    [SPECIES_POOCHYENA] = {gMonPalette_Poochyena, SPECIES_POOCHYENA},
-    [SPECIES_MIGHTYENA] = {gMonPalette_Mightyena, SPECIES_MIGHTYENA},
-    [SPECIES_ZIGZAGOON] = {gMonPalette_Zigzagoon, SPECIES_ZIGZAGOON},
-    [SPECIES_LINOONE] = {gMonPalette_Linoone, SPECIES_LINOONE},
-    [SPECIES_WURMPLE] = {gMonPalette_Wurmple, SPECIES_WURMPLE},
-    [SPECIES_SILCOON] = {gMonPalette_Silcoon, SPECIES_SILCOON},
-    [SPECIES_BEAUTIFLY] = {gMonPalette_Beautifly, SPECIES_BEAUTIFLY},
-    [SPECIES_CASCOON] = {gMonPalette_Cascoon, SPECIES_CASCOON},
-    [SPECIES_DUSTOX] = {gMonPalette_Dustox, SPECIES_DUSTOX},
-    [SPECIES_LOTAD] = {gMonPalette_Lotad, SPECIES_LOTAD},
-    [SPECIES_LOMBRE] = {gMonPalette_Lombre, SPECIES_LOMBRE},
-    [SPECIES_LUDICOLO] = {gMonPalette_Ludicolo, SPECIES_LUDICOLO},
-    [SPECIES_SEEDOT] = {gMonPalette_Seedot, SPECIES_SEEDOT},
-    [SPECIES_NUZLEAF] = {gMonPalette_Nuzleaf, SPECIES_NUZLEAF},
-    [SPECIES_SHIFTRY] = {gMonPalette_Shiftry, SPECIES_SHIFTRY},
-    [SPECIES_NINCADA] = {gMonPalette_Nincada, SPECIES_NINCADA},
-    [SPECIES_NINJASK] = {gMonPalette_Ninjask, SPECIES_NINJASK},
-    [SPECIES_SHEDINJA] = {gMonPalette_Shedinja, SPECIES_SHEDINJA},
-    [SPECIES_TAILLOW] = {gMonPalette_Taillow, SPECIES_TAILLOW},
-    [SPECIES_SWELLOW] = {gMonPalette_Swellow, SPECIES_SWELLOW},
-    [SPECIES_SHROOMISH] = {gMonPalette_Shroomish, SPECIES_SHROOMISH},
-    [SPECIES_BRELOOM] = {gMonPalette_Breloom, SPECIES_BRELOOM},
-    [SPECIES_SPINDA] = {gMonPalette_Spinda, SPECIES_SPINDA},
-    [SPECIES_WINGULL] = {gMonPalette_Wingull, SPECIES_WINGULL},
-    [SPECIES_PELIPPER] = {gMonPalette_Pelipper, SPECIES_PELIPPER},
-    [SPECIES_SURSKIT] = {gMonPalette_Surskit, SPECIES_SURSKIT},
-    [SPECIES_MASQUERAIN] = {gMonPalette_Masquerain, SPECIES_MASQUERAIN},
-    [SPECIES_WAILMER] = {gMonPalette_Wailmer, SPECIES_WAILMER},
-    [SPECIES_WAILORD] = {gMonPalette_Wailord, SPECIES_WAILORD},
-    [SPECIES_SKITTY] = {gMonPalette_Skitty, SPECIES_SKITTY},
-    [SPECIES_DELCATTY] = {gMonPalette_Delcatty, SPECIES_DELCATTY},
-    [SPECIES_KECLEON] = {gMonPalette_Kecleon, SPECIES_KECLEON},
-    [SPECIES_BALTOY] = {gMonPalette_Baltoy, SPECIES_BALTOY},
-    [SPECIES_CLAYDOL] = {gMonPalette_Claydol, SPECIES_CLAYDOL},
-    [SPECIES_NOSEPASS] = {gMonPalette_Nosepass, SPECIES_NOSEPASS},
-    [SPECIES_TORKOAL] = {gMonPalette_Torkoal, SPECIES_TORKOAL},
-    [SPECIES_SABLEYE] = {gMonPalette_Sableye, SPECIES_SABLEYE},
-    [SPECIES_BARBOACH] = {gMonPalette_Barboach, SPECIES_BARBOACH},
-    [SPECIES_WHISCASH] = {gMonPalette_Whiscash, SPECIES_WHISCASH},
-    [SPECIES_LUVDISC] = {gMonPalette_Luvdisc, SPECIES_LUVDISC},
-    [SPECIES_CORPHISH] = {gMonPalette_Corphish, SPECIES_CORPHISH},
-    [SPECIES_CRAWDAUNT] = {gMonPalette_Crawdaunt, SPECIES_CRAWDAUNT},
-    [SPECIES_FEEBAS] = {gMonPalette_Feebas, SPECIES_FEEBAS},
-    [SPECIES_MILOTIC] = {gMonPalette_Milotic, SPECIES_MILOTIC},
-    [SPECIES_CARVANHA] = {gMonPalette_Carvanha, SPECIES_CARVANHA},
-    [SPECIES_SHARPEDO] = {gMonPalette_Sharpedo, SPECIES_SHARPEDO},
-    [SPECIES_TRAPINCH] = {gMonPalette_Trapinch, SPECIES_TRAPINCH},
-    [SPECIES_VIBRAVA] = {gMonPalette_Vibrava, SPECIES_VIBRAVA},
-    [SPECIES_FLYGON] = {gMonPalette_Flygon, SPECIES_FLYGON},
-    [SPECIES_MAKUHITA] = {gMonPalette_Makuhita, SPECIES_MAKUHITA},
-    [SPECIES_HARIYAMA] = {gMonPalette_Hariyama, SPECIES_HARIYAMA},
-    [SPECIES_ELECTRIKE] = {gMonPalette_Electrike, SPECIES_ELECTRIKE},
-    [SPECIES_MANECTRIC] = {gMonPalette_Manectric, SPECIES_MANECTRIC},
-    [SPECIES_NUMEL] = {gMonPalette_Numel, SPECIES_NUMEL},
-    [SPECIES_CAMERUPT] = {gMonPalette_Camerupt, SPECIES_CAMERUPT},
-    [SPECIES_SPHEAL] = {gMonPalette_Spheal, SPECIES_SPHEAL},
-    [SPECIES_SEALEO] = {gMonPalette_Sealeo, SPECIES_SEALEO},
-    [SPECIES_WALREIN] = {gMonPalette_Walrein, SPECIES_WALREIN},
-    [SPECIES_CACNEA] = {gMonPalette_Cacnea, SPECIES_CACNEA},
-    [SPECIES_CACTURNE] = {gMonPalette_Cacturne, SPECIES_CACTURNE},
-    [SPECIES_SNORUNT] = {gMonPalette_Snorunt, SPECIES_SNORUNT},
-    [SPECIES_GLALIE] = {gMonPalette_Glalie, SPECIES_GLALIE},
-    [SPECIES_LUNATONE] = {gMonPalette_Lunatone, SPECIES_LUNATONE},
-    [SPECIES_SOLROCK] = {gMonPalette_Solrock, SPECIES_SOLROCK},
-    [SPECIES_AZURILL] = {gMonPalette_Azurill, SPECIES_AZURILL},
-    [SPECIES_SPOINK] = {gMonPalette_Spoink, SPECIES_SPOINK},
-    [SPECIES_GRUMPIG] = {gMonPalette_Grumpig, SPECIES_GRUMPIG},
-    [SPECIES_PLUSLE] = {gMonPalette_Plusle, SPECIES_PLUSLE},
-    [SPECIES_MINUN] = {gMonPalette_Minun, SPECIES_MINUN},
-    [SPECIES_MAWILE] = {gMonPalette_Mawile, SPECIES_MAWILE},
-    [SPECIES_MEDITITE] = {gMonPalette_Meditite, SPECIES_MEDITITE},
-    [SPECIES_MEDICHAM] = {gMonPalette_Medicham, SPECIES_MEDICHAM},
-    [SPECIES_SWABLU] = {gMonPalette_Swablu, SPECIES_SWABLU},
-    [SPECIES_ALTARIA] = {gMonPalette_Altaria, SPECIES_ALTARIA},
-    [SPECIES_WYNAUT] = {gMonPalette_Wynaut, SPECIES_WYNAUT},
-    [SPECIES_DUSKULL] = {gMonPalette_Duskull, SPECIES_DUSKULL},
-    [SPECIES_DUSCLOPS] = {gMonPalette_Dusclops, SPECIES_DUSCLOPS},
-    [SPECIES_ROSELIA] = {gMonPalette_Roselia, SPECIES_ROSELIA},
-    [SPECIES_SLAKOTH] = {gMonPalette_Slakoth, SPECIES_SLAKOTH},
-    [SPECIES_VIGOROTH] = {gMonPalette_Vigoroth, SPECIES_VIGOROTH},
-    [SPECIES_SLAKING] = {gMonPalette_Slaking, SPECIES_SLAKING},
-    [SPECIES_GULPIN] = {gMonPalette_Gulpin, SPECIES_GULPIN},
-    [SPECIES_SWALOT] = {gMonPalette_Swalot, SPECIES_SWALOT},
-    [SPECIES_TROPIUS] = {gMonPalette_Tropius, SPECIES_TROPIUS},
-    [SPECIES_WHISMUR] = {gMonPalette_Whismur, SPECIES_WHISMUR},
-    [SPECIES_LOUDRED] = {gMonPalette_Loudred, SPECIES_LOUDRED},
-    [SPECIES_EXPLOUD] = {gMonPalette_Exploud, SPECIES_EXPLOUD},
-    [SPECIES_CLAMPERL] = {gMonPalette_Clamperl, SPECIES_CLAMPERL},
-    [SPECIES_HUNTAIL] = {gMonPalette_Huntail, SPECIES_HUNTAIL},
-    [SPECIES_GOREBYSS] = {gMonPalette_Gorebyss, SPECIES_GOREBYSS},
-    [SPECIES_ABSOL] = {gMonPalette_Absol, SPECIES_ABSOL},
-    [SPECIES_SHUPPET] = {gMonPalette_Shuppet, SPECIES_SHUPPET},
-    [SPECIES_BANETTE] = {gMonPalette_Banette, SPECIES_BANETTE},
-    [SPECIES_SEVIPER] = {gMonPalette_Seviper, SPECIES_SEVIPER},
-    [SPECIES_ZANGOOSE] = {gMonPalette_Zangoose, SPECIES_ZANGOOSE},
-    [SPECIES_RELICANTH] = {gMonPalette_Relicanth, SPECIES_RELICANTH},
-    [SPECIES_ARON] = {gMonPalette_Aron, SPECIES_ARON},
-    [SPECIES_LAIRON] = {gMonPalette_Lairon, SPECIES_LAIRON},
-    [SPECIES_AGGRON] = {gMonPalette_Aggron, SPECIES_AGGRON},
-    [SPECIES_CASTFORM] = {gMonPalette_Castform, SPECIES_CASTFORM},
-    [SPECIES_VOLBEAT] = {gMonPalette_Volbeat, SPECIES_VOLBEAT},
-    [SPECIES_ILLUMISE] = {gMonPalette_Illumise, SPECIES_ILLUMISE},
-    [SPECIES_LILEEP] = {gMonPalette_Lileep, SPECIES_LILEEP},
-    [SPECIES_CRADILY] = {gMonPalette_Cradily, SPECIES_CRADILY},
-    [SPECIES_ANORITH] = {gMonPalette_Anorith, SPECIES_ANORITH},
-    [SPECIES_ARMALDO] = {gMonPalette_Armaldo, SPECIES_ARMALDO},
-    [SPECIES_RALTS] = {gMonPalette_Ralts, SPECIES_RALTS},
-    [SPECIES_KIRLIA] = {gMonPalette_Kirlia, SPECIES_KIRLIA},
-    [SPECIES_GARDEVOIR] = {gMonPalette_Gardevoir, SPECIES_GARDEVOIR},
-    [SPECIES_BAGON] = {gMonPalette_Bagon, SPECIES_BAGON},
-    [SPECIES_SHELGON] = {gMonPalette_Shelgon, SPECIES_SHELGON},
-    [SPECIES_SALAMENCE] = {gMonPalette_Salamence, SPECIES_SALAMENCE},
-    [SPECIES_BELDUM] = {gMonPalette_Beldum, SPECIES_BELDUM},
-    [SPECIES_METANG] = {gMonPalette_Metang, SPECIES_METANG},
-    [SPECIES_METAGROSS] = {gMonPalette_Metagross, SPECIES_METAGROSS},
-    [SPECIES_REGIROCK] = {gMonPalette_Regirock, SPECIES_REGIROCK},
-    [SPECIES_REGICE] = {gMonPalette_Regice, SPECIES_REGICE},
-    [SPECIES_REGISTEEL] = {gMonPalette_Registeel, SPECIES_REGISTEEL},
-    [SPECIES_KYOGRE] = {gMonPalette_Kyogre, SPECIES_KYOGRE},
-    [SPECIES_GROUDON] = {gMonPalette_Groudon, SPECIES_GROUDON},
-    [SPECIES_RAYQUAZA] = {gMonPalette_Rayquaza, SPECIES_RAYQUAZA},
-    [SPECIES_LATIAS] = {gMonPalette_Latias, SPECIES_LATIAS},
-    [SPECIES_LATIOS] = {gMonPalette_Latios, SPECIES_LATIOS},
-    [SPECIES_JIRACHI] = {gMonPalette_Jirachi, SPECIES_JIRACHI},
-    [SPECIES_DEOXYS] = {gMonPalette_Deoxys, SPECIES_DEOXYS},
-    [SPECIES_CHIMECHO] = {gMonPalette_Chimecho, SPECIES_CHIMECHO},
-    [SPECIES_EGG] = {gMonPalette_Egg, SPECIES_EGG},
-    [SPECIES_UNOWN_B] = {gMonPalette_Unown, SPECIES_UNOWN_B},
-    [SPECIES_UNOWN_C] = {gMonPalette_Unown, SPECIES_UNOWN_C},
-    [SPECIES_UNOWN_D] = {gMonPalette_Unown, SPECIES_UNOWN_D},
-    [SPECIES_UNOWN_E] = {gMonPalette_Unown, SPECIES_UNOWN_E},
-    [SPECIES_UNOWN_F] = {gMonPalette_Unown, SPECIES_UNOWN_F},
-    [SPECIES_UNOWN_G] = {gMonPalette_Unown, SPECIES_UNOWN_G},
-    [SPECIES_UNOWN_H] = {gMonPalette_Unown, SPECIES_UNOWN_H},
-    [SPECIES_UNOWN_I] = {gMonPalette_Unown, SPECIES_UNOWN_I},
-    [SPECIES_UNOWN_J] = {gMonPalette_Unown, SPECIES_UNOWN_J},
-    [SPECIES_UNOWN_K] = {gMonPalette_Unown, SPECIES_UNOWN_K},
-    [SPECIES_UNOWN_L] = {gMonPalette_Unown, SPECIES_UNOWN_L},
-    [SPECIES_UNOWN_M] = {gMonPalette_Unown, SPECIES_UNOWN_M},
-    [SPECIES_UNOWN_N] = {gMonPalette_Unown, SPECIES_UNOWN_N},
-    [SPECIES_UNOWN_O] = {gMonPalette_Unown, SPECIES_UNOWN_O},
-    [SPECIES_UNOWN_P] = {gMonPalette_Unown, SPECIES_UNOWN_P},
-    [SPECIES_UNOWN_Q] = {gMonPalette_Unown, SPECIES_UNOWN_Q},
-    [SPECIES_UNOWN_R] = {gMonPalette_Unown, SPECIES_UNOWN_R},
-    [SPECIES_UNOWN_S] = {gMonPalette_Unown, SPECIES_UNOWN_S},
-    [SPECIES_UNOWN_T] = {gMonPalette_Unown, SPECIES_UNOWN_T},
-    [SPECIES_UNOWN_U] = {gMonPalette_Unown, SPECIES_UNOWN_U},
-    [SPECIES_UNOWN_V] = {gMonPalette_Unown, SPECIES_UNOWN_V},
-    [SPECIES_UNOWN_W] = {gMonPalette_Unown, SPECIES_UNOWN_W},
-    [SPECIES_UNOWN_X] = {gMonPalette_Unown, SPECIES_UNOWN_X},
-    [SPECIES_UNOWN_Y] = {gMonPalette_Unown, SPECIES_UNOWN_Y},
-    [SPECIES_UNOWN_Z] = {gMonPalette_Unown, SPECIES_UNOWN_Z},
-    [SPECIES_UNOWN_EMARK] = {gMonPalette_Unown, SPECIES_UNOWN_EMARK},
-    [SPECIES_UNOWN_QMARK] = {gMonPalette_Unown, SPECIES_UNOWN_QMARK},
+    SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark),
+    SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur),
+    SPECIES_PAL(IVYSAUR, gMonPalette_Ivysaur),
+    SPECIES_PAL(VENUSAUR, gMonPalette_Venusaur),
+    SPECIES_PAL(CHARMANDER, gMonPalette_Charmander),
+    SPECIES_PAL(CHARMELEON, gMonPalette_Charmeleon),
+    SPECIES_PAL(CHARIZARD, gMonPalette_Charizard),
+    SPECIES_PAL(SQUIRTLE, gMonPalette_Squirtle),
+    SPECIES_PAL(WARTORTLE, gMonPalette_Wartortle),
+    SPECIES_PAL(BLASTOISE, gMonPalette_Blastoise),
+    SPECIES_PAL(CATERPIE, gMonPalette_Caterpie),
+    SPECIES_PAL(METAPOD, gMonPalette_Metapod),
+    SPECIES_PAL(BUTTERFREE, gMonPalette_Butterfree),
+    SPECIES_PAL(WEEDLE, gMonPalette_Weedle),
+    SPECIES_PAL(KAKUNA, gMonPalette_Kakuna),
+    SPECIES_PAL(BEEDRILL, gMonPalette_Beedrill),
+    SPECIES_PAL(PIDGEY, gMonPalette_Pidgey),
+    SPECIES_PAL(PIDGEOTTO, gMonPalette_Pidgeotto),
+    SPECIES_PAL(PIDGEOT, gMonPalette_Pidgeot),
+    SPECIES_PAL(RATTATA, gMonPalette_Rattata),
+    SPECIES_PAL(RATICATE, gMonPalette_Raticate),
+    SPECIES_PAL(SPEAROW, gMonPalette_Spearow),
+    SPECIES_PAL(FEAROW, gMonPalette_Fearow),
+    SPECIES_PAL(EKANS, gMonPalette_Ekans),
+    SPECIES_PAL(ARBOK, gMonPalette_Arbok),
+    SPECIES_PAL(PIKACHU, gMonPalette_Pikachu),
+    SPECIES_PAL(RAICHU, gMonPalette_Raichu),
+    SPECIES_PAL(SANDSHREW, gMonPalette_Sandshrew),
+    SPECIES_PAL(SANDSLASH, gMonPalette_Sandslash),
+    SPECIES_PAL(NIDORAN_F, gMonPalette_NidoranF),
+    SPECIES_PAL(NIDORINA, gMonPalette_Nidorina),
+    SPECIES_PAL(NIDOQUEEN, gMonPalette_Nidoqueen),
+    SPECIES_PAL(NIDORAN_M, gMonPalette_NidoranM),
+    SPECIES_PAL(NIDORINO, gMonPalette_Nidorino),
+    SPECIES_PAL(NIDOKING, gMonPalette_Nidoking),
+    SPECIES_PAL(CLEFAIRY, gMonPalette_Clefairy),
+    SPECIES_PAL(CLEFABLE, gMonPalette_Clefable),
+    SPECIES_PAL(VULPIX, gMonPalette_Vulpix),
+    SPECIES_PAL(NINETALES, gMonPalette_Ninetales),
+    SPECIES_PAL(JIGGLYPUFF, gMonPalette_Jigglypuff),
+    SPECIES_PAL(WIGGLYTUFF, gMonPalette_Wigglytuff),
+    SPECIES_PAL(ZUBAT, gMonPalette_Zubat),
+    SPECIES_PAL(GOLBAT, gMonPalette_Golbat),
+    SPECIES_PAL(ODDISH, gMonPalette_Oddish),
+    SPECIES_PAL(GLOOM, gMonPalette_Gloom),
+    SPECIES_PAL(VILEPLUME, gMonPalette_Vileplume),
+    SPECIES_PAL(PARAS, gMonPalette_Paras),
+    SPECIES_PAL(PARASECT, gMonPalette_Parasect),
+    SPECIES_PAL(VENONAT, gMonPalette_Venonat),
+    SPECIES_PAL(VENOMOTH, gMonPalette_Venomoth),
+    SPECIES_PAL(DIGLETT, gMonPalette_Diglett),
+    SPECIES_PAL(DUGTRIO, gMonPalette_Dugtrio),
+    SPECIES_PAL(MEOWTH, gMonPalette_Meowth),
+    SPECIES_PAL(PERSIAN, gMonPalette_Persian),
+    SPECIES_PAL(PSYDUCK, gMonPalette_Psyduck),
+    SPECIES_PAL(GOLDUCK, gMonPalette_Golduck),
+    SPECIES_PAL(MANKEY, gMonPalette_Mankey),
+    SPECIES_PAL(PRIMEAPE, gMonPalette_Primeape),
+    SPECIES_PAL(GROWLITHE, gMonPalette_Growlithe),
+    SPECIES_PAL(ARCANINE, gMonPalette_Arcanine),
+    SPECIES_PAL(POLIWAG, gMonPalette_Poliwag),
+    SPECIES_PAL(POLIWHIRL, gMonPalette_Poliwhirl),
+    SPECIES_PAL(POLIWRATH, gMonPalette_Poliwrath),
+    SPECIES_PAL(ABRA, gMonPalette_Abra),
+    SPECIES_PAL(KADABRA, gMonPalette_Kadabra),
+    SPECIES_PAL(ALAKAZAM, gMonPalette_Alakazam),
+    SPECIES_PAL(MACHOP, gMonPalette_Machop),
+    SPECIES_PAL(MACHOKE, gMonPalette_Machoke),
+    SPECIES_PAL(MACHAMP, gMonPalette_Machamp),
+    SPECIES_PAL(BELLSPROUT, gMonPalette_Bellsprout),
+    SPECIES_PAL(WEEPINBELL, gMonPalette_Weepinbell),
+    SPECIES_PAL(VICTREEBEL, gMonPalette_Victreebel),
+    SPECIES_PAL(TENTACOOL, gMonPalette_Tentacool),
+    SPECIES_PAL(TENTACRUEL, gMonPalette_Tentacruel),
+    SPECIES_PAL(GEODUDE, gMonPalette_Geodude),
+    SPECIES_PAL(GRAVELER, gMonPalette_Graveler),
+    SPECIES_PAL(GOLEM, gMonPalette_Golem),
+    SPECIES_PAL(PONYTA, gMonPalette_Ponyta),
+    SPECIES_PAL(RAPIDASH, gMonPalette_Rapidash),
+    SPECIES_PAL(SLOWPOKE, gMonPalette_Slowpoke),
+    SPECIES_PAL(SLOWBRO, gMonPalette_Slowbro),
+    SPECIES_PAL(MAGNEMITE, gMonPalette_Magnemite),
+    SPECIES_PAL(MAGNETON, gMonPalette_Magneton),
+    SPECIES_PAL(FARFETCHD, gMonPalette_Farfetchd),
+    SPECIES_PAL(DODUO, gMonPalette_Doduo),
+    SPECIES_PAL(DODRIO, gMonPalette_Dodrio),
+    SPECIES_PAL(SEEL, gMonPalette_Seel),
+    SPECIES_PAL(DEWGONG, gMonPalette_Dewgong),
+    SPECIES_PAL(GRIMER, gMonPalette_Grimer),
+    SPECIES_PAL(MUK, gMonPalette_Muk),
+    SPECIES_PAL(SHELLDER, gMonPalette_Shellder),
+    SPECIES_PAL(CLOYSTER, gMonPalette_Cloyster),
+    SPECIES_PAL(GASTLY, gMonPalette_Gastly),
+    SPECIES_PAL(HAUNTER, gMonPalette_Haunter),
+    SPECIES_PAL(GENGAR, gMonPalette_Gengar),
+    SPECIES_PAL(ONIX, gMonPalette_Onix),
+    SPECIES_PAL(DROWZEE, gMonPalette_Drowzee),
+    SPECIES_PAL(HYPNO, gMonPalette_Hypno),
+    SPECIES_PAL(KRABBY, gMonPalette_Krabby),
+    SPECIES_PAL(KINGLER, gMonPalette_Kingler),
+    SPECIES_PAL(VOLTORB, gMonPalette_Voltorb),
+    SPECIES_PAL(ELECTRODE, gMonPalette_Electrode),
+    SPECIES_PAL(EXEGGCUTE, gMonPalette_Exeggcute),
+    SPECIES_PAL(EXEGGUTOR, gMonPalette_Exeggutor),
+    SPECIES_PAL(CUBONE, gMonPalette_Cubone),
+    SPECIES_PAL(MAROWAK, gMonPalette_Marowak),
+    SPECIES_PAL(HITMONLEE, gMonPalette_Hitmonlee),
+    SPECIES_PAL(HITMONCHAN, gMonPalette_Hitmonchan),
+    SPECIES_PAL(LICKITUNG, gMonPalette_Lickitung),
+    SPECIES_PAL(KOFFING, gMonPalette_Koffing),
+    SPECIES_PAL(WEEZING, gMonPalette_Weezing),
+    SPECIES_PAL(RHYHORN, gMonPalette_Rhyhorn),
+    SPECIES_PAL(RHYDON, gMonPalette_Rhydon),
+    SPECIES_PAL(CHANSEY, gMonPalette_Chansey),
+    SPECIES_PAL(TANGELA, gMonPalette_Tangela),
+    SPECIES_PAL(KANGASKHAN, gMonPalette_Kangaskhan),
+    SPECIES_PAL(HORSEA, gMonPalette_Horsea),
+    SPECIES_PAL(SEADRA, gMonPalette_Seadra),
+    SPECIES_PAL(GOLDEEN, gMonPalette_Goldeen),
+    SPECIES_PAL(SEAKING, gMonPalette_Seaking),
+    SPECIES_PAL(STARYU, gMonPalette_Staryu),
+    SPECIES_PAL(STARMIE, gMonPalette_Starmie),
+    SPECIES_PAL(MR_MIME, gMonPalette_Mrmime),
+    SPECIES_PAL(SCYTHER, gMonPalette_Scyther),
+    SPECIES_PAL(JYNX, gMonPalette_Jynx),
+    SPECIES_PAL(ELECTABUZZ, gMonPalette_Electabuzz),
+    SPECIES_PAL(MAGMAR, gMonPalette_Magmar),
+    SPECIES_PAL(PINSIR, gMonPalette_Pinsir),
+    SPECIES_PAL(TAUROS, gMonPalette_Tauros),
+    SPECIES_PAL(MAGIKARP, gMonPalette_Magikarp),
+    SPECIES_PAL(GYARADOS, gMonPalette_Gyarados),
+    SPECIES_PAL(LAPRAS, gMonPalette_Lapras),
+    SPECIES_PAL(DITTO, gMonPalette_Ditto),
+    SPECIES_PAL(EEVEE, gMonPalette_Eevee),
+    SPECIES_PAL(VAPOREON, gMonPalette_Vaporeon),
+    SPECIES_PAL(JOLTEON, gMonPalette_Jolteon),
+    SPECIES_PAL(FLAREON, gMonPalette_Flareon),
+    SPECIES_PAL(PORYGON, gMonPalette_Porygon),
+    SPECIES_PAL(OMANYTE, gMonPalette_Omanyte),
+    SPECIES_PAL(OMASTAR, gMonPalette_Omastar),
+    SPECIES_PAL(KABUTO, gMonPalette_Kabuto),
+    SPECIES_PAL(KABUTOPS, gMonPalette_Kabutops),
+    SPECIES_PAL(AERODACTYL, gMonPalette_Aerodactyl),
+    SPECIES_PAL(SNORLAX, gMonPalette_Snorlax),
+    SPECIES_PAL(ARTICUNO, gMonPalette_Articuno),
+    SPECIES_PAL(ZAPDOS, gMonPalette_Zapdos),
+    SPECIES_PAL(MOLTRES, gMonPalette_Moltres),
+    SPECIES_PAL(DRATINI, gMonPalette_Dratini),
+    SPECIES_PAL(DRAGONAIR, gMonPalette_Dragonair),
+    SPECIES_PAL(DRAGONITE, gMonPalette_Dragonite),
+    SPECIES_PAL(MEWTWO, gMonPalette_Mewtwo),
+    SPECIES_PAL(MEW, gMonPalette_Mew),
+    SPECIES_PAL(CHIKORITA, gMonPalette_Chikorita),
+    SPECIES_PAL(BAYLEEF, gMonPalette_Bayleef),
+    SPECIES_PAL(MEGANIUM, gMonPalette_Meganium),
+    SPECIES_PAL(CYNDAQUIL, gMonPalette_Cyndaquil),
+    SPECIES_PAL(QUILAVA, gMonPalette_Quilava),
+    SPECIES_PAL(TYPHLOSION, gMonPalette_Typhlosion),
+    SPECIES_PAL(TOTODILE, gMonPalette_Totodile),
+    SPECIES_PAL(CROCONAW, gMonPalette_Croconaw),
+    SPECIES_PAL(FERALIGATR, gMonPalette_Feraligatr),
+    SPECIES_PAL(SENTRET, gMonPalette_Sentret),
+    SPECIES_PAL(FURRET, gMonPalette_Furret),
+    SPECIES_PAL(HOOTHOOT, gMonPalette_Hoothoot),
+    SPECIES_PAL(NOCTOWL, gMonPalette_Noctowl),
+    SPECIES_PAL(LEDYBA, gMonPalette_Ledyba),
+    SPECIES_PAL(LEDIAN, gMonPalette_Ledian),
+    SPECIES_PAL(SPINARAK, gMonPalette_Spinarak),
+    SPECIES_PAL(ARIADOS, gMonPalette_Ariados),
+    SPECIES_PAL(CROBAT, gMonPalette_Crobat),
+    SPECIES_PAL(CHINCHOU, gMonPalette_Chinchou),
+    SPECIES_PAL(LANTURN, gMonPalette_Lanturn),
+    SPECIES_PAL(PICHU, gMonPalette_Pichu),
+    SPECIES_PAL(CLEFFA, gMonPalette_Cleffa),
+    SPECIES_PAL(IGGLYBUFF, gMonPalette_Igglybuff),
+    SPECIES_PAL(TOGEPI, gMonPalette_Togepi),
+    SPECIES_PAL(TOGETIC, gMonPalette_Togetic),
+    SPECIES_PAL(NATU, gMonPalette_Natu),
+    SPECIES_PAL(XATU, gMonPalette_Xatu),
+    SPECIES_PAL(MAREEP, gMonPalette_Mareep),
+    SPECIES_PAL(FLAAFFY, gMonPalette_Flaaffy),
+    SPECIES_PAL(AMPHAROS, gMonPalette_Ampharos),
+    SPECIES_PAL(BELLOSSOM, gMonPalette_Bellossom),
+    SPECIES_PAL(MARILL, gMonPalette_Marill),
+    SPECIES_PAL(AZUMARILL, gMonPalette_Azumarill),
+    SPECIES_PAL(SUDOWOODO, gMonPalette_Sudowoodo),
+    SPECIES_PAL(POLITOED, gMonPalette_Politoed),
+    SPECIES_PAL(HOPPIP, gMonPalette_Hoppip),
+    SPECIES_PAL(SKIPLOOM, gMonPalette_Skiploom),
+    SPECIES_PAL(JUMPLUFF, gMonPalette_Jumpluff),
+    SPECIES_PAL(AIPOM, gMonPalette_Aipom),
+    SPECIES_PAL(SUNKERN, gMonPalette_Sunkern),
+    SPECIES_PAL(SUNFLORA, gMonPalette_Sunflora),
+    SPECIES_PAL(YANMA, gMonPalette_Yanma),
+    SPECIES_PAL(WOOPER, gMonPalette_Wooper),
+    SPECIES_PAL(QUAGSIRE, gMonPalette_Quagsire),
+    SPECIES_PAL(ESPEON, gMonPalette_Espeon),
+    SPECIES_PAL(UMBREON, gMonPalette_Umbreon),
+    SPECIES_PAL(MURKROW, gMonPalette_Murkrow),
+    SPECIES_PAL(SLOWKING, gMonPalette_Slowking),
+    SPECIES_PAL(MISDREAVUS, gMonPalette_Misdreavus),
+    SPECIES_PAL(UNOWN, gMonPalette_Unown),
+    SPECIES_PAL(WOBBUFFET, gMonPalette_Wobbuffet),
+    SPECIES_PAL(GIRAFARIG, gMonPalette_Girafarig),
+    SPECIES_PAL(PINECO, gMonPalette_Pineco),
+    SPECIES_PAL(FORRETRESS, gMonPalette_Forretress),
+    SPECIES_PAL(DUNSPARCE, gMonPalette_Dunsparce),
+    SPECIES_PAL(GLIGAR, gMonPalette_Gligar),
+    SPECIES_PAL(STEELIX, gMonPalette_Steelix),
+    SPECIES_PAL(SNUBBULL, gMonPalette_Snubbull),
+    SPECIES_PAL(GRANBULL, gMonPalette_Granbull),
+    SPECIES_PAL(QWILFISH, gMonPalette_Qwilfish),
+    SPECIES_PAL(SCIZOR, gMonPalette_Scizor),
+    SPECIES_PAL(SHUCKLE, gMonPalette_Shuckle),
+    SPECIES_PAL(HERACROSS, gMonPalette_Heracross),
+    SPECIES_PAL(SNEASEL, gMonPalette_Sneasel),
+    SPECIES_PAL(TEDDIURSA, gMonPalette_Teddiursa),
+    SPECIES_PAL(URSARING, gMonPalette_Ursaring),
+    SPECIES_PAL(SLUGMA, gMonPalette_Slugma),
+    SPECIES_PAL(MAGCARGO, gMonPalette_Magcargo),
+    SPECIES_PAL(SWINUB, gMonPalette_Swinub),
+    SPECIES_PAL(PILOSWINE, gMonPalette_Piloswine),
+    SPECIES_PAL(CORSOLA, gMonPalette_Corsola),
+    SPECIES_PAL(REMORAID, gMonPalette_Remoraid),
+    SPECIES_PAL(OCTILLERY, gMonPalette_Octillery),
+    SPECIES_PAL(DELIBIRD, gMonPalette_Delibird),
+    SPECIES_PAL(MANTINE, gMonPalette_Mantine),
+    SPECIES_PAL(SKARMORY, gMonPalette_Skarmory),
+    SPECIES_PAL(HOUNDOUR, gMonPalette_Houndour),
+    SPECIES_PAL(HOUNDOOM, gMonPalette_Houndoom),
+    SPECIES_PAL(KINGDRA, gMonPalette_Kingdra),
+    SPECIES_PAL(PHANPY, gMonPalette_Phanpy),
+    SPECIES_PAL(DONPHAN, gMonPalette_Donphan),
+    SPECIES_PAL(PORYGON2, gMonPalette_Porygon2),
+    SPECIES_PAL(STANTLER, gMonPalette_Stantler),
+    SPECIES_PAL(SMEARGLE, gMonPalette_Smeargle),
+    SPECIES_PAL(TYROGUE, gMonPalette_Tyrogue),
+    SPECIES_PAL(HITMONTOP, gMonPalette_Hitmontop),
+    SPECIES_PAL(SMOOCHUM, gMonPalette_Smoochum),
+    SPECIES_PAL(ELEKID, gMonPalette_Elekid),
+    SPECIES_PAL(MAGBY, gMonPalette_Magby),
+    SPECIES_PAL(MILTANK, gMonPalette_Miltank),
+    SPECIES_PAL(BLISSEY, gMonPalette_Blissey),
+    SPECIES_PAL(RAIKOU, gMonPalette_Raikou),
+    SPECIES_PAL(ENTEI, gMonPalette_Entei),
+    SPECIES_PAL(SUICUNE, gMonPalette_Suicune),
+    SPECIES_PAL(LARVITAR, gMonPalette_Larvitar),
+    SPECIES_PAL(PUPITAR, gMonPalette_Pupitar),
+    SPECIES_PAL(TYRANITAR, gMonPalette_Tyranitar),
+    SPECIES_PAL(LUGIA, gMonPalette_Lugia),
+    SPECIES_PAL(HO_OH, gMonPalette_HoOh),
+    SPECIES_PAL(CELEBI, gMonPalette_Celebi),
+    SPECIES_PAL(OLD_UNOWN_B, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_C, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_D, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_E, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_F, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_G, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_H, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_I, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_J, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_K, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_L, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_M, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_N, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_O, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_P, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_Q, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_R, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_S, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_T, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_U, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_V, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_W, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_X, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_Y, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_Z, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(TREECKO, gMonPalette_Treecko),
+    SPECIES_PAL(GROVYLE, gMonPalette_Grovyle),
+    SPECIES_PAL(SCEPTILE, gMonPalette_Sceptile),
+    SPECIES_PAL(TORCHIC, gMonPalette_Torchic),
+    SPECIES_PAL(COMBUSKEN, gMonPalette_Combusken),
+    SPECIES_PAL(BLAZIKEN, gMonPalette_Blaziken),
+    SPECIES_PAL(MUDKIP, gMonPalette_Mudkip),
+    SPECIES_PAL(MARSHTOMP, gMonPalette_Marshtomp),
+    SPECIES_PAL(SWAMPERT, gMonPalette_Swampert),
+    SPECIES_PAL(POOCHYENA, gMonPalette_Poochyena),
+    SPECIES_PAL(MIGHTYENA, gMonPalette_Mightyena),
+    SPECIES_PAL(ZIGZAGOON, gMonPalette_Zigzagoon),
+    SPECIES_PAL(LINOONE, gMonPalette_Linoone),
+    SPECIES_PAL(WURMPLE, gMonPalette_Wurmple),
+    SPECIES_PAL(SILCOON, gMonPalette_Silcoon),
+    SPECIES_PAL(BEAUTIFLY, gMonPalette_Beautifly),
+    SPECIES_PAL(CASCOON, gMonPalette_Cascoon),
+    SPECIES_PAL(DUSTOX, gMonPalette_Dustox),
+    SPECIES_PAL(LOTAD, gMonPalette_Lotad),
+    SPECIES_PAL(LOMBRE, gMonPalette_Lombre),
+    SPECIES_PAL(LUDICOLO, gMonPalette_Ludicolo),
+    SPECIES_PAL(SEEDOT, gMonPalette_Seedot),
+    SPECIES_PAL(NUZLEAF, gMonPalette_Nuzleaf),
+    SPECIES_PAL(SHIFTRY, gMonPalette_Shiftry),
+    SPECIES_PAL(NINCADA, gMonPalette_Nincada),
+    SPECIES_PAL(NINJASK, gMonPalette_Ninjask),
+    SPECIES_PAL(SHEDINJA, gMonPalette_Shedinja),
+    SPECIES_PAL(TAILLOW, gMonPalette_Taillow),
+    SPECIES_PAL(SWELLOW, gMonPalette_Swellow),
+    SPECIES_PAL(SHROOMISH, gMonPalette_Shroomish),
+    SPECIES_PAL(BRELOOM, gMonPalette_Breloom),
+    SPECIES_PAL(SPINDA, gMonPalette_Spinda),
+    SPECIES_PAL(WINGULL, gMonPalette_Wingull),
+    SPECIES_PAL(PELIPPER, gMonPalette_Pelipper),
+    SPECIES_PAL(SURSKIT, gMonPalette_Surskit),
+    SPECIES_PAL(MASQUERAIN, gMonPalette_Masquerain),
+    SPECIES_PAL(WAILMER, gMonPalette_Wailmer),
+    SPECIES_PAL(WAILORD, gMonPalette_Wailord),
+    SPECIES_PAL(SKITTY, gMonPalette_Skitty),
+    SPECIES_PAL(DELCATTY, gMonPalette_Delcatty),
+    SPECIES_PAL(KECLEON, gMonPalette_Kecleon),
+    SPECIES_PAL(BALTOY, gMonPalette_Baltoy),
+    SPECIES_PAL(CLAYDOL, gMonPalette_Claydol),
+    SPECIES_PAL(NOSEPASS, gMonPalette_Nosepass),
+    SPECIES_PAL(TORKOAL, gMonPalette_Torkoal),
+    SPECIES_PAL(SABLEYE, gMonPalette_Sableye),
+    SPECIES_PAL(BARBOACH, gMonPalette_Barboach),
+    SPECIES_PAL(WHISCASH, gMonPalette_Whiscash),
+    SPECIES_PAL(LUVDISC, gMonPalette_Luvdisc),
+    SPECIES_PAL(CORPHISH, gMonPalette_Corphish),
+    SPECIES_PAL(CRAWDAUNT, gMonPalette_Crawdaunt),
+    SPECIES_PAL(FEEBAS, gMonPalette_Feebas),
+    SPECIES_PAL(MILOTIC, gMonPalette_Milotic),
+    SPECIES_PAL(CARVANHA, gMonPalette_Carvanha),
+    SPECIES_PAL(SHARPEDO, gMonPalette_Sharpedo),
+    SPECIES_PAL(TRAPINCH, gMonPalette_Trapinch),
+    SPECIES_PAL(VIBRAVA, gMonPalette_Vibrava),
+    SPECIES_PAL(FLYGON, gMonPalette_Flygon),
+    SPECIES_PAL(MAKUHITA, gMonPalette_Makuhita),
+    SPECIES_PAL(HARIYAMA, gMonPalette_Hariyama),
+    SPECIES_PAL(ELECTRIKE, gMonPalette_Electrike),
+    SPECIES_PAL(MANECTRIC, gMonPalette_Manectric),
+    SPECIES_PAL(NUMEL, gMonPalette_Numel),
+    SPECIES_PAL(CAMERUPT, gMonPalette_Camerupt),
+    SPECIES_PAL(SPHEAL, gMonPalette_Spheal),
+    SPECIES_PAL(SEALEO, gMonPalette_Sealeo),
+    SPECIES_PAL(WALREIN, gMonPalette_Walrein),
+    SPECIES_PAL(CACNEA, gMonPalette_Cacnea),
+    SPECIES_PAL(CACTURNE, gMonPalette_Cacturne),
+    SPECIES_PAL(SNORUNT, gMonPalette_Snorunt),
+    SPECIES_PAL(GLALIE, gMonPalette_Glalie),
+    SPECIES_PAL(LUNATONE, gMonPalette_Lunatone),
+    SPECIES_PAL(SOLROCK, gMonPalette_Solrock),
+    SPECIES_PAL(AZURILL, gMonPalette_Azurill),
+    SPECIES_PAL(SPOINK, gMonPalette_Spoink),
+    SPECIES_PAL(GRUMPIG, gMonPalette_Grumpig),
+    SPECIES_PAL(PLUSLE, gMonPalette_Plusle),
+    SPECIES_PAL(MINUN, gMonPalette_Minun),
+    SPECIES_PAL(MAWILE, gMonPalette_Mawile),
+    SPECIES_PAL(MEDITITE, gMonPalette_Meditite),
+    SPECIES_PAL(MEDICHAM, gMonPalette_Medicham),
+    SPECIES_PAL(SWABLU, gMonPalette_Swablu),
+    SPECIES_PAL(ALTARIA, gMonPalette_Altaria),
+    SPECIES_PAL(WYNAUT, gMonPalette_Wynaut),
+    SPECIES_PAL(DUSKULL, gMonPalette_Duskull),
+    SPECIES_PAL(DUSCLOPS, gMonPalette_Dusclops),
+    SPECIES_PAL(ROSELIA, gMonPalette_Roselia),
+    SPECIES_PAL(SLAKOTH, gMonPalette_Slakoth),
+    SPECIES_PAL(VIGOROTH, gMonPalette_Vigoroth),
+    SPECIES_PAL(SLAKING, gMonPalette_Slaking),
+    SPECIES_PAL(GULPIN, gMonPalette_Gulpin),
+    SPECIES_PAL(SWALOT, gMonPalette_Swalot),
+    SPECIES_PAL(TROPIUS, gMonPalette_Tropius),
+    SPECIES_PAL(WHISMUR, gMonPalette_Whismur),
+    SPECIES_PAL(LOUDRED, gMonPalette_Loudred),
+    SPECIES_PAL(EXPLOUD, gMonPalette_Exploud),
+    SPECIES_PAL(CLAMPERL, gMonPalette_Clamperl),
+    SPECIES_PAL(HUNTAIL, gMonPalette_Huntail),
+    SPECIES_PAL(GOREBYSS, gMonPalette_Gorebyss),
+    SPECIES_PAL(ABSOL, gMonPalette_Absol),
+    SPECIES_PAL(SHUPPET, gMonPalette_Shuppet),
+    SPECIES_PAL(BANETTE, gMonPalette_Banette),
+    SPECIES_PAL(SEVIPER, gMonPalette_Seviper),
+    SPECIES_PAL(ZANGOOSE, gMonPalette_Zangoose),
+    SPECIES_PAL(RELICANTH, gMonPalette_Relicanth),
+    SPECIES_PAL(ARON, gMonPalette_Aron),
+    SPECIES_PAL(LAIRON, gMonPalette_Lairon),
+    SPECIES_PAL(AGGRON, gMonPalette_Aggron),
+    SPECIES_PAL(CASTFORM, gMonPalette_Castform),
+    SPECIES_PAL(VOLBEAT, gMonPalette_Volbeat),
+    SPECIES_PAL(ILLUMISE, gMonPalette_Illumise),
+    SPECIES_PAL(LILEEP, gMonPalette_Lileep),
+    SPECIES_PAL(CRADILY, gMonPalette_Cradily),
+    SPECIES_PAL(ANORITH, gMonPalette_Anorith),
+    SPECIES_PAL(ARMALDO, gMonPalette_Armaldo),
+    SPECIES_PAL(RALTS, gMonPalette_Ralts),
+    SPECIES_PAL(KIRLIA, gMonPalette_Kirlia),
+    SPECIES_PAL(GARDEVOIR, gMonPalette_Gardevoir),
+    SPECIES_PAL(BAGON, gMonPalette_Bagon),
+    SPECIES_PAL(SHELGON, gMonPalette_Shelgon),
+    SPECIES_PAL(SALAMENCE, gMonPalette_Salamence),
+    SPECIES_PAL(BELDUM, gMonPalette_Beldum),
+    SPECIES_PAL(METANG, gMonPalette_Metang),
+    SPECIES_PAL(METAGROSS, gMonPalette_Metagross),
+    SPECIES_PAL(REGIROCK, gMonPalette_Regirock),
+    SPECIES_PAL(REGICE, gMonPalette_Regice),
+    SPECIES_PAL(REGISTEEL, gMonPalette_Registeel),
+    SPECIES_PAL(KYOGRE, gMonPalette_Kyogre),
+    SPECIES_PAL(GROUDON, gMonPalette_Groudon),
+    SPECIES_PAL(RAYQUAZA, gMonPalette_Rayquaza),
+    SPECIES_PAL(LATIAS, gMonPalette_Latias),
+    SPECIES_PAL(LATIOS, gMonPalette_Latios),
+    SPECIES_PAL(JIRACHI, gMonPalette_Jirachi),
+    SPECIES_PAL(DEOXYS, gMonPalette_Deoxys),
+    SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho),
+    SPECIES_PAL(EGG, gMonPalette_Egg),
+    SPECIES_PAL(UNOWN_B, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_C, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_D, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_E, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_F, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_G, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_H, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_I, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_J, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_K, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_L, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_M, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_N, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_O, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_P, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_Q, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_R, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_S, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_T, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_U, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_V, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_W, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_X, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_Y, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_Z, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_EMARK, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_QMARK, gMonPalette_Unown),
 };

src/data/pokemon_graphics/shiny_palette_table.h

@@ -1,443 +1,443 @@
 const struct CompressedSpritePalette gMonShinyPaletteTable[] =
 {
-    [SPECIES_NONE] = {gMonShinyPalette_CircledQuestionMark, SPECIES_NONE + 500},
-    [SPECIES_BULBASAUR] = {gMonShinyPalette_Bulbasaur, SPECIES_BULBASAUR + 500},
-    [SPECIES_IVYSAUR] = {gMonShinyPalette_Ivysaur, SPECIES_IVYSAUR + 500},
-    [SPECIES_VENUSAUR] = {gMonShinyPalette_Venusaur, SPECIES_VENUSAUR + 500},
-    [SPECIES_CHARMANDER] = {gMonShinyPalette_Charmander, SPECIES_CHARMANDER + 500},
-    [SPECIES_CHARMELEON] = {gMonShinyPalette_Charmeleon, SPECIES_CHARMELEON + 500},
-    [SPECIES_CHARIZARD] = {gMonShinyPalette_Charizard, SPECIES_CHARIZARD + 500},
-    [SPECIES_SQUIRTLE] = {gMonShinyPalette_Squirtle, SPECIES_SQUIRTLE + 500},
-    [SPECIES_WARTORTLE] = {gMonShinyPalette_Wartortle, SPECIES_WARTORTLE + 500},
-    [SPECIES_BLASTOISE] = {gMonShinyPalette_Blastoise, SPECIES_BLASTOISE + 500},
-    [SPECIES_CATERPIE] = {gMonShinyPalette_Caterpie, SPECIES_CATERPIE + 500},
-    [SPECIES_METAPOD] = {gMonShinyPalette_Metapod, SPECIES_METAPOD + 500},
-    [SPECIES_BUTTERFREE] = {gMonShinyPalette_Butterfree, SPECIES_BUTTERFREE + 500},
-    [SPECIES_WEEDLE] = {gMonShinyPalette_Weedle, SPECIES_WEEDLE + 500},
-    [SPECIES_KAKUNA] = {gMonShinyPalette_Kakuna, SPECIES_KAKUNA + 500},
-    [SPECIES_BEEDRILL] = {gMonShinyPalette_Beedrill, SPECIES_BEEDRILL + 500},
-    [SPECIES_PIDGEY] = {gMonShinyPalette_Pidgey, SPECIES_PIDGEY + 500},
-    [SPECIES_PIDGEOTTO] = {gMonShinyPalette_Pidgeotto, SPECIES_PIDGEOTTO + 500},
-    [SPECIES_PIDGEOT] = {gMonShinyPalette_Pidgeot, SPECIES_PIDGEOT + 500},
-    [SPECIES_RATTATA] = {gMonShinyPalette_Rattata, SPECIES_RATTATA + 500},
-    [SPECIES_RATICATE] = {gMonShinyPalette_Raticate, SPECIES_RATICATE + 500},
-    [SPECIES_SPEAROW] = {gMonShinyPalette_Spearow, SPECIES_SPEAROW + 500},
-    [SPECIES_FEAROW] = {gMonShinyPalette_Fearow, SPECIES_FEAROW + 500},
-    [SPECIES_EKANS] = {gMonShinyPalette_Ekans, SPECIES_EKANS + 500},
-    [SPECIES_ARBOK] = {gMonShinyPalette_Arbok, SPECIES_ARBOK + 500},
-    [SPECIES_PIKACHU] = {gMonShinyPalette_Pikachu, SPECIES_PIKACHU + 500},
-    [SPECIES_RAICHU] = {gMonShinyPalette_Raichu, SPECIES_RAICHU + 500},
-    [SPECIES_SANDSHREW] = {gMonShinyPalette_Sandshrew, SPECIES_SANDSHREW + 500},
-    [SPECIES_SANDSLASH] = {gMonShinyPalette_Sandslash, SPECIES_SANDSLASH + 500},
-    [SPECIES_NIDORAN_F] = {gMonShinyPalette_NidoranF, SPECIES_NIDORAN_F + 500},
-    [SPECIES_NIDORINA] = {gMonShinyPalette_Nidorina, SPECIES_NIDORINA + 500},
-    [SPECIES_NIDOQUEEN] = {gMonShinyPalette_Nidoqueen, SPECIES_NIDOQUEEN + 500},
-    [SPECIES_NIDORAN_M] = {gMonShinyPalette_NidoranM, SPECIES_NIDORAN_M + 500},
-    [SPECIES_NIDORINO] = {gMonShinyPalette_Nidorino, SPECIES_NIDORINO + 500},
-    [SPECIES_NIDOKING] = {gMonShinyPalette_Nidoking, SPECIES_NIDOKING + 500},
-    [SPECIES_CLEFAIRY] = {gMonShinyPalette_Clefairy, SPECIES_CLEFAIRY + 500},
-    [SPECIES_CLEFABLE] = {gMonShinyPalette_Clefable, SPECIES_CLEFABLE + 500},
-    [SPECIES_VULPIX] = {gMonShinyPalette_Vulpix, SPECIES_VULPIX + 500},
-    [SPECIES_NINETALES] = {gMonShinyPalette_Ninetales, SPECIES_NINETALES + 500},
-    [SPECIES_JIGGLYPUFF] = {gMonShinyPalette_Jigglypuff, SPECIES_JIGGLYPUFF + 500},
-    [SPECIES_WIGGLYTUFF] = {gMonShinyPalette_Wigglytuff, SPECIES_WIGGLYTUFF + 500},
-    [SPECIES_ZUBAT] = {gMonShinyPalette_Zubat, SPECIES_ZUBAT + 500},
-    [SPECIES_GOLBAT] = {gMonShinyPalette_Golbat, SPECIES_GOLBAT + 500},
-    [SPECIES_ODDISH] = {gMonShinyPalette_Oddish, SPECIES_ODDISH + 500},
-    [SPECIES_GLOOM] = {gMonShinyPalette_Gloom, SPECIES_GLOOM + 500},
-    [SPECIES_VILEPLUME] = {gMonShinyPalette_Vileplume, SPECIES_VILEPLUME + 500},
-    [SPECIES_PARAS] = {gMonShinyPalette_Paras, SPECIES_PARAS + 500},
-    [SPECIES_PARASECT] = {gMonShinyPalette_Parasect, SPECIES_PARASECT + 500},
-    [SPECIES_VENONAT] = {gMonShinyPalette_Venonat, SPECIES_VENONAT + 500},
-    [SPECIES_VENOMOTH] = {gMonShinyPalette_Venomoth, SPECIES_VENOMOTH + 500},
-    [SPECIES_DIGLETT] = {gMonShinyPalette_Diglett, SPECIES_DIGLETT + 500},
-    [SPECIES_DUGTRIO] = {gMonShinyPalette_Dugtrio, SPECIES_DUGTRIO + 500},
-    [SPECIES_MEOWTH] = {gMonShinyPalette_Meowth, SPECIES_MEOWTH + 500},
-    [SPECIES_PERSIAN] = {gMonShinyPalette_Persian, SPECIES_PERSIAN + 500},
-    [SPECIES_PSYDUCK] = {gMonShinyPalette_Psyduck, SPECIES_PSYDUCK + 500},
-    [SPECIES_GOLDUCK] = {gMonShinyPalette_Golduck, SPECIES_GOLDUCK + 500},
-    [SPECIES_MANKEY] = {gMonShinyPalette_Mankey, SPECIES_MANKEY + 500},
-    [SPECIES_PRIMEAPE] = {gMonShinyPalette_Primeape, SPECIES_PRIMEAPE + 500},
-    [SPECIES_GROWLITHE] = {gMonShinyPalette_Growlithe, SPECIES_GROWLITHE + 500},
-    [SPECIES_ARCANINE] = {gMonShinyPalette_Arcanine, SPECIES_ARCANINE + 500},
-    [SPECIES_POLIWAG] = {gMonShinyPalette_Poliwag, SPECIES_POLIWAG + 500},
-    [SPECIES_POLIWHIRL] = {gMonShinyPalette_Poliwhirl, SPECIES_POLIWHIRL + 500},
-    [SPECIES_POLIWRATH] = {gMonShinyPalette_Poliwrath, SPECIES_POLIWRATH + 500},
-    [SPECIES_ABRA] = {gMonShinyPalette_Abra, SPECIES_ABRA + 500},
-    [SPECIES_KADABRA] = {gMonShinyPalette_Kadabra, SPECIES_KADABRA + 500},
-    [SPECIES_ALAKAZAM] = {gMonShinyPalette_Alakazam, SPECIES_ALAKAZAM + 500},
-    [SPECIES_MACHOP] = {gMonShinyPalette_Machop, SPECIES_MACHOP + 500},
-    [SPECIES_MACHOKE] = {gMonShinyPalette_Machoke, SPECIES_MACHOKE + 500},
-    [SPECIES_MACHAMP] = {gMonShinyPalette_Machamp, SPECIES_MACHAMP + 500},
-    [SPECIES_BELLSPROUT] = {gMonShinyPalette_Bellsprout, SPECIES_BELLSPROUT + 500},
-    [SPECIES_WEEPINBELL] = {gMonShinyPalette_Weepinbell, SPECIES_WEEPINBELL + 500},
-    [SPECIES_VICTREEBEL] = {gMonShinyPalette_Victreebel, SPECIES_VICTREEBEL + 500},
-    [SPECIES_TENTACOOL] = {gMonShinyPalette_Tentacool, SPECIES_TENTACOOL + 500},
-    [SPECIES_TENTACRUEL] = {gMonShinyPalette_Tentacruel, SPECIES_TENTACRUEL + 500},
-    [SPECIES_GEODUDE] = {gMonShinyPalette_Geodude, SPECIES_GEODUDE + 500},
-    [SPECIES_GRAVELER] = {gMonShinyPalette_Graveler, SPECIES_GRAVELER + 500},
-    [SPECIES_GOLEM] = {gMonShinyPalette_Golem, SPECIES_GOLEM + 500},
-    [SPECIES_PONYTA] = {gMonShinyPalette_Ponyta, SPECIES_PONYTA + 500},
-    [SPECIES_RAPIDASH] = {gMonShinyPalette_Rapidash, SPECIES_RAPIDASH + 500},
-    [SPECIES_SLOWPOKE] = {gMonShinyPalette_Slowpoke, SPECIES_SLOWPOKE + 500},
-    [SPECIES_SLOWBRO] = {gMonShinyPalette_Slowbro, SPECIES_SLOWBRO + 500},
-    [SPECIES_MAGNEMITE] = {gMonShinyPalette_Magnemite, SPECIES_MAGNEMITE + 500},
-    [SPECIES_MAGNETON] = {gMonShinyPalette_Magneton, SPECIES_MAGNETON + 500},
-    [SPECIES_FARFETCHD] = {gMonShinyPalette_Farfetchd, SPECIES_FARFETCHD + 500},
-    [SPECIES_DODUO] = {gMonShinyPalette_Doduo, SPECIES_DODUO + 500},
-    [SPECIES_DODRIO] = {gMonShinyPalette_Dodrio, SPECIES_DODRIO + 500},
-    [SPECIES_SEEL] = {gMonShinyPalette_Seel, SPECIES_SEEL + 500},
-    [SPECIES_DEWGONG] = {gMonShinyPalette_Dewgong, SPECIES_DEWGONG + 500},
-    [SPECIES_GRIMER] = {gMonShinyPalette_Grimer, SPECIES_GRIMER + 500},
-    [SPECIES_MUK] = {gMonShinyPalette_Muk, SPECIES_MUK + 500},
-    [SPECIES_SHELLDER] = {gMonShinyPalette_Shellder, SPECIES_SHELLDER + 500},
-    [SPECIES_CLOYSTER] = {gMonShinyPalette_Cloyster, SPECIES_CLOYSTER + 500},
-    [SPECIES_GASTLY] = {gMonShinyPalette_Gastly, SPECIES_GASTLY + 500},
-    [SPECIES_HAUNTER] = {gMonShinyPalette_Haunter, SPECIES_HAUNTER + 500},
-    [SPECIES_GENGAR] = {gMonShinyPalette_Gengar, SPECIES_GENGAR + 500},
-    [SPECIES_ONIX] = {gMonShinyPalette_Onix, SPECIES_ONIX + 500},
-    [SPECIES_DROWZEE] = {gMonShinyPalette_Drowzee, SPECIES_DROWZEE + 500},
-    [SPECIES_HYPNO] = {gMonShinyPalette_Hypno, SPECIES_HYPNO + 500},
-    [SPECIES_KRABBY] = {gMonShinyPalette_Krabby, SPECIES_KRABBY + 500},
-    [SPECIES_KINGLER] = {gMonShinyPalette_Kingler, SPECIES_KINGLER + 500},
-    [SPECIES_VOLTORB] = {gMonShinyPalette_Voltorb, SPECIES_VOLTORB + 500},
-    [SPECIES_ELECTRODE] = {gMonShinyPalette_Electrode, SPECIES_ELECTRODE + 500},
-    [SPECIES_EXEGGCUTE] = {gMonShinyPalette_Exeggcute, SPECIES_EXEGGCUTE + 500},
-    [SPECIES_EXEGGUTOR] = {gMonShinyPalette_Exeggutor, SPECIES_EXEGGUTOR + 500},
-    [SPECIES_CUBONE] = {gMonShinyPalette_Cubone, SPECIES_CUBONE + 500},
-    [SPECIES_MAROWAK] = {gMonShinyPalette_Marowak, SPECIES_MAROWAK + 500},
-    [SPECIES_HITMONLEE] = {gMonShinyPalette_Hitmonlee, SPECIES_HITMONLEE + 500},
-    [SPECIES_HITMONCHAN] = {gMonShinyPalette_Hitmonchan, SPECIES_HITMONCHAN + 500},
-    [SPECIES_LICKITUNG] = {gMonShinyPalette_Lickitung, SPECIES_LICKITUNG + 500},
-    [SPECIES_KOFFING] = {gMonShinyPalette_Koffing, SPECIES_KOFFING + 500},
-    [SPECIES_WEEZING] = {gMonShinyPalette_Weezing, SPECIES_WEEZING + 500},
-    [SPECIES_RHYHORN] = {gMonShinyPalette_Rhyhorn, SPECIES_RHYHORN + 500},
-    [SPECIES_RHYDON] = {gMonShinyPalette_Rhydon, SPECIES_RHYDON + 500},
-    [SPECIES_CHANSEY] = {gMonShinyPalette_Chansey, SPECIES_CHANSEY + 500},
-    [SPECIES_TANGELA] = {gMonShinyPalette_Tangela, SPECIES_TANGELA + 500},
-    [SPECIES_KANGASKHAN] = {gMonShinyPalette_Kangaskhan, SPECIES_KANGASKHAN + 500},
-    [SPECIES_HORSEA] = {gMonShinyPalette_Horsea, SPECIES_HORSEA + 500},
-    [SPECIES_SEADRA] = {gMonShinyPalette_Seadra, SPECIES_SEADRA + 500},
-    [SPECIES_GOLDEEN] = {gMonShinyPalette_Goldeen, SPECIES_GOLDEEN + 500},
-    [SPECIES_SEAKING] = {gMonShinyPalette_Seaking, SPECIES_SEAKING + 500},
-    [SPECIES_STARYU] = {gMonShinyPalette_Staryu, SPECIES_STARYU + 500},
-    [SPECIES_STARMIE] = {gMonShinyPalette_Starmie, SPECIES_STARMIE + 500},
-    [SPECIES_MR_MIME] = {gMonShinyPalette_Mrmime, SPECIES_MR_MIME + 500},
-    [SPECIES_SCYTHER] = {gMonShinyPalette_Scyther, SPECIES_SCYTHER + 500},
-    [SPECIES_JYNX] = {gMonShinyPalette_Jynx, SPECIES_JYNX + 500},
-    [SPECIES_ELECTABUZZ] = {gMonShinyPalette_Electabuzz, SPECIES_ELECTABUZZ + 500},
-    [SPECIES_MAGMAR] = {gMonShinyPalette_Magmar, SPECIES_MAGMAR + 500},
-    [SPECIES_PINSIR] = {gMonShinyPalette_Pinsir, SPECIES_PINSIR + 500},
-    [SPECIES_TAUROS] = {gMonShinyPalette_Tauros, SPECIES_TAUROS + 500},
-    [SPECIES_MAGIKARP] = {gMonShinyPalette_Magikarp, SPECIES_MAGIKARP + 500},
-    [SPECIES_GYARADOS] = {gMonShinyPalette_Gyarados, SPECIES_GYARADOS + 500},
-    [SPECIES_LAPRAS] = {gMonShinyPalette_Lapras, SPECIES_LAPRAS + 500},
-    [SPECIES_DITTO] = {gMonShinyPalette_Ditto, SPECIES_DITTO + 500},
-    [SPECIES_EEVEE] = {gMonShinyPalette_Eevee, SPECIES_EEVEE + 500},
-    [SPECIES_VAPOREON] = {gMonShinyPalette_Vaporeon, SPECIES_VAPOREON + 500},
-    [SPECIES_JOLTEON] = {gMonShinyPalette_Jolteon, SPECIES_JOLTEON + 500},
-    [SPECIES_FLAREON] = {gMonShinyPalette_Flareon, SPECIES_FLAREON + 500},
-    [SPECIES_PORYGON] = {gMonShinyPalette_Porygon, SPECIES_PORYGON + 500},
-    [SPECIES_OMANYTE] = {gMonShinyPalette_Omanyte, SPECIES_OMANYTE + 500},
-    [SPECIES_OMASTAR] = {gMonShinyPalette_Omastar, SPECIES_OMASTAR + 500},
-    [SPECIES_KABUTO] = {gMonShinyPalette_Kabuto, SPECIES_KABUTO + 500},
-    [SPECIES_KABUTOPS] = {gMonShinyPalette_Kabutops, SPECIES_KABUTOPS + 500},
-    [SPECIES_AERODACTYL] = {gMonShinyPalette_Aerodactyl, SPECIES_AERODACTYL + 500},
-    [SPECIES_SNORLAX] = {gMonShinyPalette_Snorlax, SPECIES_SNORLAX + 500},
-    [SPECIES_ARTICUNO] = {gMonShinyPalette_Articuno, SPECIES_ARTICUNO + 500},
-    [SPECIES_ZAPDOS] = {gMonShinyPalette_Zapdos, SPECIES_ZAPDOS + 500},
-    [SPECIES_MOLTRES] = {gMonShinyPalette_Moltres, SPECIES_MOLTRES + 500},
-    [SPECIES_DRATINI] = {gMonShinyPalette_Dratini, SPECIES_DRATINI + 500},
-    [SPECIES_DRAGONAIR] = {gMonShinyPalette_Dragonair, SPECIES_DRAGONAIR + 500},
-    [SPECIES_DRAGONITE] = {gMonShinyPalette_Dragonite, SPECIES_DRAGONITE + 500},
-    [SPECIES_MEWTWO] = {gMonShinyPalette_Mewtwo, SPECIES_MEWTWO + 500},
-    [SPECIES_MEW] = {gMonShinyPalette_Mew, SPECIES_MEW + 500},
-    [SPECIES_CHIKORITA] = {gMonShinyPalette_Chikorita, SPECIES_CHIKORITA + 500},
-    [SPECIES_BAYLEEF] = {gMonShinyPalette_Bayleef, SPECIES_BAYLEEF + 500},
-    [SPECIES_MEGANIUM] = {gMonShinyPalette_Meganium, SPECIES_MEGANIUM + 500},
-    [SPECIES_CYNDAQUIL] = {gMonShinyPalette_Cyndaquil, SPECIES_CYNDAQUIL + 500},
-    [SPECIES_QUILAVA] = {gMonShinyPalette_Quilava, SPECIES_QUILAVA + 500},
-    [SPECIES_TYPHLOSION] = {gMonShinyPalette_Typhlosion, SPECIES_TYPHLOSION + 500},
-    [SPECIES_TOTODILE] = {gMonShinyPalette_Totodile, SPECIES_TOTODILE + 500},
-    [SPECIES_CROCONAW] = {gMonShinyPalette_Croconaw, SPECIES_CROCONAW + 500},
-    [SPECIES_FERALIGATR] = {gMonShinyPalette_Feraligatr, SPECIES_FERALIGATR + 500},
-    [SPECIES_SENTRET] = {gMonShinyPalette_Sentret, SPECIES_SENTRET + 500},
-    [SPECIES_FURRET] = {gMonShinyPalette_Furret, SPECIES_FURRET + 500},
-    [SPECIES_HOOTHOOT] = {gMonShinyPalette_Hoothoot, SPECIES_HOOTHOOT + 500},
-    [SPECIES_NOCTOWL] = {gMonShinyPalette_Noctowl, SPECIES_NOCTOWL + 500},
-    [SPECIES_LEDYBA] = {gMonShinyPalette_Ledyba, SPECIES_LEDYBA + 500},
-    [SPECIES_LEDIAN] = {gMonShinyPalette_Ledian, SPECIES_LEDIAN + 500},
-    [SPECIES_SPINARAK] = {gMonShinyPalette_Spinarak, SPECIES_SPINARAK + 500},
-    [SPECIES_ARIADOS] = {gMonShinyPalette_Ariados, SPECIES_ARIADOS + 500},
-    [SPECIES_CROBAT] = {gMonShinyPalette_Crobat, SPECIES_CROBAT + 500},
-    [SPECIES_CHINCHOU] = {gMonShinyPalette_Chinchou, SPECIES_CHINCHOU + 500},
-    [SPECIES_LANTURN] = {gMonShinyPalette_Lanturn, SPECIES_LANTURN + 500},
-    [SPECIES_PICHU] = {gMonShinyPalette_Pichu, SPECIES_PICHU + 500},
-    [SPECIES_CLEFFA] = {gMonShinyPalette_Cleffa, SPECIES_CLEFFA + 500},
-    [SPECIES_IGGLYBUFF] = {gMonShinyPalette_Igglybuff, SPECIES_IGGLYBUFF + 500},
-    [SPECIES_TOGEPI] = {gMonShinyPalette_Togepi, SPECIES_TOGEPI + 500},
-    [SPECIES_TOGETIC] = {gMonShinyPalette_Togetic, SPECIES_TOGETIC + 500},
-    [SPECIES_NATU] = {gMonShinyPalette_Natu, SPECIES_NATU + 500},
-    [SPECIES_XATU] = {gMonShinyPalette_Xatu, SPECIES_XATU + 500},
-    [SPECIES_MAREEP] = {gMonShinyPalette_Mareep, SPECIES_MAREEP + 500},
-    [SPECIES_FLAAFFY] = {gMonShinyPalette_Flaaffy, SPECIES_FLAAFFY + 500},
-    [SPECIES_AMPHAROS] = {gMonShinyPalette_Ampharos, SPECIES_AMPHAROS + 500},
-    [SPECIES_BELLOSSOM] = {gMonShinyPalette_Bellossom, SPECIES_BELLOSSOM + 500},
-    [SPECIES_MARILL] = {gMonShinyPalette_Marill, SPECIES_MARILL + 500},
-    [SPECIES_AZUMARILL] = {gMonShinyPalette_Azumarill, SPECIES_AZUMARILL + 500},
-    [SPECIES_SUDOWOODO] = {gMonShinyPalette_Sudowoodo, SPECIES_SUDOWOODO + 500},
-    [SPECIES_POLITOED] = {gMonShinyPalette_Politoed, SPECIES_POLITOED + 500},
-    [SPECIES_HOPPIP] = {gMonShinyPalette_Hoppip, SPECIES_HOPPIP + 500},
-    [SPECIES_SKIPLOOM] = {gMonShinyPalette_Skiploom, SPECIES_SKIPLOOM + 500},
-    [SPECIES_JUMPLUFF] = {gMonShinyPalette_Jumpluff, SPECIES_JUMPLUFF + 500},
-    [SPECIES_AIPOM] = {gMonShinyPalette_Aipom, SPECIES_AIPOM + 500},
-    [SPECIES_SUNKERN] = {gMonShinyPalette_Sunkern, SPECIES_SUNKERN + 500},
-    [SPECIES_SUNFLORA] = {gMonShinyPalette_Sunflora, SPECIES_SUNFLORA + 500},
-    [SPECIES_YANMA] = {gMonShinyPalette_Yanma, SPECIES_YANMA + 500},
-    [SPECIES_WOOPER] = {gMonShinyPalette_Wooper, SPECIES_WOOPER + 500},
-    [SPECIES_QUAGSIRE] = {gMonShinyPalette_Quagsire, SPECIES_QUAGSIRE + 500},
-    [SPECIES_ESPEON] = {gMonShinyPalette_Espeon, SPECIES_ESPEON + 500},
-    [SPECIES_UMBREON] = {gMonShinyPalette_Umbreon, SPECIES_UMBREON + 500},
-    [SPECIES_MURKROW] = {gMonShinyPalette_Murkrow, SPECIES_MURKROW + 500},
-    [SPECIES_SLOWKING] = {gMonShinyPalette_Slowking, SPECIES_SLOWKING + 500},
-    [SPECIES_MISDREAVUS] = {gMonShinyPalette_Misdreavus, SPECIES_MISDREAVUS + 500},
-    [SPECIES_UNOWN] = {gMonShinyPalette_Unown, SPECIES_UNOWN + 500},
-    [SPECIES_WOBBUFFET] = {gMonShinyPalette_Wobbuffet, SPECIES_WOBBUFFET + 500},
-    [SPECIES_GIRAFARIG] = {gMonShinyPalette_Girafarig, SPECIES_GIRAFARIG + 500},
-    [SPECIES_PINECO] = {gMonShinyPalette_Pineco, SPECIES_PINECO + 500},
-    [SPECIES_FORRETRESS] = {gMonShinyPalette_Forretress, SPECIES_FORRETRESS + 500},
-    [SPECIES_DUNSPARCE] = {gMonShinyPalette_Dunsparce, SPECIES_DUNSPARCE + 500},
-    [SPECIES_GLIGAR] = {gMonShinyPalette_Gligar, SPECIES_GLIGAR + 500},
-    [SPECIES_STEELIX] = {gMonShinyPalette_Steelix, SPECIES_STEELIX + 500},
-    [SPECIES_SNUBBULL] = {gMonShinyPalette_Snubbull, SPECIES_SNUBBULL + 500},
-    [SPECIES_GRANBULL] = {gMonShinyPalette_Granbull, SPECIES_GRANBULL + 500},
-    [SPECIES_QWILFISH] = {gMonShinyPalette_Qwilfish, SPECIES_QWILFISH + 500},
-    [SPECIES_SCIZOR] = {gMonShinyPalette_Scizor, SPECIES_SCIZOR + 500},
-    [SPECIES_SHUCKLE] = {gMonShinyPalette_Shuckle, SPECIES_SHUCKLE + 500},
-    [SPECIES_HERACROSS] = {gMonShinyPalette_Heracross, SPECIES_HERACROSS + 500},
-    [SPECIES_SNEASEL] = {gMonShinyPalette_Sneasel, SPECIES_SNEASEL + 500},
-    [SPECIES_TEDDIURSA] = {gMonShinyPalette_Teddiursa, SPECIES_TEDDIURSA + 500},
-    [SPECIES_URSARING] = {gMonShinyPalette_Ursaring, SPECIES_URSARING + 500},
-    [SPECIES_SLUGMA] = {gMonShinyPalette_Slugma, SPECIES_SLUGMA + 500},
-    [SPECIES_MAGCARGO] = {gMonShinyPalette_Magcargo, SPECIES_MAGCARGO + 500},
-    [SPECIES_SWINUB] = {gMonShinyPalette_Swinub, SPECIES_SWINUB + 500},
-    [SPECIES_PILOSWINE] = {gMonShinyPalette_Piloswine, SPECIES_PILOSWINE + 500},
-    [SPECIES_CORSOLA] = {gMonShinyPalette_Corsola, SPECIES_CORSOLA + 500},
-    [SPECIES_REMORAID] = {gMonShinyPalette_Remoraid, SPECIES_REMORAID + 500},
-    [SPECIES_OCTILLERY] = {gMonShinyPalette_Octillery, SPECIES_OCTILLERY + 500},
-    [SPECIES_DELIBIRD] = {gMonShinyPalette_Delibird, SPECIES_DELIBIRD + 500},
-    [SPECIES_MANTINE] = {gMonShinyPalette_Mantine, SPECIES_MANTINE + 500},
-    [SPECIES_SKARMORY] = {gMonShinyPalette_Skarmory, SPECIES_SKARMORY + 500},
-    [SPECIES_HOUNDOUR] = {gMonShinyPalette_Houndour, SPECIES_HOUNDOUR + 500},
-    [SPECIES_HOUNDOOM] = {gMonShinyPalette_Houndoom, SPECIES_HOUNDOOM + 500},
-    [SPECIES_KINGDRA] = {gMonShinyPalette_Kingdra, SPECIES_KINGDRA + 500},
-    [SPECIES_PHANPY] = {gMonShinyPalette_Phanpy, SPECIES_PHANPY + 500},
-    [SPECIES_DONPHAN] = {gMonShinyPalette_Donphan, SPECIES_DONPHAN + 500},
-    [SPECIES_PORYGON2] = {gMonShinyPalette_Porygon2, SPECIES_PORYGON2 + 500},
-    [SPECIES_STANTLER] = {gMonShinyPalette_Stantler, SPECIES_STANTLER + 500},
-    [SPECIES_SMEARGLE] = {gMonShinyPalette_Smeargle, SPECIES_SMEARGLE + 500},
-    [SPECIES_TYROGUE] = {gMonShinyPalette_Tyrogue, SPECIES_TYROGUE + 500},
-    [SPECIES_HITMONTOP] = {gMonShinyPalette_Hitmontop, SPECIES_HITMONTOP + 500},
-    [SPECIES_SMOOCHUM] = {gMonShinyPalette_Smoochum, SPECIES_SMOOCHUM + 500},
-    [SPECIES_ELEKID] = {gMonShinyPalette_Elekid, SPECIES_ELEKID + 500},
-    [SPECIES_MAGBY] = {gMonShinyPalette_Magby, SPECIES_MAGBY + 500},
-    [SPECIES_MILTANK] = {gMonShinyPalette_Miltank, SPECIES_MILTANK + 500},
-    [SPECIES_BLISSEY] = {gMonShinyPalette_Blissey, SPECIES_BLISSEY + 500},
-    [SPECIES_RAIKOU] = {gMonShinyPalette_Raikou, SPECIES_RAIKOU + 500},
-    [SPECIES_ENTEI] = {gMonShinyPalette_Entei, SPECIES_ENTEI + 500},
-    [SPECIES_SUICUNE] = {gMonShinyPalette_Suicune, SPECIES_SUICUNE + 500},
-    [SPECIES_LARVITAR] = {gMonShinyPalette_Larvitar, SPECIES_LARVITAR + 500},
-    [SPECIES_PUPITAR] = {gMonShinyPalette_Pupitar, SPECIES_PUPITAR + 500},
-    [SPECIES_TYRANITAR] = {gMonShinyPalette_Tyranitar, SPECIES_TYRANITAR + 500},
-    [SPECIES_LUGIA] = {gMonShinyPalette_Lugia, SPECIES_LUGIA + 500},
-    [SPECIES_HO_OH] = {gMonShinyPalette_HoOh, SPECIES_HO_OH + 500},
-    [SPECIES_CELEBI] = {gMonShinyPalette_Celebi, SPECIES_CELEBI + 500},
-    [SPECIES_OLD_UNOWN_B] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_B + 500},
-    [SPECIES_OLD_UNOWN_C] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_C + 500},
-    [SPECIES_OLD_UNOWN_D] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_D + 500},
-    [SPECIES_OLD_UNOWN_E] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_E + 500},
-    [SPECIES_OLD_UNOWN_F] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_F + 500},
-    [SPECIES_OLD_UNOWN_G] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_G + 500},
-    [SPECIES_OLD_UNOWN_H] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_H + 500},
-    [SPECIES_OLD_UNOWN_I] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_I + 500},
-    [SPECIES_OLD_UNOWN_J] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_J + 500},
-    [SPECIES_OLD_UNOWN_K] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_K + 500},
-    [SPECIES_OLD_UNOWN_L] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_L + 500},
-    [SPECIES_OLD_UNOWN_M] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_M + 500},
-    [SPECIES_OLD_UNOWN_N] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_N + 500},
-    [SPECIES_OLD_UNOWN_O] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_O + 500},
-    [SPECIES_OLD_UNOWN_P] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_P + 500},
-    [SPECIES_OLD_UNOWN_Q] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Q + 500},
-    [SPECIES_OLD_UNOWN_R] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_R + 500},
-    [SPECIES_OLD_UNOWN_S] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_S + 500},
-    [SPECIES_OLD_UNOWN_T] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_T + 500},
-    [SPECIES_OLD_UNOWN_U] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_U + 500},
-    [SPECIES_OLD_UNOWN_V] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_V + 500},
-    [SPECIES_OLD_UNOWN_W] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_W + 500},
-    [SPECIES_OLD_UNOWN_X] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_X + 500},
-    [SPECIES_OLD_UNOWN_Y] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Y + 500},
-    [SPECIES_OLD_UNOWN_Z] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Z + 500},
-    [SPECIES_TREECKO] = {gMonShinyPalette_Treecko, SPECIES_TREECKO + 500},
-    [SPECIES_GROVYLE] = {gMonShinyPalette_Grovyle, SPECIES_GROVYLE + 500},
-    [SPECIES_SCEPTILE] = {gMonShinyPalette_Sceptile, SPECIES_SCEPTILE + 500},
-    [SPECIES_TORCHIC] = {gMonShinyPalette_Torchic, SPECIES_TORCHIC + 500},
-    [SPECIES_COMBUSKEN] = {gMonShinyPalette_Combusken, SPECIES_COMBUSKEN + 500},
-    [SPECIES_BLAZIKEN] = {gMonShinyPalette_Blaziken, SPECIES_BLAZIKEN + 500},
-    [SPECIES_MUDKIP] = {gMonShinyPalette_Mudkip, SPECIES_MUDKIP + 500},
-    [SPECIES_MARSHTOMP] = {gMonShinyPalette_Marshtomp, SPECIES_MARSHTOMP + 500},
-    [SPECIES_SWAMPERT] = {gMonShinyPalette_Swampert, SPECIES_SWAMPERT + 500},
-    [SPECIES_POOCHYENA] = {gMonShinyPalette_Poochyena, SPECIES_POOCHYENA + 500},
-    [SPECIES_MIGHTYENA] = {gMonShinyPalette_Mightyena, SPECIES_MIGHTYENA + 500},
-    [SPECIES_ZIGZAGOON] = {gMonShinyPalette_Zigzagoon, SPECIES_ZIGZAGOON + 500},
-    [SPECIES_LINOONE] = {gMonShinyPalette_Linoone, SPECIES_LINOONE + 500},
-    [SPECIES_WURMPLE] = {gMonShinyPalette_Wurmple, SPECIES_WURMPLE + 500},
-    [SPECIES_SILCOON] = {gMonShinyPalette_Silcoon, SPECIES_SILCOON + 500},
-    [SPECIES_BEAUTIFLY] = {gMonShinyPalette_Beautifly, SPECIES_BEAUTIFLY + 500},
-    [SPECIES_CASCOON] = {gMonShinyPalette_Cascoon, SPECIES_CASCOON + 500},
-    [SPECIES_DUSTOX] = {gMonShinyPalette_Dustox, SPECIES_DUSTOX + 500},
-    [SPECIES_LOTAD] = {gMonShinyPalette_Lotad, SPECIES_LOTAD + 500},
-    [SPECIES_LOMBRE] = {gMonShinyPalette_Lombre, SPECIES_LOMBRE + 500},
-    [SPECIES_LUDICOLO] = {gMonShinyPalette_Ludicolo, SPECIES_LUDICOLO + 500},
-    [SPECIES_SEEDOT] = {gMonShinyPalette_Seedot, SPECIES_SEEDOT + 500},
-    [SPECIES_NUZLEAF] = {gMonShinyPalette_Nuzleaf, SPECIES_NUZLEAF + 500},
-    [SPECIES_SHIFTRY] = {gMonShinyPalette_Shiftry, SPECIES_SHIFTRY + 500},
-    [SPECIES_NINCADA] = {gMonShinyPalette_Nincada, SPECIES_NINCADA + 500},
-    [SPECIES_NINJASK] = {gMonShinyPalette_Ninjask, SPECIES_NINJASK + 500},
-    [SPECIES_SHEDINJA] = {gMonShinyPalette_Shedinja, SPECIES_SHEDINJA + 500},
-    [SPECIES_TAILLOW] = {gMonShinyPalette_Taillow, SPECIES_TAILLOW + 500},
-    [SPECIES_SWELLOW] = {gMonShinyPalette_Swellow, SPECIES_SWELLOW + 500},
-    [SPECIES_SHROOMISH] = {gMonShinyPalette_Shroomish, SPECIES_SHROOMISH + 500},
-    [SPECIES_BRELOOM] = {gMonShinyPalette_Breloom, SPECIES_BRELOOM + 500},
-    [SPECIES_SPINDA] = {gMonShinyPalette_Spinda, SPECIES_SPINDA + 500},
-    [SPECIES_WINGULL] = {gMonShinyPalette_Wingull, SPECIES_WINGULL + 500},
-    [SPECIES_PELIPPER] = {gMonShinyPalette_Pelipper, SPECIES_PELIPPER + 500},
-    [SPECIES_SURSKIT] = {gMonShinyPalette_Surskit, SPECIES_SURSKIT + 500},
-    [SPECIES_MASQUERAIN] = {gMonShinyPalette_Masquerain, SPECIES_MASQUERAIN + 500},
-    [SPECIES_WAILMER] = {gMonShinyPalette_Wailmer, SPECIES_WAILMER + 500},
-    [SPECIES_WAILORD] = {gMonShinyPalette_Wailord, SPECIES_WAILORD + 500},
-    [SPECIES_SKITTY] = {gMonShinyPalette_Skitty, SPECIES_SKITTY + 500},
-    [SPECIES_DELCATTY] = {gMonShinyPalette_Delcatty, SPECIES_DELCATTY + 500},
-    [SPECIES_KECLEON] = {gMonShinyPalette_Kecleon, SPECIES_KECLEON + 500},
-    [SPECIES_BALTOY] = {gMonShinyPalette_Baltoy, SPECIES_BALTOY + 500},
-    [SPECIES_CLAYDOL] = {gMonShinyPalette_Claydol, SPECIES_CLAYDOL + 500},
-    [SPECIES_NOSEPASS] = {gMonShinyPalette_Nosepass, SPECIES_NOSEPASS + 500},
-    [SPECIES_TORKOAL] = {gMonShinyPalette_Torkoal, SPECIES_TORKOAL + 500},
-    [SPECIES_SABLEYE] = {gMonShinyPalette_Sableye, SPECIES_SABLEYE + 500},
-    [SPECIES_BARBOACH] = {gMonShinyPalette_Barboach, SPECIES_BARBOACH + 500},
-    [SPECIES_WHISCASH] = {gMonShinyPalette_Whiscash, SPECIES_WHISCASH + 500},
-    [SPECIES_LUVDISC] = {gMonShinyPalette_Luvdisc, SPECIES_LUVDISC + 500},
-    [SPECIES_CORPHISH] = {gMonShinyPalette_Corphish, SPECIES_CORPHISH + 500},
-    [SPECIES_CRAWDAUNT] = {gMonShinyPalette_Crawdaunt, SPECIES_CRAWDAUNT + 500},
-    [SPECIES_FEEBAS] = {gMonShinyPalette_Feebas, SPECIES_FEEBAS + 500},
-    [SPECIES_MILOTIC] = {gMonShinyPalette_Milotic, SPECIES_MILOTIC + 500},
-    [SPECIES_CARVANHA] = {gMonShinyPalette_Carvanha, SPECIES_CARVANHA + 500},
-    [SPECIES_SHARPEDO] = {gMonShinyPalette_Sharpedo, SPECIES_SHARPEDO + 500},
-    [SPECIES_TRAPINCH] = {gMonShinyPalette_Trapinch, SPECIES_TRAPINCH + 500},
-    [SPECIES_VIBRAVA] = {gMonShinyPalette_Vibrava, SPECIES_VIBRAVA + 500},
-    [SPECIES_FLYGON] = {gMonShinyPalette_Flygon, SPECIES_FLYGON + 500},
-    [SPECIES_MAKUHITA] = {gMonShinyPalette_Makuhita, SPECIES_MAKUHITA + 500},
-    [SPECIES_HARIYAMA] = {gMonShinyPalette_Hariyama, SPECIES_HARIYAMA + 500},
-    [SPECIES_ELECTRIKE] = {gMonShinyPalette_Electrike, SPECIES_ELECTRIKE + 500},
-    [SPECIES_MANECTRIC] = {gMonShinyPalette_Manectric, SPECIES_MANECTRIC + 500},
-    [SPECIES_NUMEL] = {gMonShinyPalette_Numel, SPECIES_NUMEL + 500},
-    [SPECIES_CAMERUPT] = {gMonShinyPalette_Camerupt, SPECIES_CAMERUPT + 500},
-    [SPECIES_SPHEAL] = {gMonShinyPalette_Spheal, SPECIES_SPHEAL + 500},
-    [SPECIES_SEALEO] = {gMonShinyPalette_Sealeo, SPECIES_SEALEO + 500},
-    [SPECIES_WALREIN] = {gMonShinyPalette_Walrein, SPECIES_WALREIN + 500},
-    [SPECIES_CACNEA] = {gMonShinyPalette_Cacnea, SPECIES_CACNEA + 500},
-    [SPECIES_CACTURNE] = {gMonShinyPalette_Cacturne, SPECIES_CACTURNE + 500},
-    [SPECIES_SNORUNT] = {gMonShinyPalette_Snorunt, SPECIES_SNORUNT + 500},
-    [SPECIES_GLALIE] = {gMonShinyPalette_Glalie, SPECIES_GLALIE + 500},
-    [SPECIES_LUNATONE] = {gMonShinyPalette_Lunatone, SPECIES_LUNATONE + 500},
-    [SPECIES_SOLROCK] = {gMonShinyPalette_Solrock, SPECIES_SOLROCK + 500},
-    [SPECIES_AZURILL] = {gMonShinyPalette_Azurill, SPECIES_AZURILL + 500},
-    [SPECIES_SPOINK] = {gMonShinyPalette_Spoink, SPECIES_SPOINK + 500},
-    [SPECIES_GRUMPIG] = {gMonShinyPalette_Grumpig, SPECIES_GRUMPIG + 500},
-    [SPECIES_PLUSLE] = {gMonShinyPalette_Plusle, SPECIES_PLUSLE + 500},
-    [SPECIES_MINUN] = {gMonShinyPalette_Minun, SPECIES_MINUN + 500},
-    [SPECIES_MAWILE] = {gMonShinyPalette_Mawile, SPECIES_MAWILE + 500},
-    [SPECIES_MEDITITE] = {gMonShinyPalette_Meditite, SPECIES_MEDITITE + 500},
-    [SPECIES_MEDICHAM] = {gMonShinyPalette_Medicham, SPECIES_MEDICHAM + 500},
-    [SPECIES_SWABLU] = {gMonShinyPalette_Swablu, SPECIES_SWABLU + 500},
-    [SPECIES_ALTARIA] = {gMonShinyPalette_Altaria, SPECIES_ALTARIA + 500},
-    [SPECIES_WYNAUT] = {gMonShinyPalette_Wynaut, SPECIES_WYNAUT + 500},
-    [SPECIES_DUSKULL] = {gMonShinyPalette_Duskull, SPECIES_DUSKULL + 500},
-    [SPECIES_DUSCLOPS] = {gMonShinyPalette_Dusclops, SPECIES_DUSCLOPS + 500},
-    [SPECIES_ROSELIA] = {gMonShinyPalette_Roselia, SPECIES_ROSELIA + 500},
-    [SPECIES_SLAKOTH] = {gMonShinyPalette_Slakoth, SPECIES_SLAKOTH + 500},
-    [SPECIES_VIGOROTH] = {gMonShinyPalette_Vigoroth, SPECIES_VIGOROTH + 500},
-    [SPECIES_SLAKING] = {gMonShinyPalette_Slaking, SPECIES_SLAKING + 500},
-    [SPECIES_GULPIN] = {gMonShinyPalette_Gulpin, SPECIES_GULPIN + 500},
-    [SPECIES_SWALOT] = {gMonShinyPalette_Swalot, SPECIES_SWALOT + 500},
-    [SPECIES_TROPIUS] = {gMonShinyPalette_Tropius, SPECIES_TROPIUS + 500},
-    [SPECIES_WHISMUR] = {gMonShinyPalette_Whismur, SPECIES_WHISMUR + 500},
-    [SPECIES_LOUDRED] = {gMonShinyPalette_Loudred, SPECIES_LOUDRED + 500},
-    [SPECIES_EXPLOUD] = {gMonShinyPalette_Exploud, SPECIES_EXPLOUD + 500},
-    [SPECIES_CLAMPERL] = {gMonShinyPalette_Clamperl, SPECIES_CLAMPERL + 500},
-    [SPECIES_HUNTAIL] = {gMonShinyPalette_Huntail, SPECIES_HUNTAIL + 500},
-    [SPECIES_GOREBYSS] = {gMonShinyPalette_Gorebyss, SPECIES_GOREBYSS + 500},
-    [SPECIES_ABSOL] = {gMonShinyPalette_Absol, SPECIES_ABSOL + 500},
-    [SPECIES_SHUPPET] = {gMonShinyPalette_Shuppet, SPECIES_SHUPPET + 500},
-    [SPECIES_BANETTE] = {gMonShinyPalette_Banette, SPECIES_BANETTE + 500},
-    [SPECIES_SEVIPER] = {gMonShinyPalette_Seviper, SPECIES_SEVIPER + 500},
-    [SPECIES_ZANGOOSE] = {gMonShinyPalette_Zangoose, SPECIES_ZANGOOSE + 500},
-    [SPECIES_RELICANTH] = {gMonShinyPalette_Relicanth, SPECIES_RELICANTH + 500},
-    [SPECIES_ARON] = {gMonShinyPalette_Aron, SPECIES_ARON + 500},
-    [SPECIES_LAIRON] = {gMonShinyPalette_Lairon, SPECIES_LAIRON + 500},
-    [SPECIES_AGGRON] = {gMonShinyPalette_Aggron, SPECIES_AGGRON + 500},
-    [SPECIES_CASTFORM] = {gMonShinyPalette_Castform, SPECIES_CASTFORM + 500},
-    [SPECIES_VOLBEAT] = {gMonShinyPalette_Volbeat, SPECIES_VOLBEAT + 500},
-    [SPECIES_ILLUMISE] = {gMonShinyPalette_Illumise, SPECIES_ILLUMISE + 500},
-    [SPECIES_LILEEP] = {gMonShinyPalette_Lileep, SPECIES_LILEEP + 500},
-    [SPECIES_CRADILY] = {gMonShinyPalette_Cradily, SPECIES_CRADILY + 500},
-    [SPECIES_ANORITH] = {gMonShinyPalette_Anorith, SPECIES_ANORITH + 500},
-    [SPECIES_ARMALDO] = {gMonShinyPalette_Armaldo, SPECIES_ARMALDO + 500},
-    [SPECIES_RALTS] = {gMonShinyPalette_Ralts, SPECIES_RALTS + 500},
-    [SPECIES_KIRLIA] = {gMonShinyPalette_Kirlia, SPECIES_KIRLIA + 500},
-    [SPECIES_GARDEVOIR] = {gMonShinyPalette_Gardevoir, SPECIES_GARDEVOIR + 500},
-    [SPECIES_BAGON] = {gMonShinyPalette_Bagon, SPECIES_BAGON + 500},
-    [SPECIES_SHELGON] = {gMonShinyPalette_Shelgon, SPECIES_SHELGON + 500},
-    [SPECIES_SALAMENCE] = {gMonShinyPalette_Salamence, SPECIES_SALAMENCE + 500},
-    [SPECIES_BELDUM] = {gMonShinyPalette_Beldum, SPECIES_BELDUM + 500},
-    [SPECIES_METANG] = {gMonShinyPalette_Metang, SPECIES_METANG + 500},
-    [SPECIES_METAGROSS] = {gMonShinyPalette_Metagross, SPECIES_METAGROSS + 500},
-    [SPECIES_REGIROCK] = {gMonShinyPalette_Regirock, SPECIES_REGIROCK + 500},
-    [SPECIES_REGICE] = {gMonShinyPalette_Regice, SPECIES_REGICE + 500},
-    [SPECIES_REGISTEEL] = {gMonShinyPalette_Registeel, SPECIES_REGISTEEL + 500},
-    [SPECIES_KYOGRE] = {gMonShinyPalette_Kyogre, SPECIES_KYOGRE + 500},
-    [SPECIES_GROUDON] = {gMonShinyPalette_Groudon, SPECIES_GROUDON + 500},
-    [SPECIES_RAYQUAZA] = {gMonShinyPalette_Rayquaza, SPECIES_RAYQUAZA + 500},
-    [SPECIES_LATIAS] = {gMonShinyPalette_Latias, SPECIES_LATIAS + 500},
-    [SPECIES_LATIOS] = {gMonShinyPalette_Latios, SPECIES_LATIOS + 500},
-    [SPECIES_JIRACHI] = {gMonShinyPalette_Jirachi, SPECIES_JIRACHI + 500},
-    [SPECIES_DEOXYS] = {gMonShinyPalette_Deoxys, SPECIES_DEOXYS + 500},
-    [SPECIES_CHIMECHO] = {gMonShinyPalette_Chimecho, SPECIES_CHIMECHO + 500},
-    [SPECIES_EGG] = {gMonPalette_Egg, SPECIES_EGG + 500},
-    [SPECIES_UNOWN_B] = {gMonShinyPalette_Unown, SPECIES_UNOWN_B + 500},
-    [SPECIES_UNOWN_C] = {gMonShinyPalette_Unown, SPECIES_UNOWN_C + 500},
-    [SPECIES_UNOWN_D] = {gMonShinyPalette_Unown, SPECIES_UNOWN_D + 500},
-    [SPECIES_UNOWN_E] = {gMonShinyPalette_Unown, SPECIES_UNOWN_E + 500},
-    [SPECIES_UNOWN_F] = {gMonShinyPalette_Unown, SPECIES_UNOWN_F + 500},
-    [SPECIES_UNOWN_G] = {gMonShinyPalette_Unown, SPECIES_UNOWN_G + 500},
-    [SPECIES_UNOWN_H] = {gMonShinyPalette_Unown, SPECIES_UNOWN_H + 500},
-    [SPECIES_UNOWN_I] = {gMonShinyPalette_Unown, SPECIES_UNOWN_I + 500},
-    [SPECIES_UNOWN_J] = {gMonShinyPalette_Unown, SPECIES_UNOWN_J + 500},
-    [SPECIES_UNOWN_K] = {gMonShinyPalette_Unown, SPECIES_UNOWN_K + 500},
-    [SPECIES_UNOWN_L] = {gMonShinyPalette_Unown, SPECIES_UNOWN_L + 500},
-    [SPECIES_UNOWN_M] = {gMonShinyPalette_Unown, SPECIES_UNOWN_M + 500},
-    [SPECIES_UNOWN_N] = {gMonShinyPalette_Unown, SPECIES_UNOWN_N + 500},
-    [SPECIES_UNOWN_O] = {gMonShinyPalette_Unown, SPECIES_UNOWN_O + 500},
-    [SPECIES_UNOWN_P] = {gMonShinyPalette_Unown, SPECIES_UNOWN_P + 500},
-    [SPECIES_UNOWN_Q] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Q + 500},
-    [SPECIES_UNOWN_R] = {gMonShinyPalette_Unown, SPECIES_UNOWN_R + 500},
-    [SPECIES_UNOWN_S] = {gMonShinyPalette_Unown, SPECIES_UNOWN_S + 500},
-    [SPECIES_UNOWN_T] = {gMonShinyPalette_Unown, SPECIES_UNOWN_T + 500},
-    [SPECIES_UNOWN_U] = {gMonShinyPalette_Unown, SPECIES_UNOWN_U + 500},
-    [SPECIES_UNOWN_V] = {gMonShinyPalette_Unown, SPECIES_UNOWN_V + 500},
-    [SPECIES_UNOWN_W] = {gMonShinyPalette_Unown, SPECIES_UNOWN_W + 500},
-    [SPECIES_UNOWN_X] = {gMonShinyPalette_Unown, SPECIES_UNOWN_X + 500},
-    [SPECIES_UNOWN_Y] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Y + 500},
-    [SPECIES_UNOWN_Z] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Z + 500},
-    [SPECIES_UNOWN_EMARK] = {gMonShinyPalette_Unown, SPECIES_UNOWN_EMARK + 500},
-    [SPECIES_UNOWN_QMARK] = {gMonShinyPalette_Unown, SPECIES_UNOWN_QMARK + 500},
+    SPECIES_SHINY_PAL(NONE, gMonShinyPalette_CircledQuestionMark),
+    SPECIES_SHINY_PAL(BULBASAUR, gMonShinyPalette_Bulbasaur),
+    SPECIES_SHINY_PAL(IVYSAUR, gMonShinyPalette_Ivysaur),
+    SPECIES_SHINY_PAL(VENUSAUR, gMonShinyPalette_Venusaur),
+    SPECIES_SHINY_PAL(CHARMANDER, gMonShinyPalette_Charmander),
+    SPECIES_SHINY_PAL(CHARMELEON, gMonShinyPalette_Charmeleon),
+    SPECIES_SHINY_PAL(CHARIZARD, gMonShinyPalette_Charizard),
+    SPECIES_SHINY_PAL(SQUIRTLE, gMonShinyPalette_Squirtle),
+    SPECIES_SHINY_PAL(WARTORTLE, gMonShinyPalette_Wartortle),
+    SPECIES_SHINY_PAL(BLASTOISE, gMonShinyPalette_Blastoise),
+    SPECIES_SHINY_PAL(CATERPIE, gMonShinyPalette_Caterpie),
+    SPECIES_SHINY_PAL(METAPOD, gMonShinyPalette_Metapod),
+    SPECIES_SHINY_PAL(BUTTERFREE, gMonShinyPalette_Butterfree),
+    SPECIES_SHINY_PAL(WEEDLE, gMonShinyPalette_Weedle),
+    SPECIES_SHINY_PAL(KAKUNA, gMonShinyPalette_Kakuna),
+    SPECIES_SHINY_PAL(BEEDRILL, gMonShinyPalette_Beedrill),
+    SPECIES_SHINY_PAL(PIDGEY, gMonShinyPalette_Pidgey),
+    SPECIES_SHINY_PAL(PIDGEOTTO, gMonShinyPalette_Pidgeotto),
+    SPECIES_SHINY_PAL(PIDGEOT, gMonShinyPalette_Pidgeot),
+    SPECIES_SHINY_PAL(RATTATA, gMonShinyPalette_Rattata),
+    SPECIES_SHINY_PAL(RATICATE, gMonShinyPalette_Raticate),
+    SPECIES_SHINY_PAL(SPEAROW, gMonShinyPalette_Spearow),
+    SPECIES_SHINY_PAL(FEAROW, gMonShinyPalette_Fearow),
+    SPECIES_SHINY_PAL(EKANS, gMonShinyPalette_Ekans),
+    SPECIES_SHINY_PAL(ARBOK, gMonShinyPalette_Arbok),
+    SPECIES_SHINY_PAL(PIKACHU, gMonShinyPalette_Pikachu),
+    SPECIES_SHINY_PAL(RAICHU, gMonShinyPalette_Raichu),
+    SPECIES_SHINY_PAL(SANDSHREW, gMonShinyPalette_Sandshrew),
+    SPECIES_SHINY_PAL(SANDSLASH, gMonShinyPalette_Sandslash),
+    SPECIES_SHINY_PAL(NIDORAN_F, gMonShinyPalette_NidoranF),
+    SPECIES_SHINY_PAL(NIDORINA, gMonShinyPalette_Nidorina),
+    SPECIES_SHINY_PAL(NIDOQUEEN, gMonShinyPalette_Nidoqueen),
+    SPECIES_SHINY_PAL(NIDORAN_M, gMonShinyPalette_NidoranM),
+    SPECIES_SHINY_PAL(NIDORINO, gMonShinyPalette_Nidorino),
+    SPECIES_SHINY_PAL(NIDOKING, gMonShinyPalette_Nidoking),
+    SPECIES_SHINY_PAL(CLEFAIRY, gMonShinyPalette_Clefairy),
+    SPECIES_SHINY_PAL(CLEFABLE, gMonShinyPalette_Clefable),
+    SPECIES_SHINY_PAL(VULPIX, gMonShinyPalette_Vulpix),
+    SPECIES_SHINY_PAL(NINETALES, gMonShinyPalette_Ninetales),
+    SPECIES_SHINY_PAL(JIGGLYPUFF, gMonShinyPalette_Jigglypuff),
+    SPECIES_SHINY_PAL(WIGGLYTUFF, gMonShinyPalette_Wigglytuff),
+    SPECIES_SHINY_PAL(ZUBAT, gMonShinyPalette_Zubat),
+    SPECIES_SHINY_PAL(GOLBAT, gMonShinyPalette_Golbat),
+    SPECIES_SHINY_PAL(ODDISH, gMonShinyPalette_Oddish),
+    SPECIES_SHINY_PAL(GLOOM, gMonShinyPalette_Gloom),
+    SPECIES_SHINY_PAL(VILEPLUME, gMonShinyPalette_Vileplume),
+    SPECIES_SHINY_PAL(PARAS, gMonShinyPalette_Paras),
+    SPECIES_SHINY_PAL(PARASECT, gMonShinyPalette_Parasect),
+    SPECIES_SHINY_PAL(VENONAT, gMonShinyPalette_Venonat),
+    SPECIES_SHINY_PAL(VENOMOTH, gMonShinyPalette_Venomoth),
+    SPECIES_SHINY_PAL(DIGLETT, gMonShinyPalette_Diglett),
+    SPECIES_SHINY_PAL(DUGTRIO, gMonShinyPalette_Dugtrio),
+    SPECIES_SHINY_PAL(MEOWTH, gMonShinyPalette_Meowth),
+    SPECIES_SHINY_PAL(PERSIAN, gMonShinyPalette_Persian),
+    SPECIES_SHINY_PAL(PSYDUCK, gMonShinyPalette_Psyduck),
+    SPECIES_SHINY_PAL(GOLDUCK, gMonShinyPalette_Golduck),
+    SPECIES_SHINY_PAL(MANKEY, gMonShinyPalette_Mankey),
+    SPECIES_SHINY_PAL(PRIMEAPE, gMonShinyPalette_Primeape),
+    SPECIES_SHINY_PAL(GROWLITHE, gMonShinyPalette_Growlithe),
+    SPECIES_SHINY_PAL(ARCANINE, gMonShinyPalette_Arcanine),
+    SPECIES_SHINY_PAL(POLIWAG, gMonShinyPalette_Poliwag),
+    SPECIES_SHINY_PAL(POLIWHIRL, gMonShinyPalette_Poliwhirl),
+    SPECIES_SHINY_PAL(POLIWRATH, gMonShinyPalette_Poliwrath),
+    SPECIES_SHINY_PAL(ABRA, gMonShinyPalette_Abra),
+    SPECIES_SHINY_PAL(KADABRA, gMonShinyPalette_Kadabra),
+    SPECIES_SHINY_PAL(ALAKAZAM, gMonShinyPalette_Alakazam),
+    SPECIES_SHINY_PAL(MACHOP, gMonShinyPalette_Machop),
+    SPECIES_SHINY_PAL(MACHOKE, gMonShinyPalette_Machoke),
+    SPECIES_SHINY_PAL(MACHAMP, gMonShinyPalette_Machamp),
+    SPECIES_SHINY_PAL(BELLSPROUT, gMonShinyPalette_Bellsprout),
+    SPECIES_SHINY_PAL(WEEPINBELL, gMonShinyPalette_Weepinbell),
+    SPECIES_SHINY_PAL(VICTREEBEL, gMonShinyPalette_Victreebel),
+    SPECIES_SHINY_PAL(TENTACOOL, gMonShinyPalette_Tentacool),
+    SPECIES_SHINY_PAL(TENTACRUEL, gMonShinyPalette_Tentacruel),
+    SPECIES_SHINY_PAL(GEODUDE, gMonShinyPalette_Geodude),
+    SPECIES_SHINY_PAL(GRAVELER, gMonShinyPalette_Graveler),
+    SPECIES_SHINY_PAL(GOLEM, gMonShinyPalette_Golem),
+    SPECIES_SHINY_PAL(PONYTA, gMonShinyPalette_Ponyta),
+    SPECIES_SHINY_PAL(RAPIDASH, gMonShinyPalette_Rapidash),
+    SPECIES_SHINY_PAL(SLOWPOKE, gMonShinyPalette_Slowpoke),
+    SPECIES_SHINY_PAL(SLOWBRO, gMonShinyPalette_Slowbro),
+    SPECIES_SHINY_PAL(MAGNEMITE, gMonShinyPalette_Magnemite),
+    SPECIES_SHINY_PAL(MAGNETON, gMonShinyPalette_Magneton),
+    SPECIES_SHINY_PAL(FARFETCHD, gMonShinyPalette_Farfetchd),
+    SPECIES_SHINY_PAL(DODUO, gMonShinyPalette_Doduo),
+    SPECIES_SHINY_PAL(DODRIO, gMonShinyPalette_Dodrio),
+    SPECIES_SHINY_PAL(SEEL, gMonShinyPalette_Seel),
+    SPECIES_SHINY_PAL(DEWGONG, gMonShinyPalette_Dewgong),
+    SPECIES_SHINY_PAL(GRIMER, gMonShinyPalette_Grimer),
+    SPECIES_SHINY_PAL(MUK, gMonShinyPalette_Muk),
+    SPECIES_SHINY_PAL(SHELLDER, gMonShinyPalette_Shellder),
+    SPECIES_SHINY_PAL(CLOYSTER, gMonShinyPalette_Cloyster),
+    SPECIES_SHINY_PAL(GASTLY, gMonShinyPalette_Gastly),
+    SPECIES_SHINY_PAL(HAUNTER, gMonShinyPalette_Haunter),
+    SPECIES_SHINY_PAL(GENGAR, gMonShinyPalette_Gengar),
+    SPECIES_SHINY_PAL(ONIX, gMonShinyPalette_Onix),
+    SPECIES_SHINY_PAL(DROWZEE, gMonShinyPalette_Drowzee),
+    SPECIES_SHINY_PAL(HYPNO, gMonShinyPalette_Hypno),
+    SPECIES_SHINY_PAL(KRABBY, gMonShinyPalette_Krabby),
+    SPECIES_SHINY_PAL(KINGLER, gMonShinyPalette_Kingler),
+    SPECIES_SHINY_PAL(VOLTORB, gMonShinyPalette_Voltorb),
+    SPECIES_SHINY_PAL(ELECTRODE, gMonShinyPalette_Electrode),
+    SPECIES_SHINY_PAL(EXEGGCUTE, gMonShinyPalette_Exeggcute),
+    SPECIES_SHINY_PAL(EXEGGUTOR, gMonShinyPalette_Exeggutor),
+    SPECIES_SHINY_PAL(CUBONE, gMonShinyPalette_Cubone),
+    SPECIES_SHINY_PAL(MAROWAK, gMonShinyPalette_Marowak),
+    SPECIES_SHINY_PAL(HITMONLEE, gMonShinyPalette_Hitmonlee),
+    SPECIES_SHINY_PAL(HITMONCHAN, gMonShinyPalette_Hitmonchan),
+    SPECIES_SHINY_PAL(LICKITUNG, gMonShinyPalette_Lickitung),
+    SPECIES_SHINY_PAL(KOFFING, gMonShinyPalette_Koffing),
+    SPECIES_SHINY_PAL(WEEZING, gMonShinyPalette_Weezing),
+    SPECIES_SHINY_PAL(RHYHORN, gMonShinyPalette_Rhyhorn),
+    SPECIES_SHINY_PAL(RHYDON, gMonShinyPalette_Rhydon),
+    SPECIES_SHINY_PAL(CHANSEY, gMonShinyPalette_Chansey),
+    SPECIES_SHINY_PAL(TANGELA, gMonShinyPalette_Tangela),
+    SPECIES_SHINY_PAL(KANGASKHAN, gMonShinyPalette_Kangaskhan),
+    SPECIES_SHINY_PAL(HORSEA, gMonShinyPalette_Horsea),
+    SPECIES_SHINY_PAL(SEADRA, gMonShinyPalette_Seadra),
+    SPECIES_SHINY_PAL(GOLDEEN, gMonShinyPalette_Goldeen),
+    SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking),
+    SPECIES_SHINY_PAL(STARYU, gMonShinyPalette_Staryu),
+    SPECIES_SHINY_PAL(STARMIE, gMonShinyPalette_Starmie),
+    SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_Mrmime),
+    SPECIES_SHINY_PAL(SCYTHER, gMonShinyPalette_Scyther),
+    SPECIES_SHINY_PAL(JYNX, gMonShinyPalette_Jynx),
+    SPECIES_SHINY_PAL(ELECTABUZZ, gMonShinyPalette_Electabuzz),
+    SPECIES_SHINY_PAL(MAGMAR, gMonShinyPalette_Magmar),
+    SPECIES_SHINY_PAL(PINSIR, gMonShinyPalette_Pinsir),
+    SPECIES_SHINY_PAL(TAUROS, gMonShinyPalette_Tauros),
+    SPECIES_SHINY_PAL(MAGIKARP, gMonShinyPalette_Magikarp),
+    SPECIES_SHINY_PAL(GYARADOS, gMonShinyPalette_Gyarados),
+    SPECIES_SHINY_PAL(LAPRAS, gMonShinyPalette_Lapras),
+    SPECIES_SHINY_PAL(DITTO, gMonShinyPalette_Ditto),
+    SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee),
+    SPECIES_SHINY_PAL(VAPOREON, gMonShinyPalette_Vaporeon),
+    SPECIES_SHINY_PAL(JOLTEON, gMonShinyPalette_Jolteon),
+    SPECIES_SHINY_PAL(FLAREON, gMonShinyPalette_Flareon),
+    SPECIES_SHINY_PAL(PORYGON, gMonShinyPalette_Porygon),
+    SPECIES_SHINY_PAL(OMANYTE, gMonShinyPalette_Omanyte),
+    SPECIES_SHINY_PAL(OMASTAR, gMonShinyPalette_Omastar),
+    SPECIES_SHINY_PAL(KABUTO, gMonShinyPalette_Kabuto),
+    SPECIES_SHINY_PAL(KABUTOPS, gMonShinyPalette_Kabutops),
+    SPECIES_SHINY_PAL(AERODACTYL, gMonShinyPalette_Aerodactyl),
+    SPECIES_SHINY_PAL(SNORLAX, gMonShinyPalette_Snorlax),
+    SPECIES_SHINY_PAL(ARTICUNO, gMonShinyPalette_Articuno),
+    SPECIES_SHINY_PAL(ZAPDOS, gMonShinyPalette_Zapdos),
+    SPECIES_SHINY_PAL(MOLTRES, gMonShinyPalette_Moltres),
+    SPECIES_SHINY_PAL(DRATINI, gMonShinyPalette_Dratini),
+    SPECIES_SHINY_PAL(DRAGONAIR, gMonShinyPalette_Dragonair),
+    SPECIES_SHINY_PAL(DRAGONITE, gMonShinyPalette_Dragonite),
+    SPECIES_SHINY_PAL(MEWTWO, gMonShinyPalette_Mewtwo),
+    SPECIES_SHINY_PAL(MEW, gMonShinyPalette_Mew),
+    SPECIES_SHINY_PAL(CHIKORITA, gMonShinyPalette_Chikorita),
+    SPECIES_SHINY_PAL(BAYLEEF, gMonShinyPalette_Bayleef),
+    SPECIES_SHINY_PAL(MEGANIUM, gMonShinyPalette_Meganium),
+    SPECIES_SHINY_PAL(CYNDAQUIL, gMonShinyPalette_Cyndaquil),
+    SPECIES_SHINY_PAL(QUILAVA, gMonShinyPalette_Quilava),
+    SPECIES_SHINY_PAL(TYPHLOSION, gMonShinyPalette_Typhlosion),
+    SPECIES_SHINY_PAL(TOTODILE, gMonShinyPalette_Totodile),
+    SPECIES_SHINY_PAL(CROCONAW, gMonShinyPalette_Croconaw),
+    SPECIES_SHINY_PAL(FERALIGATR, gMonShinyPalette_Feraligatr),
+    SPECIES_SHINY_PAL(SENTRET, gMonShinyPalette_Sentret),
+    SPECIES_SHINY_PAL(FURRET, gMonShinyPalette_Furret),
+    SPECIES_SHINY_PAL(HOOTHOOT, gMonShinyPalette_Hoothoot),
+    SPECIES_SHINY_PAL(NOCTOWL, gMonShinyPalette_Noctowl),
+    SPECIES_SHINY_PAL(LEDYBA, gMonShinyPalette_Ledyba),
+    SPECIES_SHINY_PAL(LEDIAN, gMonShinyPalette_Ledian),
+    SPECIES_SHINY_PAL(SPINARAK, gMonShinyPalette_Spinarak),
+    SPECIES_SHINY_PAL(ARIADOS, gMonShinyPalette_Ariados),
+    SPECIES_SHINY_PAL(CROBAT, gMonShinyPalette_Crobat),
+    SPECIES_SHINY_PAL(CHINCHOU, gMonShinyPalette_Chinchou),
+    SPECIES_SHINY_PAL(LANTURN, gMonShinyPalette_Lanturn),
+    SPECIES_SHINY_PAL(PICHU, gMonShinyPalette_Pichu),
+    SPECIES_SHINY_PAL(CLEFFA, gMonShinyPalette_Cleffa),
+    SPECIES_SHINY_PAL(IGGLYBUFF, gMonShinyPalette_Igglybuff),
+    SPECIES_SHINY_PAL(TOGEPI, gMonShinyPalette_Togepi),
+    SPECIES_SHINY_PAL(TOGETIC, gMonShinyPalette_Togetic),
+    SPECIES_SHINY_PAL(NATU, gMonShinyPalette_Natu),
+    SPECIES_SHINY_PAL(XATU, gMonShinyPalette_Xatu),
+    SPECIES_SHINY_PAL(MAREEP, gMonShinyPalette_Mareep),
+    SPECIES_SHINY_PAL(FLAAFFY, gMonShinyPalette_Flaaffy),
+    SPECIES_SHINY_PAL(AMPHAROS, gMonShinyPalette_Ampharos),
+    SPECIES_SHINY_PAL(BELLOSSOM, gMonShinyPalette_Bellossom),
+    SPECIES_SHINY_PAL(MARILL, gMonShinyPalette_Marill),
+    SPECIES_SHINY_PAL(AZUMARILL, gMonShinyPalette_Azumarill),
+    SPECIES_SHINY_PAL(SUDOWOODO, gMonShinyPalette_Sudowoodo),
+    SPECIES_SHINY_PAL(POLITOED, gMonShinyPalette_Politoed),
+    SPECIES_SHINY_PAL(HOPPIP, gMonShinyPalette_Hoppip),
+    SPECIES_SHINY_PAL(SKIPLOOM, gMonShinyPalette_Skiploom),
+    SPECIES_SHINY_PAL(JUMPLUFF, gMonShinyPalette_Jumpluff),
+    SPECIES_SHINY_PAL(AIPOM, gMonShinyPalette_Aipom),
+    SPECIES_SHINY_PAL(SUNKERN, gMonShinyPalette_Sunkern),
+    SPECIES_SHINY_PAL(SUNFLORA, gMonShinyPalette_Sunflora),
+    SPECIES_SHINY_PAL(YANMA, gMonShinyPalette_Yanma),
+    SPECIES_SHINY_PAL(WOOPER, gMonShinyPalette_Wooper),
+    SPECIES_SHINY_PAL(QUAGSIRE, gMonShinyPalette_Quagsire),
+    SPECIES_SHINY_PAL(ESPEON, gMonShinyPalette_Espeon),
+    SPECIES_SHINY_PAL(UMBREON, gMonShinyPalette_Umbreon),
+    SPECIES_SHINY_PAL(MURKROW, gMonShinyPalette_Murkrow),
+    SPECIES_SHINY_PAL(SLOWKING, gMonShinyPalette_Slowking),
+    SPECIES_SHINY_PAL(MISDREAVUS, gMonShinyPalette_Misdreavus),
+    SPECIES_SHINY_PAL(UNOWN, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(WOBBUFFET, gMonShinyPalette_Wobbuffet),
+    SPECIES_SHINY_PAL(GIRAFARIG, gMonShinyPalette_Girafarig),
+    SPECIES_SHINY_PAL(PINECO, gMonShinyPalette_Pineco),
+    SPECIES_SHINY_PAL(FORRETRESS, gMonShinyPalette_Forretress),
+    SPECIES_SHINY_PAL(DUNSPARCE, gMonShinyPalette_Dunsparce),
+    SPECIES_SHINY_PAL(GLIGAR, gMonShinyPalette_Gligar),
+    SPECIES_SHINY_PAL(STEELIX, gMonShinyPalette_Steelix),
+    SPECIES_SHINY_PAL(SNUBBULL, gMonShinyPalette_Snubbull),
+    SPECIES_SHINY_PAL(GRANBULL, gMonShinyPalette_Granbull),
+    SPECIES_SHINY_PAL(QWILFISH, gMonShinyPalette_Qwilfish),
+    SPECIES_SHINY_PAL(SCIZOR, gMonShinyPalette_Scizor),
+    SPECIES_SHINY_PAL(SHUCKLE, gMonShinyPalette_Shuckle),
+    SPECIES_SHINY_PAL(HERACROSS, gMonShinyPalette_Heracross),
+    SPECIES_SHINY_PAL(SNEASEL, gMonShinyPalette_Sneasel),
+    SPECIES_SHINY_PAL(TEDDIURSA, gMonShinyPalette_Teddiursa),
+    SPECIES_SHINY_PAL(URSARING, gMonShinyPalette_Ursaring),
+    SPECIES_SHINY_PAL(SLUGMA, gMonShinyPalette_Slugma),
+    SPECIES_SHINY_PAL(MAGCARGO, gMonShinyPalette_Magcargo),
+    SPECIES_SHINY_PAL(SWINUB, gMonShinyPalette_Swinub),
+    SPECIES_SHINY_PAL(PILOSWINE, gMonShinyPalette_Piloswine),
+    SPECIES_SHINY_PAL(CORSOLA, gMonShinyPalette_Corsola),
+    SPECIES_SHINY_PAL(REMORAID, gMonShinyPalette_Remoraid),
+    SPECIES_SHINY_PAL(OCTILLERY, gMonShinyPalette_Octillery),
+    SPECIES_SHINY_PAL(DELIBIRD, gMonShinyPalette_Delibird),
+    SPECIES_SHINY_PAL(MANTINE, gMonShinyPalette_Mantine),
+    SPECIES_SHINY_PAL(SKARMORY, gMonShinyPalette_Skarmory),
+    SPECIES_SHINY_PAL(HOUNDOUR, gMonShinyPalette_Houndour),
+    SPECIES_SHINY_PAL(HOUNDOOM, gMonShinyPalette_Houndoom),
+    SPECIES_SHINY_PAL(KINGDRA, gMonShinyPalette_Kingdra),
+    SPECIES_SHINY_PAL(PHANPY, gMonShinyPalette_Phanpy),
+    SPECIES_SHINY_PAL(DONPHAN, gMonShinyPalette_Donphan),
+    SPECIES_SHINY_PAL(PORYGON2, gMonShinyPalette_Porygon2),
+    SPECIES_SHINY_PAL(STANTLER, gMonShinyPalette_Stantler),
+    SPECIES_SHINY_PAL(SMEARGLE, gMonShinyPalette_Smeargle),
+    SPECIES_SHINY_PAL(TYROGUE, gMonShinyPalette_Tyrogue),
+    SPECIES_SHINY_PAL(HITMONTOP, gMonShinyPalette_Hitmontop),
+    SPECIES_SHINY_PAL(SMOOCHUM, gMonShinyPalette_Smoochum),
+    SPECIES_SHINY_PAL(ELEKID, gMonShinyPalette_Elekid),
+    SPECIES_SHINY_PAL(MAGBY, gMonShinyPalette_Magby),
+    SPECIES_SHINY_PAL(MILTANK, gMonShinyPalette_Miltank),
+    SPECIES_SHINY_PAL(BLISSEY, gMonShinyPalette_Blissey),
+    SPECIES_SHINY_PAL(RAIKOU, gMonShinyPalette_Raikou),
+    SPECIES_SHINY_PAL(ENTEI, gMonShinyPalette_Entei),
+    SPECIES_SHINY_PAL(SUICUNE, gMonShinyPalette_Suicune),
+    SPECIES_SHINY_PAL(LARVITAR, gMonShinyPalette_Larvitar),
+    SPECIES_SHINY_PAL(PUPITAR, gMonShinyPalette_Pupitar),
+    SPECIES_SHINY_PAL(TYRANITAR, gMonShinyPalette_Tyranitar),
+    SPECIES_SHINY_PAL(LUGIA, gMonShinyPalette_Lugia),
+    SPECIES_SHINY_PAL(HO_OH, gMonShinyPalette_HoOh),
+    SPECIES_SHINY_PAL(CELEBI, gMonShinyPalette_Celebi),
+    SPECIES_SHINY_PAL(OLD_UNOWN_B, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_C, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_D, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_E, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_F, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_G, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_H, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_I, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_J, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_K, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_L, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_M, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_N, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_O, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_P, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_Q, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_R, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_S, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_T, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_U, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_V, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_W, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_X, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_Y, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_Z, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(TREECKO, gMonShinyPalette_Treecko),
+    SPECIES_SHINY_PAL(GROVYLE, gMonShinyPalette_Grovyle),
+    SPECIES_SHINY_PAL(SCEPTILE, gMonShinyPalette_Sceptile),
+    SPECIES_SHINY_PAL(TORCHIC, gMonShinyPalette_Torchic),
+    SPECIES_SHINY_PAL(COMBUSKEN, gMonShinyPalette_Combusken),
+    SPECIES_SHINY_PAL(BLAZIKEN, gMonShinyPalette_Blaziken),
+    SPECIES_SHINY_PAL(MUDKIP, gMonShinyPalette_Mudkip),
+    SPECIES_SHINY_PAL(MARSHTOMP, gMonShinyPalette_Marshtomp),
+    SPECIES_SHINY_PAL(SWAMPERT, gMonShinyPalette_Swampert),
+    SPECIES_SHINY_PAL(POOCHYENA, gMonShinyPalette_Poochyena),
+    SPECIES_SHINY_PAL(MIGHTYENA, gMonShinyPalette_Mightyena),
+    SPECIES_SHINY_PAL(ZIGZAGOON, gMonShinyPalette_Zigzagoon),
+    SPECIES_SHINY_PAL(LINOONE, gMonShinyPalette_Linoone),
+    SPECIES_SHINY_PAL(WURMPLE, gMonShinyPalette_Wurmple),
+    SPECIES_SHINY_PAL(SILCOON, gMonShinyPalette_Silcoon),
+    SPECIES_SHINY_PAL(BEAUTIFLY, gMonShinyPalette_Beautifly),
+    SPECIES_SHINY_PAL(CASCOON, gMonShinyPalette_Cascoon),
+    SPECIES_SHINY_PAL(DUSTOX, gMonShinyPalette_Dustox),
+    SPECIES_SHINY_PAL(LOTAD, gMonShinyPalette_Lotad),
+    SPECIES_SHINY_PAL(LOMBRE, gMonShinyPalette_Lombre),
+    SPECIES_SHINY_PAL(LUDICOLO, gMonShinyPalette_Ludicolo),
+    SPECIES_SHINY_PAL(SEEDOT, gMonShinyPalette_Seedot),
+    SPECIES_SHINY_PAL(NUZLEAF, gMonShinyPalette_Nuzleaf),
+    SPECIES_SHINY_PAL(SHIFTRY, gMonShinyPalette_Shiftry),
+    SPECIES_SHINY_PAL(NINCADA, gMonShinyPalette_Nincada),
+    SPECIES_SHINY_PAL(NINJASK, gMonShinyPalette_Ninjask),
+    SPECIES_SHINY_PAL(SHEDINJA, gMonShinyPalette_Shedinja),
+    SPECIES_SHINY_PAL(TAILLOW, gMonShinyPalette_Taillow),
+    SPECIES_SHINY_PAL(SWELLOW, gMonShinyPalette_Swellow),
+    SPECIES_SHINY_PAL(SHROOMISH, gMonShinyPalette_Shroomish),
+    SPECIES_SHINY_PAL(BRELOOM, gMonShinyPalette_Breloom),
+    SPECIES_SHINY_PAL(SPINDA, gMonShinyPalette_Spinda),
+    SPECIES_SHINY_PAL(WINGULL, gMonShinyPalette_Wingull),
+    SPECIES_SHINY_PAL(PELIPPER, gMonShinyPalette_Pelipper),
+    SPECIES_SHINY_PAL(SURSKIT, gMonShinyPalette_Surskit),
+    SPECIES_SHINY_PAL(MASQUERAIN, gMonShinyPalette_Masquerain),
+    SPECIES_SHINY_PAL(WAILMER, gMonShinyPalette_Wailmer),
+    SPECIES_SHINY_PAL(WAILORD, gMonShinyPalette_Wailord),
+    SPECIES_SHINY_PAL(SKITTY, gMonShinyPalette_Skitty),
+    SPECIES_SHINY_PAL(DELCATTY, gMonShinyPalette_Delcatty),
+    SPECIES_SHINY_PAL(KECLEON, gMonShinyPalette_Kecleon),
+    SPECIES_SHINY_PAL(BALTOY, gMonShinyPalette_Baltoy),
+    SPECIES_SHINY_PAL(CLAYDOL, gMonShinyPalette_Claydol),
+    SPECIES_SHINY_PAL(NOSEPASS, gMonShinyPalette_Nosepass),
+    SPECIES_SHINY_PAL(TORKOAL, gMonShinyPalette_Torkoal),
+    SPECIES_SHINY_PAL(SABLEYE, gMonShinyPalette_Sableye),
+    SPECIES_SHINY_PAL(BARBOACH, gMonShinyPalette_Barboach),
+    SPECIES_SHINY_PAL(WHISCASH, gMonShinyPalette_Whiscash),
+    SPECIES_SHINY_PAL(LUVDISC, gMonShinyPalette_Luvdisc),
+    SPECIES_SHINY_PAL(CORPHISH, gMonShinyPalette_Corphish),
+    SPECIES_SHINY_PAL(CRAWDAUNT, gMonShinyPalette_Crawdaunt),
+    SPECIES_SHINY_PAL(FEEBAS, gMonShinyPalette_Feebas),
+    SPECIES_SHINY_PAL(MILOTIC, gMonShinyPalette_Milotic),
+    SPECIES_SHINY_PAL(CARVANHA, gMonShinyPalette_Carvanha),
+    SPECIES_SHINY_PAL(SHARPEDO, gMonShinyPalette_Sharpedo),
+    SPECIES_SHINY_PAL(TRAPINCH, gMonShinyPalette_Trapinch),
+    SPECIES_SHINY_PAL(VIBRAVA, gMonShinyPalette_Vibrava),
+    SPECIES_SHINY_PAL(FLYGON, gMonShinyPalette_Flygon),
+    SPECIES_SHINY_PAL(MAKUHITA, gMonShinyPalette_Makuhita),
+    SPECIES_SHINY_PAL(HARIYAMA, gMonShinyPalette_Hariyama),
+    SPECIES_SHINY_PAL(ELECTRIKE, gMonShinyPalette_Electrike),
+    SPECIES_SHINY_PAL(MANECTRIC, gMonShinyPalette_Manectric),
+    SPECIES_SHINY_PAL(NUMEL, gMonShinyPalette_Numel),
+    SPECIES_SHINY_PAL(CAMERUPT, gMonShinyPalette_Camerupt),
+    SPECIES_SHINY_PAL(SPHEAL, gMonShinyPalette_Spheal),
+    SPECIES_SHINY_PAL(SEALEO, gMonShinyPalette_Sealeo),
+    SPECIES_SHINY_PAL(WALREIN, gMonShinyPalette_Walrein),
+    SPECIES_SHINY_PAL(CACNEA, gMonShinyPalette_Cacnea),
+    SPECIES_SHINY_PAL(CACTURNE, gMonShinyPalette_Cacturne),
+    SPECIES_SHINY_PAL(SNORUNT, gMonShinyPalette_Snorunt),
+    SPECIES_SHINY_PAL(GLALIE, gMonShinyPalette_Glalie),
+    SPECIES_SHINY_PAL(LUNATONE, gMonShinyPalette_Lunatone),
+    SPECIES_SHINY_PAL(SOLROCK, gMonShinyPalette_Solrock),
+    SPECIES_SHINY_PAL(AZURILL, gMonShinyPalette_Azurill),
+    SPECIES_SHINY_PAL(SPOINK, gMonShinyPalette_Spoink),
+    SPECIES_SHINY_PAL(GRUMPIG, gMonShinyPalette_Grumpig),
+    SPECIES_SHINY_PAL(PLUSLE, gMonShinyPalette_Plusle),
+    SPECIES_SHINY_PAL(MINUN, gMonShinyPalette_Minun),
+    SPECIES_SHINY_PAL(MAWILE, gMonShinyPalette_Mawile),
+    SPECIES_SHINY_PAL(MEDITITE, gMonShinyPalette_Meditite),
+    SPECIES_SHINY_PAL(MEDICHAM, gMonShinyPalette_Medicham),
+    SPECIES_SHINY_PAL(SWABLU, gMonShinyPalette_Swablu),
+    SPECIES_SHINY_PAL(ALTARIA, gMonShinyPalette_Altaria),
+    SPECIES_SHINY_PAL(WYNAUT, gMonShinyPalette_Wynaut),
+    SPECIES_SHINY_PAL(DUSKULL, gMonShinyPalette_Duskull),
+    SPECIES_SHINY_PAL(DUSCLOPS, gMonShinyPalette_Dusclops),
+    SPECIES_SHINY_PAL(ROSELIA, gMonShinyPalette_Roselia),
+    SPECIES_SHINY_PAL(SLAKOTH, gMonShinyPalette_Slakoth),
+    SPECIES_SHINY_PAL(VIGOROTH, gMonShinyPalette_Vigoroth),
+    SPECIES_SHINY_PAL(SLAKING, gMonShinyPalette_Slaking),
+    SPECIES_SHINY_PAL(GULPIN, gMonShinyPalette_Gulpin),
+    SPECIES_SHINY_PAL(SWALOT, gMonShinyPalette_Swalot),
+    SPECIES_SHINY_PAL(TROPIUS, gMonShinyPalette_Tropius),
+    SPECIES_SHINY_PAL(WHISMUR, gMonShinyPalette_Whismur),
+    SPECIES_SHINY_PAL(LOUDRED, gMonShinyPalette_Loudred),
+    SPECIES_SHINY_PAL(EXPLOUD, gMonShinyPalette_Exploud),
+    SPECIES_SHINY_PAL(CLAMPERL, gMonShinyPalette_Clamperl),
+    SPECIES_SHINY_PAL(HUNTAIL, gMonShinyPalette_Huntail),
+    SPECIES_SHINY_PAL(GOREBYSS, gMonShinyPalette_Gorebyss),
+    SPECIES_SHINY_PAL(ABSOL, gMonShinyPalette_Absol),
+    SPECIES_SHINY_PAL(SHUPPET, gMonShinyPalette_Shuppet),
+    SPECIES_SHINY_PAL(BANETTE, gMonShinyPalette_Banette),
+    SPECIES_SHINY_PAL(SEVIPER, gMonShinyPalette_Seviper),
+    SPECIES_SHINY_PAL(ZANGOOSE, gMonShinyPalette_Zangoose),
+    SPECIES_SHINY_PAL(RELICANTH, gMonShinyPalette_Relicanth),
+    SPECIES_SHINY_PAL(ARON, gMonShinyPalette_Aron),
+    SPECIES_SHINY_PAL(LAIRON, gMonShinyPalette_Lairon),
+    SPECIES_SHINY_PAL(AGGRON, gMonShinyPalette_Aggron),
+    SPECIES_SHINY_PAL(CASTFORM, gMonShinyPalette_Castform),
+    SPECIES_SHINY_PAL(VOLBEAT, gMonShinyPalette_Volbeat),
+    SPECIES_SHINY_PAL(ILLUMISE, gMonShinyPalette_Illumise),
+    SPECIES_SHINY_PAL(LILEEP, gMonShinyPalette_Lileep),
+    SPECIES_SHINY_PAL(CRADILY, gMonShinyPalette_Cradily),
+    SPECIES_SHINY_PAL(ANORITH, gMonShinyPalette_Anorith),
+    SPECIES_SHINY_PAL(ARMALDO, gMonShinyPalette_Armaldo),
+    SPECIES_SHINY_PAL(RALTS, gMonShinyPalette_Ralts),
+    SPECIES_SHINY_PAL(KIRLIA, gMonShinyPalette_Kirlia),
+    SPECIES_SHINY_PAL(GARDEVOIR, gMonShinyPalette_Gardevoir),
+    SPECIES_SHINY_PAL(BAGON, gMonShinyPalette_Bagon),
+    SPECIES_SHINY_PAL(SHELGON, gMonShinyPalette_Shelgon),
+    SPECIES_SHINY_PAL(SALAMENCE, gMonShinyPalette_Salamence),
+    SPECIES_SHINY_PAL(BELDUM, gMonShinyPalette_Beldum),
+    SPECIES_SHINY_PAL(METANG, gMonShinyPalette_Metang),
+    SPECIES_SHINY_PAL(METAGROSS, gMonShinyPalette_Metagross),
+    SPECIES_SHINY_PAL(REGIROCK, gMonShinyPalette_Regirock),
+    SPECIES_SHINY_PAL(REGICE, gMonShinyPalette_Regice),
+    SPECIES_SHINY_PAL(REGISTEEL, gMonShinyPalette_Registeel),
+    SPECIES_SHINY_PAL(KYOGRE, gMonShinyPalette_Kyogre),
+    SPECIES_SHINY_PAL(GROUDON, gMonShinyPalette_Groudon),
+    SPECIES_SHINY_PAL(RAYQUAZA, gMonShinyPalette_Rayquaza),
+    SPECIES_SHINY_PAL(LATIAS, gMonShinyPalette_Latias),
+    SPECIES_SHINY_PAL(LATIOS, gMonShinyPalette_Latios),
+    SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi),
+    SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys),
+    SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho),
+    SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
+    SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_D, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_E, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_F, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_G, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_H, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_I, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_J, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_K, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_L, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_M, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_N, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_O, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_P, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_Q, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_R, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_S, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_T, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_U, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_V, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_W, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_X, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_Y, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_Z, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_EMARK, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_QMARK, gMonShinyPalette_Unown),
 };

src/data/pokemon_graphics/still_front_pic_table.h

@@ -1,448 +1,446 @@
-#define STILL_FRONT_PIC(species, frontpic) [SPECIES_##species] = {frontpic, 0x800, SPECIES_##species}
-
-const struct CompressedSpriteSheet gMonStillFrontPicTable[] = 
+const struct CompressedSpriteSheet gMonStillFrontPicTable[] =
 {
-    STILL_FRONT_PIC(NONE,          gMonStillFrontPic_CircledQuestionMark),
-    STILL_FRONT_PIC(BULBASAUR,     gMonStillFrontPic_Bulbasaur),
-    STILL_FRONT_PIC(IVYSAUR,       gMonStillFrontPic_Ivysaur),
-    STILL_FRONT_PIC(VENUSAUR,      gMonStillFrontPic_Venusaur),
-    STILL_FRONT_PIC(CHARMANDER,    gMonStillFrontPic_Charmander),
-    STILL_FRONT_PIC(CHARMELEON,    gMonStillFrontPic_Charmeleon),
-    STILL_FRONT_PIC(CHARIZARD,     gMonStillFrontPic_Charizard),
-    STILL_FRONT_PIC(SQUIRTLE,      gMonStillFrontPic_Squirtle),
-    STILL_FRONT_PIC(WARTORTLE,     gMonStillFrontPic_Wartortle),
-    STILL_FRONT_PIC(BLASTOISE,     gMonStillFrontPic_Blastoise),
-    STILL_FRONT_PIC(CATERPIE,      gMonStillFrontPic_Caterpie),
-    STILL_FRONT_PIC(METAPOD,       gMonStillFrontPic_Metapod),
-    STILL_FRONT_PIC(BUTTERFREE,    gMonStillFrontPic_Butterfree),
-    STILL_FRONT_PIC(WEEDLE,        gMonStillFrontPic_Weedle),
-    STILL_FRONT_PIC(KAKUNA,        gMonStillFrontPic_Kakuna),
-    STILL_FRONT_PIC(BEEDRILL,      gMonStillFrontPic_Beedrill),
-    STILL_FRONT_PIC(PIDGEY,        gMonStillFrontPic_Pidgey),
-    STILL_FRONT_PIC(PIDGEOTTO,     gMonStillFrontPic_Pidgeotto),
-    STILL_FRONT_PIC(PIDGEOT,       gMonStillFrontPic_Pidgeot),
-    STILL_FRONT_PIC(RATTATA,       gMonStillFrontPic_Rattata),
-    STILL_FRONT_PIC(RATICATE,      gMonStillFrontPic_Raticate),
-    STILL_FRONT_PIC(SPEAROW,       gMonStillFrontPic_Spearow),
-    STILL_FRONT_PIC(FEAROW,        gMonStillFrontPic_Fearow),
-    STILL_FRONT_PIC(EKANS,         gMonStillFrontPic_Ekans),
-    STILL_FRONT_PIC(ARBOK,         gMonStillFrontPic_Arbok),
-    STILL_FRONT_PIC(PIKACHU,       gMonStillFrontPic_Pikachu),
-    STILL_FRONT_PIC(RAICHU,        gMonStillFrontPic_Raichu),
-    STILL_FRONT_PIC(SANDSHREW,     gMonStillFrontPic_Sandshrew),
-    STILL_FRONT_PIC(SANDSLASH,     gMonStillFrontPic_Sandslash),
-    STILL_FRONT_PIC(NIDORAN_F,     gMonStillFrontPic_NidoranF),
-    STILL_FRONT_PIC(NIDORINA,      gMonStillFrontPic_Nidorina),
-    STILL_FRONT_PIC(NIDOQUEEN,     gMonStillFrontPic_Nidoqueen),
-    STILL_FRONT_PIC(NIDORAN_M,     gMonStillFrontPic_NidoranM),
-    STILL_FRONT_PIC(NIDORINO,      gMonStillFrontPic_Nidorino),
-    STILL_FRONT_PIC(NIDOKING,      gMonStillFrontPic_Nidoking),
-    STILL_FRONT_PIC(CLEFAIRY,      gMonStillFrontPic_Clefairy),
-    STILL_FRONT_PIC(CLEFABLE,      gMonStillFrontPic_Clefable),
-    STILL_FRONT_PIC(VULPIX,        gMonStillFrontPic_Vulpix),
-    STILL_FRONT_PIC(NINETALES,     gMonStillFrontPic_Ninetales),
-    STILL_FRONT_PIC(JIGGLYPUFF,    gMonStillFrontPic_Jigglypuff),
-    STILL_FRONT_PIC(WIGGLYTUFF,    gMonStillFrontPic_Wigglytuff),
-    STILL_FRONT_PIC(ZUBAT,         gMonStillFrontPic_Zubat),
-    STILL_FRONT_PIC(GOLBAT,        gMonStillFrontPic_Golbat),
-    STILL_FRONT_PIC(ODDISH,        gMonStillFrontPic_Oddish),
-    STILL_FRONT_PIC(GLOOM,         gMonStillFrontPic_Gloom),
-    STILL_FRONT_PIC(VILEPLUME,     gMonStillFrontPic_Vileplume),
-    STILL_FRONT_PIC(PARAS,         gMonStillFrontPic_Paras),
-    STILL_FRONT_PIC(PARASECT,      gMonStillFrontPic_Parasect),
-    STILL_FRONT_PIC(VENONAT,       gMonStillFrontPic_Venonat),
-    STILL_FRONT_PIC(VENOMOTH,      gMonStillFrontPic_Venomoth),
-    STILL_FRONT_PIC(DIGLETT,       gMonStillFrontPic_Diglett),
-    STILL_FRONT_PIC(DUGTRIO,       gMonStillFrontPic_Dugtrio),
-    STILL_FRONT_PIC(MEOWTH,        gMonStillFrontPic_Meowth),
-    STILL_FRONT_PIC(PERSIAN,       gMonStillFrontPic_Persian),
-    STILL_FRONT_PIC(PSYDUCK,       gMonStillFrontPic_Psyduck),
-    STILL_FRONT_PIC(GOLDUCK,       gMonStillFrontPic_Golduck),
-    STILL_FRONT_PIC(MANKEY,        gMonStillFrontPic_Mankey),
-    STILL_FRONT_PIC(PRIMEAPE,      gMonStillFrontPic_Primeape),
-    STILL_FRONT_PIC(GROWLITHE,     gMonStillFrontPic_Growlithe),
-    STILL_FRONT_PIC(ARCANINE,      gMonStillFrontPic_Arcanine),
-    STILL_FRONT_PIC(POLIWAG,       gMonStillFrontPic_Poliwag),
-    STILL_FRONT_PIC(POLIWHIRL,     gMonStillFrontPic_Poliwhirl),
-    STILL_FRONT_PIC(POLIWRATH,     gMonStillFrontPic_Poliwrath),
-    STILL_FRONT_PIC(ABRA,          gMonStillFrontPic_Abra),
-    STILL_FRONT_PIC(KADABRA,       gMonStillFrontPic_Kadabra),
-    STILL_FRONT_PIC(ALAKAZAM,      gMonStillFrontPic_Alakazam),
-    STILL_FRONT_PIC(MACHOP,        gMonStillFrontPic_Machop),
-    STILL_FRONT_PIC(MACHOKE,       gMonStillFrontPic_Machoke),
-    STILL_FRONT_PIC(MACHAMP,       gMonStillFrontPic_Machamp),
-    STILL_FRONT_PIC(BELLSPROUT,    gMonStillFrontPic_Bellsprout),
-    STILL_FRONT_PIC(WEEPINBELL,    gMonStillFrontPic_Weepinbell),
-    STILL_FRONT_PIC(VICTREEBEL,    gMonStillFrontPic_Victreebel),
-    STILL_FRONT_PIC(TENTACOOL,     gMonStillFrontPic_Tentacool),
-    STILL_FRONT_PIC(TENTACRUEL,    gMonStillFrontPic_Tentacruel),
-    STILL_FRONT_PIC(GEODUDE,       gMonStillFrontPic_Geodude),
-    STILL_FRONT_PIC(GRAVELER,      gMonStillFrontPic_Graveler),
-    STILL_FRONT_PIC(GOLEM,         gMonStillFrontPic_Golem),
-    STILL_FRONT_PIC(PONYTA,        gMonStillFrontPic_Ponyta),
-    STILL_FRONT_PIC(RAPIDASH,      gMonStillFrontPic_Rapidash),
-    STILL_FRONT_PIC(SLOWPOKE,      gMonStillFrontPic_Slowpoke),
-    STILL_FRONT_PIC(SLOWBRO,       gMonStillFrontPic_Slowbro),
-    STILL_FRONT_PIC(MAGNEMITE,     gMonStillFrontPic_Magnemite),
-    STILL_FRONT_PIC(MAGNETON,      gMonStillFrontPic_Magneton),
-    STILL_FRONT_PIC(FARFETCHD,     gMonStillFrontPic_Farfetchd),
-    STILL_FRONT_PIC(DODUO,         gMonStillFrontPic_Doduo),
-    STILL_FRONT_PIC(DODRIO,        gMonStillFrontPic_Dodrio),
-    STILL_FRONT_PIC(SEEL,          gMonStillFrontPic_Seel),
-    STILL_FRONT_PIC(DEWGONG,       gMonStillFrontPic_Dewgong),
-    STILL_FRONT_PIC(GRIMER,        gMonStillFrontPic_Grimer),
-    STILL_FRONT_PIC(MUK,           gMonStillFrontPic_Muk),
-    STILL_FRONT_PIC(SHELLDER,      gMonStillFrontPic_Shellder),
-    STILL_FRONT_PIC(CLOYSTER,      gMonStillFrontPic_Cloyster),
-    STILL_FRONT_PIC(GASTLY,        gMonStillFrontPic_Gastly),
-    STILL_FRONT_PIC(HAUNTER,       gMonStillFrontPic_Haunter),
-    STILL_FRONT_PIC(GENGAR,        gMonStillFrontPic_Gengar),
-    STILL_FRONT_PIC(ONIX,          gMonStillFrontPic_Onix),
-    STILL_FRONT_PIC(DROWZEE,       gMonStillFrontPic_Drowzee),
-    STILL_FRONT_PIC(HYPNO,         gMonStillFrontPic_Hypno),
-    STILL_FRONT_PIC(KRABBY,        gMonStillFrontPic_Krabby),
-    STILL_FRONT_PIC(KINGLER,       gMonStillFrontPic_Kingler),
-    STILL_FRONT_PIC(VOLTORB,       gMonStillFrontPic_Voltorb),
-    STILL_FRONT_PIC(ELECTRODE,     gMonStillFrontPic_Electrode),
-    STILL_FRONT_PIC(EXEGGCUTE,     gMonStillFrontPic_Exeggcute),
-    STILL_FRONT_PIC(EXEGGUTOR,     gMonStillFrontPic_Exeggutor),
-    STILL_FRONT_PIC(CUBONE,        gMonStillFrontPic_Cubone),
-    STILL_FRONT_PIC(MAROWAK,       gMonStillFrontPic_Marowak),
-    STILL_FRONT_PIC(HITMONLEE,     gMonStillFrontPic_Hitmonlee),
-    STILL_FRONT_PIC(HITMONCHAN,    gMonStillFrontPic_Hitmonchan),
-    STILL_FRONT_PIC(LICKITUNG,     gMonStillFrontPic_Lickitung),
-    STILL_FRONT_PIC(KOFFING,       gMonStillFrontPic_Koffing),
-    STILL_FRONT_PIC(WEEZING,       gMonStillFrontPic_Weezing),
-    STILL_FRONT_PIC(RHYHORN,       gMonStillFrontPic_Rhyhorn),
-    STILL_FRONT_PIC(RHYDON,        gMonStillFrontPic_Rhydon),
-    STILL_FRONT_PIC(CHANSEY,       gMonStillFrontPic_Chansey),
-    STILL_FRONT_PIC(TANGELA,       gMonStillFrontPic_Tangela),
-    STILL_FRONT_PIC(KANGASKHAN,    gMonStillFrontPic_Kangaskhan),
-    STILL_FRONT_PIC(HORSEA,        gMonStillFrontPic_Horsea),
-    STILL_FRONT_PIC(SEADRA,        gMonStillFrontPic_Seadra),
-    STILL_FRONT_PIC(GOLDEEN,       gMonStillFrontPic_Goldeen),
-    STILL_FRONT_PIC(SEAKING,       gMonStillFrontPic_Seaking),
-    STILL_FRONT_PIC(STARYU,        gMonStillFrontPic_Staryu),
-    STILL_FRONT_PIC(STARMIE,       gMonStillFrontPic_Starmie),
-    STILL_FRONT_PIC(MR_MIME,       gMonStillFrontPic_Mrmime),
-    STILL_FRONT_PIC(SCYTHER,       gMonStillFrontPic_Scyther),
-    STILL_FRONT_PIC(JYNX,          gMonStillFrontPic_Jynx),
-    STILL_FRONT_PIC(ELECTABUZZ,    gMonStillFrontPic_Electabuzz),
-    STILL_FRONT_PIC(MAGMAR,        gMonStillFrontPic_Magmar),
-    STILL_FRONT_PIC(PINSIR,        gMonStillFrontPic_Pinsir),
-    STILL_FRONT_PIC(TAUROS,        gMonStillFrontPic_Tauros),
-    STILL_FRONT_PIC(MAGIKARP,      gMonStillFrontPic_Magikarp),
-    STILL_FRONT_PIC(GYARADOS,      gMonStillFrontPic_Gyarados),
-    STILL_FRONT_PIC(LAPRAS,        gMonStillFrontPic_Lapras),
-    STILL_FRONT_PIC(DITTO,         gMonStillFrontPic_Ditto),
-    STILL_FRONT_PIC(EEVEE,         gMonStillFrontPic_Eevee),
-    STILL_FRONT_PIC(VAPOREON,      gMonStillFrontPic_Vaporeon),
-    STILL_FRONT_PIC(JOLTEON,       gMonStillFrontPic_Jolteon),
-    STILL_FRONT_PIC(FLAREON,       gMonStillFrontPic_Flareon),
-    STILL_FRONT_PIC(PORYGON,       gMonStillFrontPic_Porygon),
-    STILL_FRONT_PIC(OMANYTE,       gMonStillFrontPic_Omanyte),
-    STILL_FRONT_PIC(OMASTAR,       gMonStillFrontPic_Omastar),
-    STILL_FRONT_PIC(KABUTO,        gMonStillFrontPic_Kabuto),
-    STILL_FRONT_PIC(KABUTOPS,      gMonStillFrontPic_Kabutops),
-    STILL_FRONT_PIC(AERODACTYL,    gMonStillFrontPic_Aerodactyl),
-    STILL_FRONT_PIC(SNORLAX,       gMonStillFrontPic_Snorlax),
-    STILL_FRONT_PIC(ARTICUNO,      gMonStillFrontPic_Articuno),
-    STILL_FRONT_PIC(ZAPDOS,        gMonStillFrontPic_Zapdos),
-    STILL_FRONT_PIC(MOLTRES,       gMonStillFrontPic_Moltres),
-    STILL_FRONT_PIC(DRATINI,       gMonStillFrontPic_Dratini),
-    STILL_FRONT_PIC(DRAGONAIR,     gMonStillFrontPic_Dragonair),
-    STILL_FRONT_PIC(DRAGONITE,     gMonStillFrontPic_Dragonite),
-    STILL_FRONT_PIC(MEWTWO,        gMonStillFrontPic_Mewtwo),
-    STILL_FRONT_PIC(MEW,           gMonStillFrontPic_Mew),
+    SPECIES_SPRITE(NONE,          gMonStillFrontPic_CircledQuestionMark),
+    SPECIES_SPRITE(BULBASAUR,     gMonStillFrontPic_Bulbasaur),
+    SPECIES_SPRITE(IVYSAUR,       gMonStillFrontPic_Ivysaur),
+    SPECIES_SPRITE(VENUSAUR,      gMonStillFrontPic_Venusaur),
+    SPECIES_SPRITE(CHARMANDER,    gMonStillFrontPic_Charmander),
+    SPECIES_SPRITE(CHARMELEON,    gMonStillFrontPic_Charmeleon),
+    SPECIES_SPRITE(CHARIZARD,     gMonStillFrontPic_Charizard),
+    SPECIES_SPRITE(SQUIRTLE,      gMonStillFrontPic_Squirtle),
+    SPECIES_SPRITE(WARTORTLE,     gMonStillFrontPic_Wartortle),
+    SPECIES_SPRITE(BLASTOISE,     gMonStillFrontPic_Blastoise),
+    SPECIES_SPRITE(CATERPIE,      gMonStillFrontPic_Caterpie),
+    SPECIES_SPRITE(METAPOD,       gMonStillFrontPic_Metapod),
+    SPECIES_SPRITE(BUTTERFREE,    gMonStillFrontPic_Butterfree),
+    SPECIES_SPRITE(WEEDLE,        gMonStillFrontPic_Weedle),
+    SPECIES_SPRITE(KAKUNA,        gMonStillFrontPic_Kakuna),
+    SPECIES_SPRITE(BEEDRILL,      gMonStillFrontPic_Beedrill),
+    SPECIES_SPRITE(PIDGEY,        gMonStillFrontPic_Pidgey),
+    SPECIES_SPRITE(PIDGEOTTO,     gMonStillFrontPic_Pidgeotto),
+    SPECIES_SPRITE(PIDGEOT,       gMonStillFrontPic_Pidgeot),
+    SPECIES_SPRITE(RATTATA,       gMonStillFrontPic_Rattata),
+    SPECIES_SPRITE(RATICATE,      gMonStillFrontPic_Raticate),
+    SPECIES_SPRITE(SPEAROW,       gMonStillFrontPic_Spearow),
+    SPECIES_SPRITE(FEAROW,        gMonStillFrontPic_Fearow),
+    SPECIES_SPRITE(EKANS,         gMonStillFrontPic_Ekans),
+    SPECIES_SPRITE(ARBOK,         gMonStillFrontPic_Arbok),
+    SPECIES_SPRITE(PIKACHU,       gMonStillFrontPic_Pikachu),
+    SPECIES_SPRITE(RAICHU,        gMonStillFrontPic_Raichu),
+    SPECIES_SPRITE(SANDSHREW,     gMonStillFrontPic_Sandshrew),
+    SPECIES_SPRITE(SANDSLASH,     gMonStillFrontPic_Sandslash),
+    SPECIES_SPRITE(NIDORAN_F,     gMonStillFrontPic_NidoranF),
+    SPECIES_SPRITE(NIDORINA,      gMonStillFrontPic_Nidorina),
+    SPECIES_SPRITE(NIDOQUEEN,     gMonStillFrontPic_Nidoqueen),
+    SPECIES_SPRITE(NIDORAN_M,     gMonStillFrontPic_NidoranM),
+    SPECIES_SPRITE(NIDORINO,      gMonStillFrontPic_Nidorino),
+    SPECIES_SPRITE(NIDOKING,      gMonStillFrontPic_Nidoking),
+    SPECIES_SPRITE(CLEFAIRY,      gMonStillFrontPic_Clefairy),
+    SPECIES_SPRITE(CLEFABLE,      gMonStillFrontPic_Clefable),
+    SPECIES_SPRITE(VULPIX,        gMonStillFrontPic_Vulpix),
+    SPECIES_SPRITE(NINETALES,     gMonStillFrontPic_Ninetales),
+    SPECIES_SPRITE(JIGGLYPUFF,    gMonStillFrontPic_Jigglypuff),
+    SPECIES_SPRITE(WIGGLYTUFF,    gMonStillFrontPic_Wigglytuff),
+    SPECIES_SPRITE(ZUBAT,         gMonStillFrontPic_Zubat),
+    SPECIES_SPRITE(GOLBAT,        gMonStillFrontPic_Golbat),
+    SPECIES_SPRITE(ODDISH,        gMonStillFrontPic_Oddish),
+    SPECIES_SPRITE(GLOOM,         gMonStillFrontPic_Gloom),
+    SPECIES_SPRITE(VILEPLUME,     gMonStillFrontPic_Vileplume),
+    SPECIES_SPRITE(PARAS,         gMonStillFrontPic_Paras),
+    SPECIES_SPRITE(PARASECT,      gMonStillFrontPic_Parasect),
+    SPECIES_SPRITE(VENONAT,       gMonStillFrontPic_Venonat),
+    SPECIES_SPRITE(VENOMOTH,      gMonStillFrontPic_Venomoth),
+    SPECIES_SPRITE(DIGLETT,       gMonStillFrontPic_Diglett),
+    SPECIES_SPRITE(DUGTRIO,       gMonStillFrontPic_Dugtrio),
+    SPECIES_SPRITE(MEOWTH,        gMonStillFrontPic_Meowth),
+    SPECIES_SPRITE(PERSIAN,       gMonStillFrontPic_Persian),
+    SPECIES_SPRITE(PSYDUCK,       gMonStillFrontPic_Psyduck),
+    SPECIES_SPRITE(GOLDUCK,       gMonStillFrontPic_Golduck),
+    SPECIES_SPRITE(MANKEY,        gMonStillFrontPic_Mankey),
+    SPECIES_SPRITE(PRIMEAPE,      gMonStillFrontPic_Primeape),
+    SPECIES_SPRITE(GROWLITHE,     gMonStillFrontPic_Growlithe),
+    SPECIES_SPRITE(ARCANINE,      gMonStillFrontPic_Arcanine),
+    SPECIES_SPRITE(POLIWAG,       gMonStillFrontPic_Poliwag),
+    SPECIES_SPRITE(POLIWHIRL,     gMonStillFrontPic_Poliwhirl),
+    SPECIES_SPRITE(POLIWRATH,     gMonStillFrontPic_Poliwrath),
+    SPECIES_SPRITE(ABRA,          gMonStillFrontPic_Abra),
+    SPECIES_SPRITE(KADABRA,       gMonStillFrontPic_Kadabra),
+    SPECIES_SPRITE(ALAKAZAM,      gMonStillFrontPic_Alakazam),
+    SPECIES_SPRITE(MACHOP,        gMonStillFrontPic_Machop),
+    SPECIES_SPRITE(MACHOKE,       gMonStillFrontPic_Machoke),
+    SPECIES_SPRITE(MACHAMP,       gMonStillFrontPic_Machamp),
+    SPECIES_SPRITE(BELLSPROUT,    gMonStillFrontPic_Bellsprout),
+    SPECIES_SPRITE(WEEPINBELL,    gMonStillFrontPic_Weepinbell),
+    SPECIES_SPRITE(VICTREEBEL,    gMonStillFrontPic_Victreebel),
+    SPECIES_SPRITE(TENTACOOL,     gMonStillFrontPic_Tentacool),
+    SPECIES_SPRITE(TENTACRUEL,    gMonStillFrontPic_Tentacruel),
+    SPECIES_SPRITE(GEODUDE,       gMonStillFrontPic_Geodude),
+    SPECIES_SPRITE(GRAVELER,      gMonStillFrontPic_Graveler),
+    SPECIES_SPRITE(GOLEM,         gMonStillFrontPic_Golem),
+    SPECIES_SPRITE(PONYTA,        gMonStillFrontPic_Ponyta),
+    SPECIES_SPRITE(RAPIDASH,      gMonStillFrontPic_Rapidash),
+    SPECIES_SPRITE(SLOWPOKE,      gMonStillFrontPic_Slowpoke),
+    SPECIES_SPRITE(SLOWBRO,       gMonStillFrontPic_Slowbro),
+    SPECIES_SPRITE(MAGNEMITE,     gMonStillFrontPic_Magnemite),
+    SPECIES_SPRITE(MAGNETON,      gMonStillFrontPic_Magneton),
+    SPECIES_SPRITE(FARFETCHD,     gMonStillFrontPic_Farfetchd),
+    SPECIES_SPRITE(DODUO,         gMonStillFrontPic_Doduo),
+    SPECIES_SPRITE(DODRIO,        gMonStillFrontPic_Dodrio),
+    SPECIES_SPRITE(SEEL,          gMonStillFrontPic_Seel),
+    SPECIES_SPRITE(DEWGONG,       gMonStillFrontPic_Dewgong),
+    SPECIES_SPRITE(GRIMER,        gMonStillFrontPic_Grimer),
+    SPECIES_SPRITE(MUK,           gMonStillFrontPic_Muk),
+    SPECIES_SPRITE(SHELLDER,      gMonStillFrontPic_Shellder),
+    SPECIES_SPRITE(CLOYSTER,      gMonStillFrontPic_Cloyster),
+    SPECIES_SPRITE(GASTLY,        gMonStillFrontPic_Gastly),
+    SPECIES_SPRITE(HAUNTER,       gMonStillFrontPic_Haunter),
+    SPECIES_SPRITE(GENGAR,        gMonStillFrontPic_Gengar),
+    SPECIES_SPRITE(ONIX,          gMonStillFrontPic_Onix),
+    SPECIES_SPRITE(DROWZEE,       gMonStillFrontPic_Drowzee),
+    SPECIES_SPRITE(HYPNO,         gMonStillFrontPic_Hypno),
+    SPECIES_SPRITE(KRABBY,        gMonStillFrontPic_Krabby),
+    SPECIES_SPRITE(KINGLER,       gMonStillFrontPic_Kingler),
+    SPECIES_SPRITE(VOLTORB,       gMonStillFrontPic_Voltorb),
+    SPECIES_SPRITE(ELECTRODE,     gMonStillFrontPic_Electrode),
+    SPECIES_SPRITE(EXEGGCUTE,     gMonStillFrontPic_Exeggcute),
+    SPECIES_SPRITE(EXEGGUTOR,     gMonStillFrontPic_Exeggutor),
+    SPECIES_SPRITE(CUBONE,        gMonStillFrontPic_Cubone),
+    SPECIES_SPRITE(MAROWAK,       gMonStillFrontPic_Marowak),
+    SPECIES_SPRITE(HITMONLEE,     gMonStillFrontPic_Hitmonlee),
+    SPECIES_SPRITE(HITMONCHAN,    gMonStillFrontPic_Hitmonchan),
+    SPECIES_SPRITE(LICKITUNG,     gMonStillFrontPic_Lickitung),
+    SPECIES_SPRITE(KOFFING,       gMonStillFrontPic_Koffing),
+    SPECIES_SPRITE(WEEZING,       gMonStillFrontPic_Weezing),
+    SPECIES_SPRITE(RHYHORN,       gMonStillFrontPic_Rhyhorn),
+    SPECIES_SPRITE(RHYDON,        gMonStillFrontPic_Rhydon),
+    SPECIES_SPRITE(CHANSEY,       gMonStillFrontPic_Chansey),
+    SPECIES_SPRITE(TANGELA,       gMonStillFrontPic_Tangela),
+    SPECIES_SPRITE(KANGASKHAN,    gMonStillFrontPic_Kangaskhan),
+    SPECIES_SPRITE(HORSEA,        gMonStillFrontPic_Horsea),
+    SPECIES_SPRITE(SEADRA,        gMonStillFrontPic_Seadra),
+    SPECIES_SPRITE(GOLDEEN,       gMonStillFrontPic_Goldeen),
+    SPECIES_SPRITE(SEAKING,       gMonStillFrontPic_Seaking),
+    SPECIES_SPRITE(STARYU,        gMonStillFrontPic_Staryu),
+    SPECIES_SPRITE(STARMIE,       gMonStillFrontPic_Starmie),
+    SPECIES_SPRITE(MR_MIME,       gMonStillFrontPic_Mrmime),
+    SPECIES_SPRITE(SCYTHER,       gMonStillFrontPic_Scyther),
+    SPECIES_SPRITE(JYNX,          gMonStillFrontPic_Jynx),
+    SPECIES_SPRITE(ELECTABUZZ,    gMonStillFrontPic_Electabuzz),
+    SPECIES_SPRITE(MAGMAR,        gMonStillFrontPic_Magmar),
+    SPECIES_SPRITE(PINSIR,        gMonStillFrontPic_Pinsir),
+    SPECIES_SPRITE(TAUROS,        gMonStillFrontPic_Tauros),
+    SPECIES_SPRITE(MAGIKARP,      gMonStillFrontPic_Magikarp),
+    SPECIES_SPRITE(GYARADOS,      gMonStillFrontPic_Gyarados),
+    SPECIES_SPRITE(LAPRAS,        gMonStillFrontPic_Lapras),
+    SPECIES_SPRITE(DITTO,         gMonStillFrontPic_Ditto),
+    SPECIES_SPRITE(EEVEE,         gMonStillFrontPic_Eevee),
+    SPECIES_SPRITE(VAPOREON,      gMonStillFrontPic_Vaporeon),
+    SPECIES_SPRITE(JOLTEON,       gMonStillFrontPic_Jolteon),
+    SPECIES_SPRITE(FLAREON,       gMonStillFrontPic_Flareon),
+    SPECIES_SPRITE(PORYGON,       gMonStillFrontPic_Porygon),
+    SPECIES_SPRITE(OMANYTE,       gMonStillFrontPic_Omanyte),
+    SPECIES_SPRITE(OMASTAR,       gMonStillFrontPic_Omastar),
+    SPECIES_SPRITE(KABUTO,        gMonStillFrontPic_Kabuto),
+    SPECIES_SPRITE(KABUTOPS,      gMonStillFrontPic_Kabutops),
+    SPECIES_SPRITE(AERODACTYL,    gMonStillFrontPic_Aerodactyl),
+    SPECIES_SPRITE(SNORLAX,       gMonStillFrontPic_Snorlax),
+    SPECIES_SPRITE(ARTICUNO,      gMonStillFrontPic_Articuno),
+    SPECIES_SPRITE(ZAPDOS,        gMonStillFrontPic_Zapdos),
+    SPECIES_SPRITE(MOLTRES,       gMonStillFrontPic_Moltres),
+    SPECIES_SPRITE(DRATINI,       gMonStillFrontPic_Dratini),
+    SPECIES_SPRITE(DRAGONAIR,     gMonStillFrontPic_Dragonair),
+    SPECIES_SPRITE(DRAGONITE,     gMonStillFrontPic_Dragonite),
+    SPECIES_SPRITE(MEWTWO,        gMonStillFrontPic_Mewtwo),
+    SPECIES_SPRITE(MEW,           gMonStillFrontPic_Mew),
 // Gen II
-    STILL_FRONT_PIC(CHIKORITA,     gMonStillFrontPic_Chikorita),
-    STILL_FRONT_PIC(BAYLEEF,       gMonStillFrontPic_Bayleef),
-    STILL_FRONT_PIC(MEGANIUM,      gMonStillFrontPic_Meganium),
-    STILL_FRONT_PIC(CYNDAQUIL,     gMonStillFrontPic_Cyndaquil),
-    STILL_FRONT_PIC(QUILAVA,       gMonStillFrontPic_Quilava),
-    STILL_FRONT_PIC(TYPHLOSION,    gMonStillFrontPic_Typhlosion),
-    STILL_FRONT_PIC(TOTODILE,      gMonStillFrontPic_Totodile),
-    STILL_FRONT_PIC(CROCONAW,      gMonStillFrontPic_Croconaw),
-    STILL_FRONT_PIC(FERALIGATR,    gMonStillFrontPic_Feraligatr),
-    STILL_FRONT_PIC(SENTRET,       gMonStillFrontPic_Sentret),
-    STILL_FRONT_PIC(FURRET,        gMonStillFrontPic_Furret),
-    STILL_FRONT_PIC(HOOTHOOT,      gMonStillFrontPic_Hoothoot),
-    STILL_FRONT_PIC(NOCTOWL,       gMonStillFrontPic_Noctowl),
-    STILL_FRONT_PIC(LEDYBA,        gMonStillFrontPic_Ledyba),
-    STILL_FRONT_PIC(LEDIAN,        gMonStillFrontPic_Ledian),
-    STILL_FRONT_PIC(SPINARAK,      gMonStillFrontPic_Spinarak),
-    STILL_FRONT_PIC(ARIADOS,       gMonStillFrontPic_Ariados),
-    STILL_FRONT_PIC(CROBAT,        gMonStillFrontPic_Crobat),
-    STILL_FRONT_PIC(CHINCHOU,      gMonStillFrontPic_Chinchou),
-    STILL_FRONT_PIC(LANTURN,       gMonStillFrontPic_Lanturn),
-    STILL_FRONT_PIC(PICHU,         gMonStillFrontPic_Pichu),
-    STILL_FRONT_PIC(CLEFFA,        gMonStillFrontPic_Cleffa),
-    STILL_FRONT_PIC(IGGLYBUFF,     gMonStillFrontPic_Igglybuff),
-    STILL_FRONT_PIC(TOGEPI,        gMonStillFrontPic_Togepi),
-    STILL_FRONT_PIC(TOGETIC,       gMonStillFrontPic_Togetic),
-    STILL_FRONT_PIC(NATU,          gMonStillFrontPic_Natu),
-    STILL_FRONT_PIC(XATU,          gMonStillFrontPic_Xatu),
-    STILL_FRONT_PIC(MAREEP,        gMonStillFrontPic_Mareep),
-    STILL_FRONT_PIC(FLAAFFY,       gMonStillFrontPic_Flaaffy),
-    STILL_FRONT_PIC(AMPHAROS,      gMonStillFrontPic_Ampharos),
-    STILL_FRONT_PIC(BELLOSSOM,     gMonStillFrontPic_Bellossom),
-    STILL_FRONT_PIC(MARILL,        gMonStillFrontPic_Marill),
-    STILL_FRONT_PIC(AZUMARILL,     gMonStillFrontPic_Azumarill),
-    STILL_FRONT_PIC(SUDOWOODO,     gMonStillFrontPic_Sudowoodo),
-    STILL_FRONT_PIC(POLITOED,      gMonStillFrontPic_Politoed),
-    STILL_FRONT_PIC(HOPPIP,        gMonStillFrontPic_Hoppip),
-    STILL_FRONT_PIC(SKIPLOOM,      gMonStillFrontPic_Skiploom),
-    STILL_FRONT_PIC(JUMPLUFF,      gMonStillFrontPic_Jumpluff),
-    STILL_FRONT_PIC(AIPOM,         gMonStillFrontPic_Aipom),
-    STILL_FRONT_PIC(SUNKERN,       gMonStillFrontPic_Sunkern),
-    STILL_FRONT_PIC(SUNFLORA,      gMonStillFrontPic_Sunflora),
-    STILL_FRONT_PIC(YANMA,         gMonStillFrontPic_Yanma),
-    STILL_FRONT_PIC(WOOPER,        gMonStillFrontPic_Wooper),
-    STILL_FRONT_PIC(QUAGSIRE,      gMonStillFrontPic_Quagsire),
-    STILL_FRONT_PIC(ESPEON,        gMonStillFrontPic_Espeon),
-    STILL_FRONT_PIC(UMBREON,       gMonStillFrontPic_Umbreon),
-    STILL_FRONT_PIC(MURKROW,       gMonStillFrontPic_Murkrow),
-    STILL_FRONT_PIC(SLOWKING,      gMonStillFrontPic_Slowking),
-    STILL_FRONT_PIC(MISDREAVUS,    gMonStillFrontPic_Misdreavus),
-    STILL_FRONT_PIC(UNOWN,         gMonStillFrontPic_UnownA),
-    STILL_FRONT_PIC(WOBBUFFET,     gMonStillFrontPic_Wobbuffet),
-    STILL_FRONT_PIC(GIRAFARIG,     gMonStillFrontPic_Girafarig),
-    STILL_FRONT_PIC(PINECO,        gMonStillFrontPic_Pineco),
-    STILL_FRONT_PIC(FORRETRESS,    gMonStillFrontPic_Forretress),
-    STILL_FRONT_PIC(DUNSPARCE,     gMonStillFrontPic_Dunsparce),
-    STILL_FRONT_PIC(GLIGAR,        gMonStillFrontPic_Gligar),
-    STILL_FRONT_PIC(STEELIX,       gMonStillFrontPic_Steelix),
-    STILL_FRONT_PIC(SNUBBULL,      gMonStillFrontPic_Snubbull),
-    STILL_FRONT_PIC(GRANBULL,      gMonStillFrontPic_Granbull),
-    STILL_FRONT_PIC(QWILFISH,      gMonStillFrontPic_Qwilfish),
-    STILL_FRONT_PIC(SCIZOR,        gMonStillFrontPic_Scizor),
-    STILL_FRONT_PIC(SHUCKLE,       gMonStillFrontPic_Shuckle),
-    STILL_FRONT_PIC(HERACROSS,     gMonStillFrontPic_Heracross),
-    STILL_FRONT_PIC(SNEASEL,       gMonStillFrontPic_Sneasel),
-    STILL_FRONT_PIC(TEDDIURSA,     gMonStillFrontPic_Teddiursa),
-    STILL_FRONT_PIC(URSARING,      gMonStillFrontPic_Ursaring),
-    STILL_FRONT_PIC(SLUGMA,        gMonStillFrontPic_Slugma),
-    STILL_FRONT_PIC(MAGCARGO,      gMonStillFrontPic_Magcargo),
-    STILL_FRONT_PIC(SWINUB,        gMonStillFrontPic_Swinub),
-    STILL_FRONT_PIC(PILOSWINE,     gMonStillFrontPic_Piloswine),
-    STILL_FRONT_PIC(CORSOLA,       gMonStillFrontPic_Corsola),
-    STILL_FRONT_PIC(REMORAID,      gMonStillFrontPic_Remoraid),
-    STILL_FRONT_PIC(OCTILLERY,     gMonStillFrontPic_Octillery),
-    STILL_FRONT_PIC(DELIBIRD,      gMonStillFrontPic_Delibird),
-    STILL_FRONT_PIC(MANTINE,       gMonStillFrontPic_Mantine),
-    STILL_FRONT_PIC(SKARMORY,      gMonStillFrontPic_Skarmory),
-    STILL_FRONT_PIC(HOUNDOUR,      gMonStillFrontPic_Houndour),
-    STILL_FRONT_PIC(HOUNDOOM,      gMonStillFrontPic_Houndoom),
-    STILL_FRONT_PIC(KINGDRA,       gMonStillFrontPic_Kingdra),
-    STILL_FRONT_PIC(PHANPY,        gMonStillFrontPic_Phanpy),
-    STILL_FRONT_PIC(DONPHAN,       gMonStillFrontPic_Donphan),
-    STILL_FRONT_PIC(PORYGON2,      gMonStillFrontPic_Porygon2),
-    STILL_FRONT_PIC(STANTLER,      gMonStillFrontPic_Stantler),
-    STILL_FRONT_PIC(SMEARGLE,      gMonStillFrontPic_Smeargle),
-    STILL_FRONT_PIC(TYROGUE,       gMonStillFrontPic_Tyrogue),
-    STILL_FRONT_PIC(HITMONTOP,     gMonStillFrontPic_Hitmontop),
-    STILL_FRONT_PIC(SMOOCHUM,      gMonStillFrontPic_Smoochum),
-    STILL_FRONT_PIC(ELEKID,        gMonStillFrontPic_Elekid),
-    STILL_FRONT_PIC(MAGBY,         gMonStillFrontPic_Magby),
-    STILL_FRONT_PIC(MILTANK,       gMonStillFrontPic_Miltank),
-    STILL_FRONT_PIC(BLISSEY,       gMonStillFrontPic_Blissey),
-    STILL_FRONT_PIC(RAIKOU,        gMonStillFrontPic_Raikou),
-    STILL_FRONT_PIC(ENTEI,         gMonStillFrontPic_Entei),
-    STILL_FRONT_PIC(SUICUNE,       gMonStillFrontPic_Suicune),
-    STILL_FRONT_PIC(LARVITAR,      gMonStillFrontPic_Larvitar),
-    STILL_FRONT_PIC(PUPITAR,       gMonStillFrontPic_Pupitar),
-    STILL_FRONT_PIC(TYRANITAR,     gMonStillFrontPic_Tyranitar),
-    STILL_FRONT_PIC(LUGIA,         gMonStillFrontPic_Lugia),
-    STILL_FRONT_PIC(HO_OH,         gMonStillFrontPic_HoOh),
-    STILL_FRONT_PIC(CELEBI,        gMonStillFrontPic_Celebi),
+    SPECIES_SPRITE(CHIKORITA,     gMonStillFrontPic_Chikorita),
+    SPECIES_SPRITE(BAYLEEF,       gMonStillFrontPic_Bayleef),
+    SPECIES_SPRITE(MEGANIUM,      gMonStillFrontPic_Meganium),
+    SPECIES_SPRITE(CYNDAQUIL,     gMonStillFrontPic_Cyndaquil),
+    SPECIES_SPRITE(QUILAVA,       gMonStillFrontPic_Quilava),
+    SPECIES_SPRITE(TYPHLOSION,    gMonStillFrontPic_Typhlosion),
+    SPECIES_SPRITE(TOTODILE,      gMonStillFrontPic_Totodile),
+    SPECIES_SPRITE(CROCONAW,      gMonStillFrontPic_Croconaw),
+    SPECIES_SPRITE(FERALIGATR,    gMonStillFrontPic_Feraligatr),
+    SPECIES_SPRITE(SENTRET,       gMonStillFrontPic_Sentret),
+    SPECIES_SPRITE(FURRET,        gMonStillFrontPic_Furret),
+    SPECIES_SPRITE(HOOTHOOT,      gMonStillFrontPic_Hoothoot),
+    SPECIES_SPRITE(NOCTOWL,       gMonStillFrontPic_Noctowl),
+    SPECIES_SPRITE(LEDYBA,        gMonStillFrontPic_Ledyba),
+    SPECIES_SPRITE(LEDIAN,        gMonStillFrontPic_Ledian),
+    SPECIES_SPRITE(SPINARAK,      gMonStillFrontPic_Spinarak),
+    SPECIES_SPRITE(ARIADOS,       gMonStillFrontPic_Ariados),
+    SPECIES_SPRITE(CROBAT,        gMonStillFrontPic_Crobat),
+    SPECIES_SPRITE(CHINCHOU,      gMonStillFrontPic_Chinchou),
+    SPECIES_SPRITE(LANTURN,       gMonStillFrontPic_Lanturn),
+    SPECIES_SPRITE(PICHU,         gMonStillFrontPic_Pichu),
+    SPECIES_SPRITE(CLEFFA,        gMonStillFrontPic_Cleffa),
+    SPECIES_SPRITE(IGGLYBUFF,     gMonStillFrontPic_Igglybuff),
+    SPECIES_SPRITE(TOGEPI,        gMonStillFrontPic_Togepi),
+    SPECIES_SPRITE(TOGETIC,       gMonStillFrontPic_Togetic),
+    SPECIES_SPRITE(NATU,          gMonStillFrontPic_Natu),
+    SPECIES_SPRITE(XATU,          gMonStillFrontPic_Xatu),
+    SPECIES_SPRITE(MAREEP,        gMonStillFrontPic_Mareep),
+    SPECIES_SPRITE(FLAAFFY,       gMonStillFrontPic_Flaaffy),
+    SPECIES_SPRITE(AMPHAROS,      gMonStillFrontPic_Ampharos),
+    SPECIES_SPRITE(BELLOSSOM,     gMonStillFrontPic_Bellossom),
+    SPECIES_SPRITE(MARILL,        gMonStillFrontPic_Marill),
+    SPECIES_SPRITE(AZUMARILL,     gMonStillFrontPic_Azumarill),
+    SPECIES_SPRITE(SUDOWOODO,     gMonStillFrontPic_Sudowoodo),
+    SPECIES_SPRITE(POLITOED,      gMonStillFrontPic_Politoed),
+    SPECIES_SPRITE(HOPPIP,        gMonStillFrontPic_Hoppip),
+    SPECIES_SPRITE(SKIPLOOM,      gMonStillFrontPic_Skiploom),
+    SPECIES_SPRITE(JUMPLUFF,      gMonStillFrontPic_Jumpluff),
+    SPECIES_SPRITE(AIPOM,         gMonStillFrontPic_Aipom),
+    SPECIES_SPRITE(SUNKERN,       gMonStillFrontPic_Sunkern),
+    SPECIES_SPRITE(SUNFLORA,      gMonStillFrontPic_Sunflora),
+    SPECIES_SPRITE(YANMA,         gMonStillFrontPic_Yanma),
+    SPECIES_SPRITE(WOOPER,        gMonStillFrontPic_Wooper),
+    SPECIES_SPRITE(QUAGSIRE,      gMonStillFrontPic_Quagsire),
+    SPECIES_SPRITE(ESPEON,        gMonStillFrontPic_Espeon),
+    SPECIES_SPRITE(UMBREON,       gMonStillFrontPic_Umbreon),
+    SPECIES_SPRITE(MURKROW,       gMonStillFrontPic_Murkrow),
+    SPECIES_SPRITE(SLOWKING,      gMonStillFrontPic_Slowking),
+    SPECIES_SPRITE(MISDREAVUS,    gMonStillFrontPic_Misdreavus),
+    SPECIES_SPRITE(UNOWN,         gMonStillFrontPic_UnownA),
+    SPECIES_SPRITE(WOBBUFFET,     gMonStillFrontPic_Wobbuffet),
+    SPECIES_SPRITE(GIRAFARIG,     gMonStillFrontPic_Girafarig),
+    SPECIES_SPRITE(PINECO,        gMonStillFrontPic_Pineco),
+    SPECIES_SPRITE(FORRETRESS,    gMonStillFrontPic_Forretress),
+    SPECIES_SPRITE(DUNSPARCE,     gMonStillFrontPic_Dunsparce),
+    SPECIES_SPRITE(GLIGAR,        gMonStillFrontPic_Gligar),
+    SPECIES_SPRITE(STEELIX,       gMonStillFrontPic_Steelix),
+    SPECIES_SPRITE(SNUBBULL,      gMonStillFrontPic_Snubbull),
+    SPECIES_SPRITE(GRANBULL,      gMonStillFrontPic_Granbull),
+    SPECIES_SPRITE(QWILFISH,      gMonStillFrontPic_Qwilfish),
+    SPECIES_SPRITE(SCIZOR,        gMonStillFrontPic_Scizor),
+    SPECIES_SPRITE(SHUCKLE,       gMonStillFrontPic_Shuckle),
+    SPECIES_SPRITE(HERACROSS,     gMonStillFrontPic_Heracross),
+    SPECIES_SPRITE(SNEASEL,       gMonStillFrontPic_Sneasel),
+    SPECIES_SPRITE(TEDDIURSA,     gMonStillFrontPic_Teddiursa),
+    SPECIES_SPRITE(URSARING,      gMonStillFrontPic_Ursaring),
+    SPECIES_SPRITE(SLUGMA,        gMonStillFrontPic_Slugma),
+    SPECIES_SPRITE(MAGCARGO,      gMonStillFrontPic_Magcargo),
+    SPECIES_SPRITE(SWINUB,        gMonStillFrontPic_Swinub),
+    SPECIES_SPRITE(PILOSWINE,     gMonStillFrontPic_Piloswine),
+    SPECIES_SPRITE(CORSOLA,       gMonStillFrontPic_Corsola),
+    SPECIES_SPRITE(REMORAID,      gMonStillFrontPic_Remoraid),
+    SPECIES_SPRITE(OCTILLERY,     gMonStillFrontPic_Octillery),
+    SPECIES_SPRITE(DELIBIRD,      gMonStillFrontPic_Delibird),
+    SPECIES_SPRITE(MANTINE,       gMonStillFrontPic_Mantine),
+    SPECIES_SPRITE(SKARMORY,      gMonStillFrontPic_Skarmory),
+    SPECIES_SPRITE(HOUNDOUR,      gMonStillFrontPic_Houndour),
+    SPECIES_SPRITE(HOUNDOOM,      gMonStillFrontPic_Houndoom),
+    SPECIES_SPRITE(KINGDRA,       gMonStillFrontPic_Kingdra),
+    SPECIES_SPRITE(PHANPY,        gMonStillFrontPic_Phanpy),
+    SPECIES_SPRITE(DONPHAN,       gMonStillFrontPic_Donphan),
+    SPECIES_SPRITE(PORYGON2,      gMonStillFrontPic_Porygon2),
+    SPECIES_SPRITE(STANTLER,      gMonStillFrontPic_Stantler),
+    SPECIES_SPRITE(SMEARGLE,      gMonStillFrontPic_Smeargle),
+    SPECIES_SPRITE(TYROGUE,       gMonStillFrontPic_Tyrogue),
+    SPECIES_SPRITE(HITMONTOP,     gMonStillFrontPic_Hitmontop),
+    SPECIES_SPRITE(SMOOCHUM,      gMonStillFrontPic_Smoochum),
+    SPECIES_SPRITE(ELEKID,        gMonStillFrontPic_Elekid),
+    SPECIES_SPRITE(MAGBY,         gMonStillFrontPic_Magby),
+    SPECIES_SPRITE(MILTANK,       gMonStillFrontPic_Miltank),
+    SPECIES_SPRITE(BLISSEY,       gMonStillFrontPic_Blissey),
+    SPECIES_SPRITE(RAIKOU,        gMonStillFrontPic_Raikou),
+    SPECIES_SPRITE(ENTEI,         gMonStillFrontPic_Entei),
+    SPECIES_SPRITE(SUICUNE,       gMonStillFrontPic_Suicune),
+    SPECIES_SPRITE(LARVITAR,      gMonStillFrontPic_Larvitar),
+    SPECIES_SPRITE(PUPITAR,       gMonStillFrontPic_Pupitar),
+    SPECIES_SPRITE(TYRANITAR,     gMonStillFrontPic_Tyranitar),
+    SPECIES_SPRITE(LUGIA,         gMonStillFrontPic_Lugia),
+    SPECIES_SPRITE(HO_OH,         gMonStillFrontPic_HoOh),
+    SPECIES_SPRITE(CELEBI,        gMonStillFrontPic_Celebi),
 // Empty slots
-    STILL_FRONT_PIC(OLD_UNOWN_B,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_C,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_D,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_E,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_F,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_G,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_H,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_I,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_J,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_K,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_L,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_M,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_N,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_O,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_P,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_Q,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_R,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_S,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_T,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_U,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_V,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_W,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_X,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_Y,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_Z,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_B,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_C,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_D,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_E,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_F,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_G,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_H,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_I,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_J,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_K,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_L,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_M,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_N,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_O,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_P,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Q,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_R,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_S,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_T,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_U,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_V,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_W,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_X,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Y,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Z,   gMonStillFrontPic_DoubleQuestionMark),
 // Gen III
-    STILL_FRONT_PIC(TREECKO,       gMonStillFrontPic_Treecko),
-    STILL_FRONT_PIC(GROVYLE,       gMonStillFrontPic_Grovyle),
-    STILL_FRONT_PIC(SCEPTILE,      gMonStillFrontPic_Sceptile),
-    STILL_FRONT_PIC(TORCHIC,       gMonStillFrontPic_Torchic),
-    STILL_FRONT_PIC(COMBUSKEN,     gMonStillFrontPic_Combusken),
-    STILL_FRONT_PIC(BLAZIKEN,      gMonStillFrontPic_Blaziken),
-    STILL_FRONT_PIC(MUDKIP,        gMonStillFrontPic_Mudkip),
-    STILL_FRONT_PIC(MARSHTOMP,     gMonStillFrontPic_Marshtomp),
-    STILL_FRONT_PIC(SWAMPERT,      gMonStillFrontPic_Swampert),
-    STILL_FRONT_PIC(POOCHYENA,     gMonStillFrontPic_Poochyena),
-    STILL_FRONT_PIC(MIGHTYENA,     gMonStillFrontPic_Mightyena),
-    STILL_FRONT_PIC(ZIGZAGOON,     gMonStillFrontPic_Zigzagoon),
-    STILL_FRONT_PIC(LINOONE,       gMonStillFrontPic_Linoone),
-    STILL_FRONT_PIC(WURMPLE,       gMonStillFrontPic_Wurmple),
-    STILL_FRONT_PIC(SILCOON,       gMonStillFrontPic_Silcoon),
-    STILL_FRONT_PIC(BEAUTIFLY,     gMonStillFrontPic_Beautifly),
-    STILL_FRONT_PIC(CASCOON,       gMonStillFrontPic_Cascoon),
-    STILL_FRONT_PIC(DUSTOX,        gMonStillFrontPic_Dustox),
-    STILL_FRONT_PIC(LOTAD,         gMonStillFrontPic_Lotad),
-    STILL_FRONT_PIC(LOMBRE,        gMonStillFrontPic_Lombre),
-    STILL_FRONT_PIC(LUDICOLO,      gMonStillFrontPic_Ludicolo),
-    STILL_FRONT_PIC(SEEDOT,        gMonStillFrontPic_Seedot),
-    STILL_FRONT_PIC(NUZLEAF,       gMonStillFrontPic_Nuzleaf),
-    STILL_FRONT_PIC(SHIFTRY,       gMonStillFrontPic_Shiftry),
-    STILL_FRONT_PIC(NINCADA,       gMonStillFrontPic_Nincada),
-    STILL_FRONT_PIC(NINJASK,       gMonStillFrontPic_Ninjask),
-    STILL_FRONT_PIC(SHEDINJA,      gMonStillFrontPic_Shedinja),
-    STILL_FRONT_PIC(TAILLOW,       gMonStillFrontPic_Taillow),
-    STILL_FRONT_PIC(SWELLOW,       gMonStillFrontPic_Swellow),
-    STILL_FRONT_PIC(SHROOMISH,     gMonStillFrontPic_Shroomish),
-    STILL_FRONT_PIC(BRELOOM,       gMonStillFrontPic_Breloom),
-    STILL_FRONT_PIC(SPINDA,        gMonStillFrontPic_Spinda),
-    STILL_FRONT_PIC(WINGULL,       gMonStillFrontPic_Wingull),
-    STILL_FRONT_PIC(PELIPPER,      gMonStillFrontPic_Pelipper),
-    STILL_FRONT_PIC(SURSKIT,       gMonStillFrontPic_Surskit),
-    STILL_FRONT_PIC(MASQUERAIN,    gMonStillFrontPic_Masquerain),
-    STILL_FRONT_PIC(WAILMER,       gMonStillFrontPic_Wailmer),
-    STILL_FRONT_PIC(WAILORD,       gMonStillFrontPic_Wailord),
-    STILL_FRONT_PIC(SKITTY,        gMonStillFrontPic_Skitty),
-    STILL_FRONT_PIC(DELCATTY,      gMonStillFrontPic_Delcatty),
-    STILL_FRONT_PIC(KECLEON,       gMonStillFrontPic_Kecleon),
-    STILL_FRONT_PIC(BALTOY,        gMonStillFrontPic_Baltoy),
-    STILL_FRONT_PIC(CLAYDOL,       gMonStillFrontPic_Claydol),
-    STILL_FRONT_PIC(NOSEPASS,      gMonStillFrontPic_Nosepass),
-    STILL_FRONT_PIC(TORKOAL,       gMonStillFrontPic_Torkoal),
-    STILL_FRONT_PIC(SABLEYE,       gMonStillFrontPic_Sableye),
-    STILL_FRONT_PIC(BARBOACH,      gMonStillFrontPic_Barboach),
-    STILL_FRONT_PIC(WHISCASH,      gMonStillFrontPic_Whiscash),
-    STILL_FRONT_PIC(LUVDISC,       gMonStillFrontPic_Luvdisc),
-    STILL_FRONT_PIC(CORPHISH,      gMonStillFrontPic_Corphish),
-    STILL_FRONT_PIC(CRAWDAUNT,     gMonStillFrontPic_Crawdaunt),
-    STILL_FRONT_PIC(FEEBAS,        gMonStillFrontPic_Feebas),
-    STILL_FRONT_PIC(MILOTIC,       gMonStillFrontPic_Milotic),
-    STILL_FRONT_PIC(CARVANHA,      gMonStillFrontPic_Carvanha),
-    STILL_FRONT_PIC(SHARPEDO,      gMonStillFrontPic_Sharpedo),
-    STILL_FRONT_PIC(TRAPINCH,      gMonStillFrontPic_Trapinch),
-    STILL_FRONT_PIC(VIBRAVA,       gMonStillFrontPic_Vibrava),
-    STILL_FRONT_PIC(FLYGON,        gMonStillFrontPic_Flygon),
-    STILL_FRONT_PIC(MAKUHITA,      gMonStillFrontPic_Makuhita),
-    STILL_FRONT_PIC(HARIYAMA,      gMonStillFrontPic_Hariyama),
-    STILL_FRONT_PIC(ELECTRIKE,     gMonStillFrontPic_Electrike),
-    STILL_FRONT_PIC(MANECTRIC,     gMonStillFrontPic_Manectric),
-    STILL_FRONT_PIC(NUMEL,         gMonStillFrontPic_Numel),
-    STILL_FRONT_PIC(CAMERUPT,      gMonStillFrontPic_Camerupt),
-    STILL_FRONT_PIC(SPHEAL,        gMonStillFrontPic_Spheal),
-    STILL_FRONT_PIC(SEALEO,        gMonStillFrontPic_Sealeo),
-    STILL_FRONT_PIC(WALREIN,       gMonStillFrontPic_Walrein),
-    STILL_FRONT_PIC(CACNEA,        gMonStillFrontPic_Cacnea),
-    STILL_FRONT_PIC(CACTURNE,      gMonStillFrontPic_Cacturne),
-    STILL_FRONT_PIC(SNORUNT,       gMonStillFrontPic_Snorunt),
-    STILL_FRONT_PIC(GLALIE,        gMonStillFrontPic_Glalie),
-    STILL_FRONT_PIC(LUNATONE,      gMonStillFrontPic_Lunatone),
-    STILL_FRONT_PIC(SOLROCK,       gMonStillFrontPic_Solrock),
-    STILL_FRONT_PIC(AZURILL,       gMonStillFrontPic_Azurill),
-    STILL_FRONT_PIC(SPOINK,        gMonStillFrontPic_Spoink),
-    STILL_FRONT_PIC(GRUMPIG,       gMonStillFrontPic_Grumpig),
-    STILL_FRONT_PIC(PLUSLE,        gMonStillFrontPic_Plusle),
-    STILL_FRONT_PIC(MINUN,         gMonStillFrontPic_Minun),
-    STILL_FRONT_PIC(MAWILE,        gMonStillFrontPic_Mawile),
-    STILL_FRONT_PIC(MEDITITE,      gMonStillFrontPic_Meditite),
-    STILL_FRONT_PIC(MEDICHAM,      gMonStillFrontPic_Medicham),
-    STILL_FRONT_PIC(SWABLU,        gMonStillFrontPic_Swablu),
-    STILL_FRONT_PIC(ALTARIA,       gMonStillFrontPic_Altaria),
-    STILL_FRONT_PIC(WYNAUT,        gMonStillFrontPic_Wynaut),
-    STILL_FRONT_PIC(DUSKULL,       gMonStillFrontPic_Duskull),
-    STILL_FRONT_PIC(DUSCLOPS,      gMonStillFrontPic_Dusclops),
-    STILL_FRONT_PIC(ROSELIA,       gMonStillFrontPic_Roselia),
-    STILL_FRONT_PIC(SLAKOTH,       gMonStillFrontPic_Slakoth),
-    STILL_FRONT_PIC(VIGOROTH,      gMonStillFrontPic_Vigoroth),
-    STILL_FRONT_PIC(SLAKING,       gMonStillFrontPic_Slaking),
-    STILL_FRONT_PIC(GULPIN,        gMonStillFrontPic_Gulpin),
-    STILL_FRONT_PIC(SWALOT,        gMonStillFrontPic_Swalot),
-    STILL_FRONT_PIC(TROPIUS,       gMonStillFrontPic_Tropius),
-    STILL_FRONT_PIC(WHISMUR,       gMonStillFrontPic_Whismur),
-    STILL_FRONT_PIC(LOUDRED,       gMonStillFrontPic_Loudred),
-    STILL_FRONT_PIC(EXPLOUD,       gMonStillFrontPic_Exploud),
-    STILL_FRONT_PIC(CLAMPERL,      gMonStillFrontPic_Clamperl),
-    STILL_FRONT_PIC(HUNTAIL,       gMonStillFrontPic_Huntail),
-    STILL_FRONT_PIC(GOREBYSS,      gMonStillFrontPic_Gorebyss),
-    STILL_FRONT_PIC(ABSOL,         gMonStillFrontPic_Absol),
-    STILL_FRONT_PIC(SHUPPET,       gMonStillFrontPic_Shuppet),
-    STILL_FRONT_PIC(BANETTE,       gMonStillFrontPic_Banette),
-    STILL_FRONT_PIC(SEVIPER,       gMonStillFrontPic_Seviper),
-    STILL_FRONT_PIC(ZANGOOSE,      gMonStillFrontPic_Zangoose),
-    STILL_FRONT_PIC(RELICANTH,     gMonStillFrontPic_Relicanth),
-    STILL_FRONT_PIC(ARON,          gMonStillFrontPic_Aron),
-    STILL_FRONT_PIC(LAIRON,        gMonStillFrontPic_Lairon),
-    STILL_FRONT_PIC(AGGRON,        gMonStillFrontPic_Aggron),
-    STILL_FRONT_PIC(CASTFORM,      gMonStillFrontPic_Castform),
-    STILL_FRONT_PIC(VOLBEAT,       gMonStillFrontPic_Volbeat),
-    STILL_FRONT_PIC(ILLUMISE,      gMonStillFrontPic_Illumise),
-    STILL_FRONT_PIC(LILEEP,        gMonStillFrontPic_Lileep),
-    STILL_FRONT_PIC(CRADILY,       gMonStillFrontPic_Cradily),
-    STILL_FRONT_PIC(ANORITH,       gMonStillFrontPic_Anorith),
-    STILL_FRONT_PIC(ARMALDO,       gMonStillFrontPic_Armaldo),
-    STILL_FRONT_PIC(RALTS,         gMonStillFrontPic_Ralts),
-    STILL_FRONT_PIC(KIRLIA,        gMonStillFrontPic_Kirlia),
-    STILL_FRONT_PIC(GARDEVOIR,     gMonStillFrontPic_Gardevoir),
-    STILL_FRONT_PIC(BAGON,         gMonStillFrontPic_Bagon),
-    STILL_FRONT_PIC(SHELGON,       gMonStillFrontPic_Shelgon),
-    STILL_FRONT_PIC(SALAMENCE,     gMonStillFrontPic_Salamence),
-    STILL_FRONT_PIC(BELDUM,        gMonStillFrontPic_Beldum),
-    STILL_FRONT_PIC(METANG,        gMonStillFrontPic_Metang),
-    STILL_FRONT_PIC(METAGROSS,     gMonStillFrontPic_Metagross),
-    STILL_FRONT_PIC(REGIROCK,      gMonStillFrontPic_Regirock),
-    STILL_FRONT_PIC(REGICE,        gMonStillFrontPic_Regice),
-    STILL_FRONT_PIC(REGISTEEL,     gMonStillFrontPic_Registeel),
-    STILL_FRONT_PIC(KYOGRE,        gMonStillFrontPic_Kyogre),
-    STILL_FRONT_PIC(GROUDON,       gMonStillFrontPic_Groudon),
-    STILL_FRONT_PIC(RAYQUAZA,      gMonStillFrontPic_Rayquaza),
-    STILL_FRONT_PIC(LATIAS,        gMonStillFrontPic_Latias),
-    STILL_FRONT_PIC(LATIOS,        gMonStillFrontPic_Latios),
-    STILL_FRONT_PIC(JIRACHI,       gMonStillFrontPic_Jirachi),
-    STILL_FRONT_PIC(DEOXYS,        gMonStillFrontPic_Deoxys),
-    STILL_FRONT_PIC(CHIMECHO,      gMonStillFrontPic_Chimecho),
-    STILL_FRONT_PIC(EGG,           gMonStillFrontPic_Egg),
-    STILL_FRONT_PIC(UNOWN_B,       gMonStillFrontPic_UnownB),
-    STILL_FRONT_PIC(UNOWN_C,       gMonStillFrontPic_UnownC),
-    STILL_FRONT_PIC(UNOWN_D,       gMonStillFrontPic_UnownD),
-    STILL_FRONT_PIC(UNOWN_E,       gMonStillFrontPic_UnownE),
-    STILL_FRONT_PIC(UNOWN_F,       gMonStillFrontPic_UnownF),
-    STILL_FRONT_PIC(UNOWN_G,       gMonStillFrontPic_UnownG),
-    STILL_FRONT_PIC(UNOWN_H,       gMonStillFrontPic_UnownH),
-    STILL_FRONT_PIC(UNOWN_I,       gMonStillFrontPic_UnownI),
-    STILL_FRONT_PIC(UNOWN_J,       gMonStillFrontPic_UnownJ),
-    STILL_FRONT_PIC(UNOWN_K,       gMonStillFrontPic_UnownK),
-    STILL_FRONT_PIC(UNOWN_L,       gMonStillFrontPic_UnownL),
-    STILL_FRONT_PIC(UNOWN_M,       gMonStillFrontPic_UnownM),
-    STILL_FRONT_PIC(UNOWN_N,       gMonStillFrontPic_UnownN),
-    STILL_FRONT_PIC(UNOWN_O,       gMonStillFrontPic_UnownO),
-    STILL_FRONT_PIC(UNOWN_P,       gMonStillFrontPic_UnownP),
-    STILL_FRONT_PIC(UNOWN_Q,       gMonStillFrontPic_UnownQ),
-    STILL_FRONT_PIC(UNOWN_R,       gMonStillFrontPic_UnownR),
-    STILL_FRONT_PIC(UNOWN_S,       gMonStillFrontPic_UnownS),
-    STILL_FRONT_PIC(UNOWN_T,       gMonStillFrontPic_UnownT),
-    STILL_FRONT_PIC(UNOWN_U,       gMonStillFrontPic_UnownU),
-    STILL_FRONT_PIC(UNOWN_V,       gMonStillFrontPic_UnownV),
-    STILL_FRONT_PIC(UNOWN_W,       gMonStillFrontPic_UnownW),
-    STILL_FRONT_PIC(UNOWN_X,       gMonStillFrontPic_UnownX),
-    STILL_FRONT_PIC(UNOWN_Y,       gMonStillFrontPic_UnownY),
-    STILL_FRONT_PIC(UNOWN_Z,       gMonStillFrontPic_UnownZ),
-    STILL_FRONT_PIC(UNOWN_EMARK,   gMonStillFrontPic_UnownExclamationMark),
-    STILL_FRONT_PIC(UNOWN_QMARK,   gMonStillFrontPic_UnownQuestionMark),
+    SPECIES_SPRITE(TREECKO,       gMonStillFrontPic_Treecko),
+    SPECIES_SPRITE(GROVYLE,       gMonStillFrontPic_Grovyle),
+    SPECIES_SPRITE(SCEPTILE,      gMonStillFrontPic_Sceptile),
+    SPECIES_SPRITE(TORCHIC,       gMonStillFrontPic_Torchic),
+    SPECIES_SPRITE(COMBUSKEN,     gMonStillFrontPic_Combusken),
+    SPECIES_SPRITE(BLAZIKEN,      gMonStillFrontPic_Blaziken),
+    SPECIES_SPRITE(MUDKIP,        gMonStillFrontPic_Mudkip),
+    SPECIES_SPRITE(MARSHTOMP,     gMonStillFrontPic_Marshtomp),
+    SPECIES_SPRITE(SWAMPERT,      gMonStillFrontPic_Swampert),
+    SPECIES_SPRITE(POOCHYENA,     gMonStillFrontPic_Poochyena),
+    SPECIES_SPRITE(MIGHTYENA,     gMonStillFrontPic_Mightyena),
+    SPECIES_SPRITE(ZIGZAGOON,     gMonStillFrontPic_Zigzagoon),
+    SPECIES_SPRITE(LINOONE,       gMonStillFrontPic_Linoone),
+    SPECIES_SPRITE(WURMPLE,       gMonStillFrontPic_Wurmple),
+    SPECIES_SPRITE(SILCOON,       gMonStillFrontPic_Silcoon),
+    SPECIES_SPRITE(BEAUTIFLY,     gMonStillFrontPic_Beautifly),
+    SPECIES_SPRITE(CASCOON,       gMonStillFrontPic_Cascoon),
+    SPECIES_SPRITE(DUSTOX,        gMonStillFrontPic_Dustox),
+    SPECIES_SPRITE(LOTAD,         gMonStillFrontPic_Lotad),
+    SPECIES_SPRITE(LOMBRE,        gMonStillFrontPic_Lombre),
+    SPECIES_SPRITE(LUDICOLO,      gMonStillFrontPic_Ludicolo),
+    SPECIES_SPRITE(SEEDOT,        gMonStillFrontPic_Seedot),
+    SPECIES_SPRITE(NUZLEAF,       gMonStillFrontPic_Nuzleaf),
+    SPECIES_SPRITE(SHIFTRY,       gMonStillFrontPic_Shiftry),
+    SPECIES_SPRITE(NINCADA,       gMonStillFrontPic_Nincada),
+    SPECIES_SPRITE(NINJASK,       gMonStillFrontPic_Ninjask),
+    SPECIES_SPRITE(SHEDINJA,      gMonStillFrontPic_Shedinja),
+    SPECIES_SPRITE(TAILLOW,       gMonStillFrontPic_Taillow),
+    SPECIES_SPRITE(SWELLOW,       gMonStillFrontPic_Swellow),
+    SPECIES_SPRITE(SHROOMISH,     gMonStillFrontPic_Shroomish),
+    SPECIES_SPRITE(BRELOOM,       gMonStillFrontPic_Breloom),
+    SPECIES_SPRITE(SPINDA,        gMonStillFrontPic_Spinda),
+    SPECIES_SPRITE(WINGULL,       gMonStillFrontPic_Wingull),
+    SPECIES_SPRITE(PELIPPER,      gMonStillFrontPic_Pelipper),
+    SPECIES_SPRITE(SURSKIT,       gMonStillFrontPic_Surskit),
+    SPECIES_SPRITE(MASQUERAIN,    gMonStillFrontPic_Masquerain),
+    SPECIES_SPRITE(WAILMER,       gMonStillFrontPic_Wailmer),
+    SPECIES_SPRITE(WAILORD,       gMonStillFrontPic_Wailord),
+    SPECIES_SPRITE(SKITTY,        gMonStillFrontPic_Skitty),
+    SPECIES_SPRITE(DELCATTY,      gMonStillFrontPic_Delcatty),
+    SPECIES_SPRITE(KECLEON,       gMonStillFrontPic_Kecleon),
+    SPECIES_SPRITE(BALTOY,        gMonStillFrontPic_Baltoy),
+    SPECIES_SPRITE(CLAYDOL,       gMonStillFrontPic_Claydol),
+    SPECIES_SPRITE(NOSEPASS,      gMonStillFrontPic_Nosepass),
+    SPECIES_SPRITE(TORKOAL,       gMonStillFrontPic_Torkoal),
+    SPECIES_SPRITE(SABLEYE,       gMonStillFrontPic_Sableye),
+    SPECIES_SPRITE(BARBOACH,      gMonStillFrontPic_Barboach),
+    SPECIES_SPRITE(WHISCASH,      gMonStillFrontPic_Whiscash),
+    SPECIES_SPRITE(LUVDISC,       gMonStillFrontPic_Luvdisc),
+    SPECIES_SPRITE(CORPHISH,      gMonStillFrontPic_Corphish),
+    SPECIES_SPRITE(CRAWDAUNT,     gMonStillFrontPic_Crawdaunt),
+    SPECIES_SPRITE(FEEBAS,        gMonStillFrontPic_Feebas),
+    SPECIES_SPRITE(MILOTIC,       gMonStillFrontPic_Milotic),
+    SPECIES_SPRITE(CARVANHA,      gMonStillFrontPic_Carvanha),
+    SPECIES_SPRITE(SHARPEDO,      gMonStillFrontPic_Sharpedo),
+    SPECIES_SPRITE(TRAPINCH,      gMonStillFrontPic_Trapinch),
+    SPECIES_SPRITE(VIBRAVA,       gMonStillFrontPic_Vibrava),
+    SPECIES_SPRITE(FLYGON,        gMonStillFrontPic_Flygon),
+    SPECIES_SPRITE(MAKUHITA,      gMonStillFrontPic_Makuhita),
+    SPECIES_SPRITE(HARIYAMA,      gMonStillFrontPic_Hariyama),
+    SPECIES_SPRITE(ELECTRIKE,     gMonStillFrontPic_Electrike),
+    SPECIES_SPRITE(MANECTRIC,     gMonStillFrontPic_Manectric),
+    SPECIES_SPRITE(NUMEL,         gMonStillFrontPic_Numel),
+    SPECIES_SPRITE(CAMERUPT,      gMonStillFrontPic_Camerupt),
+    SPECIES_SPRITE(SPHEAL,        gMonStillFrontPic_Spheal),
+    SPECIES_SPRITE(SEALEO,        gMonStillFrontPic_Sealeo),
+    SPECIES_SPRITE(WALREIN,       gMonStillFrontPic_Walrein),
+    SPECIES_SPRITE(CACNEA,        gMonStillFrontPic_Cacnea),
+    SPECIES_SPRITE(CACTURNE,      gMonStillFrontPic_Cacturne),
+    SPECIES_SPRITE(SNORUNT,       gMonStillFrontPic_Snorunt),
+    SPECIES_SPRITE(GLALIE,        gMonStillFrontPic_Glalie),
+    SPECIES_SPRITE(LUNATONE,      gMonStillFrontPic_Lunatone),
+    SPECIES_SPRITE(SOLROCK,       gMonStillFrontPic_Solrock),
+    SPECIES_SPRITE(AZURILL,       gMonStillFrontPic_Azurill),
+    SPECIES_SPRITE(SPOINK,        gMonStillFrontPic_Spoink),
+    SPECIES_SPRITE(GRUMPIG,       gMonStillFrontPic_Grumpig),
+    SPECIES_SPRITE(PLUSLE,        gMonStillFrontPic_Plusle),
+    SPECIES_SPRITE(MINUN,         gMonStillFrontPic_Minun),
+    SPECIES_SPRITE(MAWILE,        gMonStillFrontPic_Mawile),
+    SPECIES_SPRITE(MEDITITE,      gMonStillFrontPic_Meditite),
+    SPECIES_SPRITE(MEDICHAM,      gMonStillFrontPic_Medicham),
+    SPECIES_SPRITE(SWABLU,        gMonStillFrontPic_Swablu),
+    SPECIES_SPRITE(ALTARIA,       gMonStillFrontPic_Altaria),
+    SPECIES_SPRITE(WYNAUT,        gMonStillFrontPic_Wynaut),
+    SPECIES_SPRITE(DUSKULL,       gMonStillFrontPic_Duskull),
+    SPECIES_SPRITE(DUSCLOPS,      gMonStillFrontPic_Dusclops),
+    SPECIES_SPRITE(ROSELIA,       gMonStillFrontPic_Roselia),
+    SPECIES_SPRITE(SLAKOTH,       gMonStillFrontPic_Slakoth),
+    SPECIES_SPRITE(VIGOROTH,      gMonStillFrontPic_Vigoroth),
+    SPECIES_SPRITE(SLAKING,       gMonStillFrontPic_Slaking),
+    SPECIES_SPRITE(GULPIN,        gMonStillFrontPic_Gulpin),
+    SPECIES_SPRITE(SWALOT,        gMonStillFrontPic_Swalot),
+    SPECIES_SPRITE(TROPIUS,       gMonStillFrontPic_Tropius),
+    SPECIES_SPRITE(WHISMUR,       gMonStillFrontPic_Whismur),
+    SPECIES_SPRITE(LOUDRED,       gMonStillFrontPic_Loudred),
+    SPECIES_SPRITE(EXPLOUD,       gMonStillFrontPic_Exploud),
+    SPECIES_SPRITE(CLAMPERL,      gMonStillFrontPic_Clamperl),
+    SPECIES_SPRITE(HUNTAIL,       gMonStillFrontPic_Huntail),
+    SPECIES_SPRITE(GOREBYSS,      gMonStillFrontPic_Gorebyss),
+    SPECIES_SPRITE(ABSOL,         gMonStillFrontPic_Absol),
+    SPECIES_SPRITE(SHUPPET,       gMonStillFrontPic_Shuppet),
+    SPECIES_SPRITE(BANETTE,       gMonStillFrontPic_Banette),
+    SPECIES_SPRITE(SEVIPER,       gMonStillFrontPic_Seviper),
+    SPECIES_SPRITE(ZANGOOSE,      gMonStillFrontPic_Zangoose),
+    SPECIES_SPRITE(RELICANTH,     gMonStillFrontPic_Relicanth),
+    SPECIES_SPRITE(ARON,          gMonStillFrontPic_Aron),
+    SPECIES_SPRITE(LAIRON,        gMonStillFrontPic_Lairon),
+    SPECIES_SPRITE(AGGRON,        gMonStillFrontPic_Aggron),
+    SPECIES_SPRITE(CASTFORM,      gMonStillFrontPic_Castform),
+    SPECIES_SPRITE(VOLBEAT,       gMonStillFrontPic_Volbeat),
+    SPECIES_SPRITE(ILLUMISE,      gMonStillFrontPic_Illumise),
+    SPECIES_SPRITE(LILEEP,        gMonStillFrontPic_Lileep),
+    SPECIES_SPRITE(CRADILY,       gMonStillFrontPic_Cradily),
+    SPECIES_SPRITE(ANORITH,       gMonStillFrontPic_Anorith),
+    SPECIES_SPRITE(ARMALDO,       gMonStillFrontPic_Armaldo),
+    SPECIES_SPRITE(RALTS,         gMonStillFrontPic_Ralts),
+    SPECIES_SPRITE(KIRLIA,        gMonStillFrontPic_Kirlia),
+    SPECIES_SPRITE(GARDEVOIR,     gMonStillFrontPic_Gardevoir),
+    SPECIES_SPRITE(BAGON,         gMonStillFrontPic_Bagon),
+    SPECIES_SPRITE(SHELGON,       gMonStillFrontPic_Shelgon),
+    SPECIES_SPRITE(SALAMENCE,     gMonStillFrontPic_Salamence),
+    SPECIES_SPRITE(BELDUM,        gMonStillFrontPic_Beldum),
+    SPECIES_SPRITE(METANG,        gMonStillFrontPic_Metang),
+    SPECIES_SPRITE(METAGROSS,     gMonStillFrontPic_Metagross),
+    SPECIES_SPRITE(REGIROCK,      gMonStillFrontPic_Regirock),
+    SPECIES_SPRITE(REGICE,        gMonStillFrontPic_Regice),
+    SPECIES_SPRITE(REGISTEEL,     gMonStillFrontPic_Registeel),
+    SPECIES_SPRITE(KYOGRE,        gMonStillFrontPic_Kyogre),
+    SPECIES_SPRITE(GROUDON,       gMonStillFrontPic_Groudon),
+    SPECIES_SPRITE(RAYQUAZA,      gMonStillFrontPic_Rayquaza),
+    SPECIES_SPRITE(LATIAS,        gMonStillFrontPic_Latias),
+    SPECIES_SPRITE(LATIOS,        gMonStillFrontPic_Latios),
+    SPECIES_SPRITE(JIRACHI,       gMonStillFrontPic_Jirachi),
+    SPECIES_SPRITE(DEOXYS,        gMonStillFrontPic_Deoxys),
+    SPECIES_SPRITE(CHIMECHO,      gMonStillFrontPic_Chimecho),
+    SPECIES_SPRITE(EGG,           gMonStillFrontPic_Egg),
+    SPECIES_SPRITE(UNOWN_B,       gMonStillFrontPic_UnownB),
+    SPECIES_SPRITE(UNOWN_C,       gMonStillFrontPic_UnownC),
+    SPECIES_SPRITE(UNOWN_D,       gMonStillFrontPic_UnownD),
+    SPECIES_SPRITE(UNOWN_E,       gMonStillFrontPic_UnownE),
+    SPECIES_SPRITE(UNOWN_F,       gMonStillFrontPic_UnownF),
+    SPECIES_SPRITE(UNOWN_G,       gMonStillFrontPic_UnownG),
+    SPECIES_SPRITE(UNOWN_H,       gMonStillFrontPic_UnownH),
+    SPECIES_SPRITE(UNOWN_I,       gMonStillFrontPic_UnownI),
+    SPECIES_SPRITE(UNOWN_J,       gMonStillFrontPic_UnownJ),
+    SPECIES_SPRITE(UNOWN_K,       gMonStillFrontPic_UnownK),
+    SPECIES_SPRITE(UNOWN_L,       gMonStillFrontPic_UnownL),
+    SPECIES_SPRITE(UNOWN_M,       gMonStillFrontPic_UnownM),
+    SPECIES_SPRITE(UNOWN_N,       gMonStillFrontPic_UnownN),
+    SPECIES_SPRITE(UNOWN_O,       gMonStillFrontPic_UnownO),
+    SPECIES_SPRITE(UNOWN_P,       gMonStillFrontPic_UnownP),
+    SPECIES_SPRITE(UNOWN_Q,       gMonStillFrontPic_UnownQ),
+    SPECIES_SPRITE(UNOWN_R,       gMonStillFrontPic_UnownR),
+    SPECIES_SPRITE(UNOWN_S,       gMonStillFrontPic_UnownS),
+    SPECIES_SPRITE(UNOWN_T,       gMonStillFrontPic_UnownT),
+    SPECIES_SPRITE(UNOWN_U,       gMonStillFrontPic_UnownU),
+    SPECIES_SPRITE(UNOWN_V,       gMonStillFrontPic_UnownV),
+    SPECIES_SPRITE(UNOWN_W,       gMonStillFrontPic_UnownW),
+    SPECIES_SPRITE(UNOWN_X,       gMonStillFrontPic_UnownX),
+    SPECIES_SPRITE(UNOWN_Y,       gMonStillFrontPic_UnownY),
+    SPECIES_SPRITE(UNOWN_Z,       gMonStillFrontPic_UnownZ),
+    SPECIES_SPRITE(UNOWN_EMARK,   gMonStillFrontPic_UnownExclamationMark),
+    SPECIES_SPRITE(UNOWN_QMARK,   gMonStillFrontPic_UnownQuestionMark),
 };

src/data/trainer_graphics/back_pic_anims.h

@@ -1,4 +1,4 @@
-const union AnimCmd gAnimCmd_Brendan_1[] =
+static const union AnimCmd gAnimCmd_Brendan_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -8,7 +8,7 @@ const union AnimCmd gAnimCmd_Brendan_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_May_Steven_1[] =
+static const union AnimCmd gAnimCmd_May_Steven_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -18,7 +18,7 @@ const union AnimCmd gAnimCmd_May_Steven_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Wally_1[] =
+static const union AnimCmd gAnimCmd_Wally_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -28,7 +28,7 @@ const union AnimCmd gAnimCmd_Wally_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Red_1[] =
+static const union AnimCmd gAnimCmd_Red_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(2, 6),
@@ -38,7 +38,7 @@ const union AnimCmd gAnimCmd_Red_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Leaf_1[] =
+static const union AnimCmd gAnimCmd_Leaf_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(2, 6),
@@ -48,7 +48,7 @@ const union AnimCmd gAnimCmd_Leaf_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
+static const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -58,72 +58,72 @@ const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
+static const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
-    ANIMCMD_FRAME(2, 24), 
+    ANIMCMD_FRAME(2, 24),
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(3, 50),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Brendan[] =
+static const union AnimCmd *const sBackAnims_Brendan[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_Brendan_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_May[] =
+static const union AnimCmd *const sBackAnims_May[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_May_Steven_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Red[] =
+static const union AnimCmd *const sBackAnims_Red[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gAnimCmd_Red_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Leaf[] =
+static const union AnimCmd *const sBackAnims_Leaf[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gAnimCmd_Leaf_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
+static const union AnimCmd *const sBackAnims_RubySapphireBrendan[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_RubySapphireBrendan_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
+static const union AnimCmd *const sBackAnims_RubySapphireMay[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_RubySapphireMay_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Wally[] =
+static const union AnimCmd *const sBackAnims_Wally[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_Wally_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Steven[] =
+static const union AnimCmd *const sBackAnims_Steven[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_May_Steven_1,
 };
 
 const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] =
 {
-    gTrainerBackAnims_Brendan,
-    gTrainerBackAnims_May,
-    gTrainerBackAnims_Red,
-    gTrainerBackAnims_Leaf,
-    gTrainerBackAnims_RubySapphireBrendan,
-    gTrainerBackAnims_RubySapphireMay,
-    gTrainerBackAnims_Wally,
-    gTrainerBackAnims_Steven,
+    [TRAINER_BACK_PIC_BRENDAN] = sBackAnims_Brendan,
+    [TRAINER_BACK_PIC_MAY] = sBackAnims_May,
+    [TRAINER_BACK_PIC_RED] = sBackAnims_Red,
+    [TRAINER_BACK_PIC_LEAF] = sBackAnims_Leaf,
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = sBackAnims_RubySapphireBrendan,
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = sBackAnims_RubySapphireMay,
+    [TRAINER_BACK_PIC_WALLY] = sBackAnims_Wally,
+    [TRAINER_BACK_PIC_STEVEN] = sBackAnims_Steven,
 };

src/data/trainer_graphics/back_pic_tables.h

@@ -1,13 +1,13 @@
 const struct MonCoords gTrainerBackPicCoords[] =
 {
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 5},
-    {.size = 8, .y_offset = 5},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_BRENDAN] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_MAY] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_RED] = {.size = 8, .y_offset = 5},
+    [TRAINER_BACK_PIC_LEAF] = {.size = 8, .y_offset = 5},
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_WALLY] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_STEVEN] = {.size = 8, .y_offset = 4},
 };
 
 // this table goes functionally unused, since none of these pics are compressed
@@ -25,14 +25,14 @@ const struct CompressedSpriteSheet gTrainerBackPicTable[] =
     (const u32 *)gTrainerBackPic_Steven, 0x2000, TRAINER_BACK_PIC_STEVEN,
 };
 
-const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = 
+const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] =
 {
-    gTrainerPalette_Brendan, TRAINER_BACK_PIC_BRENDAN,
-    gTrainerPalette_May, TRAINER_BACK_PIC_MAY,
-    gTrainerBackPicPalette_Red, TRAINER_BACK_PIC_RED,
-    gTrainerBackPicPalette_Leaf, TRAINER_BACK_PIC_LEAF,
-    gTrainerPalette_RubySapphireBrendan, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN,
-    gTrainerPalette_RubySapphireMay, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY,
-    gTrainerPalette_Wally, TRAINER_BACK_PIC_WALLY,
-    gTrainerPalette_Steven, TRAINER_BACK_PIC_STEVEN,
+    TRAINER_BACK_PAL(BRENDAN, gTrainerPalette_Brendan),
+    TRAINER_BACK_PAL(MAY, gTrainerPalette_May),
+    TRAINER_BACK_PAL(RED, gTrainerBackPicPalette_Red),
+    TRAINER_BACK_PAL(LEAF, gTrainerBackPicPalette_Leaf),
+    TRAINER_BACK_PAL(RUBY_SAPPHIRE_BRENDAN, gTrainerPalette_RubySapphireBrendan),
+    TRAINER_BACK_PAL(RUBY_SAPPHIRE_MAY, gTrainerPalette_RubySapphireMay),
+    TRAINER_BACK_PAL(WALLY, gTrainerPalette_Wally),
+    TRAINER_BACK_PAL(STEVEN, gTrainerPalette_Steven),
 };

src/data/trainer_graphics/front_pic_anims.h

@@ -1,470 +1,468 @@
-#include "constants/trainers.h"
-
-const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Hiker[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaGruntM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaGruntM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonBreederF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonBreederF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CoolTrainerM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CoolTrainerM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BirdKeeper[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BirdKeeper[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Collector[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Collector[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaGruntF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaGruntF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmerM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmerM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaGruntM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaGruntM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ExpertM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ExpertM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaAdminM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaAdminM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BlackBelt[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BlackBelt[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaAdminF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaAdminF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaLeaderArchie[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaLeaderArchie[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_HexManiac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_HexManiac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AromaLady[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AromaLady[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RuinManiac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RuinManiac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Interviewer[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Interviewer[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_TuberF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_TuberF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_TuberM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_TuberM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CoolTrainerF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CoolTrainerF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Lady[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Lady[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Beauty[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Beauty[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RichBoy[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RichBoy[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ExpertF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ExpertF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Pokemaniac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Pokemaniac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaGruntF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaGruntF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Guitarist[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Guitarist[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Kindler[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Kindler[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Camper[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Camper[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Picnicker[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Picnicker[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BugManiac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BugManiac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonBreederM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonBreederM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PsychicM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PsychicM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PsychicF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PsychicF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Gentleman[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Gentleman[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourSidney[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourSidney[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourPhoebe[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourPhoebe[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourGlacia[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourGlacia[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourDrake[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourDrake[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderRoxanne[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderRoxanne[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderBrawly[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderBrawly[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderWattson[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderWattson[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderFlannery[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderFlannery[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderNorman[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderNorman[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderWinona[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderWinona[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderTateAndLiza[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderTateAndLiza[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderJuan[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderJuan[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SchoolKidM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SchoolKidM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SchoolKidF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SchoolKidF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SrAndJr[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokefanM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokefanM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokefanF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokefanF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Youngster[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Youngster[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ChampionWallace[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ChampionWallace[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Fisherman[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Fisherman[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CyclingTriathleteM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CyclingTriathleteF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RunningTriathleteM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RunningTriathleteF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmingTriathleteM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmingTriathleteF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_DragonTamer[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_DragonTamer[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_NinjaBoy[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_NinjaBoy[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BattleGirl[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BattleGirl[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ParasolLady[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ParasolLady[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmerF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmerF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Twins[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Twins[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Sailor[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Sailor[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaAdmin[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaAdmin[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Wally[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Wally[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Brendan[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Brendan[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_May[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_May[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BugCatcher[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BugCatcher[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonRangerM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonRangerM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonRangerF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonRangerF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaLeaderMaxie[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaLeaderMaxie[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Lass[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Lass[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_YoungCouple[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_YoungCouple[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_OldCouple[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_OldCouple[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SisAndBro[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SisAndBro[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Steven[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Steven[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SalonMaidenAnabel[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SalonMaidenAnabel[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_DomeAceTucker[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_DomeAceTucker[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PalaceMavenSpenser[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PalaceMavenSpenser[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ArenaTycoonGreta[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ArenaTycoonGreta[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_FactoryHeadNoland[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_FactoryHeadNoland[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PikeQueenLucy[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PikeQueenLucy[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PyramidKingBrandon[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PyramidKingBrandon[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Red[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Red[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Leaf[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Leaf[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RubySapphireBrendan[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RubySapphireBrendan[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RubySapphireMay[] ={
+    sAnim_GeneralFrame0,
 };
 
 const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
 {
-    [TRAINER_PIC_HIKER] = gTrainerFrontAnims_Hiker,
-    [TRAINER_PIC_AQUA_GRUNT_M] = gTrainerFrontAnims_AquaGruntM,
-    [TRAINER_PIC_POKEMON_BREEDER_F] = gTrainerFrontAnims_PokemonBreederF,
-    [TRAINER_PIC_COOLTRAINER_M] = gTrainerFrontAnims_CoolTrainerM,
-    [TRAINER_PIC_BIRD_KEEPER] = gTrainerFrontAnims_BirdKeeper,
-    [TRAINER_PIC_COLLECTOR] = gTrainerFrontAnims_Collector,
-    [TRAINER_PIC_AQUA_GRUNT_F] = gTrainerFrontAnims_AquaGruntF,
-    [TRAINER_PIC_SWIMMER_M] = gTrainerFrontAnims_SwimmerM,
-    [TRAINER_PIC_MAGMA_GRUNT_M] = gTrainerFrontAnims_MagmaGruntM,
-    [TRAINER_PIC_EXPERT_M] = gTrainerFrontAnims_ExpertM,
-    [TRAINER_PIC_AQUA_ADMIN_M] = gTrainerFrontAnims_AquaAdminM,
-    [TRAINER_PIC_BLACK_BELT] = gTrainerFrontAnims_BlackBelt,
-    [TRAINER_PIC_AQUA_ADMIN_F] = gTrainerFrontAnims_AquaAdminF,
-    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = gTrainerFrontAnims_AquaLeaderArchie,
-    [TRAINER_PIC_HEX_MANIAC] = gTrainerFrontAnims_HexManiac,
-    [TRAINER_PIC_AROMA_LADY] = gTrainerFrontAnims_AromaLady,
-    [TRAINER_PIC_RUIN_MANIAC] = gTrainerFrontAnims_RuinManiac,
-    [TRAINER_PIC_INTERVIEWER] = gTrainerFrontAnims_Interviewer,
-    [TRAINER_PIC_TUBER_F] = gTrainerFrontAnims_TuberF,
-    [TRAINER_PIC_TUBER_M] = gTrainerFrontAnims_TuberM,
-    [TRAINER_PIC_COOLTRAINER_F] = gTrainerFrontAnims_CoolTrainerF,
-    [TRAINER_PIC_LADY] = gTrainerFrontAnims_Lady,
-    [TRAINER_PIC_BEAUTY] = gTrainerFrontAnims_Beauty,
-    [TRAINER_PIC_RICH_BOY] = gTrainerFrontAnims_RichBoy,
-    [TRAINER_PIC_EXPERT_F] = gTrainerFrontAnims_ExpertF,
-    [TRAINER_PIC_POKEMANIAC] = gTrainerFrontAnims_Pokemaniac,
-    [TRAINER_PIC_MAGMA_GRUNT_F] = gTrainerFrontAnims_MagmaGruntF,
-    [TRAINER_PIC_GUITARIST] = gTrainerFrontAnims_Guitarist,
-    [TRAINER_PIC_KINDLER] = gTrainerFrontAnims_Kindler,
-    [TRAINER_PIC_CAMPER] = gTrainerFrontAnims_Camper,
-    [TRAINER_PIC_PICNICKER] = gTrainerFrontAnims_Picnicker,
-    [TRAINER_PIC_BUG_MANIAC] = gTrainerFrontAnims_BugManiac,
-    [TRAINER_PIC_POKEMON_BREEDER_M] = gTrainerFrontAnims_PokemonBreederM,
-    [TRAINER_PIC_PSYCHIC_M] = gTrainerFrontAnims_PsychicM,
-    [TRAINER_PIC_PSYCHIC_F] = gTrainerFrontAnims_PsychicF,
-    [TRAINER_PIC_GENTLEMAN] = gTrainerFrontAnims_Gentleman,
-    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = gTrainerFrontAnims_EliteFourSidney,
-    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = gTrainerFrontAnims_EliteFourPhoebe,
-    [TRAINER_PIC_ELITE_FOUR_GLACIA] = gTrainerFrontAnims_EliteFourGlacia,
-    [TRAINER_PIC_ELITE_FOUR_DRAKE] = gTrainerFrontAnims_EliteFourDrake,
-    [TRAINER_PIC_LEADER_ROXANNE] = gTrainerFrontAnims_LeaderRoxanne,
-    [TRAINER_PIC_LEADER_BRAWLY] = gTrainerFrontAnims_LeaderBrawly,
-    [TRAINER_PIC_LEADER_WATTSON] = gTrainerFrontAnims_LeaderWattson,
-    [TRAINER_PIC_LEADER_FLANNERY] = gTrainerFrontAnims_LeaderFlannery,
-    [TRAINER_PIC_LEADER_NORMAN] = gTrainerFrontAnims_LeaderNorman,
-    [TRAINER_PIC_LEADER_WINONA] = gTrainerFrontAnims_LeaderWinona,
-    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = gTrainerFrontAnims_LeaderTateAndLiza,
-    [TRAINER_PIC_LEADER_JUAN] = gTrainerFrontAnims_LeaderJuan,
-    [TRAINER_PIC_SCHOOL_KID_M] = gTrainerFrontAnims_SchoolKidM,
-    [TRAINER_PIC_SCHOOL_KID_F] = gTrainerFrontAnims_SchoolKidF,
-    [TRAINER_PIC_SR_AND_JR] = gTrainerFrontAnims_SrAndJr,
-    [TRAINER_PIC_POKEFAN_M] = gTrainerFrontAnims_PokefanM,
-    [TRAINER_PIC_POKEFAN_F] = gTrainerFrontAnims_PokefanF,
-    [TRAINER_PIC_YOUNGSTER] = gTrainerFrontAnims_Youngster,
-    [TRAINER_PIC_CHAMPION_WALLACE] = gTrainerFrontAnims_ChampionWallace,
-    [TRAINER_PIC_FISHERMAN] = gTrainerFrontAnims_Fisherman,
-    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = gTrainerFrontAnims_CyclingTriathleteM,
-    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = gTrainerFrontAnims_CyclingTriathleteF,
-    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = gTrainerFrontAnims_RunningTriathleteM,
-    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = gTrainerFrontAnims_RunningTriathleteF,
-    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = gTrainerFrontAnims_SwimmingTriathleteM,
-    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = gTrainerFrontAnims_SwimmingTriathleteF,
-    [TRAINER_PIC_DRAGON_TAMER] = gTrainerFrontAnims_DragonTamer,
-    [TRAINER_PIC_NINJA_BOY] = gTrainerFrontAnims_NinjaBoy,
-    [TRAINER_PIC_BATTLE_GIRL] = gTrainerFrontAnims_BattleGirl,
-    [TRAINER_PIC_PARASOL_LADY] = gTrainerFrontAnims_ParasolLady,
-    [TRAINER_PIC_SWIMMER_F] = gTrainerFrontAnims_SwimmerF,
-    [TRAINER_PIC_TWINS] = gTrainerFrontAnims_Twins,
-    [TRAINER_PIC_SAILOR] = gTrainerFrontAnims_Sailor,
-    [TRAINER_PIC_MAGMA_ADMIN] = gTrainerFrontAnims_MagmaAdmin,
-    [TRAINER_PIC_WALLY] = gTrainerFrontAnims_Wally,
-    [TRAINER_PIC_BRENDAN] = gTrainerFrontAnims_Brendan,
-    [TRAINER_PIC_MAY] = gTrainerFrontAnims_May,
-    [TRAINER_PIC_BUG_CATCHER] = gTrainerFrontAnims_BugCatcher,
-    [TRAINER_PIC_POKEMON_RANGER_M] = gTrainerFrontAnims_PokemonRangerM,
-    [TRAINER_PIC_POKEMON_RANGER_F] = gTrainerFrontAnims_PokemonRangerF,
-    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = gTrainerFrontAnims_MagmaLeaderMaxie,
-    [TRAINER_PIC_LASS] = gTrainerFrontAnims_Lass,
-    [TRAINER_PIC_YOUNG_COUPLE] = gTrainerFrontAnims_YoungCouple,
-    [TRAINER_PIC_OLD_COUPLE] = gTrainerFrontAnims_OldCouple,
-    [TRAINER_PIC_SIS_AND_BRO] = gTrainerFrontAnims_SisAndBro,
-    [TRAINER_PIC_STEVEN] = gTrainerFrontAnims_Steven,
-    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = gTrainerFrontAnims_SalonMaidenAnabel,
-    [TRAINER_PIC_DOME_ACE_TUCKER] = gTrainerFrontAnims_DomeAceTucker,
-    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = gTrainerFrontAnims_PalaceMavenSpenser,
-    [TRAINER_PIC_ARENA_TYCOON_GRETA] = gTrainerFrontAnims_ArenaTycoonGreta,
-    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = gTrainerFrontAnims_FactoryHeadNoland,
-    [TRAINER_PIC_PIKE_QUEEN_LUCY] = gTrainerFrontAnims_PikeQueenLucy,
-    [TRAINER_PIC_PYRAMID_KING_BRANDON] = gTrainerFrontAnims_PyramidKingBrandon,
-    [TRAINER_PIC_RED] = gTrainerFrontAnims_Red,
-    [TRAINER_PIC_LEAF] = gTrainerFrontAnims_Leaf,
-    [TRAINER_PIC_RS_BRENDAN] = gTrainerFrontAnims_RubySapphireBrendan,
-    [TRAINER_PIC_RS_MAY] = gTrainerFrontAnims_RubySapphireMay,
+    [TRAINER_PIC_HIKER] = sAnims_Hiker,
+    [TRAINER_PIC_AQUA_GRUNT_M] = sAnims_AquaGruntM,
+    [TRAINER_PIC_POKEMON_BREEDER_F] = sAnims_PokemonBreederF,
+    [TRAINER_PIC_COOLTRAINER_M] = sAnims_CoolTrainerM,
+    [TRAINER_PIC_BIRD_KEEPER] = sAnims_BirdKeeper,
+    [TRAINER_PIC_COLLECTOR] = sAnims_Collector,
+    [TRAINER_PIC_AQUA_GRUNT_F] = sAnims_AquaGruntF,
+    [TRAINER_PIC_SWIMMER_M] = sAnims_SwimmerM,
+    [TRAINER_PIC_MAGMA_GRUNT_M] = sAnims_MagmaGruntM,
+    [TRAINER_PIC_EXPERT_M] = sAnims_ExpertM,
+    [TRAINER_PIC_AQUA_ADMIN_M] = sAnims_AquaAdminM,
+    [TRAINER_PIC_BLACK_BELT] = sAnims_BlackBelt,
+    [TRAINER_PIC_AQUA_ADMIN_F] = sAnims_AquaAdminF,
+    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = sAnims_AquaLeaderArchie,
+    [TRAINER_PIC_HEX_MANIAC] = sAnims_HexManiac,
+    [TRAINER_PIC_AROMA_LADY] = sAnims_AromaLady,
+    [TRAINER_PIC_RUIN_MANIAC] = sAnims_RuinManiac,
+    [TRAINER_PIC_INTERVIEWER] = sAnims_Interviewer,
+    [TRAINER_PIC_TUBER_F] = sAnims_TuberF,
+    [TRAINER_PIC_TUBER_M] = sAnims_TuberM,
+    [TRAINER_PIC_COOLTRAINER_F] = sAnims_CoolTrainerF,
+    [TRAINER_PIC_LADY] = sAnims_Lady,
+    [TRAINER_PIC_BEAUTY] = sAnims_Beauty,
+    [TRAINER_PIC_RICH_BOY] = sAnims_RichBoy,
+    [TRAINER_PIC_EXPERT_F] = sAnims_ExpertF,
+    [TRAINER_PIC_POKEMANIAC] = sAnims_Pokemaniac,
+    [TRAINER_PIC_MAGMA_GRUNT_F] = sAnims_MagmaGruntF,
+    [TRAINER_PIC_GUITARIST] = sAnims_Guitarist,
+    [TRAINER_PIC_KINDLER] = sAnims_Kindler,
+    [TRAINER_PIC_CAMPER] = sAnims_Camper,
+    [TRAINER_PIC_PICNICKER] = sAnims_Picnicker,
+    [TRAINER_PIC_BUG_MANIAC] = sAnims_BugManiac,
+    [TRAINER_PIC_POKEMON_BREEDER_M] = sAnims_PokemonBreederM,
+    [TRAINER_PIC_PSYCHIC_M] = sAnims_PsychicM,
+    [TRAINER_PIC_PSYCHIC_F] = sAnims_PsychicF,
+    [TRAINER_PIC_GENTLEMAN] = sAnims_Gentleman,
+    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = sAnims_EliteFourSidney,
+    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = sAnims_EliteFourPhoebe,
+    [TRAINER_PIC_ELITE_FOUR_GLACIA] = sAnims_EliteFourGlacia,
+    [TRAINER_PIC_ELITE_FOUR_DRAKE] = sAnims_EliteFourDrake,
+    [TRAINER_PIC_LEADER_ROXANNE] = sAnims_LeaderRoxanne,
+    [TRAINER_PIC_LEADER_BRAWLY] = sAnims_LeaderBrawly,
+    [TRAINER_PIC_LEADER_WATTSON] = sAnims_LeaderWattson,
+    [TRAINER_PIC_LEADER_FLANNERY] = sAnims_LeaderFlannery,
+    [TRAINER_PIC_LEADER_NORMAN] = sAnims_LeaderNorman,
+    [TRAINER_PIC_LEADER_WINONA] = sAnims_LeaderWinona,
+    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = sAnims_LeaderTateAndLiza,
+    [TRAINER_PIC_LEADER_JUAN] = sAnims_LeaderJuan,
+    [TRAINER_PIC_SCHOOL_KID_M] = sAnims_SchoolKidM,
+    [TRAINER_PIC_SCHOOL_KID_F] = sAnims_SchoolKidF,
+    [TRAINER_PIC_SR_AND_JR] = sAnims_SrAndJr,
+    [TRAINER_PIC_POKEFAN_M] = sAnims_PokefanM,
+    [TRAINER_PIC_POKEFAN_F] = sAnims_PokefanF,
+    [TRAINER_PIC_YOUNGSTER] = sAnims_Youngster,
+    [TRAINER_PIC_CHAMPION_WALLACE] = sAnims_ChampionWallace,
+    [TRAINER_PIC_FISHERMAN] = sAnims_Fisherman,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = sAnims_CyclingTriathleteM,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = sAnims_CyclingTriathleteF,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = sAnims_RunningTriathleteM,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = sAnims_RunningTriathleteF,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = sAnims_SwimmingTriathleteM,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = sAnims_SwimmingTriathleteF,
+    [TRAINER_PIC_DRAGON_TAMER] = sAnims_DragonTamer,
+    [TRAINER_PIC_NINJA_BOY] = sAnims_NinjaBoy,
+    [TRAINER_PIC_BATTLE_GIRL] = sAnims_BattleGirl,
+    [TRAINER_PIC_PARASOL_LADY] = sAnims_ParasolLady,
+    [TRAINER_PIC_SWIMMER_F] = sAnims_SwimmerF,
+    [TRAINER_PIC_TWINS] = sAnims_Twins,
+    [TRAINER_PIC_SAILOR] = sAnims_Sailor,
+    [TRAINER_PIC_MAGMA_ADMIN] = sAnims_MagmaAdmin,
+    [TRAINER_PIC_WALLY] = sAnims_Wally,
+    [TRAINER_PIC_BRENDAN] = sAnims_Brendan,
+    [TRAINER_PIC_MAY] = sAnims_May,
+    [TRAINER_PIC_BUG_CATCHER] = sAnims_BugCatcher,
+    [TRAINER_PIC_POKEMON_RANGER_M] = sAnims_PokemonRangerM,
+    [TRAINER_PIC_POKEMON_RANGER_F] = sAnims_PokemonRangerF,
+    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = sAnims_MagmaLeaderMaxie,
+    [TRAINER_PIC_LASS] = sAnims_Lass,
+    [TRAINER_PIC_YOUNG_COUPLE] = sAnims_YoungCouple,
+    [TRAINER_PIC_OLD_COUPLE] = sAnims_OldCouple,
+    [TRAINER_PIC_SIS_AND_BRO] = sAnims_SisAndBro,
+    [TRAINER_PIC_STEVEN] = sAnims_Steven,
+    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = sAnims_SalonMaidenAnabel,
+    [TRAINER_PIC_DOME_ACE_TUCKER] = sAnims_DomeAceTucker,
+    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = sAnims_PalaceMavenSpenser,
+    [TRAINER_PIC_ARENA_TYCOON_GRETA] = sAnims_ArenaTycoonGreta,
+    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = sAnims_FactoryHeadNoland,
+    [TRAINER_PIC_PIKE_QUEEN_LUCY] = sAnims_PikeQueenLucy,
+    [TRAINER_PIC_PYRAMID_KING_BRANDON] = sAnims_PyramidKingBrandon,
+    [TRAINER_PIC_RED] = sAnims_Red,
+    [TRAINER_PIC_LEAF] = sAnims_Leaf,
+    [TRAINER_PIC_RS_BRENDAN] = sAnims_RubySapphireBrendan,
+    [TRAINER_PIC_RS_MAY] = sAnims_RubySapphireMay,
 };

src/data/trainer_graphics/front_pic_tables.h

@@ -1,290 +1,290 @@
 const struct MonCoords gTrainerFrontPicCoords[] =
 {
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_HIKER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_GRUNT_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_BREEDER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_COOLTRAINER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BIRD_KEEPER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_COLLECTOR] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_GRUNT_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_GRUNT_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_EXPERT_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_ADMIN_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BLACK_BELT] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_ADMIN_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_HEX_MANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AROMA_LADY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RUIN_MANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_INTERVIEWER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_TUBER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_TUBER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_COOLTRAINER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LADY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BEAUTY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RICH_BOY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_EXPERT_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_GRUNT_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_GUITARIST] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_KINDLER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_CAMPER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PICNICKER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BUG_MANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_BREEDER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PSYCHIC_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PSYCHIC_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_GENTLEMAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_GLACIA] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_DRAKE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_ROXANNE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_BRAWLY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_WATTSON] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_FLANNERY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_NORMAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_WINONA] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_JUAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SCHOOL_KID_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SCHOOL_KID_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SR_AND_JR] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_POKEFAN_M] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_POKEFAN_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_YOUNGSTER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_CHAMPION_WALLACE] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_FISHERMAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_DRAGON_TAMER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_NINJA_BOY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BATTLE_GIRL] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_PARASOL_LADY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_TWINS] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SAILOR] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_ADMIN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_WALLY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BRENDAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BUG_CATCHER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_RANGER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_RANGER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LASS] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_YOUNG_COUPLE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_OLD_COUPLE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SIS_AND_BRO] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_STEVEN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_DOME_ACE_TUCKER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ARENA_TYCOON_GRETA] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PIKE_QUEEN_LUCY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PYRAMID_KING_BRANDON] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RED] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEAF] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RS_BRENDAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RS_MAY] = {.size = 8, .y_offset = 1},
 };
 
 const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
 {
-    gTrainerFrontPic_Hiker, 0x800, 0,
-    gTrainerFrontPic_AquaGruntM, 0x800, 1,
-    gTrainerFrontPic_PokemonBreederF, 0x800, 2,
-    gTrainerFrontPic_CoolTrainerM, 0x800, 3,
-    gTrainerFrontPic_BirdKeeper, 0x800, 4,
-    gTrainerFrontPic_Collector, 0x800, 5,
-    gTrainerFrontPic_AquaGruntF, 0x800, 6,
-    gTrainerFrontPic_SwimmerM, 0x800, 7,
-    gTrainerFrontPic_MagmaGruntM, 0x800, 8,
-    gTrainerFrontPic_ExpertM, 0x800, 9,
-    gTrainerFrontPic_AquaAdminM, 0x800, 10,
-    gTrainerFrontPic_BlackBelt, 0x800, 11,
-    gTrainerFrontPic_AquaAdminF, 0x800, 12,
-    gTrainerFrontPic_AquaLeaderArchie, 0x800, 13,
-    gTrainerFrontPic_HexManiac, 0x800, 14,
-    gTrainerFrontPic_AromaLady, 0x800, 15,
-    gTrainerFrontPic_RuinManiac, 0x800, 16,
-    gTrainerFrontPic_Interviewer, 0x800, 17,
-    gTrainerFrontPic_TuberF, 0x800, 18,
-    gTrainerFrontPic_TuberM, 0x800, 19,
-    gTrainerFrontPic_CoolTrainerF, 0x800, 20,
-    gTrainerFrontPic_Lady, 0x800, 21,
-    gTrainerFrontPic_Beauty, 0x800, 22,
-    gTrainerFrontPic_RichBoy, 0x800, 23,
-    gTrainerFrontPic_ExpertF, 0x800, 24,
-    gTrainerFrontPic_Pokemaniac, 0x800, 25,
-    gTrainerFrontPic_MagmaGruntF, 0x800, 26,
-    gTrainerFrontPic_Guitarist, 0x800, 27,
-    gTrainerFrontPic_Kindler, 0x800, 28,
-    gTrainerFrontPic_Camper, 0x800, 29,
-    gTrainerFrontPic_Picnicker, 0x800, 30,
-    gTrainerFrontPic_BugManiac, 0x800, 31,
-    gTrainerFrontPic_PokemonBreederM, 0x800, 32,
-    gTrainerFrontPic_PsychicM, 0x800, 33,
-    gTrainerFrontPic_PsychicF, 0x800, 34,
-    gTrainerFrontPic_Gentleman, 0x800, 35,
-    gTrainerFrontPic_EliteFourSidney, 0x800, 36,
-    gTrainerFrontPic_EliteFourPhoebe, 0x800, 37,
-    gTrainerFrontPic_EliteFourGlacia, 0x800, 38,
-    gTrainerFrontPic_EliteFourDrake, 0x800, 39,
-    gTrainerFrontPic_LeaderRoxanne, 0x800, 40,
-    gTrainerFrontPic_LeaderBrawly, 0x800, 41,
-    gTrainerFrontPic_LeaderWattson, 0x800, 42,
-    gTrainerFrontPic_LeaderFlannery, 0x800, 43,
-    gTrainerFrontPic_LeaderNorman, 0x800, 44,
-    gTrainerFrontPic_LeaderWinona, 0x800, 45,
-    gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46,
-    gTrainerFrontPic_LeaderJuan, 0x800, 47,
-    gTrainerFrontPic_SchoolKidM, 0x800, 48,
-    gTrainerFrontPic_SchoolKidF, 0x800, 49,
-    gTrainerFrontPic_SrAndJr, 0x1000, 50,
-    gTrainerFrontPic_PokefanM, 0x1000, 51,
-    gTrainerFrontPic_PokefanF, 0x800, 52,
-    gTrainerFrontPic_Youngster, 0x800, 53,
-    gTrainerFrontPic_ChampionWallace, 0x1000, 54,
-    gTrainerFrontPic_Fisherman, 0x800, 55,
-    gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56,
-    gTrainerFrontPic_CyclingTriathleteF, 0x800, 57,
-    gTrainerFrontPic_RunningTriathleteM, 0x800, 58,
-    gTrainerFrontPic_RunningTriathleteF, 0x800, 59,
-    gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60,
-    gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61,
-    gTrainerFrontPic_DragonTamer, 0x800, 62,
-    gTrainerFrontPic_NinjaBoy, 0x800, 63,
-    gTrainerFrontPic_BattleGirl, 0x1000, 64,
-    gTrainerFrontPic_ParasolLady, 0x800, 65,
-    gTrainerFrontPic_SwimmerF, 0x800, 66,
-    gTrainerFrontPic_Twins, 0x800, 67,
-    gTrainerFrontPic_Sailor, 0x800, 68,
-    gTrainerFrontPic_MagmaAdmin, 0x800, 69,
-    gTrainerFrontPic_Wally, 0x800, 70,
-    gTrainerFrontPic_Brendan, 0x800, 71,
-    gTrainerFrontPic_May, 0x800, 72,
-    gTrainerFrontPic_BugCatcher, 0x800, 73,
-    gTrainerFrontPic_PokemonRangerM, 0x800, 74,
-    gTrainerFrontPic_PokemonRangerF, 0x800, 75,
-    gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76,
-    gTrainerFrontPic_Lass, 0x800, 77,
-    gTrainerFrontPic_YoungCouple, 0x800, 78,
-    gTrainerFrontPic_OldCouple, 0x800, 79,
-    gTrainerFrontPic_SisAndBro, 0x800, 80,
-    gTrainerFrontPic_Steven, 0x800, 81,
-    gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82,
-    gTrainerFrontPic_DomeAceTucker, 0x800, 83,
-    gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84,
-    gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85,
-    gTrainerFrontPic_FactoryHeadNoland, 0x800, 86,
-    gTrainerFrontPic_PikeQueenLucy, 0x800, 87,
-    gTrainerFrontPic_PyramidKingBrandon, 0x800, 88,
-    gTrainerFrontPic_Red, 0x800, 89,
-    gTrainerFrontPic_Leaf, 0x800, 90,
-    gTrainerFrontPic_RubySapphireBrendan, 0x800, 91,
-    gTrainerFrontPic_RubySapphireMay, 0x800, 92,
+    TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, 0x800),
+    TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, 0x800),
+    TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, 0x800),
+    TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, 0x800),
+    TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, 0x800),
+    TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, 0x800),
+    TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, 0x800),
+    TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, 0x800),
+    TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, 0x800),
+    TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, 0x800),
+    TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, 0x800),
+    TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, 0x800),
+    TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, 0x800),
+    TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, 0x800),
+    TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, 0x800),
+    TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, 0x800),
+    TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, 0x800),
+    TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, 0x800),
+    TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, 0x800),
+    TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, 0x800),
+    TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, 0x800),
+    TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, 0x800),
+    TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, 0x800),
+    TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, 0x800),
+    TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, 0x800),
+    TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, 0x800),
+    TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, 0x800),
+    TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, 0x800),
+    TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, 0x800),
+    TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, 0x800),
+    TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, 0x800),
+    TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, 0x800),
+    TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, 0x800),
+    TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, 0x800),
+    TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, 0x800),
+    TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, 0x800),
+    TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, 0x800),
+    TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, 0x800),
+    TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, 0x800),
+    TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, 0x800),
+    TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, 0x800),
+    TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, 0x800),
+    TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, 0x800),
+    TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, 0x800),
+    TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, 0x800),
+    TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, 0x800),
+    TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, 0x1000),
+    TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, 0x1000),
+    TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, 0x800),
+    TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, 0x800),
+    TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, 0x1000),
+    TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, 0x800),
+    TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, 0x1000),
+    TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, 0x800),
+    TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, 0x800),
+    TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, 0x800),
+    TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, 0x800),
+    TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, 0x800),
+    TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, 0x800),
+    TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, 0x800),
+    TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, 0x1000),
+    TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, 0x800),
+    TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, 0x800),
+    TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, 0x800),
+    TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, 0x800),
+    TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, 0x800),
+    TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, 0x800),
+    TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, 0x800),
+    TRAINER_SPRITE(MAY, gTrainerFrontPic_May, 0x800),
+    TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, 0x800),
+    TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, 0x800),
+    TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, 0x800),
+    TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, 0x800),
+    TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, 0x800),
+    TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, 0x800),
+    TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, 0x800),
+    TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, 0x800),
+    TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, 0x800),
+    TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, 0x800),
+    TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, 0x800),
+    TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, 0x800),
+    TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, 0x1000),
+    TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, 0x800),
+    TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, 0x800),
+    TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, 0x800),
+    TRAINER_SPRITE(RED, gTrainerFrontPic_Red, 0x800),
+    TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, 0x800),
+    TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, 0x800),
+    TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, 0x800),
 };
 
 const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
 {
-    gTrainerPalette_Hiker, 0,
-    gTrainerPalette_AquaGruntM, 1,
-    gTrainerPalette_PokemonBreederF, 2,
-    gTrainerPalette_CoolTrainerM, 3,
-    gTrainerPalette_BirdKeeper, 4,
-    gTrainerPalette_Collector, 5,
-    gTrainerPalette_AquaGruntF, 6,
-    gTrainerPalette_SwimmerM, 7,
-    gTrainerPalette_MagmaGruntM, 8,
-    gTrainerPalette_ExpertM, 9,
-    gTrainerPalette_AquaAdminM, 10,
-    gTrainerPalette_BlackBelt, 11,
-    gTrainerPalette_AquaAdminF, 12,
-    gTrainerPalette_AquaLeaderArchie, 13,
-    gTrainerPalette_HexManiac, 14,
-    gTrainerPalette_AromaLady, 15,
-    gTrainerPalette_RuinManiac, 16,
-    gTrainerPalette_Interviewer, 17,
-    gTrainerPalette_TuberF, 18,
-    gTrainerPalette_TuberM, 19,
-    gTrainerPalette_CoolTrainerF, 20,
-    gTrainerPalette_Lady, 21,
-    gTrainerPalette_Beauty, 22,
-    gTrainerPalette_RichBoy, 23,
-    gTrainerPalette_ExpertF, 24,
-    gTrainerPalette_Pokemaniac, 25,
-    gTrainerPalette_MagmaGruntF, 26,
-    gTrainerPalette_Guitarist, 27,
-    gTrainerPalette_Kindler, 28,
-    gTrainerPalette_Camper, 29,
-    gTrainerPalette_Picnicker, 30,
-    gTrainerPalette_BugManiac, 31,
-    gTrainerPalette_PokemonBreederM, 32,
-    gTrainerPalette_PsychicM, 33,
-    gTrainerPalette_PsychicF, 34,
-    gTrainerPalette_Gentleman, 35,
-    gTrainerPalette_EliteFourSidney, 36,
-    gTrainerPalette_EliteFourPhoebe, 37,
-    gTrainerPalette_EliteFourGlacia, 38,
-    gTrainerPalette_EliteFourDrake, 39,
-    gTrainerPalette_LeaderRoxanne, 40,
-    gTrainerPalette_LeaderBrawly, 41,
-    gTrainerPalette_LeaderWattson, 42,
-    gTrainerPalette_LeaderFlannery, 43,
-    gTrainerPalette_LeaderNorman, 44,
-    gTrainerPalette_LeaderWinona, 45,
-    gTrainerPalette_LeaderTateAndLiza, 46,
-    gTrainerPalette_LeaderJuan, 47,
-    gTrainerPalette_SchoolKidM, 48,
-    gTrainerPalette_SchoolKidF, 49,
-    gTrainerPalette_SrAndJr, 50,
-    gTrainerPalette_PokefanM, 51,
-    gTrainerPalette_PokefanF, 52,
-    gTrainerPalette_Youngster, 53,
-    gTrainerPalette_ChampionWallace, 54,
-    gTrainerPalette_Fisherman, 55,
-    gTrainerPalette_CyclingTriathleteM, 56,
-    gTrainerPalette_CyclingTriathleteF, 57,
-    gTrainerPalette_RunningTriathleteM, 58,
-    gTrainerPalette_RunningTriathleteF, 59,
-    gTrainerPalette_SwimmingTriathleteM, 60,
-    gTrainerPalette_SwimmingTriathleteF, 61,
-    gTrainerPalette_DragonTamer, 62,
-    gTrainerPalette_NinjaBoy, 63,
-    gTrainerPalette_BattleGirl, 64,
-    gTrainerPalette_ParasolLady, 65,
-    gTrainerPalette_SwimmerF, 66,
-    gTrainerPalette_Twins, 67,
-    gTrainerPalette_Sailor, 68,
-    gTrainerPalette_MagmaAdmin, 69,
-    gTrainerPalette_Wally, 70,
-    gTrainerPalette_Brendan, 71,
-    gTrainerPalette_May, 72,
-    gTrainerPalette_BugCatcher, 73,
-    gTrainerPalette_PokemonRangerM, 74,
-    gTrainerPalette_PokemonRangerF, 75,
-    gTrainerPalette_MagmaLeaderMaxie, 76,
-    gTrainerPalette_Lass, 77,
-    gTrainerPalette_YoungCouple, 78,
-    gTrainerPalette_OldCouple, 79,
-    gTrainerPalette_SisAndBro, 80,
-    gTrainerPalette_Steven, 81,
-    gTrainerPalette_SalonMaidenAnabel, 82,
-    gTrainerPalette_DomeAceTucker, 83,
-    gTrainerPalette_PalaceMavenSpenser, 84,
-    gTrainerPalette_ArenaTycoonGreta, 85,
-    gTrainerPalette_FactoryHeadNoland, 86,
-    gTrainerPalette_PikeQueenLucy, 87,
-    gTrainerPalette_PyramidKingBrandon, 88,
-    gTrainerPalette_Red, 89,
-    gTrainerPalette_Leaf, 90,
-    gTrainerPalette_RubySapphireBrendan, 91,
-    gTrainerPalette_RubySapphireMay, 92,
+    TRAINER_PAL(HIKER, gTrainerPalette_Hiker),
+    TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM),
+    TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF),
+    TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CoolTrainerM),
+    TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper),
+    TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector),
+    TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF),
+    TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM),
+    TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM),
+    TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM),
+    TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM),
+    TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt),
+    TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF),
+    TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie),
+    TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac),
+    TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady),
+    TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac),
+    TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer),
+    TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF),
+    TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM),
+    TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CoolTrainerF),
+    TRAINER_PAL(LADY, gTrainerPalette_Lady),
+    TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty),
+    TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy),
+    TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF),
+    TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac),
+    TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF),
+    TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist),
+    TRAINER_PAL(KINDLER, gTrainerPalette_Kindler),
+    TRAINER_PAL(CAMPER, gTrainerPalette_Camper),
+    TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker),
+    TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac),
+    TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM),
+    TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM),
+    TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF),
+    TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman),
+    TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney),
+    TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe),
+    TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia),
+    TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake),
+    TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne),
+    TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly),
+    TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson),
+    TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery),
+    TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman),
+    TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona),
+    TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza),
+    TRAINER_PAL(LEADER_JUAN, gTrainerPalette_LeaderJuan),
+    TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM),
+    TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF),
+    TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr),
+    TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM),
+    TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF),
+    TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster),
+    TRAINER_PAL(CHAMPION_WALLACE, gTrainerPalette_ChampionWallace),
+    TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman),
+    TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM),
+    TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF),
+    TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM),
+    TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF),
+    TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM),
+    TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF),
+    TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer),
+    TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy),
+    TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl),
+    TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady),
+    TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF),
+    TRAINER_PAL(TWINS, gTrainerPalette_Twins),
+    TRAINER_PAL(SAILOR, gTrainerPalette_Sailor),
+    TRAINER_PAL(MAGMA_ADMIN, gTrainerPalette_MagmaAdmin),
+    TRAINER_PAL(WALLY, gTrainerPalette_Wally),
+    TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan),
+    TRAINER_PAL(MAY, gTrainerPalette_May),
+    TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher),
+    TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM),
+    TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF),
+    TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie),
+    TRAINER_PAL(LASS, gTrainerPalette_Lass),
+    TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple),
+    TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple),
+    TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro),
+    TRAINER_PAL(STEVEN, gTrainerPalette_Steven),
+    TRAINER_PAL(SALON_MAIDEN_ANABEL, gTrainerPalette_SalonMaidenAnabel),
+    TRAINER_PAL(DOME_ACE_TUCKER, gTrainerPalette_DomeAceTucker),
+    TRAINER_PAL(PALACE_MAVEN_SPENSER, gTrainerPalette_PalaceMavenSpenser),
+    TRAINER_PAL(ARENA_TYCOON_GRETA, gTrainerPalette_ArenaTycoonGreta),
+    TRAINER_PAL(FACTORY_HEAD_NOLAND, gTrainerPalette_FactoryHeadNoland),
+    TRAINER_PAL(PIKE_QUEEN_LUCY, gTrainerPalette_PikeQueenLucy),
+    TRAINER_PAL(PYRAMID_KING_BRANDON, gTrainerPalette_PyramidKingBrandon),
+    TRAINER_PAL(RED, gTrainerPalette_Red),
+    TRAINER_PAL(LEAF, gTrainerPalette_Leaf),
+    TRAINER_PAL(RS_BRENDAN, gTrainerPalette_RubySapphireBrendan),
+    TRAINER_PAL(RS_MAY, gTrainerPalette_RubySapphireMay),
 };

src/data/wild_encounters.json.txt

@@ -0,0 +1,67 @@
+{{ doNotModifyHeader }}
+## for wild_encounter_group in wild_encounter_groups
+## for encounter in wild_encounter_group.encounters
+{% if existsIn(encounter, "land_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_LandMons[] =
+{
+## for wild_mon in encounter.land_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_LandMonsInfo = { {{encounter.land_mons.encounter_rate}}, {{ encounter.base_label }}_LandMons };
+{% endif %}
+{% if existsIn(encounter, "water_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_WaterMons[] =
+{
+## for wild_mon in encounter.water_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_WaterMonsInfo = { {{encounter.water_mons.encounter_rate}}, {{ encounter.base_label }}_WaterMons };
+{% endif %}
+{% if existsIn(encounter, "rock_smash_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_RockSmashMons[] =
+{
+## for wild_mon in encounter.rock_smash_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_RockSmashMonsInfo = { {{encounter.rock_smash_mons.encounter_rate}}, {{ encounter.base_label }}_RockSmashMons };
+{% endif %}
+{% if existsIn(encounter, "fishing_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_FishingMons[] =
+{
+## for wild_mon in encounter.fishing_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_FishingMonsInfo = { {{encounter.fishing_mons.encounter_rate}}, {{ encounter.base_label }}_FishingMons };
+{% endif %}
+## endfor
+
+const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
+{
+## for encounter in wild_encounter_group.encounters
+    {
+        .mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ removePrefix(encounter.map, "MAP_") }}){% else %}0{% endif %},
+        .mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ removePrefix(encounter.map, "MAP_") }}){% else %}{{ loop.index1 }}{% endif %},
+        .landMonsInfo = {% if existsIn(encounter, "land_mons") %}&{{ encounter.base_label }}_LandMonsInfo{% else %}NULL{% endif %},
+        .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %},
+        .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %},
+        .fishingMonsInfo = {% if existsIn(encounter, "fishing_mons") %}&{{ encounter.base_label }}_FishingMonsInfo{% else %}NULL{% endif %},
+    },
+## endfor
+    {
+        .mapGroup = MAP_GROUP(UNDEFINED),
+        .mapNum = MAP_NUM(UNDEFINED),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+};
+## endfor

src/decompress.c

@@ -1,15 +1,13 @@
 #include "global.h"
-#include "decompress.h"
-#include "constants/species.h"
-#include "text.h"
 #include "alloc.h"
+#include "data.h"
+#include "decompress.h"
 #include "pokemon.h"
+#include "text.h"
+#include "constants/species.h"
 
 EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
-
 static void DuplicateDeoxysTiles(void *pointer, s32 species);
 
 void LZDecompressWram(const u32 *src, void *dest)

src/decoration_inventory.c

@@ -32,7 +32,7 @@ void SetDecorationInventoriesPointers(void)
     SET_DECOR_INV(5, gSaveBlock1Ptr->decorPoster);
     SET_DECOR_INV(6, gSaveBlock1Ptr->decorDoll);
     SET_DECOR_INV(7, gSaveBlock1Ptr->decorCushion);
-    sub_8126968();
+    InitDecorationContextItems();
 }
 
 static void ClearDecorationInventory(u8 idx)
@@ -120,7 +120,7 @@ bool8 DecorationCheckSpace(u8 decor)
 s8 DecorationRemove(u8 decor)
 {
     u8 i;
-    u8 idx;
+    u8 category;
 
     i = 0;
     if (decor == DECOR_NONE)
@@ -129,38 +129,38 @@ s8 DecorationRemove(u8 decor)
     }
     for (i = 0; i < gDecorationInventories[gDecorations[decor].category].size; i ++)
     {
-        idx = gDecorations[decor].category;
-        if (gDecorationInventories[idx].items[i] == decor)
+        category = gDecorations[decor].category;
+        if (gDecorationInventories[category].items[i] == decor)
         {
-            gDecorationInventories[idx].items[i] = DECOR_NONE;
-            CondenseDecorationCategoryN(idx);
+            gDecorationInventories[category].items[i] = DECOR_NONE;
+            CondenseDecorationsInCategory(category);
             return 1;
         }
     }
     return 0;
 }
 
-void CondenseDecorationCategoryN(u8 idx)
+void CondenseDecorationsInCategory(u8 category)
 {
     u8 i;
     u8 j;
     u8 tmp;
 
-    for (i = 0; i < gDecorationInventories[idx].size; i ++)
+    for (i = 0; i < gDecorationInventories[category].size; i ++)
     {
-        for (j = i + 1; j < gDecorationInventories[idx].size; j ++)
+        for (j = i + 1; j < gDecorationInventories[category].size; j ++)
         {
-            if (gDecorationInventories[idx].items[j] != DECOR_NONE && (gDecorationInventories[idx].items[i] == DECOR_NONE || gDecorationInventories[idx].items[i] > gDecorationInventories[idx].items[j]))
+            if (gDecorationInventories[category].items[j] != DECOR_NONE && (gDecorationInventories[category].items[i] == DECOR_NONE || gDecorationInventories[category].items[i] > gDecorationInventories[category].items[j]))
             {
-                tmp = gDecorationInventories[idx].items[i];
-                gDecorationInventories[idx].items[i] = gDecorationInventories[idx].items[j];
-                gDecorationInventories[idx].items[j] = tmp;
+                tmp = gDecorationInventories[category].items[i];
+                gDecorationInventories[category].items[i] = gDecorationInventories[category].items[j];
+                gDecorationInventories[category].items[j] = tmp;
             }
         }
     }
 }
 
-u8 CountDecorationCategoryN(u8 idx)
+u8 GetNumOwnedDecorationsInCategory(u8 idx)
 {
     u8 i;
     u8 ct;
@@ -176,15 +176,14 @@ u8 CountDecorationCategoryN(u8 idx)
     return ct;
 }
 
-u8 CountDecorations(void)
+u8 GetNumOwnedDecorations(void)
 {
-    u8 idx;
-    u8 ct;
+    u8 category;
+    u8 count;
 
-    ct = 0;
-    for (idx = 0; idx < 8; idx ++)
-    {
-        ct += CountDecorationCategoryN(idx);
-    }
-    return ct;
+    count = 0;
+    for (category = 0; category < DECORCAT_COUNT; category++)
+        count += GetNumOwnedDecorationsInCategory(category);
+
+    return count;
 }

src/diploma.c

@@ -14,6 +14,7 @@
 #include "overworld.h"
 #include "menu.h"
 #include "pokedex.h"
+#include "constants/rgb.h"
 
 extern const u8 gText_DexNational[];
 extern const u8 gText_DexHoenn[];
@@ -83,7 +84,7 @@ void CB2_ShowDiploma(void)
     CopyBgTilemapBufferToVram(1);
     DisplayDiplomaText();
     BlendPalettes(-1, 16, 0);
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
     EnableInterrupts(1);
     SetVBlankCallback(VBlankCB);
     SetMainCallback2(MainCB2);
@@ -108,7 +109,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId)
 {
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
         gTasks[taskId].func = Task_DiplomaFadeOut;
     }
 }

src/dodrio_berry_picking.c

@@ -360,7 +360,7 @@ void sub_8024BC8(u8 taskId)
         {
             if (gReceivedRemoteLinkPlayers != 0)
             {
-                sub_800E0E8();
+                LoadWirelessStatusIndicatorSpriteGfx();
                 CreateWirelessStatusIndicatorSprite(0, 0);
             }
             gUnknown_02022C98->unk_000C++;

src/easy_chat.c

@@ -2,7 +2,7 @@
 #include "alloc.h"
 #include "bard_music.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dewford_trend.h"
 #include "dynamic_placeholder_text_util.h"
@@ -32,6 +32,7 @@
 #include "constants/flags.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/rgb.h"
 
 #define EZCHAT_TASK_STATE        0
 #define EZCHAT_TASK_TYPE         1
@@ -1139,20 +1140,20 @@ static void sub_811A2FC(u8 taskId)
     case 0:
         SetVBlankCallback(VBlankCallback_EasyChatScreen);
         BlendPalettes(0xFFFFFFFF, 16, 0);
-        BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
         data[EZCHAT_TASK_STATE] = 5;
         break;
     case 1:
         v0 = sub_811AAAC();
         if (sub_811A88C(v0))
         {
-            BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
             data[EZCHAT_TASK_STATE] = 3;
             data[EZCHAT_TASK_UNK06] = v0;
         }
         else if (v0 == 0x18)
         {
-            BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
             data[EZCHAT_TASK_STATE] = 4;
         }
         else if (v0 != 0)

src/egg_hatch.c

@@ -33,7 +33,9 @@
 #include "naming_screen.h"
 #include "pokemon_storage_system.h"
 #include "field_screen_effect.h"
+#include "data.h"
 #include "battle.h" // to get rid of later
+#include "constants/rgb.h"
 
 struct EggHatchData
 {
@@ -52,7 +54,6 @@ struct EggHatchData
     u8 textColor[3];
 };
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
 extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NickHatchPrompt[];
@@ -596,7 +597,7 @@ static void CB2_EggHatch_1(void)
     switch (sEggHatchData->CB2_state)
     {
     case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5);
         ShowBg(0);
         ShowBg(1);
@@ -679,7 +680,7 @@ static void CB2_EggHatch_1(void)
         }
         break;
     case 11:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         sEggHatchData->CB2_state++;
         break;
     case 12:
@@ -789,7 +790,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
 {
     s16 i;
     if (sprite->data[0] == 0)
-        BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF);
+        BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_WHITEALPHA);
     if (sprite->data[0] < 4u)
     {
         for (i = 0; i <= 3; i++)
@@ -813,7 +814,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite)
         StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1);
     }
     if (sprite->data[0] == 8)
-        BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF);
+        BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, RGB_WHITEALPHA);
     if (sprite->data[0] <= 9)
         gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1;
     if (sprite->data[0] > 40)

src/event_object_movement.c

@@ -25,6 +25,7 @@
 #include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 #include "constants/field_effects.h"
+#include "constants/items.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
 
@@ -1534,10 +1535,10 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
         paletteSlot -= 16;
         sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
     }
+
     if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE)
-    {
         eventObject->invisible = TRUE;
-    }
+
     *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
     spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
     if (spriteId == MAX_SPRITES)
@@ -1545,6 +1546,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
         gEventObjects[eventObjectId].active = FALSE;
         return EVENT_OBJECTS_COUNT;
     }
+
     sprite = &gSprites[spriteId];
     sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
@@ -1557,15 +1559,14 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
     eventObject->spriteId = spriteId;
     eventObject->inanimate = graphicsInfo->inanimate;
     if (!eventObject->inanimate)
-    {
         StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection));
-    }
+
     SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
     UpdateEventObjectVisibility(eventObject, sprite);
     return eventObjectId;
 }
 
-static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+static u8 TrySpawnEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
 {
     u8 eventObjectId;
     struct SpriteTemplate spriteTemplate;
@@ -1579,14 +1580,12 @@ static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u
     spriteTemplate.images = &spriteFrameImage;
     eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
     if (eventObjectId == EVENT_OBJECTS_COUNT)
-    {
         return EVENT_OBJECTS_COUNT;
-    }
+
     gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images;
-    if (subspriteTables != NULL)
-    {
+    if (subspriteTables)
         SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables);
-    }
+
     return eventObjectId;
 }
 
@@ -1596,7 +1595,7 @@ u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate)
     s16 cameraY;
 
     GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
-    return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+    return TrySpawnEventObjectTemplate(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
 }
 
 u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
@@ -1619,19 +1618,17 @@ u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 l
     return SpawnSpecialEventObject(&eventObjectTemplate);
 }
 
-u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup)
+u8 TrySpawnEventObject(u8 localId, u8 mapNum, u8 mapGroup)
 {
     struct EventObjectTemplate *eventObjectTemplate;
-    s16 cameraX;
-    s16 cameraY;
+    s16 cameraX, cameraY;
 
     eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
-    if (eventObjectTemplate == NULL)
-    {
+    if (!eventObjectTemplate)
         return EVENT_OBJECTS_COUNT;
-    }
+
     GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
-    return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
+    return TrySpawnEventObjectTemplate(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
 }
 
 static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables)
@@ -1765,7 +1762,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY)
 
             if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX
                 && !FlagGet(template->flagId))
-                TrySpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+                TrySpawnEventObjectTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
         }
     }
 }
@@ -2009,10 +2006,9 @@ static void get_berry_tree_graphics(struct EventObject *eventObject, struct Spri
         sprite->invisible = FALSE;
         berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1;
         berryStage--;
-        if (berryId >= NUM_BERRIES)
-        {
+        if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX))
             berryId = 0;
-        }
+
         EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]);
         sprite->images = gBerryTreePicTablePointers[berryId];
         sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage];
@@ -2245,7 +2241,7 @@ static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y)
     eventObject->currentCoords.y = y;
 }
 
-void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y)
+void MoveEventObjectToMapCoords(struct EventObject *eventObject, s16 x, s16 y)
 {
     struct Sprite *sprite;
     const struct EventObjectGraphicsInfo *graphicsInfo;
@@ -2260,20 +2256,17 @@ void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y)
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
     sub_808E38C(eventObject);
     if (eventObject->trackedByCamera)
-    {
         CameraObjectReset1();
-    }
 }
 
-void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
+void TryMoveEventObjectToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
     u8 eventObjectId;
-
     if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         x += 7;
         y += 7;
-        sub_808EB08(&gEventObjects[eventObjectId], x, y);
+        MoveEventObjectToMapCoords(&gEventObjects[eventObjectId], x, y);
     }
 }
 
@@ -2604,15 +2597,13 @@ void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject)
     }
 }
 
-void OverrideMovementTypeForEventObject(const struct EventObject *eventObject, const u8 *script)
+static void OverrideEventObjectTemplateScript(const struct EventObject *eventObject, const u8 *script)
 {
     struct EventObjectTemplate *eventObjectTemplate;
 
     eventObjectTemplate = GetBaseTemplateForEventObject(eventObject);
-    if (eventObjectTemplate != NULL)
-    {
+    if (eventObjectTemplate)
         eventObjectTemplate->script = script;
-    }
 }
 
 void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType)
@@ -2626,30 +2617,26 @@ void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObje
     }
 }
 
-void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup)
+void TryOverrideEventObjectTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup)
 {
     u8 eventObjectId;
-
     if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
-    {
         OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]);
-    }
 }
 
-void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
+void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorationCategory)
 {
     u8 eventObjectId;
-
     if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        switch (decorCat)
+        switch (decorationCategory)
         {
-            case DECORCAT_DOLL:
-                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_SecretPower1);
-                break;
-            case DECORCAT_CUSHION:
-                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_SecretPower2);
-                break;
+        case DECORCAT_DOLL:
+            OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_DollInteract);
+            break;
+        case DECORCAT_CUSHION:
+            OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_CushionInteract);
+            break;
         }
     }
 }

src/evolution_graphics.c

@@ -8,6 +8,7 @@
 #include "sound.h"
 #include "constants/songs.h"
 #include "palette.h"
+#include "constants/rgb.h"
 
 // this file's functions
 static void EvoSparkle_DummySpriteCb(struct Sprite* sprite);
@@ -268,7 +269,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID)
 {
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
-    BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, 0x7FFF);
+    BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, RGB_WHITE);
     gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1;
     PlaySE(SE_W025);
 }
@@ -386,7 +387,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID)
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
     CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
-    BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, 0x7FFF); // was 0xFFF9001C in R/S
+    BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, RGB_WHITE); // was 0xFFF9001C in R/S
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash;
     PlaySE(SE_W080);
 }
@@ -407,7 +408,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID)
                 CreatePostEvoSparkleSet2(i);
             break;
         case 32:
-            BeginNormalPaletteFade(0xFFFF041C, 0x10, 0x10, 0, 0x7FFF); // was 0xFFF9001C in R/S
+            BeginNormalPaletteFade(0xFFFF041C, 0x10, 0x10, 0, RGB_WHITE); // was 0xFFF9001C in R/S
             break;
         }
         gTasks[taskID].tFrameCounter++;
@@ -434,7 +435,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID)
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
     CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
-    BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, 0x7FFF); // was 0xFFFF0001 in R/S
+    BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, RGB_WHITE); // was 0xFFFF0001 in R/S
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade;
     PlaySE(SE_W080);
 }
@@ -455,7 +456,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID)
                 CreatePostEvoSparkleSet2(i);
             break;
         case 32:
-            BeginNormalPaletteFade(0xFFFF0400, 0x10, 0x10, 0, 0x7FFF); // was 0xFFFF0001 in R/S
+            BeginNormalPaletteFade(0xFFFF0400, 0x10, 0x10, 0, RGB_WHITE); // was 0xFFFF0001 in R/S
             break;
         }
         gTasks[taskID].tFrameCounter++;

src/evolution_scene.c

@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
@@ -32,6 +32,7 @@
 #include "constants/battle_string_ids.h"
 #include "constants/species.h"
 #include "constants/songs.h"
+#include "constants/rgb.h"
 
 struct EvoInfo
 {
@@ -52,8 +53,6 @@ void (*gCB2_AfterEvolution)(void);
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
 #define sEvoGraphicsTaskID      gBattleCommunication[2]
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-
 // this file's functions
 static void Task_EvolutionScene(u8 taskID);
 static void Task_TradeEvolutionScene(u8 taskID);
@@ -171,7 +170,7 @@ static void Task_BeginEvolutionScene(u8 taskID)
     switch (gTasks[taskID].tState)
     {
     case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
         gTasks[taskID].tState++;
         break;
     case 1:
@@ -368,7 +367,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     SetVBlankCallback(VBlankCB_EvolutionScene);
     SetMainCallback2(CB2_EvolutionSceneUpdate);
 
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
 
     ShowBg(0);
     ShowBg(1);
@@ -445,14 +444,14 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
     case 6:
         if (gWirelessCommType)
         {
-            sub_800E0E8();
+            LoadWirelessStatusIndicatorSpriteGfx();
             CreateWirelessStatusIndicatorSprite(0, 0);
         }
         BlendPalettes(-1,0x10, 0);
         gMain.state++;
         break;
     case 7:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         sub_807B140();
         ShowBg(0);
         ShowBg(1);
@@ -557,7 +556,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
         SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_NICKNAME, (gSpeciesNames[gEvolutionTable[preEvoSpecies][1].targetSpecies]));
         SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_HELD_ITEM, (&data));
         SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, (&data));
-        SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_10, (&data));
+        SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_ENCRYPT_SEPARATOR, (&data));
 
         for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++)
             SetMonData(&gPlayerParty[gPlayerPartyCount], i, (&data));
@@ -605,7 +604,7 @@ static void Task_EvolutionScene(u8 taskID)
     switch (gTasks[taskID].tState)
     {
     case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
         gSprites[sEvoStructPtr->preEvoSpriteID].invisible = FALSE;
         gTasks[taskID].tState++;
         ShowBg(0);
@@ -640,7 +639,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             PlayNewMapMusic(MUS_SHINKA);
             gTasks[taskID].tState++;
-            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
+            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
         }
         break;
     case 5: // launch moving bg task, preapre evo sparkles
@@ -698,7 +697,7 @@ static void Task_EvolutionScene(u8 taskID)
             m4aMPlayAllStop();
             memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60);
             sub_8140174();
-            BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0);
+            BeginNormalPaletteFade(0x1C, 0, 0x10, 0, RGB_BLACK);
             gTasks[taskID].tState++;
         }
         break;
@@ -753,7 +752,7 @@ static void Task_EvolutionScene(u8 taskID)
             }
             else // no move to learn
             {
-                BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+                BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
                 gTasks[taskID].tState++;
             }
         }
@@ -781,7 +780,7 @@ static void Task_EvolutionScene(u8 taskID)
         if (!gTasks[sEvoGraphicsTaskID].isActive)
         {
             m4aMPlayAllStop();
-            BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, 0x7FFF);
+            BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, RGB_WHITE);
             gTasks[taskID].tState++;
         }
         break;
@@ -887,7 +886,7 @@ static void Task_EvolutionScene(u8 taskID)
                 {
                     gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
                     if (gTasks[taskID].tLearnMoveState == 5)
-                        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+                        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
                 }
             }
             if (gMain.newKeys & B_BUTTON)
@@ -1009,7 +1008,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             PlayBGM(MUS_SHINKA);
             gTasks[taskID].tState++;
-            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
+            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
         }
         break;
     case 4:
@@ -1130,7 +1129,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         if (!gTasks[sEvoGraphicsTaskID].isActive)
         {
             m4aMPlayAllStop();
-            BeginNormalPaletteFade((1 << (gSprites[sEvoStructPtr->preEvoSpriteID].oam.paletteNum + 16)) | (0x4001C), 0, 0x10, 0, 0x7FFF);
+            BeginNormalPaletteFade((1 << (gSprites[sEvoStructPtr->preEvoSpriteID].oam.paletteNum + 16)) | (0x4001C), 0, 0x10, 0, RGB_WHITE);
             gTasks[taskID].tState++;
         }
         break;
@@ -1213,7 +1212,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
                 if (gTasks[taskID].tLearnMoveState == 5)
-                    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+                    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
                 break;
             case 1:
             case -1:

src/field_control_avatar.c

@@ -16,6 +16,7 @@
 #include "fldeff_misc.h"
 #include "item_menu.h"
 #include "link.h"
+#include "match_call.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "pokemon.h"
@@ -32,7 +33,6 @@
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
-#include "match_call.h"
 
 static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
 static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
@@ -227,8 +227,8 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
      && script != EventScript_PlayerPCFemale
      && script != EventScript_SecretBasePC
      && script != EventScript_RecordMixingSecretBasePC
-     && script != EventScript_SecretPower1
-     && script != EventScript_SecretPower2
+     && script != SecretBase_EventScript_DollInteract
+     && script != SecretBase_EventScript_CushionInteract
      && script != EventScript_PC)
         PlaySE(SE_SELECT);
 
@@ -354,7 +354,7 @@ static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *position
         if (direction == DIR_NORTH)
         {
             gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId;
-            if (sub_80E9680())
+            if (TrySetCurSecretBase())
                 return EventScript_2759F1;
         }
         return NULL;
@@ -421,23 +421,23 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
             return EventScript_SecretBaseShieldOrToyTV;
         if (MetatileBehavior_IsMB_C6(metatileBehavior) == TRUE)
         {
-            sub_80EB56C();
+            SetSecretBaseSecretsTvFlags_MiscFurnature();
             return NULL;
         }
-        if (MetatileBehavior_IsLargeMatCenter(metatileBehavior) == TRUE)
+        if (MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE)
         {
-            sub_80EB9E0();
+            SetSecretBaseSecretsTvFlags_LargeDecorationSpot();
             return NULL;
         }
-        if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatileBehavior) == TRUE)
+        if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE)
         {
-            sub_80EBB28();
+            SetSecretBaseSecretsTvFlags_SmallDecorationSpot();
             return NULL;
         }
     }
     else if (MetatileBehavior_IsSecretBasePoster(metatileBehavior) == TRUE)
     {
-        sub_80EB498();
+        SetSecretBaseSecretsTvFlags_Poster();
         return NULL;
     }
 

src/field_effect.c

@@ -33,8 +33,6 @@
 
 #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
 
-extern struct CompressedSpritePalette gMonPaletteTable[]; // GF made a mistake and did not extern it as const.
-
 EWRAM_DATA s32 gFieldEffectArguments[8] = {0};
 
 // Static type declarations
@@ -237,7 +235,9 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId);
 static IWRAM_DATA u8 sActiveList[32];
 
 // External declarations
-
+extern struct CompressedSpritePalette gMonPaletteTable[]; // GF made a mistake and did not extern it as const.
+extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern u8 *gFieldEffectScriptPointers[];
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
@@ -3485,7 +3485,7 @@ static void sub_80B9978(struct Task *task)
         eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
         sprite = &gSprites[eventObject->spriteId];
         eventObject->inanimate = 0;
-        sub_808EB08(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
+        MoveEventObjectToMapCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->coordOffsetEnabled = 1;

src/field_player_avatar.c

@@ -1188,9 +1188,9 @@ u8 PlayerGetZCoord(void)
     return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation;
 }
 
-void sub_808BC90(s16 a, s16 b)
+void sub_808BC90(s16 x, s16 y)
 {
-    sub_808EB08(&gEventObjects[gPlayerAvatar.eventObjectId], a, b);
+    MoveEventObjectToMapCoords(&gEventObjects[gPlayerAvatar.eventObjectId], x, y);
 }
 
 u8 TestPlayerAvatarFlags(u8 a)

src/field_region_map.c

@@ -11,6 +11,7 @@
 #include "text.h"
 #include "text_window.h"
 #include "window.h"
+#include "constants/rgb.h"
 
 // Static type declarations
 
@@ -145,7 +146,7 @@ static void FieldUpdateRegionMap(void)
             schedule_bg_copy_tilemap_to_vram(0);
             DrawStdFrameWithCustomTileAndPalette(0, 0, 0x27, 0xd);
             PrintRegionMapSecName();
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
             sFieldRegionMapHandler->state++;
             break;
         case 2:
@@ -173,7 +174,7 @@ static void FieldUpdateRegionMap(void)
             }
             break;
         case 5:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
             sFieldRegionMapHandler->state++;
             break;
         case 6:

src/field_screen_effect.c

@@ -1132,7 +1132,7 @@ static void sub_80B0318(u8 taskId)
         data[0] = 1;
         break;
     case 1:
-        sub_8199DF0(0, 17, 0, 1);
+        sub_8199DF0(0, PIXEL_FILL(1), 0, 1);
         sub_80B028C(data[1]);
         sub_80B003C(data[2], data[3], 1, 160, 1, 2);
         data[0] = 2;
@@ -1179,7 +1179,7 @@ static void sub_80B0318(u8 taskId)
             if (sub_80B02C8(data[5]) == TRUE)
             {
                 data[0] = 5;
-                sub_8199DF0(0, 0, 0, 1);
+                sub_8199DF0(0, PIXEL_FILL(0), 0, 1);
             }
         }
         break;

src/field_specials.c

@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "battle_tower.h"
 #include "cable_club.h"
-#include "data2.h"
+#include "data.h"
 #include "decoration.h"
 #include "diploma.h"
 #include "event_data.h"
@@ -59,20 +59,20 @@
 
 EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
 EWRAM_DATA u8 gBikeCollisions = 0;
-EWRAM_DATA u32 gBikeCyclingTimer = 0;
-EWRAM_DATA u8 gUnknown_0203AB5C = 0;
-EWRAM_DATA u8 gUnknown_0203AB5D = 0;
-EWRAM_DATA u8 gUnknown_0203AB5E = 0;
-EWRAM_DATA u16 gUnknown_0203AB60 = 0;
-EWRAM_DATA u16 gUnknown_0203AB62 = 0;
-EWRAM_DATA struct ListMenuItem *gUnknown_0203AB64 = NULL;
-EWRAM_DATA u16 gUnknown_0203AB68 = 0;
-EWRAM_DATA u16 gUnknown_0203AB6A = 0;
-EWRAM_DATA u8 gUnknown_0203AB6C = 0;
-EWRAM_DATA u8 gUnknown_0203AB6D = 0;
-EWRAM_DATA u8 gUnknown_0203AB6E = 0;
-EWRAM_DATA u8 gUnknown_0203AB6F = 0;
-EWRAM_DATA u32 gUnknown_0203AB70 = 0;
+static EWRAM_DATA u32 gBikeCyclingTimer = 0;
+static EWRAM_DATA u8 gUnknown_0203AB5C = 0;
+static EWRAM_DATA u8 gUnknown_0203AB5D = 0;
+static EWRAM_DATA u8 gUnknown_0203AB5E = 0;
+static EWRAM_DATA u16 gUnknown_0203AB60 = 0;
+static EWRAM_DATA u16 gUnknown_0203AB62 = 0;
+static EWRAM_DATA struct ListMenuItem *gUnknown_0203AB64 = NULL;
+static EWRAM_DATA u16 gUnknown_0203AB68 = 0;
+static EWRAM_DATA u16 gUnknown_0203AB6A = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6C = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6D = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6E = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6F = 0;
+static EWRAM_DATA u32 gUnknown_0203AB70 = 0;
 
 struct ListMenuTemplate gUnknown_030061D0;
 

src/fieldmap.c

@@ -52,15 +52,15 @@ struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *
 void InitMap(void)
 {
     InitMapLayoutData(&gMapHeader);
-    sub_80E8EE0(gMapHeader.events);
+    SetOccupiedSecretBaseEntranceMetatiles(gMapHeader.events);
     RunOnLoadMapScript();
 }
 
 void InitMapFromSavedGame(void)
 {
     InitMapLayoutData(&gMapHeader);
-    sub_80E9238(0);
-    sub_80E8EE0(gMapHeader.events);
+    InitSecretBaseAppearance(FALSE);
+    SetOccupiedSecretBaseEntranceMetatiles(gMapHeader.events);
     LoadSavedMapView();
     RunOnLoadMapScript();
     UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);

src/fldeff_cut.c

@@ -23,7 +23,7 @@
 
 extern struct MapPosition gPlayerFacingPosition;
 
-extern const u8 Route103_EventScript_290705[];
+extern const u8 EventScript_FldEffCut[];
 extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
@@ -327,7 +327,7 @@ bool8 FldEff_UseCutOnGrass(void)
 static void FieldCallback_CutTree(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(Route103_EventScript_290705);
+    ScriptContext1_SetupScript(EventScript_FldEffCut);
 }
 
 bool8 FldEff_UseCutOnTree(void)

src/fldeff_misc.c

@@ -488,8 +488,8 @@ static void sub_80F9DFC(u8 taskId)
 
 static void SetCurrentSecretBase(void)
 {
-    sub_80E9608(&gPlayerFacingPosition, gMapHeader.events);
-    sub_80E8B6C();
+    SetCurSecretBaseIdFromPosition(&gPlayerFacingPosition, gMapHeader.events);
+    TrySetCurSecretBaseIndex();
 }
 
 static void AdjustSecretPowerSpritePixelOffsets(void)
@@ -544,7 +544,7 @@ bool8 SetUpFieldMove_SecretPower(void)
 {
     u8 mb;
 
-    sub_80E8BC8();
+    CheckPlayerHasSecretBase();
 
     if (gSpecialVar_Result == 1 || GetPlayerFacingDirection() != DIR_NORTH)
         return FALSE;
@@ -623,10 +623,8 @@ static void CaveEntranceSpriteCallback2(struct Sprite *sprite)
 {
     if (sprite->data[0] < 40)
     {
-        sprite->data[0]++;
-
-        if (sprite->data[0] == 20)
-            sub_80E8D4C();
+        if (++sprite->data[0] == 20)
+            ToggleSecretBaseEntranceMetatile();
     }
     else
     {
@@ -681,7 +679,7 @@ bool8 FldEff_SecretPowerTree(void)
                  148);
 
     if (gFieldEffectArguments[7] == 1 || gFieldEffectArguments[7] == 3)
-        sub_80E8D4C();
+        ToggleSecretBaseEntranceMetatile();
 
     return FALSE;
 }
@@ -702,7 +700,7 @@ static void TreeEntranceSpriteCallback2(struct Sprite *sprite)
     if (sprite->data[0] >= 40)
     {
         if (gFieldEffectArguments[7] == 0 || gFieldEffectArguments[7] == 2)
-            sub_80E8D4C();
+            ToggleSecretBaseEntranceMetatile();
 
         sprite->data[0] = 0;
         sprite->callback = TreeEntranceSpriteCallbackEnd;
@@ -764,7 +762,7 @@ static void ShrubEntranceSpriteCallback2(struct Sprite *sprite)
         sprite->data[0]++;
 
         if (sprite->data[0] == 20)
-            sub_80E8D4C();
+            ToggleSecretBaseEntranceMetatile();
     }
     else
     {
@@ -1168,7 +1166,7 @@ void GetShieldToyTVDecorationInfo(void)
 
 bool8 sub_80FADE4(u16 metatileId, u8 arg1)
 {
-    if (!CurrentMapIsSecretBase())
+    if (!CurMapIsSecretBase())
         return FALSE;
 
     if (!arg1)

src/fldeff_rocksmash.c

@@ -140,7 +140,7 @@ bool8 SetUpFieldMove_RockSmash(void)
 static void sub_81356C4(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(Route111_EventScript_2907F0);
+    ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
 }
 
 bool8 FldEff_UseRockSmash(void)

src/fldeff_strength.c

@@ -30,7 +30,7 @@ bool8 SetUpFieldMove_Strength(void)
 static void FldEff_UseStrength(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
+    ScriptContext1_SetupScript(EventScript_FldEffStrength);
 }
 
 bool8 sub_8145E2C(void)

src/fldeff_sweetscent.c

@@ -93,7 +93,7 @@ static void FailSweetScentEncounter(u8 taskId)
     {
         CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
         sub_80AC3E4();
-        ScriptContext1_SetupScript(EventScript_290CAE);
+        ScriptContext1_SetupScript(EventScript_FailSweetScent);
         DestroyTask(taskId);
     }
 }