Merge branch 'master' into fldeff

src/alloc.c

@@ -0,0 +1,210 @@
+#include "global.h"
+
+static void *sHeapStart;
+static u32 sHeapSize;
+static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss)
+
+#define MALLOC_SYSTEM_ID 0xA3A3
+
+struct MemBlock {
+    // Whether this block is currently allocated.
+    bool16 flag;
+
+    // Magic number used for error checking. Should equal MALLOC_SYSTEM_ID.
+    u16 magic;
+
+    // Size of the block (not including this header struct).
+    u32 size;
+
+    // Previous block pointer. Equals sHeapStart if this is the first block.
+    struct MemBlock *prev;
+
+    // Next block pointer. Equals sHeapStart if this is the last block.
+    struct MemBlock *next;
+
+    // Data in the memory block. (Arrays of length 0 are a GNU extension.)
+    u8 data[0];
+};
+
+void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
+{
+    struct MemBlock *header = (struct MemBlock *)block;
+
+    header->flag = FALSE;
+    header->magic = MALLOC_SYSTEM_ID;
+    header->size = size;
+    header->prev = prev;
+    header->next = next;
+}
+
+void PutFirstMemBlockHeader(void *block, u32 size)
+{
+    PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
+}
+
+void *AllocInternal(void *heapStart, u32 size)
+{
+    struct MemBlock *pos = (struct MemBlock *)heapStart;
+    struct MemBlock *head = pos;
+    struct MemBlock *splitBlock;
+    u32 foundBlockSize;
+
+    // Alignment
+    if (size & 3)
+        size = 4 * ((size / 4) + 1);
+
+    for (;;) {
+        // Loop through the blocks looking for unused block that's big enough.
+
+        if (!pos->flag) {
+            foundBlockSize = pos->size;
+
+            if (foundBlockSize >= size) {
+                if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
+                    // The block isn't much bigger than the requested size,
+                    // so just use it.
+                    pos->flag = TRUE;
+                } else {
+                    // The block is significantly bigger than the requested
+                    // size, so split the rest into a separate block.
+                    foundBlockSize -= sizeof(struct MemBlock);
+                    foundBlockSize -= size;
+
+                    splitBlock = (struct MemBlock *)(pos->data + size);
+
+                    pos->flag = TRUE;
+                    pos->size = size;
+
+                    PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize);
+
+                    pos->next = splitBlock;
+
+                    if (splitBlock->next != head)
+                        splitBlock->next->prev = splitBlock;
+                }
+
+                return pos->data;
+            }
+        }
+
+        if (pos->next == head)
+            return NULL;
+
+        pos = pos->next;
+    }
+}
+
+void FreeInternal(void *heapStart, void *pointer)
+{
+    if (pointer) {
+        struct MemBlock *head = (struct MemBlock *)heapStart;
+        struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
+        block->flag = FALSE;
+
+        // If the freed block isn't the last one, merge with the next block
+        // if it's not in use.
+        if (block->next != head) {
+            if (!block->next->flag) {
+                block->size += sizeof(struct MemBlock) + block->next->size;
+                block->next->magic = 0;
+                block->next = block->next->next;
+                if (block->next != head)
+                    block->next->prev = block;
+            }
+        }
+
+        // If the freed block isn't the first one, merge with the previous block
+        // if it's not in use.
+        if (block != head) {
+            if (!block->prev->flag) {
+                block->prev->next = block->next;
+
+                if (block->next != head)
+                    block->next->prev = block->prev;
+
+                block->magic = 0;
+                block->prev->size += sizeof(struct MemBlock) + block->size;
+            }
+        }
+    }
+}
+
+void *AllocZeroedInternal(void *heapStart, u32 size)
+{
+    void *mem = AllocInternal(heapStart, size);
+
+    if (mem != NULL) {
+        if (size & 3)
+            size = 4 * ((size / 4) + 1);
+
+        CpuFill32(0, mem, size);
+    }
+
+    return mem;
+}
+
+bool32 CheckMemBlockInternal(void *heapStart, void *pointer)
+{
+    struct MemBlock *head = (struct MemBlock *)heapStart;
+    struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
+
+    if (block->magic != MALLOC_SYSTEM_ID)
+        return FALSE;
+
+    if (block->next->magic != MALLOC_SYSTEM_ID)
+        return FALSE;
+
+    if (block->next != head && block->next->prev != block)
+        return FALSE;
+
+    if (block->prev->magic != MALLOC_SYSTEM_ID)
+        return FALSE;
+
+    if (block->prev != head && block->prev->next != block)
+        return FALSE;
+
+    if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size))
+        return FALSE;
+
+    return TRUE;
+}
+
+void InitHeap(void *heapStart, u32 heapSize)
+{
+    sHeapStart = heapStart;
+    sHeapSize = heapSize;
+    PutFirstMemBlockHeader(heapStart, heapSize);
+}
+
+void *Alloc(u32 size)
+{
+    AllocInternal(sHeapStart, size);
+}
+
+void *AllocZeroed(u32 size)
+{
+    AllocZeroedInternal(sHeapStart, size);
+}
+
+void Free(void *pointer)
+{
+    FreeInternal(sHeapStart, pointer);
+}
+
+bool32 CheckMemBlock(void *pointer)
+{
+    return CheckMemBlockInternal(sHeapStart, pointer);
+}
+
+bool32 CheckHeap()
+{
+    struct MemBlock *pos = (struct MemBlock *)sHeapStart;
+
+    do {
+        if (!CheckMemBlockInternal(sHeapStart, pos->data))
+            return FALSE;
+        pos = pos->next;
+    } while (pos != (struct MemBlock *)sHeapStart);
+
+    return TRUE;
+}

src/apprentice.c

@@ -9,7 +9,7 @@
 #include "item.h"
 #include "item_menu.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "new_game.h"
 #include "party_menu.h"
@@ -2047,172 +2047,172 @@ NAKED
 static void sub_81A1224(void)
 {
     asm_unified("\n\
-                	push {r4-r7,lr}\n\
-	mov r7, r9\n\
-	mov r6, r8\n\
-	push {r6,r7}\n\
-	ldr r1, =gSaveBlock2Ptr\n\
-	ldr r3, [r1]\n\
-	adds r0, r3, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	adds r7, r1, 0\n\
-	cmp r0, 0x2\n\
-	bhi _081A1242\n\
-	b _081A1362\n\
+                    push {r4-r7,lr}\n\
+    mov r7, r9\n\
+    mov r6, r8\n\
+    push {r6,r7}\n\
+    ldr r1, =gSaveBlock2Ptr\n\
+    ldr r3, [r1]\n\
+    adds r0, r3, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    adds r7, r1, 0\n\
+    cmp r0, 0x2\n\
+    bhi _081A1242\n\
+    b _081A1362\n\
 _081A1242:\n\
-	movs r5, 0\n\
-	movs r2, 0\n\
-	adds r0, r3, 0\n\
-	adds r0, 0xB8\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 30\n\
-	ldr r1, =gSpecialVar_0x8005\n\
-	mov r12, r1\n\
-	ldr r1, =gSpecialVar_Result\n\
-	mov r8, r1\n\
-	cmp r0, 0\n\
-	beq _081A127C\n\
-	adds r3, r7, 0\n\
+    movs r5, 0\n\
+    movs r2, 0\n\
+    adds r0, r3, 0\n\
+    adds r0, 0xB8\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 30\n\
+    ldr r1, =gSpecialVar_0x8005\n\
+    mov r12, r1\n\
+    ldr r1, =gSpecialVar_Result\n\
+    mov r8, r1\n\
+    cmp r0, 0\n\
+    beq _081A127C\n\
+    adds r3, r7, 0\n\
 _081A125C:\n\
-	adds r0, r5, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	cmp r2, 0x8\n\
-	bhi _081A127C\n\
-	ldr r0, [r3]\n\
-	lsls r1, r2, 2\n\
-	adds r0, r1\n\
-	adds r0, 0xB8\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 30\n\
-	cmp r0, 0\n\
-	bne _081A125C\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    cmp r2, 0x8\n\
+    bhi _081A127C\n\
+    ldr r0, [r3]\n\
+    lsls r1, r2, 2\n\
+    adds r0, r1\n\
+    adds r0, 0xB8\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 30\n\
+    cmp r0, 0\n\
+    bne _081A125C\n\
 _081A127C:\n\
-	movs r4, 0\n\
-	cmp r4, r5\n\
-	bcs _081A1322\n\
-	ldr r0, [r7]\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	cmp r4, r0\n\
-	bge _081A1322\n\
-	adds r6, r7, 0\n\
-	mov r9, r4\n\
+    movs r4, 0\n\
+    cmp r4, r5\n\
+    bcs _081A1322\n\
+    ldr r0, [r7]\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    cmp r4, r0\n\
+    bge _081A1322\n\
+    adds r6, r7, 0\n\
+    mov r9, r4\n\
 _081A1296:\n\
-	ldr r3, [r6]\n\
-	lsls r0, r4, 2\n\
-	adds r2, r3, r0\n\
-	adds r0, r2, 0\n\
-	adds r0, 0xB8\n\
-	ldrb r1, [r0]\n\
-	lsls r0, r1, 30\n\
-	lsrs r0, 30\n\
-	cmp r0, 0x1\n\
-	bne _081A1308\n\
-	lsrs r0, r1, 6\n\
-	cmp r0, 0\n\
-	beq _081A1308\n\
-	adds r0, r2, 0\n\
-	adds r0, 0xBA\n\
-	ldrh r0, [r0]\n\
-	mov r2, r12\n\
-	ldrh r2, [r2]\n\
-	cmp r0, r2\n\
-	bne _081A1308\n\
-	adds r0, r3, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r0, r3, r0\n\
-	adds r0, 0xB8\n\
-	ldrb r2, [r0]\n\
-	movs r1, 0x3F\n\
-	ands r1, r2\n\
-	strb r1, [r0]\n\
-	ldr r1, [r6]\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r1, r0\n\
-	mov r2, r12\n\
-	ldrh r0, [r2]\n\
-	adds r1, 0xBA\n\
-	strh r0, [r1]\n\
-	mov r1, r9\n\
-	mov r0, r8\n\
-	strh r1, [r0]\n\
-	b _081A1362\n\
-	.pool\n\
+    ldr r3, [r6]\n\
+    lsls r0, r4, 2\n\
+    adds r2, r3, r0\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xB8\n\
+    ldrb r1, [r0]\n\
+    lsls r0, r1, 30\n\
+    lsrs r0, 30\n\
+    cmp r0, 0x1\n\
+    bne _081A1308\n\
+    lsrs r0, r1, 6\n\
+    cmp r0, 0\n\
+    beq _081A1308\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xBA\n\
+    ldrh r0, [r0]\n\
+    mov r2, r12\n\
+    ldrh r2, [r2]\n\
+    cmp r0, r2\n\
+    bne _081A1308\n\
+    adds r0, r3, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r0, r3, r0\n\
+    adds r0, 0xB8\n\
+    ldrb r2, [r0]\n\
+    movs r1, 0x3F\n\
+    ands r1, r2\n\
+    strb r1, [r0]\n\
+    ldr r1, [r6]\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r1, r0\n\
+    mov r2, r12\n\
+    ldrh r0, [r2]\n\
+    adds r1, 0xBA\n\
+    strh r0, [r1]\n\
+    mov r1, r9\n\
+    mov r0, r8\n\
+    strh r1, [r0]\n\
+    b _081A1362\n\
+    .pool\n\
 _081A1308:\n\
-	adds r0, r4, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	cmp r4, r5\n\
-	bcs _081A1322\n\
-	ldr r0, [r6]\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	cmp r4, r0\n\
-	blt _081A1296\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r4, r5\n\
+    bcs _081A1322\n\
+    ldr r0, [r6]\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    cmp r4, r0\n\
+    blt _081A1296\n\
 _081A1322:\n\
-	ldr r2, [r7]\n\
-	adds r0, r2, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r2, r0\n\
-	adds r2, 0xB8\n\
-	ldrb r1, [r2]\n\
-	movs r0, 0x3F\n\
-	ands r0, r1\n\
-	movs r1, 0x40\n\
-	orrs r0, r1\n\
-	strb r0, [r2]\n\
-	ldr r1, [r7]\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xB1\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 26\n\
-	lsrs r0, 28\n\
-	subs r0, 0x3\n\
-	lsls r0, 2\n\
-	adds r1, r0\n\
-	mov r2, r12\n\
-	ldrh r0, [r2]\n\
-	adds r1, 0xBA\n\
-	strh r0, [r1]\n\
-	movs r0, 0x1\n\
-	mov r1, r8\n\
-	strh r0, [r1]\n\
+    ldr r2, [r7]\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r2, r0\n\
+    adds r2, 0xB8\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0x3F\n\
+    ands r0, r1\n\
+    movs r1, 0x40\n\
+    orrs r0, r1\n\
+    strb r0, [r2]\n\
+    ldr r1, [r7]\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xB1\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 26\n\
+    lsrs r0, 28\n\
+    subs r0, 0x3\n\
+    lsls r0, 2\n\
+    adds r1, r0\n\
+    mov r2, r12\n\
+    ldrh r0, [r2]\n\
+    adds r1, 0xBA\n\
+    strh r0, [r1]\n\
+    movs r0, 0x1\n\
+    mov r1, r8\n\
+    strh r0, [r1]\n\
 _081A1362:\n\
-	pop {r3,r4}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
+    pop {r3,r4}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
 ");
 }
 #endif // NONMATCHING

src/battle_ai_script_commands.c

@@ -463,7 +463,7 @@ static u8 ChooseMoveOrAction_Doubles(void)
     {
         if (i == sBattler_AI || gBattleMons[i].hp == 0)
         {
-            actionOrMoveIndex[i] = -1;
+            actionOrMoveIndex[i] = 0xFF;
             bestMovePointsForTarget[i] = -1;
         }
         else

src/battle_anim.c

@@ -26,8 +26,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2;
 
 extern const u16 gMovesWithQuietBGM[];
 extern const u8 *const gBattleAnims_Moves[];
-extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
-extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
 extern const struct BattleAnimBackground gBattleAnimBackgroundTable[];
 
 // this file's functions
@@ -1386,54 +1384,54 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
 
 static void (* const sScriptCmdTable[])(void) =
 {
-	ScriptCmd_loadspritegfx,
-	ScriptCmd_unloadspritegfx,
-	ScriptCmd_createsprite,
-	ScriptCmd_createvisualtask,
-	ScriptCmd_delay,
-	ScriptCmd_waitforvisualfinish,
-	ScriptCmd_hang1,
-	ScriptCmd_hang2,
-	ScriptCmd_end,
-	ScriptCmd_playse,
-	ScriptCmd_monbg,
-	ScriptCmd_clearmonbg,
-	ScriptCmd_setalpha,
-	ScriptCmd_blendoff,
-	ScriptCmd_call,
-	ScriptCmd_return,
-	ScriptCmd_setarg,
-	ScriptCmd_choosetwoturnanim,
-	ScriptCmd_jumpifmoveturn,
-	ScriptCmd_goto,
-	ScriptCmd_fadetobg,
-	ScriptCmd_restorebg,
-	ScriptCmd_waitbgfadeout,
-	ScriptCmd_waitbgfadein,
-	ScriptCmd_changebg,
-	ScriptCmd_playsewithpan,
-	ScriptCmd_setpan,
-	ScriptCmd_panse_1B,
-	ScriptCmd_loopsewithpan,
-	ScriptCmd_waitplaysewithpan,
-	ScriptCmd_setbldcnt,
-	ScriptCmd_createsoundtask,
-	ScriptCmd_waitsound,
-	ScriptCmd_jumpargeq,
-	ScriptCmd_monbg_22,
-	ScriptCmd_clearmonbg_23,
-	ScriptCmd_jumpifcontest,
-	ScriptCmd_fadetobgfromset,
-	ScriptCmd_panse_26,
-	ScriptCmd_panse_27,
-	ScriptCmd_monbgprio_28,
-	ScriptCmd_monbgprio_29,
-	ScriptCmd_monbgprio_2A,
-	ScriptCmd_invisible,
-	ScriptCmd_visible,
-	ScriptCmd_doublebattle_2D,
-	ScriptCmd_doublebattle_2E,
-	ScriptCmd_stopsound
+    ScriptCmd_loadspritegfx,
+    ScriptCmd_unloadspritegfx,
+    ScriptCmd_createsprite,
+    ScriptCmd_createvisualtask,
+    ScriptCmd_delay,
+    ScriptCmd_waitforvisualfinish,
+    ScriptCmd_hang1,
+    ScriptCmd_hang2,
+    ScriptCmd_end,
+    ScriptCmd_playse,
+    ScriptCmd_monbg,
+    ScriptCmd_clearmonbg,
+    ScriptCmd_setalpha,
+    ScriptCmd_blendoff,
+    ScriptCmd_call,
+    ScriptCmd_return,
+    ScriptCmd_setarg,
+    ScriptCmd_choosetwoturnanim,
+    ScriptCmd_jumpifmoveturn,
+    ScriptCmd_goto,
+    ScriptCmd_fadetobg,
+    ScriptCmd_restorebg,
+    ScriptCmd_waitbgfadeout,
+    ScriptCmd_waitbgfadein,
+    ScriptCmd_changebg,
+    ScriptCmd_playsewithpan,
+    ScriptCmd_setpan,
+    ScriptCmd_panse_1B,
+    ScriptCmd_loopsewithpan,
+    ScriptCmd_waitplaysewithpan,
+    ScriptCmd_setbldcnt,
+    ScriptCmd_createsoundtask,
+    ScriptCmd_waitsound,
+    ScriptCmd_jumpargeq,
+    ScriptCmd_monbg_22,
+    ScriptCmd_clearmonbg_23,
+    ScriptCmd_jumpifcontest,
+    ScriptCmd_fadetobgfromset,
+    ScriptCmd_panse_26,
+    ScriptCmd_panse_27,
+    ScriptCmd_monbgprio_28,
+    ScriptCmd_monbgprio_29,
+    ScriptCmd_monbgprio_2A,
+    ScriptCmd_invisible,
+    ScriptCmd_visible,
+    ScriptCmd_doublebattle_2D,
+    ScriptCmd_doublebattle_2E,
+    ScriptCmd_stopsound
 };
 
 // code

src/battle_anim_80A5C6C.c

@@ -7,7 +7,7 @@
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "pokemon_icon.h"
 #include "sprite.h"
@@ -35,7 +35,6 @@ extern const union AffineAnimCmd *gUnknown_082FF6C0[];
 
 // This file's functions.
 void sub_80A64EC(struct Sprite *sprite);
-void sub_80A653C(struct Sprite *sprite);
 void sub_80A6FB4(struct Sprite *sprite);
 void sub_80A7144(struct Sprite *sprite);
 void sub_80A791C(struct Sprite *sprite);
@@ -539,7 +538,7 @@ void WaitAnimForDuration(struct Sprite *sprite)
 void sub_80A64D0(struct Sprite *sprite)
 {
     sub_80A64EC(sprite);
-    sprite->callback = sub_80A653C;
+    sprite->callback = TranslateSpriteOverDuration;
     sprite->callback(sprite);
 }
 
@@ -557,7 +556,7 @@ void sub_80A64EC(struct Sprite *sprite)
     sprite->data[1] = old;
 }
 
-void sub_80A653C(struct Sprite *sprite)
+void TranslateSpriteOverDuration(struct Sprite *sprite)
 {
     if (sprite->data[0] > 0)
     {
@@ -613,7 +612,7 @@ void sub_80A65EC(struct Sprite *sprite)
     sprite->callback = sub_80A64D0;
 }
 
-void sub_80A6630(struct Sprite *sprite)
+void TranslateMonBGUntil(struct Sprite *sprite)
 {
     if (sprite->data[0] > 0)
     {
@@ -627,7 +626,7 @@ void sub_80A6630(struct Sprite *sprite)
     }
 }
 
-// Same as sub_80A6630, but it operates on sub-pixel values
+// Same as TranslateMonBGUntil, but it operates on sub-pixel values
 // to handle slower translations.
 void sub_80A6680(struct Sprite *sprite)
 {

src/battle_anim_80D51AC.c

@@ -11,15 +11,15 @@ void AnimTask_ShakeMon2Step(u8 taskId);
 void AnimTask_ShakeMonInPlaceStep(u8 taskId);
 void AnimTask_ShakeAndSinkMonStep(u8 taskId);
 void sub_80D57B8(u8 taskId);
-void DoHorizontalLunge(struct Sprite *sprite);
-void ReverseHorizontalLungeDirection(struct Sprite *sprite);
-void DoVerticalDip(struct Sprite *sprite);
-void ReverseVerticalDipDirection(struct Sprite* sprite);
-void SlideMonToOriginalPos(struct Sprite *sprite);
-void SlideMonToOriginalPosStep(struct Sprite *sprite);
-void SlideMonToOffset(struct Sprite *sprite);
-void sub_80D5B48(struct Sprite *sprite);
-void sub_80D5C20(struct Sprite *sprite);
+static void DoHorizontalLunge(struct Sprite *sprite);
+static void ReverseHorizontalLungeDirection(struct Sprite *sprite);
+static void DoVerticalDip(struct Sprite *sprite);
+static void ReverseVerticalDipDirection(struct Sprite* sprite);
+static void SlideMonToOriginalPos(struct Sprite *sprite);
+static void SlideMonToOriginalPosStep(struct Sprite *sprite);
+static void SlideMonToOffset(struct Sprite *sprite);
+static void sub_80D5B48(struct Sprite *sprite);
+static void sub_80D5C20(struct Sprite *sprite);
 void AnimTask_WindUpLungePart1(u8 taskId);
 void AnimTask_WindUpLungePart2(u8 taskId);
 void AnimTask_SwayMonStep(u8 taskId);
@@ -28,6 +28,61 @@ void sub_80D6308(u8 taskId);
 void sub_80D646C(u8 taskId);
 void sub_80A8B3C(u8 taskId);
 
+const struct SpriteTemplate gHorizontalLungeSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = DoHorizontalLunge,
+};
+
+const struct SpriteTemplate gVerticalDipSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = DoVerticalDip,
+};
+
+const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SlideMonToOriginalPos,
+};
+
+const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SlideMonToOffset,
+};
+
+const struct SpriteTemplate gUnknown_0857FE88 =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80D5B48,
+};
+
 // Task to facilitate simple shaking of a pokemon's picture in battle.
 // The shaking alternates between the original position and the target position.
 // arg 0: anim battler
@@ -373,7 +428,7 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
 // horizontally, and then moves back in the opposite direction.
 // arg 0: duration of single lunge direction
 // arg 1: x pixel delta that is applied each frame
-void DoHorizontalLunge(struct Sprite *sprite)
+static void DoHorizontalLunge(struct Sprite *sprite)
 {
     sprite->invisible = TRUE;
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
@@ -386,14 +441,14 @@ void DoHorizontalLunge(struct Sprite *sprite)
     sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
     sprite->data[4] = gBattleAnimArgs[0];
     StoreSpriteCallbackInData6(sprite, ReverseHorizontalLungeDirection);
-    sprite->callback = sub_80A6630;
+    sprite->callback = TranslateMonBGUntil;
 }
 
-void ReverseHorizontalLungeDirection(struct Sprite *sprite)
+static void ReverseHorizontalLungeDirection(struct Sprite *sprite)
 {
     sprite->data[0] = sprite->data[4];
     sprite->data[1] = -sprite->data[1];
-    sprite->callback = sub_80A6630;
+    sprite->callback = TranslateMonBGUntil;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
 
@@ -402,7 +457,7 @@ void ReverseHorizontalLungeDirection(struct Sprite *sprite)
 // arg 0: duration of single dip direction
 // arg 1: y pixel delta that is applied each frame
 // arg 2: battler
-void DoVerticalDip(struct Sprite *sprite)
+static void DoVerticalDip(struct Sprite *sprite)
 {
     u8 spriteId;
     sprite->invisible = TRUE;
@@ -413,14 +468,14 @@ void DoVerticalDip(struct Sprite *sprite)
     sprite->data[3] = spriteId;
     sprite->data[4] = gBattleAnimArgs[0];
     StoreSpriteCallbackInData6(sprite, ReverseVerticalDipDirection);
-    sprite->callback = sub_80A6630;
+    sprite->callback = TranslateMonBGUntil;
 }
 
-void ReverseVerticalDipDirection(struct Sprite *sprite)
+static void ReverseVerticalDipDirection(struct Sprite *sprite)
 {
     sprite->data[0] = sprite->data[4];
     sprite->data[2] = -sprite->data[2];
-    sprite->callback = sub_80A6630;
+    sprite->callback = TranslateMonBGUntil;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
 
@@ -429,7 +484,7 @@ void ReverseVerticalDipDirection(struct Sprite *sprite)
 // arg 0: 1 = target or 0 = attacker
 // arg 1: direction (0 = horizontal and vertical, 1 = horizontal only, 2 = vertical only)
 // arg 2: duration
-void SlideMonToOriginalPos(struct Sprite *sprite)
+static void SlideMonToOriginalPos(struct Sprite *sprite)
 {
     u32 monSpriteId;
     if (!gBattleAnimArgs[0])
@@ -459,7 +514,7 @@ void SlideMonToOriginalPos(struct Sprite *sprite)
     sprite->callback = SlideMonToOriginalPosStep;
 }
 
-void SlideMonToOriginalPosStep(struct Sprite *sprite)
+static void SlideMonToOriginalPosStep(struct Sprite *sprite)
 {
     s8 monSpriteId;
     u8 lo;
@@ -496,7 +551,7 @@ void SlideMonToOriginalPosStep(struct Sprite *sprite)
 // arg 2: target y pixel offset
 // arg 3: mirror vertical translation for opposite battle side
 // arg 4: duration
-void SlideMonToOffset(struct Sprite *sprite)
+static void SlideMonToOffset(struct Sprite *sprite)
 {
     u8 battler;
     u8 monSpriteId;
@@ -529,7 +584,7 @@ void SlideMonToOffset(struct Sprite *sprite)
     sprite->callback = sub_80A6680;
 }
 
-void sub_80D5B48(struct Sprite *sprite)
+static void sub_80D5B48(struct Sprite *sprite)
 {
     u8 spriteId;
     u8 battlerId;
@@ -573,7 +628,7 @@ void sub_80D5B48(struct Sprite *sprite)
 }
 
 
-void sub_80D5C20(struct Sprite *sprite)
+static void sub_80D5C20(struct Sprite *sprite)
 {
     gSprites[sprite->data[5]].pos2.x = 0;
     gSprites[sprite->data[5]].pos2.y = 0;

src/battle_anim_sound_tasks.c

@@ -389,50 +389,50 @@ void sub_8159308(u8 taskId)
 NAKED
 void sub_8159308(u8 taskId)
 {
-    asm_unified("	push {r4,r5,lr}\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r5, r0, 0\n\
-	ldr r1, =gTasks\n\
-	lsls r0, r5, 2\n\
-	adds r0, r5\n\
-	lsls r0, 3\n\
-	adds r4, r0, r1\n\
-	ldrh r2, [r4, 0xE]\n\
-	ldrh r0, [r4, 0x1C]\n\
-	adds r1, r0, 0x1\n\
-	strh r1, [r4, 0x1C]\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r1, [r4, r3]\n\
-	cmp r0, r1\n\
-	bne _08159342\n\
-	movs r0, 0\n\
-	strh r0, [r4, 0x1C]\n\
-	ldrh r1, [r4, 0x1E]\n\
-	adds r0, r2, r1\n\
-	strh r0, [r4, 0x1E]\n\
-	movs r2, 0x1E\n\
-	ldrsh r0, [r4, r2]\n\
-	bl KeepPanInRange\n\
-	strh r0, [r4, 0x1E]\n\
+    asm_unified("    push {r4,r5,lr}\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r5, r0, 0\n\
+    ldr r1, =gTasks\n\
+    lsls r0, r5, 2\n\
+    adds r0, r5\n\
+    lsls r0, 3\n\
+    adds r4, r0, r1\n\
+    ldrh r2, [r4, 0xE]\n\
+    ldrh r0, [r4, 0x1C]\n\
+    adds r1, r0, 0x1\n\
+    strh r1, [r4, 0x1C]\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    movs r3, 0x12\n\
+    ldrsh r1, [r4, r3]\n\
+    cmp r0, r1\n\
+    bne _08159342\n\
+    movs r0, 0\n\
+    strh r0, [r4, 0x1C]\n\
+    ldrh r1, [r4, 0x1E]\n\
+    adds r0, r2, r1\n\
+    strh r0, [r4, 0x1E]\n\
+    movs r2, 0x1E\n\
+    ldrsh r0, [r4, r2]\n\
+    bl KeepPanInRange\n\
+    strh r0, [r4, 0x1E]\n\
 _08159342:\n\
-	ldr r1, =gUnknown_02038440\n\
-	ldrh r0, [r4, 0x1E]\n\
-	strb r0, [r1]\n\
-	movs r3, 0x1E\n\
-	ldrsh r1, [r4, r3]\n\
-	movs r2, 0xC\n\
-	ldrsh r0, [r4, r2]\n\
-	cmp r1, r0\n\
-	bne _0815935A\n\
-	adds r0, r5, 0\n\
-	bl DestroyAnimVisualTask\n\
+    ldr r1, =gUnknown_02038440\n\
+    ldrh r0, [r4, 0x1E]\n\
+    strb r0, [r1]\n\
+    movs r3, 0x1E\n\
+    ldrsh r1, [r4, r3]\n\
+    movs r2, 0xC\n\
+    ldrsh r0, [r4, r2]\n\
+    cmp r1, r0\n\
+    bne _0815935A\n\
+    adds r0, r5, 0\n\
+    bl DestroyAnimVisualTask\n\
 _0815935A:\n\
-	pop {r4,r5}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    pop {r4,r5}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 #endif

src/battle_anim_utility_funcs.c

@@ -3,7 +3,7 @@
 #include "contest.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "sound.h"
 #include "sprite.h"
@@ -40,14 +40,14 @@ static void sub_8117FD0(u8);
 
 const u16 gUnknown_08597418 = RGB(31, 31, 31);
 
-// no clue what these are...
-// possibly some register offsets
-const u8 gUnknown_0859741A[] = {0x08, 0x0a, 0x0c, 0x0e};
-const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e};
+// These belong in battle_intro.c, but there putting them there causes 2 bytes of alignment padding
+// between the two .rodata segments. Perhaps battle_intro.c actually belongs in this file, too.
+const u8 gUnknown_0859741A[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT};
+const u8 gUnknown_0859741E[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT};
 
 void sub_8116620(u8 taskId)
 {
-    u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]);
+    u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
     selectedPalettes |= sub_80A76C4((gBattleAnimArgs[0] >>  7) & 1,
                                     (gBattleAnimArgs[0] >>  8) & 1,
                                     (gBattleAnimArgs[0] >>  9) & 1,
@@ -62,7 +62,7 @@ void sub_8116664(u8 taskId)
     u8 animBattlers[2];
 
     animBattlers[1] = 0xFF;
-    selectedPalettes = sub_811583C(1);
+    selectedPalettes = UnpackSelectedBattleAnimPalettes(1);
     switch (gBattleAnimArgs[0])
     {
     case 2:
@@ -105,7 +105,7 @@ void sub_8116664(u8 taskId)
 
 void AnimTask_SetCamouflageBlend(u8 taskId)
 {
-    u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]);
+    u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
     switch (gBattleTerrain)
     {
     case BATTLE_TERRAIN_GRASS:

src/battle_controller_link_opponent.c

@@ -27,7 +27,6 @@
 #include "constants/trainers.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
@@ -1251,17 +1250,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
             || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
             {
                 if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
                 else
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
             }
             else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
                      || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
             {
                 if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
                 else
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
             }
             else
             {
@@ -1280,17 +1279,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
             else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
         }
         else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
             else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
         }
         else
         {

src/battle_controller_link_partner.c

@@ -26,8 +26,6 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 
-extern struct UnusedControllerStruct gUnknown_02022D0C;
-
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 

src/battle_controller_opponent.c

@@ -34,7 +34,6 @@
 #include "constants/trainers.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 

src/battle_controller_player.c

@@ -37,7 +37,6 @@
 extern u8 gUnknown_0203CEE8;
 extern u8 gUnknown_0203CEE9;
 extern u8 gUnknown_0203CF00[];
-extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];

src/battle_controller_player_partner.c

@@ -6,6 +6,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_setup.h"
+#include "battle_tower.h"
 #include "bg.h"
 #include "data2.h"
 #include "item_use.h"
@@ -26,15 +27,11 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 
-extern struct UnusedControllerStruct gUnknown_02022D0C;
-
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
 extern void sub_81358F4(void);
 extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern void SetMultiuseSpriteTemplateToPokemon(u16, u8);
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void PlayerPartnerHandleGetMonData(void);

src/battle_controller_recorded_opponent.c

@@ -6,6 +6,7 @@
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "battle_setup.h"
+#include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
 #include "data2.h"
@@ -29,14 +30,11 @@
 #include "constants/trainers.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct UnusedControllerStruct gUnknown_02022D0C;
-extern u8 gUnknown_0203C7B4;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
 extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
 extern u16 sub_8068B48(void);
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void RecordedOpponentHandleGetMonData(void);

src/battle_controller_recorded_player.c

@@ -25,16 +25,12 @@
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
-extern u8 gUnknown_0203C7B4;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
 extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void RecordedPlayerHandleGetMonData(void);

src/battle_controller_wally.c

@@ -31,9 +31,6 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 
-extern s32 gUnknown_0203CD70;
-extern struct UnusedControllerStruct gUnknown_02022D0C;
-
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
 extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);

src/battle_controllers.c

@@ -13,10 +13,10 @@
 #include "constants/abilities.h"
 #include "constants/species.h"
 
-extern u8 gUnknown_02022D08;
-extern u8 gUnknown_02022D09;
-extern u8 gUnknown_02022D0A;
-
+static EWRAM_DATA u8 sLinkSendTaskId = 0;
+static EWRAM_DATA u8 sLinkReceiveTaskId = 0;
+static EWRAM_DATA u8 sUnknown_02022D0A = 0;
+EWRAM_DATA struct UnusedControllerStruct gUnknown_02022D0C = {};
 static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {};
 
 extern void sub_81B8D64(u8 battlerId, u8 arg1); // party_menu
@@ -681,20 +681,20 @@ static void PrepareBufferDataTransfer(u8 bufferId, u8 *data, u16 size)
 
 static void CreateTasksForSendRecvLinkBuffers(void)
 {
-    gUnknown_02022D08 = CreateTask(Task_HandleSendLinkBuffersData, 0);
-    gTasks[gUnknown_02022D08].data[11] = 0;
-    gTasks[gUnknown_02022D08].data[12] = 0;
-    gTasks[gUnknown_02022D08].data[13] = 0;
-    gTasks[gUnknown_02022D08].data[14] = 0;
-    gTasks[gUnknown_02022D08].data[15] = 0;
+    sLinkSendTaskId = CreateTask(Task_HandleSendLinkBuffersData, 0);
+    gTasks[sLinkSendTaskId].data[11] = 0;
+    gTasks[sLinkSendTaskId].data[12] = 0;
+    gTasks[sLinkSendTaskId].data[13] = 0;
+    gTasks[sLinkSendTaskId].data[14] = 0;
+    gTasks[sLinkSendTaskId].data[15] = 0;
 
-    gUnknown_02022D09 = CreateTask(Task_HandleCopyReceivedLinkBuffersData, 0);
-    gTasks[gUnknown_02022D09].data[12] = 0;
-    gTasks[gUnknown_02022D09].data[13] = 0;
-    gTasks[gUnknown_02022D09].data[14] = 0;
-    gTasks[gUnknown_02022D09].data[15] = 0;
+    sLinkReceiveTaskId = CreateTask(Task_HandleCopyReceivedLinkBuffersData, 0);
+    gTasks[sLinkReceiveTaskId].data[12] = 0;
+    gTasks[sLinkReceiveTaskId].data[13] = 0;
+    gTasks[sLinkReceiveTaskId].data[14] = 0;
+    gTasks[sLinkReceiveTaskId].data[15] = 0;
 
-    gUnknown_02022D0A = 0;
+    sUnknown_02022D0A = 0;
 }
 
 enum
@@ -716,24 +716,24 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
     s32 i;
 
     alignedSize = size - size % 4 + 4;
-    if (gTasks[gUnknown_02022D08].data[14] + alignedSize + LINK_BUFF_DATA + 1 > BATTLE_BUFFER_LINK_SIZE)
+    if (gTasks[sLinkSendTaskId].data[14] + alignedSize + LINK_BUFF_DATA + 1 > BATTLE_BUFFER_LINK_SIZE)
     {
-        gTasks[gUnknown_02022D08].data[12] = gTasks[gUnknown_02022D08].data[14];
-        gTasks[gUnknown_02022D08].data[14] = 0;
+        gTasks[sLinkSendTaskId].data[12] = gTasks[sLinkSendTaskId].data[14];
+        gTasks[sLinkSendTaskId].data[14] = 0;
     }
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattlerTarget;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_TARGET] = gBattlerTarget;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags;
+    gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler;
 
     for (i = 0; i < size; i++)
-        gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_DATA + i] = data[i];
+        gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_DATA + i] = data[i];
 
-    gTasks[gUnknown_02022D08].data[14] = gTasks[gUnknown_02022D08].data[14] + alignedSize + LINK_BUFF_DATA;
+    gTasks[sLinkSendTaskId].data[14] = gTasks[sLinkSendTaskId].data[14] + alignedSize + LINK_BUFF_DATA;
 }
 
 static void Task_HandleSendLinkBuffersData(u8 taskId)
@@ -845,19 +845,19 @@ void sub_8033648(void)
                 #endif
                 r6 = gBlockRecvBuffer[i][2];
 
-                if (gTasks[gUnknown_02022D09].data[14] + 9 + r6 > 0x1000)
+                if (gTasks[sLinkReceiveTaskId].data[14] + 9 + r6 > 0x1000)
                 {
-                    gTasks[gUnknown_02022D09].data[12] = gTasks[gUnknown_02022D09].data[14];
-                    gTasks[gUnknown_02022D09].data[14] = 0;
+                    gTasks[sLinkReceiveTaskId].data[12] = gTasks[sLinkReceiveTaskId].data[14];
+                    gTasks[sLinkReceiveTaskId].data[14] = 0;
                 }
 
-                dest = &gLinkBattleRecvBuffer[gTasks[gUnknown_02022D09].data[14]];
+                dest = &gLinkBattleRecvBuffer[gTasks[sLinkReceiveTaskId].data[14]];
                 src = recvBuffer;
 
                 for (j = 0; j < r6 + 8; j++)
                     dest[j] = src[j];
 
-                gTasks[gUnknown_02022D09].data[14] = gTasks[gUnknown_02022D09].data[14] + r6 + 8;
+                gTasks[sLinkReceiveTaskId].data[14] = gTasks[sLinkReceiveTaskId].data[14] + r6 + 8;
             }
         }
     }

src/battle_factory.c

@@ -13,11 +13,6 @@
 #include "constants/trainers.h"
 #include "constants/moves.h"
 
-extern const struct FacilityMon gBattleFrontierMons[];
-extern const struct FacilityMon gSlateportBattleTentMons[];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-extern const u16 gBattleFrontierHeldItems[];
-
 // IWRAM bss
 static IWRAM_DATA bool8 gUnknown_03001288;
 

src/battle_factory_screen.c

@@ -10,7 +10,7 @@
 #include "palette.h"
 #include "task.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "string_util.h"

src/battle_gfx_sfx_util.c

@@ -6,7 +6,7 @@
 #include "constants/battle_anim.h"
 #include "battle_interface.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "graphics.h"
 #include "random.h"
 #include "util.h"

src/battle_interface.c

@@ -543,11 +543,11 @@ enum
 
 static const u16 sStatusIconColors[] =
 {
-    RGB(24, 12, 24), // PAL_STATUS_PSN
-    RGB(23, 23, 3), // PAL_STATUS_PAR
-    RGB(20, 20, 17), // PAL_STATUS_SLP
-    RGB(17, 22, 28), // PAL_STATUS_FRZ
-    RGB(28, 14, 10) // PAL_STATUS_BRN
+    [PAL_STATUS_PSN] = RGB(24, 12, 24),
+    [PAL_STATUS_PAR] = RGB(23, 23, 3),
+    [PAL_STATUS_SLP] = RGB(20, 20, 17),
+    [PAL_STATUS_FRZ] = RGB(17, 22, 28),
+    [PAL_STATUS_BRN] = RGB(28, 14, 10),
 };
 
 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2
@@ -647,225 +647,225 @@ NAKED
 static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
 {
     asm(".syntax unified\n\
-        	push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x4\n\
-	adds r7, r1, 0\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	mov r10, r2\n\
-	movs r3, 0\n\
-	movs r2, 0\n\
+            push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    adds r7, r1, 0\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    mov r10, r2\n\
+    movs r3, 0\n\
+    movs r2, 0\n\
 _08072324:\n\
-	lsls r0, r3, 24\n\
-	asrs r0, 24\n\
-	mov r3, sp\n\
-	adds r1, r3, r0\n\
-	strb r2, [r1]\n\
-	adds r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r3, r0, 24\n\
-	asrs r0, 24\n\
-	cmp r0, 0x3\n\
-	ble _08072324\n\
-	movs r3, 0x3\n\
-	movs r0, 0x1\n\
-	negs r0, r0\n\
-	mov r9, r0\n\
-	mov r8, sp\n\
+    lsls r0, r3, 24\n\
+    asrs r0, 24\n\
+    mov r3, sp\n\
+    adds r1, r3, r0\n\
+    strb r2, [r1]\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3\n\
+    ble _08072324\n\
+    movs r3, 0x3\n\
+    movs r0, 0x1\n\
+    negs r0, r0\n\
+    mov r9, r0\n\
+    mov r8, sp\n\
 _08072344:\n\
-	lsls r0, r5, 16\n\
-	asrs r6, r0, 16\n\
-	cmp r6, 0\n\
-	ble _08072372\n\
-	lsls r4, r3, 24\n\
-	asrs r4, 24\n\
-	mov r1, sp\n\
-	adds r5, r1, r4\n\
-	adds r0, r6, 0\n\
-	movs r1, 0xA\n\
-	bl __modsi3\n\
-	strb r0, [r5]\n\
-	adds r0, r6, 0\n\
-	movs r1, 0xA\n\
-	bl __divsi3\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	subs r4, 0x1\n\
-	lsls r4, 24\n\
-	lsrs r3, r4, 24\n\
-	b _08072344\n\
+    lsls r0, r5, 16\n\
+    asrs r6, r0, 16\n\
+    cmp r6, 0\n\
+    ble _08072372\n\
+    lsls r4, r3, 24\n\
+    asrs r4, 24\n\
+    mov r1, sp\n\
+    adds r5, r1, r4\n\
+    adds r0, r6, 0\n\
+    movs r1, 0xA\n\
+    bl __modsi3\n\
+    strb r0, [r5]\n\
+    adds r0, r6, 0\n\
+    movs r1, 0xA\n\
+    bl __divsi3\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    subs r4, 0x1\n\
+    lsls r4, 24\n\
+    lsrs r3, r4, 24\n\
+    b _08072344\n\
 _08072372:\n\
-	lsls r1, r3, 24\n\
-	asrs r0, r1, 24\n\
-	cmp r0, r9\n\
-	ble _08072396\n\
-	movs r4, 0xFF\n\
-	movs r3, 0x1\n\
-	negs r3, r3\n\
+    lsls r1, r3, 24\n\
+    asrs r0, r1, 24\n\
+    cmp r0, r9\n\
+    ble _08072396\n\
+    movs r4, 0xFF\n\
+    movs r3, 0x1\n\
+    negs r3, r3\n\
 _08072380:\n\
-	asrs r2, r1, 24\n\
-	mov r5, sp\n\
-	adds r1, r5, r2\n\
-	ldrb r0, [r1]\n\
-	orrs r0, r4\n\
-	strb r0, [r1]\n\
-	subs r2, 0x1\n\
-	lsls r1, r2, 24\n\
-	asrs r0, r1, 24\n\
-	cmp r0, r3\n\
-	bgt _08072380\n\
+    asrs r2, r1, 24\n\
+    mov r5, sp\n\
+    adds r1, r5, r2\n\
+    ldrb r0, [r1]\n\
+    orrs r0, r4\n\
+    strb r0, [r1]\n\
+    subs r2, 0x1\n\
+    lsls r1, r2, 24\n\
+    asrs r0, r1, 24\n\
+    cmp r0, r3\n\
+    bgt _08072380\n\
 _08072396:\n\
-	mov r1, r8\n\
-	ldrb r0, [r1, 0x3]\n\
-	cmp r0, 0xFF\n\
-	bne _080723A2\n\
-	movs r0, 0\n\
-	strb r0, [r1, 0x3]\n\
+    mov r1, r8\n\
+    ldrb r0, [r1, 0x3]\n\
+    cmp r0, 0xFF\n\
+    bne _080723A2\n\
+    movs r0, 0\n\
+    strb r0, [r1, 0x3]\n\
 _080723A2:\n\
-	mov r2, r10\n\
-	cmp r2, 0\n\
-	bne _08072432\n\
-	movs r3, 0\n\
-	movs r1, 0\n\
-	movs r6, 0xFC\n\
-	lsls r6, 8\n\
-	movs r5, 0x1E\n\
-	mov r12, r5\n\
+    mov r2, r10\n\
+    cmp r2, 0\n\
+    bne _08072432\n\
+    movs r3, 0\n\
+    movs r1, 0\n\
+    movs r6, 0xFC\n\
+    lsls r6, 8\n\
+    movs r5, 0x1E\n\
+    mov r12, r5\n\
 _080723B4:\n\
-	lsls r1, 24\n\
-	asrs r2, r1, 24\n\
-	mov r0, sp\n\
-	adds r5, r0, r2\n\
-	ldrb r0, [r5]\n\
-	mov r8, r1\n\
-	cmp r0, 0xFF\n\
-	bne _080723EA\n\
-	lsls r1, r2, 1\n\
-	adds r1, r7\n\
-	ldrh r2, [r1]\n\
-	adds r0, r6, 0\n\
-	ands r0, r2\n\
-	mov r2, r12\n\
-	orrs r0, r2\n\
-	strh r0, [r1]\n\
-	lsls r3, 24\n\
-	asrs r1, r3, 23\n\
-	adds r1, r7\n\
-	adds r1, 0x40\n\
-	ldrh r2, [r1]\n\
-	adds r0, r6, 0\n\
-	ands r0, r2\n\
-	mov r5, r12\n\
-	orrs r0, r5\n\
-	strh r0, [r1]\n\
-	b _0807241A\n\
+    lsls r1, 24\n\
+    asrs r2, r1, 24\n\
+    mov r0, sp\n\
+    adds r5, r0, r2\n\
+    ldrb r0, [r5]\n\
+    mov r8, r1\n\
+    cmp r0, 0xFF\n\
+    bne _080723EA\n\
+    lsls r1, r2, 1\n\
+    adds r1, r7\n\
+    ldrh r2, [r1]\n\
+    adds r0, r6, 0\n\
+    ands r0, r2\n\
+    mov r2, r12\n\
+    orrs r0, r2\n\
+    strh r0, [r1]\n\
+    lsls r3, 24\n\
+    asrs r1, r3, 23\n\
+    adds r1, r7\n\
+    adds r1, 0x40\n\
+    ldrh r2, [r1]\n\
+    adds r0, r6, 0\n\
+    ands r0, r2\n\
+    mov r5, r12\n\
+    orrs r0, r5\n\
+    strh r0, [r1]\n\
+    b _0807241A\n\
 _080723EA:\n\
-	lsls r2, 1\n\
-	adds r2, r7\n\
-	ldrh r0, [r2]\n\
-	adds r1, r6, 0\n\
-	ands r1, r0\n\
-	ldrb r0, [r5]\n\
-	adds r0, 0x14\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
-	lsls r4, r3, 24\n\
-	asrs r3, r4, 24\n\
-	lsls r2, r3, 1\n\
-	adds r2, r7\n\
-	adds r2, 0x40\n\
-	ldrh r0, [r2]\n\
-	adds r1, r6, 0\n\
-	ands r1, r0\n\
-	mov r5, sp\n\
-	adds r0, r5, r3\n\
-	ldrb r0, [r0]\n\
-	adds r0, 0x34\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
-	adds r3, r4, 0\n\
+    lsls r2, 1\n\
+    adds r2, r7\n\
+    ldrh r0, [r2]\n\
+    adds r1, r6, 0\n\
+    ands r1, r0\n\
+    ldrb r0, [r5]\n\
+    adds r0, 0x14\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    lsls r4, r3, 24\n\
+    asrs r3, r4, 24\n\
+    lsls r2, r3, 1\n\
+    adds r2, r7\n\
+    adds r2, 0x40\n\
+    ldrh r0, [r2]\n\
+    adds r1, r6, 0\n\
+    ands r1, r0\n\
+    mov r5, sp\n\
+    adds r0, r5, r3\n\
+    ldrb r0, [r0]\n\
+    adds r0, 0x34\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    adds r3, r4, 0\n\
 _0807241A:\n\
-	movs r0, 0x80\n\
-	lsls r0, 17\n\
-	add r0, r8\n\
-	lsrs r1, r0, 24\n\
-	movs r2, 0x80\n\
-	lsls r2, 17\n\
-	adds r0, r3, r2\n\
-	lsrs r3, r0, 24\n\
-	asrs r0, 24\n\
-	cmp r0, 0x3\n\
-	ble _080723B4\n\
-	b _08072496\n\
+    movs r0, 0x80\n\
+    lsls r0, 17\n\
+    add r0, r8\n\
+    lsrs r1, r0, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r3, r2\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3\n\
+    ble _080723B4\n\
+    b _08072496\n\
 _08072432:\n\
-	movs r3, 0\n\
-	movs r4, 0xFC\n\
-	lsls r4, 8\n\
-	movs r6, 0x1E\n\
+    movs r3, 0\n\
+    movs r4, 0xFC\n\
+    lsls r4, 8\n\
+    movs r6, 0x1E\n\
 _0807243A:\n\
-	lsls r1, r3, 24\n\
-	asrs r2, r1, 24\n\
-	mov r3, sp\n\
-	adds r5, r3, r2\n\
-	ldrb r0, [r5]\n\
-	adds r3, r1, 0\n\
-	cmp r0, 0xFF\n\
-	bne _08072466\n\
-	lsls r1, r2, 1\n\
-	adds r1, r7\n\
-	ldrh r2, [r1]\n\
-	adds r0, r4, 0\n\
-	ands r0, r2\n\
-	orrs r0, r6\n\
-	strh r0, [r1]\n\
-	adds r1, 0x40\n\
-	ldrh r2, [r1]\n\
-	adds r0, r4, 0\n\
-	ands r0, r2\n\
-	orrs r0, r6\n\
-	strh r0, [r1]\n\
-	b _08072488\n\
+    lsls r1, r3, 24\n\
+    asrs r2, r1, 24\n\
+    mov r3, sp\n\
+    adds r5, r3, r2\n\
+    ldrb r0, [r5]\n\
+    adds r3, r1, 0\n\
+    cmp r0, 0xFF\n\
+    bne _08072466\n\
+    lsls r1, r2, 1\n\
+    adds r1, r7\n\
+    ldrh r2, [r1]\n\
+    adds r0, r4, 0\n\
+    ands r0, r2\n\
+    orrs r0, r6\n\
+    strh r0, [r1]\n\
+    adds r1, 0x40\n\
+    ldrh r2, [r1]\n\
+    adds r0, r4, 0\n\
+    ands r0, r2\n\
+    orrs r0, r6\n\
+    strh r0, [r1]\n\
+    b _08072488\n\
 _08072466:\n\
-	lsls r2, 1\n\
-	adds r2, r7\n\
-	ldrh r0, [r2]\n\
-	adds r1, r4, 0\n\
-	ands r1, r0\n\
-	ldrb r0, [r5]\n\
-	adds r0, 0x14\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
-	adds r2, 0x40\n\
-	ldrh r0, [r2]\n\
-	adds r1, r4, 0\n\
-	ands r1, r0\n\
-	ldrb r0, [r5]\n\
-	adds r0, 0x34\n\
-	orrs r1, r0\n\
-	strh r1, [r2]\n\
+    lsls r2, 1\n\
+    adds r2, r7\n\
+    ldrh r0, [r2]\n\
+    adds r1, r4, 0\n\
+    ands r1, r0\n\
+    ldrb r0, [r5]\n\
+    adds r0, 0x14\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    adds r2, 0x40\n\
+    ldrh r0, [r2]\n\
+    adds r1, r4, 0\n\
+    ands r1, r0\n\
+    ldrb r0, [r5]\n\
+    adds r0, 0x34\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
 _08072488:\n\
-	movs r5, 0x80\n\
-	lsls r5, 17\n\
-	adds r0, r3, r5\n\
-	lsrs r3, r0, 24\n\
-	asrs r0, 24\n\
-	cmp r0, 0x3\n\
-	ble _0807243A\n\
+    movs r5, 0x80\n\
+    lsls r5, 17\n\
+    adds r0, r3, r5\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3\n\
+    ble _0807243A\n\
 _08072496:\n\
-	add sp, 0x4\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
         .syntax divided");
 }
 

src/battle_intro.c

@@ -1,21 +1,728 @@
 #include "global.h"
+#include "battle.h"
+#include "battle_anim.h"
+#include "battle_main.h"
+#include "battle_setup.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "main.h"
+#include "scanline_effect.h"
 #include "task.h"
+#include "trig.h"
+#include "constants/trainers.h"
 
-extern void task_battle_intro_80BC47C(u8);
-extern void task00_battle_intro_80BC6C8(u8);
-extern void task_battle_intro_80BC47C(u8);
-extern void task_battle_intro_anim(u8);
+static EWRAM_DATA u16 sBgCnt = 0;
 
-const TaskFunc gUnknown_08597424[] =
+extern const u8 gUnknown_0859741A[];
+extern const u8 gUnknown_0859741E[];
+
+static void BattleIntroSlide1(u8);
+static void BattleIntroSlide2(u8);
+static void BattleIntroSlide3(u8);
+static void BattleIntroSlideLink(u8);
+static void BattleIntroSlidePartner(u8);
+
+static const TaskFunc sBattleIntroSlideFuncs[] =
 {
-    task_battle_intro_80BC47C,
-    task_battle_intro_80BC47C,
-    task00_battle_intro_80BC6C8,
-    task00_battle_intro_80BC6C8,
-    task00_battle_intro_80BC6C8,
-    task_battle_intro_80BC47C,
-    task_battle_intro_80BC47C,
-    task_battle_intro_80BC47C,
-    task_battle_intro_anim,
-    task_battle_intro_anim,
+    BattleIntroSlide1, // BATTLE_TERRAIN_GRASS
+    BattleIntroSlide1, // BATTLE_TERRAIN_LONG_GRASS
+    BattleIntroSlide2, // BATTLE_TERRAIN_SAND
+    BattleIntroSlide2, // BATTLE_TERRAIN_UNDERWATER
+    BattleIntroSlide2, // BATTLE_TERRAIN_WATER
+    BattleIntroSlide1, // BATTLE_TERRAIN_POND
+    BattleIntroSlide1, // BATTLE_TERRAIN_MOUNTAIN
+    BattleIntroSlide1, // BATTLE_TERRAIN_CAVE
+    BattleIntroSlide3, // BATTLE_TERRAIN_BUILDING
+    BattleIntroSlide3, // BATTLE_TERRAIN_PLAIN
 };
+
+void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value)
+{
+    if (bgId < 4)
+    {
+        sBgCnt = GetGpuReg(gUnknown_0859741A[bgId]);
+        switch (attributeId)
+        {
+        case BG_ANIM_SCREEN_SIZE:
+            ((struct BgCnt *)&sBgCnt)->screenSize = value;
+            break;
+        case BG_ANIM_AREA_OVERFLOW_MODE:
+            ((struct BgCnt *)&sBgCnt)->areaOverflowMode = value;
+            break;
+        case BG_ANIM_MOSAIC:
+            ((struct BgCnt *)&sBgCnt)->mosaic = value;
+            break;
+        case BG_ANIM_CHAR_BASE_BLOCK:
+            ((struct BgCnt *)&sBgCnt)->charBaseBlock = value;
+            break;
+        case BG_ANIM_PRIORITY:
+            ((struct BgCnt *)&sBgCnt)->priority = value;
+            break;
+        case BG_ANIM_PALETTES_MODE:
+            ((struct BgCnt *)&sBgCnt)->palettes = value;
+            break;
+        case BG_ANIM_SCREEN_BASE_BLOCK:
+            ((struct BgCnt *)&sBgCnt)->screenBaseBlock = value;
+            break;
+        }
+
+        SetGpuReg(gUnknown_0859741A[bgId], sBgCnt);
+    }
+}
+
+int GetAnimBgAttribute(u8 bgId, u8 attributeId)
+{
+    u16 bgCnt;
+
+    if (bgId < 4)
+    {
+        bgCnt = GetGpuReg(gUnknown_0859741E[bgId]);
+        switch (attributeId)
+        {
+        case BG_ANIM_SCREEN_SIZE:
+            return ((struct BgCnt *)&bgCnt)->screenSize;
+        case BG_ANIM_AREA_OVERFLOW_MODE:
+            return ((struct BgCnt *)&bgCnt)->areaOverflowMode;
+        case BG_ANIM_MOSAIC:
+            return ((struct BgCnt *)&bgCnt)->mosaic;
+        case BG_ANIM_CHAR_BASE_BLOCK:
+            return ((struct BgCnt *)&bgCnt)->charBaseBlock;
+        case BG_ANIM_PRIORITY:
+            return ((struct BgCnt *)&bgCnt)->priority;
+        case BG_ANIM_PALETTES_MODE:
+            return ((struct BgCnt *)&bgCnt)->palettes;
+        case BG_ANIM_SCREEN_BASE_BLOCK:
+            return ((struct BgCnt *)&bgCnt)->screenBaseBlock;
+        }
+    }
+
+    return 0;
+}
+
+void HandleIntroSlide(u8 terrain)
+{
+    u8 taskId;
+
+    if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) && gPartnerTrainerId != TRAINER_STEVEN_PARTNER)
+    {
+        taskId = CreateTask(BattleIntroSlidePartner, 0);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        taskId = CreateTask(BattleIntroSlideLink, 0);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
+    {
+        taskId = CreateTask(BattleIntroSlide3, 0);
+    }
+    else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY)
+    {
+        terrain = BATTLE_TERRAIN_UNDERWATER;
+        taskId = CreateTask(BattleIntroSlide2, 0);
+    }
+    else
+    {
+        taskId = CreateTask(sBattleIntroSlideFuncs[terrain], 0);
+    }
+
+    gTasks[taskId].data[0] = 0;
+    gTasks[taskId].data[1] = terrain;
+    gTasks[taskId].data[2] = 0;
+    gTasks[taskId].data[3] = 0;
+    gTasks[taskId].data[4] = 0;
+    gTasks[taskId].data[5] = 0;
+    gTasks[taskId].data[6] = 0;
+}
+
+void sub_811828C(u8 taskId)
+{
+    DestroyTask(taskId);
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+    SetGpuReg(REG_OFFSET_BLDY, 0);
+    SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
+    SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR);
+}
+
+static void BattleIntroSlide1(u8 taskId)
+{
+    int i;
+
+    gBattle_BG1_X += 6;
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            gTasks[taskId].data[2] = 16;
+            gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            gTasks[taskId].data[2] = 1;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 1:
+        if (--gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 0xFF;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gIntroSlideFlags &= ~1;
+        }
+        break;
+    case 3:
+        if (gTasks[taskId].data[3])
+        {
+            gTasks[taskId].data[3]--;
+        }
+        else
+        {
+            if (gTasks[taskId].data[1] == 1)
+            {
+                if (gBattle_BG1_Y != 0xFFB0)
+                    gBattle_BG1_Y -= 2;
+            }
+            else
+            {
+                if (gBattle_BG1_Y != 0xFFC8)
+                    gBattle_BG1_Y -= 1;
+            }
+        }
+
+        if (gBattle_WIN0V & 0xFF00)
+            gBattle_WIN0V -= 0x3FC;
+        
+        if (gTasks[taskId].data[2])
+            gTasks[taskId].data[2] -= 2;
+
+        // Scanline settings have already been set in CB2_InitBattleInternal()
+        for (i = 0; i < 80; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+
+        for (; i < 160; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (!gTasks[taskId].data[2])
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE);
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
+            SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512);
+            SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256);
+        }
+        break;
+    case 4:
+        sub_811828C(taskId);
+        break;
+    }
+}
+
+static void BattleIntroSlide2(u8 taskId)
+{
+    int i;
+
+    switch (gTasks[taskId].data[1])
+    {
+    case 2:
+    case 4:
+        gBattle_BG1_X += 8;
+        break;
+    case 3:
+        gBattle_BG1_X += 6;
+        break;
+    }
+
+    if (gTasks[taskId].data[1] == 4)
+    {
+        gBattle_BG1_Y = Cos2(gTasks[taskId].data[6]) / 512 - 8;
+        if (gTasks[taskId].data[6] < 180)
+            gTasks[taskId].data[6] += 4;
+        else
+            gTasks[taskId].data[6] += 6;
+
+        if (gTasks[taskId].data[6] == 360)
+            gTasks[taskId].data[6] = 0;
+    }
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        gTasks[taskId].data[4] = 16;
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            gTasks[taskId].data[2] = 16;
+            gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            gTasks[taskId].data[2] = 1;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 1:
+        if (--gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 0xFF;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].data[5] = 1;
+            gIntroSlideFlags &= ~1;
+        }
+        break;
+    case 3:
+        if (gTasks[taskId].data[3])
+        {
+            if (--gTasks[taskId].data[3] == 0)
+            {
+                SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ);
+                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(15, 0));
+                SetGpuReg(REG_OFFSET_BLDY, 0);
+            }
+        }
+        else
+        {
+            if ((gTasks[taskId].data[4] & 0x1F) && --gTasks[taskId].data[5] == 0)
+            {
+                gTasks[taskId].data[4] += 0xFF;
+                gTasks[taskId].data[5] = 4;
+            }
+        }
+
+        if (gBattle_WIN0V & 0xFF00)
+            gBattle_WIN0V -= 0x3FC;
+        
+        if (gTasks[taskId].data[2])
+            gTasks[taskId].data[2] -= 2;
+
+        // Scanline settings have already been set in CB2_InitBattleInternal()
+        for (i = 0; i < 80; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+
+        for (; i < 160; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (!gTasks[taskId].data[2])
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE);
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
+            SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512);
+            SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256);
+        }
+        break;
+    case 4:
+        sub_811828C(taskId);
+        break;
+    }
+
+    if (gTasks[taskId].data[0] != 4)
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[4], 0));
+}
+
+static void BattleIntroSlide3(u8 taskId)
+{
+    int i;
+
+    gBattle_BG1_X += 8;
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ);
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8));
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+        gTasks[taskId].data[4] = BLDALPHA_BLEND(8, 8);
+        if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+        {
+            gTasks[taskId].data[2] = 16;
+            gTasks[taskId].data[0]++;
+        }
+        else
+        {
+            gTasks[taskId].data[2] = 1;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 1:
+        if (--gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 0xFF;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gTasks[taskId].data[5] = 1;
+            gIntroSlideFlags &= ~1;
+        }
+        break;
+    case 3:
+        if (gTasks[taskId].data[3])
+        {
+            gTasks[taskId].data[3]--;
+        }
+        else
+        {
+            if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0)
+            {
+                gTasks[taskId].data[4] += 0xFF;
+                gTasks[taskId].data[5] = 6;
+            }
+        }
+
+        if (gBattle_WIN0V & 0xFF00)
+            gBattle_WIN0V -= 0x3FC;
+        
+        if (gTasks[taskId].data[2])
+            gTasks[taskId].data[2] -= 2;
+
+        // Scanline settings have already been set in CB2_InitBattleInternal()
+        for (i = 0; i < 80; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+
+        for (; i < 160; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (!gTasks[taskId].data[2])
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE);
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
+            SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512);
+            SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256);
+        }
+        break;
+    case 4:
+        sub_811828C(taskId);
+        break;
+    }
+
+    if (gTasks[taskId].data[0] != 4)
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[4], 0));
+}
+
+static void BattleIntroSlideLink(u8 taskId)
+{
+    int i;
+
+    if (gTasks[taskId].data[0] > 1 && !gTasks[taskId].data[4])
+    {
+        u16 var0 = gBattle_BG1_X & 0x8000;
+        if (var0 || gBattle_BG1_X < 80)
+        {
+            gBattle_BG1_X += 3;
+            gBattle_BG2_X -= 3;
+        }
+        else
+        {
+            CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE);
+            CpuFill32(0, (void *)BG_SCREEN_ADDR(30), BG_SCREEN_SIZE);
+            gTasks[taskId].data[4] = 1;
+        }
+    }
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        gTasks[taskId].data[2] = 32;
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        if (--gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            gSprites[gBattleStruct->field_7D].oam.objMode = ST_OAM_OBJ_WINDOW;
+            gSprites[gBattleStruct->field_7D].callback = sub_8038B74;
+            gSprites[gBattleStruct->field_7E].oam.objMode = ST_OAM_OBJ_WINDOW;
+            gSprites[gBattleStruct->field_7E].callback = sub_8038B74;
+            SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+            SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2);
+        }
+        break;
+    case 2:
+        gBattle_WIN0V -= 0xFF;
+        if ((gBattle_WIN0V & 0xFF00) == 0x3000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gTasks[taskId].data[3] = 32;
+            gIntroSlideFlags &= ~1;
+        }
+        break;
+    case 3:
+        if (gBattle_WIN0V & 0xFF00)
+            gBattle_WIN0V -= 0x3FC;
+        
+        if (gTasks[taskId].data[2])
+            gTasks[taskId].data[2] -= 2;
+
+        // Scanline settings have already been set in CB2_InitBattleInternal()
+        for (i = 0; i < 80; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2];
+
+        for (; i < 160; i++)
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2];
+
+        if (!gTasks[taskId].data[2])
+        {
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
+            SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512);
+            SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256);
+        }
+        break;
+    case 4:
+        sub_811828C(taskId);
+        break;
+    }
+}
+
+static void BattleIntroSlidePartner(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        gTasks[taskId].data[2] = 1;
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        if (--gTasks[taskId].data[2] == 0)
+        {
+            gTasks[taskId].data[0]++;
+            SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT512x256);
+            SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256);
+            SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON);
+            SetGpuReg(REG_OFFSET_WININ, WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR);
+            SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR);
+            gBattle_BG0_Y = -48;
+            gBattle_BG1_X = 240;
+            gBattle_BG2_X = -240;
+        }
+        break;
+    case 2:
+        gBattle_WIN0V += 0x100;
+        if ((gBattle_WIN0V & 0xFF00) != 0x100)
+            gBattle_WIN0V--;
+        
+        if ((gBattle_WIN0V & 0xFF00) == 0x2000)
+        {
+            gTasks[taskId].data[0]++;
+            gTasks[taskId].data[2] = 240;
+            gIntroSlideFlags &= ~1;
+        }
+        break;
+    case 3:
+        if ((gBattle_WIN0V & 0xFF00) != 0x4C00)
+            gBattle_WIN0V += 0x3FC;
+
+        if (gTasks[taskId].data[2])
+            gTasks[taskId].data[2] -= 2;
+
+        gBattle_BG1_X = gTasks[taskId].data[2];
+        gBattle_BG2_X = -gTasks[taskId].data[2];
+        if (!gTasks[taskId].data[2])
+            gTasks[taskId].data[0]++;
+        break;
+    case 4:
+        gBattle_BG0_Y += 2;
+        gBattle_BG2_Y += 2;
+        if ((gBattle_WIN0V & 0xFF00) != 0x5000)
+            gBattle_WIN0V += 0xFF;
+
+        if (!gBattle_BG0_Y)
+        {
+            CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE * 4);
+            SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) & ~DISPCNT_WIN1_ON);
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
+            SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512);
+            SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256);
+            gScanlineEffect.state = 3;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 5:
+        sub_811828C(taskId);
+        break;
+    }
+}
+
+void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 tilesOffset)
+{
+    int i, j;
+    u8 battler = GetBattlerAtPosition(battlerPosition);
+    int offset = tilesOffset;
+    CpuCopy16(gMonSpritesGfxPtr->sprites[battlerPosition] + BG_SCREEN_SIZE * gBattleMonForms[battler], arg5, BG_SCREEN_SIZE);
+    LoadBgTiles(bgId, arg5, 0x1000, tilesOffset);
+    for (i = arg2; i < arg2 + 8; i++)
+    {
+        for (j = arg1; j < arg1 + 8; j++)
+        {
+            arg6[i * 32 + j] = offset | (arg4 << 12);
+            offset++;
+        }
+    }
+
+    LoadBgTilemap(bgId, arg6, BG_SCREEN_SIZE, 0);
+}
+
+#ifdef NONMATCHING
+void unref_sub_8119094(u8 arg0, u8 arg1, u8 battlerPosition, u8 arg3, u8 arg4, u16 arg5, u8 arg6, u8 arg7)
+{
+    int i, j;
+    int offset;
+    DmaCopy16(3, gMonSpritesGfxPtr->sprites[battlerPosition] + BG_SCREEN_SIZE * arg3, (void *)BG_SCREEN_ADDR(0) + arg5, BG_SCREEN_SIZE);
+    offset = (arg5 >> 5) - (arg7 << 9);
+    for (i = arg1; i < arg1 + 8; i++)
+    {
+        for (j = arg0; j < arg0 + 8; j++)
+        {
+            ((u16 *)BG_VRAM)[i * 32 + j + (arg6 * 0x400) + arg0] = offset | (arg4 << 12);
+            offset++;
+        }
+    }
+}
+#else
+NAKED
+void unref_sub_8119094(u8 arg0, u8 arg1, u8 battlerPosition, u8 arg3, u8 arg4, u16 arg5, u8 arg6, u8 arg7)
+{
+    asm_unified("\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    ldr r4, [sp, 0x24]\n\
+    ldr r5, [sp, 0x28]\n\
+    mov r8, r5\n\
+    ldr r5, [sp, 0x2C]\n\
+    ldr r6, [sp, 0x30]\n\
+    mov r9, r6\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r12, r0\n\
+    lsls r1, 24\n\
+    lsls r2, 24\n\
+    lsls r3, 24\n\
+    lsls r4, 24\n\
+    lsrs r4, 24\n\
+    mov r10, r4\n\
+    mov r7, r8\n\
+    lsls r7, 16\n\
+    lsrs r6, r7, 16\n\
+    lsls r5, 24\n\
+    lsrs r5, 24\n\
+    mov r0, r9\n\
+    lsls r0, 24\n\
+    mov r9, r0\n\
+    ldr r4, =0x040000d4\n\
+    ldr r0, =gMonSpritesGfxPtr\n\
+    ldr r0, [r0]\n\
+    lsrs r2, 22\n\
+    adds r0, 0x4\n\
+    adds r0, r2\n\
+    lsrs r3, 13\n\
+    ldr r0, [r0]\n\
+    adds r0, r3\n\
+    str r0, [r4]\n\
+    movs r0, 0xC0\n\
+    lsls r0, 19\n\
+    adds r6, r0\n\
+    str r6, [r4, 0x4]\n\
+    ldr r0, =0x80000400\n\
+    str r0, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    adds r2, r7, 0\n\
+    lsrs r2, 21\n\
+    mov r6, r9\n\
+    lsrs r6, 15\n\
+    subs r4, r2, r6\n\
+    lsrs r0, r1, 24\n\
+    adds r1, r0, 0\n\
+    adds r1, 0x8\n\
+    cmp r0, r1\n\
+    bge _08119148\n\
+    mov r9, r1\n\
+    mov r7, r12\n\
+    lsls r7, 1\n\
+    mov r8, r7\n\
+    lsls r5, 11\n\
+    str r5, [sp]\n\
+_08119110:\n\
+    mov r2, r12\n\
+    adds r3, r2, 0\n\
+    adds r3, 0x8\n\
+    adds r5, r0, 0x1\n\
+    cmp r2, r3\n\
+    bge _08119142\n\
+    mov r1, r10\n\
+    lsls r6, r1, 12\n\
+    lsls r0, 6\n\
+    movs r7, 0xC0\n\
+    lsls r7, 19\n\
+    adds r0, r7\n\
+    ldr r1, [sp]\n\
+    adds r0, r1, r0\n\
+    mov r7, r8\n\
+    adds r1, r7, r0\n\
+    subs r2, r3, r2\n\
+_08119132:\n\
+    adds r0, r4, 0\n\
+    orrs r0, r6\n\
+    strh r0, [r1]\n\
+    adds r4, 0x1\n\
+    adds r1, 0x2\n\
+    subs r2, 0x1\n\
+    cmp r2, 0\n\
+    bne _08119132\n\
+_08119142:\n\
+    adds r0, r5, 0\n\
+    cmp r0, r9\n\
+    blt _08119110\n\
+_08119148:\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
+}
+#endif

src/battle_main.c

@@ -23,7 +23,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "m4a.h"
 #include "palette.h"
 #include "party_menu.h"
@@ -81,7 +81,7 @@ extern const u8 *const gBattlescriptsForBallThrow[];
 extern const u8 *const gBattlescriptsForRunningByItem[];
 extern const u8 *const gBattlescriptsForUsingItem[];
 extern const u8 *const gBattlescriptsForSafariActions[];
-extern const struct ScanlineEffectParams gUnknown_0831AC70;
+extern const struct ScanlineEffectParams gBattleIntroSlideScanlineEffectParams;
 
 // strings
 extern const u8 gText_LinkStandby3[];
@@ -451,10 +451,10 @@ const struct TrainerMoney gTrainerMoneyTable[] =
     {TRAINER_CLASS_AROMA_LADY, 10},
     {TRAINER_CLASS_RUIN_MANIAC, 15},
     {TRAINER_CLASS_INTERVIEWER, 12},
-    {TRAINER_CLASS_TUBER_1, 1},
-    {TRAINER_CLASS_TUBER_2, 1},
+    {TRAINER_CLASS_TUBER_F, 1},
+    {TRAINER_CLASS_TUBER_M, 1},
     {TRAINER_CLASS_SIS_AND_BRO, 3},
-    {TRAINER_CLASS_COOLTRAINER_1, 12},
+    {TRAINER_CLASS_COOLTRAINER, 12},
     {TRAINER_CLASS_HEX_MANIAC, 6},
     {TRAINER_CLASS_LADY, 50},
     {TRAINER_CLASS_BEAUTY, 20},
@@ -507,35 +507,35 @@ const struct TrainerMoney gTrainerMoneyTable[] =
 
 static void (* const sTurnActionsFuncsTable[])(void) =
 {
-    HandleAction_UseMove,               // B_ACTION_USE_MOVE
-    HandleAction_UseItem,               // B_ACTION_USE_ITEM
-    HandleAction_Switch,                // B_ACTION_SWITCH
-    HandleAction_Run,                   // B_ACTION_RUN
-    HandleAction_WatchesCarefully,      // B_ACTION_SAFARI_WATCH_CAREFULLY
-    HandleAction_SafariZoneBallThrow,   // B_ACTION_SAFARI_BALL
-    HandleAction_ThrowPokeblock,        // B_ACTION_SAFARI_POKEBLOCK
-    HandleAction_GoNear,                // B_ACTION_SAFARI_GO_NEAR
-    HandleAction_SafariZoneRun,         // B_ACTION_SAFARI_RUN
-    HandleAction_WallyBallThrow,        // B_ACTION_WALLY_THROW
-    HandleAction_RunBattleScript,       // B_ACTION_EXEC_SCRIPT
-    HandleAction_Action11,              // not sure about this one
-    HandleAction_ActionFinished,        // B_ACTION_FINISHED
-    HandleAction_NothingIsFainted,      // B_ACTION_NOTHING_FAINTED
+    [B_ACTION_USE_MOVE] = HandleAction_UseMove,
+    [B_ACTION_USE_ITEM] = HandleAction_UseItem,
+    [B_ACTION_SWITCH] = HandleAction_Switch,
+    [B_ACTION_RUN] = HandleAction_Run,
+    [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully,
+    [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow,
+    [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock,
+    [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear,
+    [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
+    [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
+    [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript,
+    [11] = HandleAction_Action11, // not sure about this one
+    [B_ACTION_FINISHED] = HandleAction_ActionFinished,
+    [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
 };
 
 static void (* const sEndTurnFuncsTable[])(void) =
 {
-    HandleEndTurn_ContinueBattle,       // battle outcome 0
-    HandleEndTurn_BattleWon,            // B_OUTCOME_WON
-    HandleEndTurn_BattleLost,           // B_OUTCOME_LOST
-    HandleEndTurn_BattleLost,           // B_OUTCOME_DREW
-    HandleEndTurn_RanFromBattle,        // B_OUTCOME_RAN
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_PLAYER_TELEPORTED
-    HandleEndTurn_MonFled,              // B_OUTCOME_MON_FLED
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_NO_SAFARI_BALLS
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_FORFEITED
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_MON_TELEPORTED
+    [0] = HandleEndTurn_ContinueBattle, //B_OUTCOME_NONE?
+    [B_OUTCOME_WON] = HandleEndTurn_BattleWon,
+    [B_OUTCOME_LOST] = HandleEndTurn_BattleLost,
+    [B_OUTCOME_DREW] = HandleEndTurn_BattleLost,
+    [B_OUTCOME_RAN] = HandleEndTurn_RanFromBattle,
+    [B_OUTCOME_PLAYER_TELEPORTED] = HandleEndTurn_FinishBattle,
+    [B_OUTCOME_MON_FLED] = HandleEndTurn_MonFled,
+    [B_OUTCOME_CAUGHT] = HandleEndTurn_FinishBattle,
+    [B_OUTCOME_NO_SAFARI_BALLS] = HandleEndTurn_FinishBattle,
+    [B_OUTCOME_FORFEITED] = HandleEndTurn_FinishBattle,
+    [B_OUTCOME_MON_TELEPORTED] = HandleEndTurn_FinishBattle,
 };
 
 const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
@@ -633,7 +633,7 @@ static void CB2_InitBattleInternal(void)
             gScanlineEffectRegBuffers[1][i] = 0xFF10;
         }
 
-        ScanlineEffect_SetParams(gUnknown_0831AC70);
+        ScanlineEffect_SetParams(gBattleIntroSlideScanlineEffectParams);
     }
 
     ResetPaletteFade();
@@ -3071,7 +3071,7 @@ static void BattleStartClearSetData(void)
         *(gBattleStruct->AI_monToSwitchIntoId + i) = PARTY_SIZE;
     }
 
-    gBattleStruct->field_DF = 0;
+    gBattleStruct->givenExpMons = 0;
     gBattleStruct->field_92 = 0;
 
     gRandomTurnNumber = Random();
@@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void)
 
     gBattleResources->flags->flags[gActiveBattler] = 0;
     gCurrentMove = 0;
-    gBattleStruct->field_DA = 0xFF;
+    gBattleStruct->arenaTurnCounter = 0xFF;
 
     ClearBattlerMoveHistory(gActiveBattler);
     ClearBattlerAbilityHistory(gActiveBattler);
@@ -3610,85 +3610,85 @@ NAKED
 static void BattleIntroOpponent1SendsOutMonAnimation(void)
 {
     asm(".syntax unified\n\
-        	push {r4-r6,lr}\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r2, [r0]\n\
-	movs r0, 0x80\n\
-	lsls r0, 17\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _0803B298\n\
-	movs r0, 0x80\n\
-	lsls r0, 18\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _0803B298\n\
-	movs r1, 0x80\n\
-	lsls r1, 24\n\
-	ands r1, r2\n\
-	negs r0, r1\n\
-	orrs r0, r1\n\
-	lsrs r5, r0, 31\n\
-	b _0803B29A\n\
-	.pool\n\
+            push {r4-r6,lr}\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r2, [r0]\n\
+    movs r0, 0x80\n\
+    lsls r0, 17\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0803B298\n\
+    movs r0, 0x80\n\
+    lsls r0, 18\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0803B298\n\
+    movs r1, 0x80\n\
+    lsls r1, 24\n\
+    ands r1, r2\n\
+    negs r0, r1\n\
+    orrs r0, r1\n\
+    lsrs r5, r0, 31\n\
+    b _0803B29A\n\
+    .pool\n\
 _0803B288:\n\
-	ldr r1, =gBattleMainFunc\n\
-	ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
-	b _0803B2F0\n\
-	.pool\n\
+    ldr r1, =gBattleMainFunc\n\
+    ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
+    b _0803B2F0\n\
+    .pool\n\
 _0803B298:\n\
-	movs r5, 0x1\n\
+    movs r5, 0x1\n\
 _0803B29A:\n\
-	ldr r0, =gBattleControllerExecFlags\n\
-	ldr r2, [r0]\n\
-	cmp r2, 0\n\
-	bne _0803B2F2\n\
-	ldr r0, =gActiveBattler\n\
-	strb r2, [r0]\n\
-	ldr r1, =gBattlersCount\n\
-	adds r4, r0, 0\n\
-	ldrb r1, [r1]\n\
-	cmp r2, r1\n\
-	bcs _0803B2EC\n\
-	adds r6, r4, 0\n\
+    ldr r0, =gBattleControllerExecFlags\n\
+    ldr r2, [r0]\n\
+    cmp r2, 0\n\
+    bne _0803B2F2\n\
+    ldr r0, =gActiveBattler\n\
+    strb r2, [r0]\n\
+    ldr r1, =gBattlersCount\n\
+    adds r4, r0, 0\n\
+    ldrb r1, [r1]\n\
+    cmp r2, r1\n\
+    bcs _0803B2EC\n\
+    adds r6, r4, 0\n\
 _0803B2B2:\n\
-	ldrb r0, [r4]\n\
-	bl GetBattlerPosition\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, r5\n\
-	bne _0803B2D8\n\
-	movs r0, 0\n\
-	bl BtlController_EmitIntroTrainerBallThrow\n\
-	ldrb r0, [r4]\n\
-	bl MarkBattlerForControllerExec\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	ldr r1, =0x00008040\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _0803B288\n\
+    ldrb r0, [r4]\n\
+    bl GetBattlerPosition\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, r5\n\
+    bne _0803B2D8\n\
+    movs r0, 0\n\
+    bl BtlController_EmitIntroTrainerBallThrow\n\
+    ldrb r0, [r4]\n\
+    bl MarkBattlerForControllerExec\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    ldr r1, =0x00008040\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _0803B288\n\
 _0803B2D8:\n\
-	ldrb r0, [r6]\n\
-	adds r0, 0x1\n\
-	strb r0, [r6]\n\
-	ldr r1, =gBattlersCount\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	ldr r4, =gActiveBattler\n\
-	ldrb r1, [r1]\n\
-	cmp r0, r1\n\
-	bcc _0803B2B2\n\
+    ldrb r0, [r6]\n\
+    adds r0, 0x1\n\
+    strb r0, [r6]\n\
+    ldr r1, =gBattlersCount\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    ldr r4, =gActiveBattler\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bcc _0803B2B2\n\
 _0803B2EC:\n\
-	ldr r1, =gBattleMainFunc\n\
-	ldr r0, =BattleIntroRecordMonsToDex\n\
+    ldr r1, =gBattleMainFunc\n\
+    ldr r0, =BattleIntroRecordMonsToDex\n\
 _0803B2F0:\n\
-	str r0, [r1]\n\
+    str r0, [r1]\n\
 _0803B2F2:\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
+    pop {r4-r6}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
         .syntax divided");
 }
 #endif // NONMATCHING
@@ -3994,7 +3994,7 @@ void BattleTurnPassed(void)
     if (gBattleResults.battleTurnCounter < 0xFF)
     {
         gBattleResults.battleTurnCounter++;
-        gBattleStruct->field_DA++;
+        gBattleStruct->arenaTurnCounter++;
     }
 
     for (i = 0; i < gBattlersCount; i++)
@@ -4013,7 +4013,7 @@ void BattleTurnPassed(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         BattleScriptExecute(BattleScript_82DB881);
-    else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
+    else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->arenaTurnCounter == 0)
         BattleScriptExecute(BattleScript_ArenaTurnBeginning);
 }
 
@@ -4591,10 +4591,10 @@ static void sub_803CDF8(void)
 
 void SwapTurnOrder(u8 id1, u8 id2)
 {
-	u32 temp;
+    u32 temp;
 
-	SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
-	SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
+    SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
+    SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
 }
 
 u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
@@ -5594,7 +5594,7 @@ bool8 TryRunFromBattle(u8 battler)
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
     {
-        gLastUsedItem = gBattleMons[battler].item ;
+        gLastUsedItem = gBattleMons[battler].item;
         gProtectStructs[battler].fleeFlag = 1;
         effect++;
     }

src/battle_pike.c

@@ -9,7 +9,7 @@
 #include "task.h"
 #include "battle_tower.h"
 #include "party_menu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "script.h"
 #include "battle_setup.h"
@@ -19,6 +19,7 @@
 #include "constants/rgb.h"
 #include "constants/trainers.h"
 #include "constants/species.h"
+#include "constants/moves.h"
 
 #define PIKE_ROOM_SINGLE_BATTLE 0
 #define PIKE_ROOM_HEAL_FULL 1
@@ -40,7 +41,6 @@ struct Unk0861231C
     u8 unk2;
     u8 unk3;
     u8 unk4;
-    u8 unk5;
 };
 
 struct PikeWildMon
@@ -50,11 +50,6 @@ struct PikeWildMon
     u16 moves[4];
 };
 
-extern const struct Unk0861231C gUnknown_0861231C[];
-extern const struct PikeWildMon *const *const gUnknown_08612314[2];
-extern const u16 gUnknown_086123E4[][6];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-
 // IWRAM bss
 static IWRAM_DATA u8 sRoomType;
 static IWRAM_DATA u8 sStatusMon;
@@ -106,6 +101,380 @@ static bool8 sub_81A7D8C(struct Task *task);
 static bool8 sub_81A7DE8(struct Task *task);
 
 // Const rom data.
+static const struct PikeWildMon sLvl50_Mons1[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF}
+    },
+    {
+        .species = SPECIES_DUSCLOPS,
+        .levelDelta = 5,
+        .moves = {MOVE_WILL_O_WISP, MOVE_MEAN_LOOK, MOVE_TOXIC, MOVE_SHADOW_PUNCH}
+    }
+};
+
+static const struct PikeWildMon sLvl50_Mons2[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF}
+    },
+    {
+        .species = SPECIES_ELECTRODE,
+        .levelDelta = 5,
+        .moves = {MOVE_EXPLOSION, MOVE_SELF_DESTRUCT, MOVE_THUNDER, MOVE_TOXIC}
+    }
+};
+
+static const struct PikeWildMon sLvl50_Mons3[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF}
+    },
+    {
+        .species = SPECIES_BRELOOM,
+        .levelDelta = 5,
+        .moves = {MOVE_SPORE, MOVE_STUN_SPORE, MOVE_POISON_POWDER, MOVE_HIDDEN_POWER}
+    }
+};
+
+static const struct PikeWildMon sLvl50_Mons4[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF}
+    },
+    {
+        .species = SPECIES_WOBBUFFET,
+        .levelDelta = 5,
+        .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND}
+    }
+};
+
+static const struct PikeWildMon *const sLvl50Mons[] =
+{
+    sLvl50_Mons1,
+    sLvl50_Mons2,
+    sLvl50_Mons3,
+    sLvl50_Mons4
+};
+
+static const struct PikeWildMon sLvlOpen_Mons1[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM}
+    },
+    {
+        .species = SPECIES_DUSCLOPS,
+        .levelDelta = 5,
+        .moves = {MOVE_WILL_O_WISP, MOVE_MEAN_LOOK, MOVE_TOXIC, MOVE_ICE_BEAM}
+    }
+};
+
+static const struct PikeWildMon sLvlOpen_Mons2[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM}
+    },
+    {
+        .species = SPECIES_ELECTRODE,
+        .levelDelta = 5,
+        .moves = {MOVE_EXPLOSION, MOVE_SELF_DESTRUCT, MOVE_THUNDER, MOVE_TOXIC}
+    }
+};
+
+static const struct PikeWildMon sLvlOpen_Mons3[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM}
+    },
+    {
+        .species = SPECIES_BRELOOM,
+        .levelDelta = 5,
+        .moves = {MOVE_SPORE, MOVE_STUN_SPORE, MOVE_POISON_POWDER, MOVE_HIDDEN_POWER}
+    }
+};
+
+static const struct PikeWildMon sLvlOpen_Mons4[] =
+{
+    {
+        .species = SPECIES_SEVIPER,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB}
+    },
+    {
+        .species = SPECIES_MILOTIC,
+        .levelDelta = 4,
+        .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM}
+    },
+    {
+        .species = SPECIES_WOBBUFFET,
+        .levelDelta = 5,
+        .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_ENCORE}
+    }
+};
+
+static const struct PikeWildMon *const sLvlOpenMons[] =
+{
+    sLvlOpen_Mons1,
+    sLvlOpen_Mons2,
+    sLvlOpen_Mons3,
+    sLvlOpen_Mons4
+};
+
+static const struct PikeWildMon *const *const sWildMons[2] =
+{
+    [FRONTIER_LVL_50]   = sLvl50Mons,
+    [FRONTIER_LVL_OPEN] = sLvlOpenMons
+};
+
+static const struct Unk0861231C gUnknown_0861231C[] =
+{
+    {
+        .unk0 = 0x0012,
+        .unk2 = 0x03,
+        .unk3 = 0x05,
+        .unk4 = 0x06
+    },
+    {
+        .unk0 = 0x0005,
+        .unk2 = 0x0d,
+        .unk3 = 0x20,
+        .unk4 = 0x25
+    },
+    {
+        .unk0 = 0x0011,
+        .unk2 = 0x08,
+        .unk3 = 0x0b,
+        .unk4 = 0x0c
+    },
+    {
+        .unk0 = 0x0024,
+        .unk2 = 0x22,
+        .unk3 = 0x1e,
+        .unk4 = 0x21
+    },
+    {
+        .unk0 = 0x0015,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .unk4 = 0x00
+    },
+    {
+        .unk0 = 0x001e,
+        .unk2 = 0x01,
+        .unk3 = 0x01,
+        .unk4 = 0x01
+    },
+    {
+        .unk0 = 0x002c,
+        .unk2 = 0x16,
+        .unk3 = 0x17,
+        .unk4 = 0x1b
+    },
+    {
+        .unk0 = 0x0037,
+        .unk2 = 0x08,
+        .unk3 = 0x16,
+        .unk4 = 0x1f
+    },
+    {
+        .unk0 = 0x000e,
+        .unk2 = 0x0d,
+        .unk3 = 0x27,
+        .unk4 = 0x15
+    },
+    {
+        .unk0 = 0x0014,
+        .unk2 = 0x02,
+        .unk3 = 0x04,
+        .unk4 = 0x11
+    },
+    {
+        .unk0 = 0x0038,
+        .unk2 = 0x1e,
+        .unk3 = 0x14,
+        .unk4 = 0x24
+    },
+    {
+        .unk0 = 0x0042,
+        .unk2 = 0x1c,
+        .unk3 = 0x22,
+        .unk4 = 0x19
+    },
+    {
+        .unk0 = 0x0026,
+        .unk2 = 0x17,
+        .unk3 = 0x26,
+        .unk4 = 0x1a
+    },
+    {
+        .unk0 = 0x0032,
+        .unk2 = 0x17,
+        .unk3 = 0x1e,
+        .unk4 = 0x0b
+    },
+    {
+        .unk0 = 0x002f,
+        .unk2 = 0x0f,
+        .unk3 = 0x13,
+        .unk4 = 0x0e
+    },
+    {
+        .unk0 = 0x0027,
+        .unk2 = 0x02,
+        .unk3 = 0x1d,
+        .unk4 = 0x1a
+    },
+    {
+        .unk0 = 0x0033,
+        .unk2 = 0x25,
+        .unk3 = 0x0c,
+        .unk4 = 0x20
+    },
+    {
+        .unk0 = 0x0021,
+        .unk2 = 0x18,
+        .unk3 = 0x17,
+        .unk4 = 0x26
+    },
+    {
+        .unk0 = 0x0018,
+        .unk2 = 0x05,
+        .unk3 = 0x16,
+        .unk4 = 0x04
+    },
+    {
+        .unk0 = 0x000b,
+        .unk2 = 0x29,
+        .unk3 = 0x25,
+        .unk4 = 0x23
+    },
+    {
+        .unk0 = 0x0035,
+        .unk2 = 0x27,
+        .unk3 = 0x0e,
+        .unk4 = 0x0d
+    },
+    {
+        .unk0 = 0x0030,
+        .unk2 = 0x0a,
+        .unk3 = 0x07,
+        .unk4 = 0x09
+    },
+    {
+        .unk0 = 0x000c,
+        .unk2 = 0x28,
+        .unk3 = 0x14,
+        .unk4 = 0x10
+    },
+    {
+        .unk0 = 0x0034,
+        .unk2 = 0x12,
+        .unk3 = 0x0d,
+        .unk4 = 0x15
+    },
+    {
+        .unk0 = 0x0013,
+        .unk2 = 0x16,
+        .unk3 = 0x1f,
+        .unk4 = 0x1b
+    }
+};
+
+static const u16 gUnknown_086123E4[][6] =
+{
+    {0x0a29, 0x0630, 0x0a01, 0x140f, 0x1020, 0x270e},
+    {0x0a2a, 0x081d, 0x061b, 0x1034, 0x1e20, 0x0a29},
+    {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1a, 0x0c03},
+    {0x1e0f, 0x100b, 0x1039, 0x200f, 0x102b, 0x0a14},
+    {0x103b, 0x0a02, 0x161e, 0x1020, 0x143e, 0x0c03},
+    {0x0a31, 0x0e02, 0x0e15, 0x1436, 0x1037, 0x1e0a},
+    {0x0a29, 0x1025, 0x142a, 0x1034, 0x1e0f, 0x0a1b},
+    {0x0a01, 0x0e07, 0x122a, 0x1e0f, 0x061f, 0xffff},
+    {0x1a35, 0x1036, 0x0e0f, 0x0a01, 0x2621, 0x1e0f},
+    {0x0e25, 0x102f, 0x062d, 0x201e, 0x0c03, 0xffff},
+    {0x0c1d, 0x081d, 0x0a2b, 0x100f, 0x0a02, 0x0c03},
+    {0x0a2a, 0x0a3e, 0x2000, 0x1027, 0x1c08, 0x0c04},
+    {0x0a01, 0x1212, 0x0a01, 0x1000, 0x062d, 0xffff},
+    {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1c, 0x0c03},
+    {0x0a01, 0x060b, 0x1030, 0x0a28, 0x2549, 0x0624},
+    {0x1014, 0x0a2c, 0x0415, 0x1642, 0x1e1b, 0x0c03},
+    {0x0628, 0x1a0f, 0x100b, 0x2017, 0x0c00, 0xffff},
+    {0x0a01, 0x1015, 0x1647, 0x1e0f, 0x0e39, 0x0e36},
+    {0x0a01, 0x1017, 0x1620, 0x0e19, 0x0a31, 0x0c38},
+    {0x0c1d, 0x081d, 0x0c00, 0x1022, 0x1c12, 0x020b},
+    {0x1029, 0x1404, 0x102f, 0x1006, 0x1e28, 0x1c1c},
+    {0x1029, 0x0e20, 0x1028, 0x1c16, 0x1e29, 0x0c03},
+    {0x1e0f, 0x100b, 0x0e2f, 0x0638, 0x100c, 0xffff},
+    {0x0a29, 0x1408, 0x102f, 0x061e, 0x102c, 0xffff},
+    {0x1023, 0x100b, 0x081d, 0x062d, 0x1037, 0x0a14},
+    {0x0a29, 0x1022, 0x1408, 0x102f, 0x161e, 0x1029},
+    {0x0601, 0x102c, 0x0a01, 0x1015, 0x0e39, 0x0e36},
+    {0x1020, 0x020b, 0x103f, 0x1c12, 0x0c04, 0xffff},
+    {0x1018, 0x0a02, 0x103a, 0x0446, 0x020e, 0x0c03},
+    {0x1e10, 0x020b, 0x1e0a, 0x100b, 0x063a, 0xffff},
+    {0x0a02, 0x1212, 0x1e0f, 0x100b, 0x0638, 0x0c03},
+    {0x1e22, 0x1000, 0x161b, 0x103f, 0x1e0f, 0x0c03},
+    {0x0a29, 0x0e1e, 0x1025, 0x1e26, 0x0c00, 0xffff},
+    {0x0a01, 0x0e1e, 0x1236, 0x102f, 0x120b, 0x0c04},
+    {0x2805, 0x1e0f, 0x0a1b, 0x100b, 0x1020, 0x063b},
+    {0x0a01, 0x101f, 0x0a3e, 0x1037, 0x1020, 0x0628},
+    {0x1026, 0x0a31, 0x1e29, 0x1c1c, 0x0a01, 0x1212},
+    {0x0c0a, 0x0c00, 0x1029, 0x101c, 0x1e0f, 0x0c23},
+    {0x0a28, 0x020e, 0x100f, 0x1039, 0x142a, 0x0c04},
+    {0x0a28, 0x020e, 0x100f, 0x0620, 0x102f, 0x043c},
+    {0x0c39, 0x0c39, 0x0c00, 0x0a29, 0x2017, 0x0c39},
+    {0x265c, 0x100b, 0x1020, 0x1230, 0x1e05, 0x100c},
+};
+
 static const u8 gUnknown_086125DC[][4] =
 {
     {0x23, 0x46, 0x23, 0x01},
@@ -732,7 +1101,7 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate)
     s32 monLevel;
     u8 headerId = GetBattlePikeWildMonHeaderId();
     u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
-    const struct PikeWildMon *const *const wildMons = gUnknown_08612314[lvlMode];
+    const struct PikeWildMon *const *const wildMons = sWildMons[lvlMode];
     u32 abilityBit;
     s32 pikeMonId = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL);
     pikeMonId = SpeciesToPikeMonId(pikeMonId);

src/battle_pyramid.c

@@ -6,6 +6,7 @@
 #include "battle_setup.h"
 #include "battle_tower.h"
 #include "save.h"
+#include "strings.h"
 #include "fieldmap.h"
 #include "palette.h"
 #include "field_message_box.h"
@@ -20,23 +21,34 @@
 #include "main.h"
 #include "load_save.h"
 #include "script.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "overworld.h"
+#include "event_scripts.h"
 #include "constants/battle_frontier.h"
 #include "constants/event_objects.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/items.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
+#include "constants/species.h"
 
 extern u8 gSelectedOrderFromParty[3];
 extern void door_upload_tiles(void);
 
 extern const struct MapLayout *const gMapLayouts[];
+extern const u16 gUnknown_08D856C8[][16];
 
 #define TOTAL_ROUNDS 20
 #define PICKUP_ITEMS_PER_ROUND 10
 
+struct PyramidWildMon
+{
+    u16 species;
+    u8 lvl;
+    u8 abilityBit;
+    u16 moves[4];
+};
+
 struct Struct_08613650
 {
     u8 unk0;
@@ -47,28 +59,12 @@ struct Struct_08613650
     u8 unk5[8];
 };
 
-struct PyramidWildMon
-{
-    u16 species;
-    u8 lvl;
-    u8 abilityBit;
-    u16 moves[4];
-};
-
 struct ClassMusic
 {
     u8 class;
     u8 music;
 };
 
-extern const u16 gBattleFrontierHeldItems[];
-extern const struct FacilityMon gBattleFrontierMons[];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[];
-
 // This file's functions.
 static void sub_81A8E9C(void);
 static void sub_81A8F38(void);
@@ -102,19 +98,662 @@ static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id);
 static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id);
 
 // Const rom data.
-extern const struct Struct_08613650 gUnknown_08613650[];
-extern const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND];
-extern const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND];
-extern const u8 gUnknown_08613ABC[63][2];
-extern const u8 gUnknown_08613B3A[];
-extern const u16 gUnknown_08D856C8[][16];
-extern const u8 gUnknown_08613C1C[50][2];
-extern const u8 *const *const *const gUnknown_08613EC0[];
-extern const struct ClassMusic gUnknown_08613B44[54];
-extern const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[];
-extern const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[];
-extern const u8 gUnknown_08613794[];
-extern const u8 gUnknown_08613750[34][2];
+#include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h"
+#include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h"
+
+static const struct Struct_08613650 gUnknown_08613650[] =
+{
+    {
+        .unk0 = 0x07,
+        .unk1 = 0x03,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x80,
+        .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03}
+    },
+    {
+        .unk0 = 0x06,
+        .unk1 = 0x03,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x80,
+        .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04}
+    },
+    {
+        .unk0 = 0x05,
+        .unk1 = 0x03,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x78,
+        .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05}
+    },
+    {
+        .unk0 = 0x04,
+        .unk1 = 0x04,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x78,
+        .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06}
+    },
+    {
+        .unk0 = 0x04,
+        .unk1 = 0x04,
+        .unk2 = 0x00,
+        .unk3 = 0x01,
+        .runMultiplier = 0x70,
+        .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07}
+    },
+    {
+        .unk0 = 0x03,
+        .unk1 = 0x05,
+        .unk2 = 0x00,
+        .unk3 = 0x02,
+        .runMultiplier = 0x70,
+        .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c}
+    },
+    {
+        .unk0 = 0x03,
+        .unk1 = 0x05,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x68,
+        .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d}
+    },
+    {
+        .unk0 = 0x02,
+        .unk1 = 0x04,
+        .unk2 = 0x00,
+        .unk3 = 0x01,
+        .runMultiplier = 0x68,
+        .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e}
+    },
+    {
+        .unk0 = 0x04,
+        .unk1 = 0x05,
+        .unk2 = 0x00,
+        .unk3 = 0x02,
+        .runMultiplier = 0x60,
+        .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
+    },
+    {
+        .unk0 = 0x03,
+        .unk1 = 0x06,
+        .unk2 = 0x00,
+        .unk3 = 0x04,
+        .runMultiplier = 0x60,
+        .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
+    },
+    {
+        .unk0 = 0x02,
+        .unk1 = 0x03,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x58,
+        .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d}
+    },
+    {
+        .unk0 = 0x04,
+        .unk1 = 0x05,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x58,
+        .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b}
+    },
+    {
+        .unk0 = 0x03,
+        .unk1 = 0x07,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x50,
+        .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c}
+    },
+    {
+        .unk0 = 0x02,
+        .unk1 = 0x04,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x50,
+        .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d}
+    },
+    {
+        .unk0 = 0x03,
+        .unk1 = 0x06,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x50,
+        .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e}
+    },
+    {
+        .unk0 = 0x03,
+        .unk1 = 0x08,
+        .unk2 = 0x00,
+        .unk3 = 0x00,
+        .runMultiplier = 0x50,
+        .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f}
+    }
+};
+
+static const u8 gUnknown_08613750[34][2] =
+{
+    {0x28, 0x00},
+    {0x46, 0x01},
+    {0x5a, 0x02},
+    {0x64, 0x03},
+    {0x23, 0x01},
+    {0x37, 0x02},
+    {0x4b, 0x03},
+    {0x5a, 0x04},
+    {0x64, 0x0a},
+    {0x23, 0x02},
+    {0x37, 0x03},
+    {0x4b, 0x04},
+    {0x5a, 0x05},
+    {0x64, 0x0b},
+    {0x23, 0x03},
+    {0x37, 0x04},
+    {0x4b, 0x05},
+    {0x5a, 0x06},
+    {0x64, 0x0c},
+    {0x23, 0x04},
+    {0x37, 0x05},
+    {0x4b, 0x06},
+    {0x5a, 0x07},
+    {0x64, 0x0d},
+    {0x23, 0x05},
+    {0x37, 0x06},
+    {0x4b, 0x07},
+    {0x5a, 0x08},
+    {0x64, 0x0e},
+    {0x23, 0x06},
+    {0x37, 0x07},
+    {0x4b, 0x08},
+    {0x5a, 0x09},
+    {0x64, 0x0f}
+};
+
+static const u8 gUnknown_08613794[] =
+{
+    0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00
+};
+
+static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
+{
+    {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+};
+
+static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
+{
+    {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+    {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+    {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+};
+
+static const u8 gUnknown_08613ABC[63][2] =
+{
+    {0x1f, 0x00},
+    {0x2e, 0x01},
+    {0x3d, 0x02},
+    {0x47, 0x03},
+    {0x51, 0x04},
+    {0x5b, 0x05},
+    {0x5e, 0x06},
+    {0x61, 0x07},
+    {0x64, 0x08},
+    {0x0f, 0x00},
+    {0x2e, 0x01},
+    {0x3d, 0x02},
+    {0x47, 0x03},
+    {0x51, 0x04},
+    {0x5b, 0x05},
+    {0x5e, 0x06},
+    {0x61, 0x08},
+    {0x64, 0x09},
+    {0x0f, 0x00},
+    {0x1e, 0x01},
+    {0x3d, 0x02},
+    {0x47, 0x03},
+    {0x51, 0x04},
+    {0x5b, 0x05},
+    {0x5e, 0x06},
+    {0x61, 0x07},
+    {0x64, 0x08},
+    {0x1c, 0x00},
+    {0x2b, 0x01},
+    {0x3a, 0x02},
+    {0x44, 0x03},
+    {0x4e, 0x04},
+    {0x58, 0x05},
+    {0x5c, 0x07},
+    {0x60, 0x08},
+    {0x64, 0x09},
+    {0x0f, 0x00},
+    {0x2b, 0x01},
+    {0x3a, 0x02},
+    {0x44, 0x03},
+    {0x4e, 0x04},
+    {0x58, 0x05},
+    {0x5c, 0x06},
+    {0x60, 0x07},
+    {0x64, 0x09},
+    {0x0f, 0x00},
+    {0x1e, 0x01},
+    {0x3a, 0x02},
+    {0x44, 0x03},
+    {0x4e, 0x04},
+    {0x58, 0x05},
+    {0x5c, 0x06},
+    {0x60, 0x07},
+    {0x64, 0x08},
+    {0x1c, 0x00},
+    {0x2b, 0x01},
+    {0x3a, 0x02},
+    {0x44, 0x03},
+    {0x4e, 0x04},
+    {0x58, 0x05},
+    {0x5c, 0x06},
+    {0x60, 0x08},
+    {0x64, 0x09},
+};
+
+static const u8 gUnknown_08613B3A[] = {0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36};
+
+static const struct ClassMusic gUnknown_08613B44[54] =
+{
+    {0x03, 0x06},
+    {0x0b, 0x06},
+    {0x0d, 0x06},
+    {0x0f, 0x01},
+    {0x2b, 0x04},
+    {0x2d, 0x01},
+    {0x24, 0x09},
+    {0x29, 0x04},
+    {0x05, 0x05},
+    {0x18, 0x04},
+    {0x2f, 0x00},
+    {0x2e, 0x09},
+    {0x11, 0x0c},
+    {0x10, 0x0b},
+    {0x1e, 0x0d},
+    {0x08, 0x01},
+    {0x17, 0x03},
+    {0x0c, 0x04},
+    {0x38, 0x04},
+    {0x1c, 0x03},
+    {0x1a, 0x00},
+    {0x19, 0x0b},
+    {0x09, 0x07},
+    {0x31, 0x07},
+    {0x35, 0x07},
+    {0x36, 0x01},
+    {0x33, 0x00},
+    {0x2a, 0x03},
+    {0x16, 0x0d},
+    {0x0e, 0x03},
+    {0x15, 0x01},
+    {0x14, 0x01},
+    {0x2c, 0x01},
+    {0x1b, 0x02},
+    {0x04, 0x01},
+    {0x07, 0x03},
+    {0x34, 0x05},
+    {0x32, 0x00},
+    {0x37, 0x02},
+    {0x1d, 0x04},
+    {0x22, 0x09},
+    {0x1f, 0x01},
+    {0x25, 0x00},
+    {0x0a, 0x04},
+    {0x28, 0x00},
+    {0x06, 0x05},
+    {0x27, 0x0b},
+    {0x26, 0x00},
+    {0x13, 0x00},
+    {0x12, 0x02},
+    {0x39, 0x08},
+    {0x02, 0x0b},
+    {0x20, 0x01},
+    {0x21, 0x00},
+};
+
+static const u8 gUnknown_08613C1C[50][2] =
+{
+    {0x0d, 0x03},
+    {0x0e, 0x04},
+    {0x10, 0x01},
+    {0x11, 0x00},
+    {0x03, 0x02},
+    {0x12, 0x03},
+    {0x0c, 0x03},
+    {0x13, 0x03},
+    {0x14, 0x03},
+    {0x15, 0x02},
+    {0x17, 0x02},
+    {0x07, 0x02},
+    {0x0a, 0x04},
+    {0x19, 0x02},
+    {0x1a, 0x02},
+    {0x1b, 0x00},
+    {0x1d, 0x02},
+    {0x1e, 0x02},
+    {0x1f, 0x03},
+    {0x20, 0x04},
+    {0x26, 0x00},
+    {0x27, 0x01},
+    {0x29, 0x04},
+    {0x2a, 0x05},
+    {0x09, 0x04},
+    {0x16, 0x05},
+    {0x2b, 0x00},
+    {0x2d, 0x04},
+    {0x2e, 0x02},
+    {0x30, 0x02},
+    {0x32, 0x02},
+    {0x31, 0x03},
+    {0x2f, 0x03},
+    {0x33, 0x03},
+    {0x34, 0x02},
+    {0x04, 0x02},
+    {0x35, 0x00},
+    {0x36, 0x03},
+    {0x37, 0x03},
+    {0x38, 0x03},
+    {0x1c, 0x01},
+    {0x3a, 0x02},
+    {0x05, 0x02},
+    {0x42, 0x02},
+    {0x02, 0x03},
+    {0x44, 0x02},
+    {0x45, 0x03},
+    {0x47, 0x03},
+    {0x43, 0x00},
+    {0x00, 0x04},
+};
+
+static const u8 *const gUnknown_08613C80[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_252D2D,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252D57,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252D81,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252DAB,
+};
+
+static const u8 *const gUnknown_08613C90[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_25330B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2532CC,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25328B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253248,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253206,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2531C4,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253183,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253140,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2530FD,
+};
+
+static const u8 *const gUnknown_08613CB4[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_2544A6,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25445A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25440B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2543BA,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25436A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25431A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2542CB,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25427A,
+};
+
+static const u8 *const gUnknown_08613CD4[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_252DD5,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252E03,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252E31,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252E5F,
+};
+
+static const u8 *const gUnknown_08613CE4[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_25362E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2535D4,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253578,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25351A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2534BD,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253460,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253404,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2533A6,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25334D,
+};
+
+static const u8 *const gUnknown_08613D08[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_25471E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2546CC,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25467C,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25462A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2545D9,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254588,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254538,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2544E6,
+};
+
+static const u8 *const gUnknown_08613D28[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_252E8D,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252EAA,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252EC7,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252EE4,
+};
+
+static const u8 *const gUnknown_08613D38[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_2539EC,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253980,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253915,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2538A8,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25383C,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2537D0,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253765,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2536F8,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25368B,
+};
+
+static const u8 *const gUnknown_08613D5C[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_254A0B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2549AE,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25494D,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2548EB,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25488A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254829,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2547C9,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254767,
+};
+
+static const u8 *const gUnknown_08613D7C[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_252F01,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252F3A,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252F73,
+    BattleFrontier_BattlePyramidEmptySquare_Text_252FAC,
+};
+
+static const u8 *const gUnknown_08613D8C[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_253D3E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253CE0,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253C87,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253C2C,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253BD2,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253B78,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253B1F,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253AC4,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253A69,
+};
+
+static const u8 *const gUnknown_08613DB0[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_254C3E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254BF1,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254BAE,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254B69,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254B25,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254AE1,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254A9E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254A59,
+};
+
+static const u8 *const gUnknown_08613DD0[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_252FE5,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253000,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25301B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253036,
+};
+
+static const u8 *const gUnknown_08613DE0[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_253F6C,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253F34,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253EFA,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253EBE,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253E83,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253E48,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253E0E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253DD2,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253D96,
+};
+
+static const u8 *const gUnknown_08613E04[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_254E6E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254E27,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254DE0,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254D97,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254D4F,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254D07,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254CC0,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254C77,
+};
+
+static const u8 *const gUnknown_08613E24[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_253051,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25307C,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2530A7,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2530D2,
+};
+
+static const u8 *const gUnknown_08613E34[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_25422B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2541DD,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25418D,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25413B,
+    BattleFrontier_BattlePyramidEmptySquare_Text_2540EA,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254099,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254049,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253FF7,
+    BattleFrontier_BattlePyramidEmptySquare_Text_253FA5,
+};
+
+static const u8 *const gUnknown_08613E58[] =
+{
+    BattleFrontier_BattlePyramidEmptySquare_Text_255068,
+    BattleFrontier_BattlePyramidEmptySquare_Text_25502F,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254FF6,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254FBB,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254F81,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254F47,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254F0E,
+    BattleFrontier_BattlePyramidEmptySquare_Text_254ED3,
+};
+
+static const u8 *const *const gUnknown_08613E78[] =
+{
+    gUnknown_08613C80,
+    gUnknown_08613C90,
+    gUnknown_08613CB4,
+};
+
+static const u8 *const *const gUnknown_08613E84[] =
+{
+    gUnknown_08613CD4,
+    gUnknown_08613CE4,
+    gUnknown_08613D08,
+};
+
+static const u8 *const *const gUnknown_08613E90[] =
+{
+    gUnknown_08613D28,
+    gUnknown_08613D38,
+    gUnknown_08613D5C,
+};
+
+static const u8 *const *const gUnknown_08613E9C[] =
+{
+    gUnknown_08613D7C,
+    gUnknown_08613D8C,
+    gUnknown_08613DB0,
+};
+
+static const u8 *const *const gUnknown_08613EA8[] =
+{
+    gUnknown_08613DD0,
+    gUnknown_08613DE0,
+    gUnknown_08613E04,
+};
+
+static const u8 *const *const gUnknown_08613EB4[] =
+{
+    gUnknown_08613E24,
+    gUnknown_08613E34,
+    gUnknown_08613E58,
+};
+
+static const u8 *const *const *const gUnknown_08613EC0[] =
+{
+    gUnknown_08613E78,
+    gUnknown_08613E84,
+    gUnknown_08613E90,
+    gUnknown_08613E9C,
+    gUnknown_08613EA8,
+    gUnknown_08613EB4,
+};
 
 static const u8 gUnknown_08613ED8[] = {3, 4, 5, 6, 7, 8, 3, 4};
 
@@ -679,9 +1318,9 @@ void GenerateBattlePyramidWildMon(void)
         round = TOTAL_ROUNDS - 1;
 
     if (lvl != FRONTIER_LVL_50)
-        wildMons = gBattlePyramidOpenLevelWildMonPointers[round];
+        wildMons = sOpenLevelWildMonPointers[round];
     else
-        wildMons = gBattlePyramidLevel50WildMonPointers[round];
+        wildMons = sLevel50WildMonPointers[round];
 
     id = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL) - 1;
     SetMonData(&gEnemyParty[0], MON_DATA_SPECIES, &wildMons[id].species);
@@ -816,7 +1455,7 @@ static u16 sub_81A9F90(u8 count)
         do
         {
             trainerId = sub_8162548(challengeNum + 1, battleNum);
-            for (i = 0 ; i < count; i++)
+            for (i = 0; i < count; i++)
             {
                 if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
                     break;
@@ -828,7 +1467,7 @@ static u16 sub_81A9F90(u8 count)
         do
         {
             trainerId = sub_8162548(challengeNum, battleNum);
-            for (i = 0 ; i < count; i++)
+            for (i = 0; i < count; i++)
             {
                 if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
                     break;

src/battle_pyramid_bag.c

@@ -17,7 +17,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"

src/battle_records.c

@@ -18,7 +18,7 @@
 #include "international_string_util.h"
 #include "sound.h"
 #include "constants/songs.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "constants/game_stat.h"
 

src/battle_script_commands.c

@@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] =
 
 static const u8* const sMoveEffectBS_Ptrs[] =
 {
-    BattleScript_MoveEffectSleep,	    //  0
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SLEEP
-    BattleScript_MoveEffectPoison,		//	MOVE_EFFECT_POISON
-    BattleScript_MoveEffectBurn,		//	MOVE_EFFECT_BURN
-    BattleScript_MoveEffectFreeze,		//	MOVE_EFFECT_FREEZE
-    BattleScript_MoveEffectParalysis,   //	MOVE_EFFECT_PARALYSIS
-    BattleScript_MoveEffectToxic,		//	MOVE_EFFECT_TOXIC
-    BattleScript_MoveEffectConfusion,	//	MOVE_EFFECT_CONFUSION
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_FLINCH
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_TRI_ATTACK
-    BattleScript_MoveEffectUproar,		//	MOVE_EFFECT_UPROAR
-    BattleScript_MoveEffectPayDay,		//	MOVE_EFFECT_PAYDAY
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_CHARGING
-    BattleScript_MoveEffectWrap,		//	MOVE_EFFECT_WRAP
-    BattleScript_MoveEffectRecoil,	    //	MOVE_EFFECT_RECOIL_25
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_DEF_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SPD_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_ATK_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_DEF_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ACC_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_EVS_PLUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_DEF_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SPD_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_ATK_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_DEF_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ACC_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_EVS_MINUS_1
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RECHARGE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RAGE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_STEAL_ITEM
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_PREVENT_ESCAPE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_NIGHTMARE
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ALL_STATS_UP
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RAPIDSPIN
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_REMOVE_PARALYSIS
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_DEF_DOWN
-    BattleScript_MoveEffectRecoil,	    //	MOVE_EFFECT_RECOIL_33
+    [0] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison,
+    [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn,
+    [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze,
+    [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis,
+    [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic,
+    [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion,
+    [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar,
+    [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay,
+    [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap,
+    [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil,
+    [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep,
+    [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil,
 };
 
 static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};
@@ -768,26 +768,26 @@ static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX /
 
 static const u16 sMovesForbiddenToCopy[] =
 {
-     MOVE_METRONOME,
-     MOVE_STRUGGLE,
-     MOVE_SKETCH,
-     MOVE_MIMIC,
-     MIMIC_FORBIDDEN_END,
-     MOVE_COUNTER,
-     MOVE_MIRROR_COAT,
-     MOVE_PROTECT,
-     MOVE_DETECT,
-     MOVE_ENDURE,
-     MOVE_DESTINY_BOND,
-     MOVE_SLEEP_TALK,
-     MOVE_THIEF,
-     MOVE_FOLLOW_ME,
-     MOVE_SNATCH,
-     MOVE_HELPING_HAND,
-     MOVE_COVET,
-     MOVE_TRICK,
-     MOVE_FOCUS_PUNCH,
-     METRONOME_FORBIDDEN_END
+    MOVE_METRONOME,
+    MOVE_STRUGGLE,
+    MOVE_SKETCH,
+    MOVE_MIMIC,
+    MIMIC_FORBIDDEN_END,
+    MOVE_COUNTER,
+    MOVE_MIRROR_COAT,
+    MOVE_PROTECT,
+    MOVE_DETECT,
+    MOVE_ENDURE,
+    MOVE_DESTINY_BOND,
+    MOVE_SLEEP_TALK,
+    MOVE_THIEF,
+    MOVE_FOLLOW_ME,
+    MOVE_SNATCH,
+    MOVE_HELPING_HAND,
+    MOVE_COVET,
+    MOVE_TRICK,
+    MOVE_FOCUS_PUNCH,
+    METRONOME_FORBIDDEN_END
 };
 
 static const u8 sFlailHpScaleToPowerTable[] =
@@ -828,38 +828,38 @@ static const u16 sWeightToDamageTable[] =
 static const u16 sPickupItems[] =
 {
     ITEM_POTION,
-	ITEM_ANTIDOTE,
-	ITEM_SUPER_POTION,
-	ITEM_GREAT_BALL,
-	ITEM_REPEL,
-	ITEM_ESCAPE_ROPE,
-	ITEM_X_ATTACK,
-	ITEM_FULL_HEAL,
-	ITEM_ULTRA_BALL,
-	ITEM_HYPER_POTION,
-	ITEM_RARE_CANDY,
-	ITEM_PROTEIN,
-	ITEM_REVIVE,
-	ITEM_HP_UP,
-	ITEM_FULL_RESTORE,
-	ITEM_MAX_REVIVE,
-	ITEM_PP_UP,
-	ITEM_MAX_ELIXIR,
+    ITEM_ANTIDOTE,
+    ITEM_SUPER_POTION,
+    ITEM_GREAT_BALL,
+    ITEM_REPEL,
+    ITEM_ESCAPE_ROPE,
+    ITEM_X_ATTACK,
+    ITEM_FULL_HEAL,
+    ITEM_ULTRA_BALL,
+    ITEM_HYPER_POTION,
+    ITEM_RARE_CANDY,
+    ITEM_PROTEIN,
+    ITEM_REVIVE,
+    ITEM_HP_UP,
+    ITEM_FULL_RESTORE,
+    ITEM_MAX_REVIVE,
+    ITEM_PP_UP,
+    ITEM_MAX_ELIXIR,
 };
 
 static const u16 sRarePickupItems[] =
 {
     ITEM_HYPER_POTION,
-	ITEM_NUGGET,
-	ITEM_KINGS_ROCK,
-	ITEM_FULL_RESTORE,
-	ITEM_ETHER,
-	ITEM_WHITE_HERB,
-	ITEM_TM44_REST,
-	ITEM_ELIXIR,
-	ITEM_TM01_FOCUS_PUNCH,
-	ITEM_LEFTOVERS,
-	ITEM_TM26_EARTHQUAKE,
+    ITEM_NUGGET,
+    ITEM_KINGS_ROCK,
+    ITEM_FULL_RESTORE,
+    ITEM_ETHER,
+    ITEM_WHITE_HERB,
+    ITEM_TM44_REST,
+    ITEM_ELIXIR,
+    ITEM_TM01_FOCUS_PUNCH,
+    ITEM_LEFTOVERS,
+    ITEM_TM26_EARTHQUAKE,
 };
 
 static const u8 sPickupProbabilities[] =
@@ -917,10 +917,10 @@ const ALIGNED(4) u8 gUnknown_0831C494[][4] =
 
 static const u8 sUnknown_0831C4F8[] =
 {
-	0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00,
-	0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01,
-	0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02,
-	0x03, 0x00, 0x00, 0x00
+    0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00,
+    0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01,
+    0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02,
+    0x03, 0x00, 0x00, 0x00
 };
 
 static void atk00_attackcanceler(void)
@@ -942,7 +942,7 @@ static void atk00_attackcanceler(void)
         return;
     if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0))
         return;
-    if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
+    if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING))
      && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         gBattlescriptCurrInstr = BattleScript_NoPPForMove;
@@ -3270,7 +3270,7 @@ static void atk23_getexp(void)
         else
         {
             gBattleScripting.atk23_state++;
-            gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
+            gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
         }
         break;
     case 1: // calculate experience points to redistribute
@@ -3403,8 +3403,8 @@ static void atk23_getexp(void)
 
                     PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId)
 
-					// buffer 'gained' or 'gained a boosted'
-					PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
+                    // buffer 'gained' or 'gained a boosted'
+                    PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
 
                     PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
 
@@ -4490,24 +4490,24 @@ static void atk48_playstatchangeanimation(void)
 
 enum
 {
-	ATK49_RAGE,
-	ATK49_DEFROST,
-	ATK49_SYNCHRONIZE_TARGET,
-	ATK49_MOVE_END_ABILITIES,
-	ATK49_STATUS_IMMUNITY_ABILITIES,
-	ATK49_SYNCHRONIZE_ATTACKER,
-	ATK49_CHOICE_MOVE,
-	ATK49_CHANGED_ITEMS,
-	ATK49_ATTACKER_INVISIBLE,
-	ATK49_ATTACKER_VISIBLE,
-	ATK49_TARGET_VISIBLE,
-	ATK49_ITEM_EFFECTS_ALL,
-	ATK49_KINGSROCK_SHELLBELL,
-	ATK49_SUBSTITUTE,
-	ATK49_UPDATE_LAST_MOVES,
-	ATK49_MIRROR_MOVE,
-	ATK49_NEXT_TARGET,
-	ATK49_COUNT,
+    ATK49_RAGE,
+    ATK49_DEFROST,
+    ATK49_SYNCHRONIZE_TARGET,
+    ATK49_MOVE_END_ABILITIES,
+    ATK49_STATUS_IMMUNITY_ABILITIES,
+    ATK49_SYNCHRONIZE_ATTACKER,
+    ATK49_CHOICE_MOVE,
+    ATK49_CHANGED_ITEMS,
+    ATK49_ATTACKER_INVISIBLE,
+    ATK49_ATTACKER_VISIBLE,
+    ATK49_TARGET_VISIBLE,
+    ATK49_ITEM_EFFECTS_ALL,
+    ATK49_KINGSROCK_SHELLBELL,
+    ATK49_SUBSTITUTE,
+    ATK49_UPDATE_LAST_MOVES,
+    ATK49_MIRROR_MOVE,
+    ATK49_NEXT_TARGET,
+    ATK49_COUNT,
 };
 
 static void atk49_moveend(void)
@@ -5560,7 +5560,7 @@ static void atk52_switchineffects(void)
         gDisableStructs[gActiveBattler].truantUnknownBit = 0;
 
         if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0)
-			&& !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
+            && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
         {
             gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
 

src/battle_setup.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "constants/trainers.h"
 #include "battle.h"
+#include "constants/battle_setup.h"
 #include "battle_setup.h"
 #include "battle_transition.h"
 #include "main.h"
@@ -305,7 +306,7 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] =
     {{TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, 0x0, 0x1b},
     {{TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5}, 0x18, 0xc},
     {{TRAINER_KIRA_AND_DAN_1, TRAINER_KIRA_AND_DAN_2, TRAINER_KIRA_AND_DAN_3, TRAINER_KIRA_AND_DAN_4, TRAINER_KIRA_AND_DAN_5}, 0x18, 0x3e},
-    {{TRAINER_WALLY_3, 0x292, 0x293, 0x294, 0x294}, 0x18, 0x2b},
+    {{TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_WALLY_6}, 0x18, 0x2b},
     {{TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5}, 0x0, 0x3},
     {{TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5}, 0x0, 0xb},
     {{TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5}, 0x0, 0x2},
@@ -1085,9 +1086,9 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 
     switch (sTrainerBattleMode)
     {
-    case TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT:
+    case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT:
         TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data);
-        return EventScript_2713C2;
+        return EventScript_DoTainerBattle;
     case TRAINER_BATTLE_DOUBLE:
         TrainerBattleLoadArgs(sDoubleBattleParams, data);
         SetMapVarsToTrainer();
@@ -1102,11 +1103,11 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
         {
             TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data);
         }
-        return EventScript_271362;
+        return EventScript_TryDoNormalTrainerBattle;
     case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC:
         TrainerBattleLoadArgs(sContinueScriptBattleParams, data);
         SetMapVarsToTrainer();
-        return EventScript_271362;
+        return EventScript_TryDoNormalTrainerBattle;
     case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE:
     case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC:
         TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data);
@@ -1121,8 +1122,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
         TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
         SetMapVarsToTrainer();
         gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
-        return EventScript_2713D1;
-    case TRAINER_BATTLE_9:
+        return EventScript_TryDoRematchBattle;
+    case TRAINER_BATTLE_PYRAMID:
         if (gApproachingTrainerId == 0)
         {
             TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
@@ -1134,7 +1135,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
             TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
             gTrainerBattleOpponent_B = LocalIdToPyramidTrainerId(gSpecialVar_LastTalked);
         }
-        return EventScript_271362;
+        return EventScript_TryDoNormalTrainerBattle;
     case TRAINER_BATTLE_SET_TRAINER_A:
         TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
         return NULL;
@@ -1153,7 +1154,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
             TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
             gTrainerBattleOpponent_B = sub_81D6180(gSpecialVar_LastTalked);
         }
-        return EventScript_271362;
+        return EventScript_TryDoNormalTrainerBattle;
     default:
         if (gApproachingTrainerId == 0)
         {
@@ -1164,7 +1165,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
         {
             TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
         }
-        return EventScript_271362;
+        return EventScript_TryDoNormalTrainerBattle;
     }
 }
 
@@ -1196,7 +1197,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
     return FlagGet(FLAG_TRAINER_FLAG_START + flag);
 }
 
-void sub_80B16D8(void)
+void SetUpTrainerMovement(void)
 {
     struct EventObject *eventObject = &gEventObjects[gSelectedEventObject];
 

src/battle_tent.c

@@ -14,10 +14,6 @@
 #include "constants/items.h"
 #include "constants/region_map_sections.h"
 
-extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[];
-extern const struct FacilityMon gSlateportBattleTentMons[];
-extern const u16 gBattleFrontierHeldItems[];
-
 // This file's functions.
 static void sub_81B99D4(void);
 static void sub_81B9A28(void);

src/battle_transition.c

@@ -7,7 +7,7 @@
 #include "field_effect.h"
 #include "gpu_regs.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "overworld.h"
 #include "palette.h"
 #include "random.h"
@@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 
 extern const struct OamData gEventObjectBaseOam_32x32;
 
-extern void sub_80AC3D0(void);
+extern void SetWeatherScreenFadeOut(void);
 
 // this file's functions
 static void LaunchBattleTransitionTask(u8 transitionId);
@@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1};
 
 static const s16 *const gUnknown_085C8CF8[] =
 {
-	gUnknown_085C8C90,
-	gUnknown_085C8CA4,
-	gUnknown_085C8C98,
-	gUnknown_085C8C9E,
-	gUnknown_085C8CEA,
-	gUnknown_085C8CE4,
-	gUnknown_085C8CF2,
-	gUnknown_085C8CDE
+    gUnknown_085C8C90,
+    gUnknown_085C8CA4,
+    gUnknown_085C8C98,
+    gUnknown_085C8C9E,
+    gUnknown_085C8CEA,
+    gUnknown_085C8CE4,
+    gUnknown_085C8CF2,
+    gUnknown_085C8CDE
 };
 
 static const s16 *const gUnknown_085C8D18[] =
 {
-	gUnknown_085C8CBC,
-	gUnknown_085C8CB0,
-	gUnknown_085C8CB6,
-	gUnknown_085C8CAA,
-	gUnknown_085C8CCA,
-	gUnknown_085C8CD8,
-	gUnknown_085C8CC4,
-	gUnknown_085C8CD2
+    gUnknown_085C8CBC,
+    gUnknown_085C8CB0,
+    gUnknown_085C8CB6,
+    gUnknown_085C8CAA,
+    gUnknown_085C8CCA,
+    gUnknown_085C8CD8,
+    gUnknown_085C8CC4,
+    gUnknown_085C8CD2
 };
 
 static const s16 *const *const gUnknown_085C8D38[] =
 {
-	gUnknown_085C8CF8,
-	gUnknown_085C8D18
+    gUnknown_085C8CF8,
+    gUnknown_085C8D18
 };
 
 static const TransitionStateFunc sPhase2_Groudon_Funcs[] =
@@ -981,7 +981,7 @@ static void Task_BattleTransitionMain(u8 taskId)
 
 static bool8 Transition_Phase1(struct Task *task)
 {
-    sub_80AC3D0();
+    SetWeatherScreenFadeOut();
     CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
     if (sPhase1_Tasks[task->tTransitionId] != NULL)
     {

src/battle_tv.c

@@ -815,324 +815,324 @@ void TryPutLinkBattleTvShowOnAir(void)
 {
     asm_unified(
     "push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x20\n\
-	movs r0, 0\n\
-	str r0, [sp]\n\
-	movs r1, 0\n\
-	str r1, [sp, 0x4]\n\
-	movs r2, 0\n\
-	str r2, [sp, 0x8]\n\
-	ldr r3, =0x00007fff\n\
-	str r3, [sp, 0xC]\n\
-	movs r4, 0\n\
-	str r4, [sp, 0x10]\n\
-	movs r7, 0\n\
-	str r7, [sp, 0x14]\n\
-	mov r8, r0\n\
-	ldr r0, =gBattleStruct\n\
-	ldr r1, [r0]\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xB3\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _0817E42A\n\
-	b _0817E670\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x20\n\
+    movs r0, 0\n\
+    str r0, [sp]\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x4]\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x8]\n\
+    ldr r3, =0x00007fff\n\
+    str r3, [sp, 0xC]\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x10]\n\
+    movs r7, 0\n\
+    str r7, [sp, 0x14]\n\
+    mov r8, r0\n\
+    ldr r0, =gBattleStruct\n\
+    ldr r1, [r0]\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xB3\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _0817E42A\n\
+    b _0817E670\n\
 _0817E42A:\n\
-	movs r2, 0xD2\n\
-	lsls r2, 1\n\
-	adds r2, r1\n\
-	mov r10, r2\n\
-	movs r6, 0\n\
+    movs r2, 0xD2\n\
+    lsls r2, 1\n\
+    adds r2, r1\n\
+    mov r10, r2\n\
+    movs r6, 0\n\
 _0817E434:\n\
-	movs r0, 0x64\n\
-	adds r4, r6, 0\n\
-	muls r4, r0\n\
-	ldr r0, =gPlayerParty\n\
-	adds r0, r4, r0\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	beq _0817E454\n\
-	mov r0, r8\n\
-	adds r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r8, r0\n\
+    movs r0, 0x64\n\
+    adds r4, r6, 0\n\
+    muls r4, r0\n\
+    ldr r0, =gPlayerParty\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    beq _0817E454\n\
+    mov r0, r8\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
 _0817E454:\n\
-	ldr r5, =gEnemyParty\n\
-	adds r0, r4, r5\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	beq _0817E46A\n\
-	adds r0, r7, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r7, r0, 24\n\
+    ldr r5, =gEnemyParty\n\
+    adds r0, r4, r5\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    beq _0817E46A\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r7, r0, 24\n\
 _0817E46A:\n\
-	adds r6, 0x1\n\
-	cmp r6, 0x5\n\
-	ble _0817E434\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	movs r1, 0x2\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _0817E47E\n\
-	b _0817E670\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x5\n\
+    ble _0817E434\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    movs r1, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _0817E47E\n\
+    b _0817E670\n\
 _0817E47E:\n\
-	cmp r8, r7\n\
-	beq _0817E484\n\
-	b _0817E670\n\
+    cmp r8, r7\n\
+    beq _0817E484\n\
+    b _0817E670\n\
 _0817E484:\n\
-	movs r6, 0\n\
-	lsls r3, r6, 1\n\
-	str r3, [sp, 0x18]\n\
-	movs r4, 0x64\n\
-	mov r8, r4\n\
+    movs r6, 0\n\
+    lsls r3, r6, 1\n\
+    str r3, [sp, 0x18]\n\
+    movs r4, 0x64\n\
+    mov r8, r4\n\
 _0817E48E:\n\
-	mov r1, r8\n\
-	muls r1, r6\n\
-	ldr r0, =gPlayerParty\n\
-	adds r4, r1, r0\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	lsls r0, 16\n\
-	lsrs r7, r0, 16\n\
-	adds r0, r6, 0x1\n\
-	mov r9, r0\n\
-	cmp r7, 0\n\
-	beq _0817E4EE\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x2D\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	bne _0817E4EE\n\
-	movs r4, 0\n\
-	lsls r0, r6, 3\n\
-	mov r2, r10\n\
-	adds r1, r0, r2\n\
-	movs r3, 0x3\n\
+    mov r1, r8\n\
+    muls r1, r6\n\
+    ldr r0, =gPlayerParty\n\
+    adds r4, r1, r0\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    adds r0, r6, 0x1\n\
+    mov r9, r0\n\
+    cmp r7, 0\n\
+    beq _0817E4EE\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x2D\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    bne _0817E4EE\n\
+    movs r4, 0\n\
+    lsls r0, r6, 3\n\
+    mov r2, r10\n\
+    adds r1, r0, r2\n\
+    movs r3, 0x3\n\
 _0817E4C4:\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	ldrh r4, [r1]\n\
-	adds r0, r4\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	adds r1, 0x2\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _0817E4C4\n\
-	ldr r1, [sp, 0x8]\n\
-	lsls r0, r1, 16\n\
-	lsls r1, r4, 16\n\
-	cmp r0, r1\n\
-	bge _0817E4EE\n\
-	lsls r0, r6, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x10]\n\
-	lsrs r1, 16\n\
-	str r1, [sp, 0x8]\n\
-	str r7, [sp]\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    ldrh r4, [r1]\n\
+    adds r0, r4\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    adds r1, 0x2\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _0817E4C4\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r0, r1, 16\n\
+    lsls r1, r4, 16\n\
+    cmp r0, r1\n\
+    bge _0817E4EE\n\
+    lsls r0, r6, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x10]\n\
+    lsrs r1, 16\n\
+    str r1, [sp, 0x8]\n\
+    str r7, [sp]\n\
 _0817E4EE:\n\
-	mov r0, r8\n\
-	muls r0, r6\n\
-	ldr r2, =gEnemyParty\n\
-	adds r4, r0, r2\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xB\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	lsls r0, 16\n\
-	lsrs r7, r0, 16\n\
-	ldr r3, [sp, 0x8]\n\
-	lsls r3, 16\n\
-	str r3, [sp, 0x1C]\n\
-	cmp r7, 0\n\
-	beq _0817E5A0\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x2D\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	bne _0817E5A0\n\
-	movs r4, 0\n\
-	ldr r0, [sp, 0xC]\n\
-	lsls r2, r0, 16\n\
-	movs r3, 0x1\n\
-	lsls r1, r3, 1\n\
-	adds r1, 0x1\n\
-	lsls r1, 4\n\
-	lsls r0, r6, 3\n\
-	adds r0, r1\n\
-	mov r3, r10\n\
-	adds r1, r0, r3\n\
-	movs r3, 0x3\n\
+    mov r0, r8\n\
+    muls r0, r6\n\
+    ldr r2, =gEnemyParty\n\
+    adds r4, r0, r2\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    ldr r3, [sp, 0x8]\n\
+    lsls r3, 16\n\
+    str r3, [sp, 0x1C]\n\
+    cmp r7, 0\n\
+    beq _0817E5A0\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x2D\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    bne _0817E5A0\n\
+    movs r4, 0\n\
+    ldr r0, [sp, 0xC]\n\
+    lsls r2, r0, 16\n\
+    movs r3, 0x1\n\
+    lsls r1, r3, 1\n\
+    adds r1, 0x1\n\
+    lsls r1, 4\n\
+    lsls r0, r6, 3\n\
+    adds r0, r1\n\
+    mov r3, r10\n\
+    adds r1, r0, r3\n\
+    movs r3, 0x3\n\
 _0817E534:\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	ldrh r4, [r1]\n\
-	adds r0, r4\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	adds r1, 0x2\n\
-	subs r3, 0x1\n\
-	cmp r3, 0\n\
-	bge _0817E534\n\
-	asrs r1, r2, 16\n\
-	lsls r5, r4, 16\n\
-	asrs r0, r5, 16\n\
-	cmp r1, r0\n\
-	bne _0817E590\n\
-	mov r0, r8\n\
-	muls r0, r6\n\
-	ldr r1, =gEnemyParty\n\
-	adds r0, r1\n\
-	movs r1, 0x19\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	adds r4, r0, 0\n\
-	ldr r2, [sp, 0x14]\n\
-	mov r0, r8\n\
-	muls r0, r2\n\
-	ldr r3, =gEnemyParty\n\
-	adds r0, r3\n\
-	movs r1, 0x19\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	cmp r4, r0\n\
-	bls _0817E5A0\n\
-	b _0817E594\n\
-	.pool\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    ldrh r4, [r1]\n\
+    adds r0, r4\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    adds r1, 0x2\n\
+    subs r3, 0x1\n\
+    cmp r3, 0\n\
+    bge _0817E534\n\
+    asrs r1, r2, 16\n\
+    lsls r5, r4, 16\n\
+    asrs r0, r5, 16\n\
+    cmp r1, r0\n\
+    bne _0817E590\n\
+    mov r0, r8\n\
+    muls r0, r6\n\
+    ldr r1, =gEnemyParty\n\
+    adds r0, r1\n\
+    movs r1, 0x19\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    adds r4, r0, 0\n\
+    ldr r2, [sp, 0x14]\n\
+    mov r0, r8\n\
+    muls r0, r2\n\
+    ldr r3, =gEnemyParty\n\
+    adds r0, r3\n\
+    movs r1, 0x19\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    cmp r4, r0\n\
+    bls _0817E5A0\n\
+    b _0817E594\n\
+    .pool\n\
 _0817E590:\n\
-	cmp r1, r0\n\
-	ble _0817E5A0\n\
+    cmp r1, r0\n\
+    ble _0817E5A0\n\
 _0817E594:\n\
-	lsls r0, r6, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x14]\n\
-	lsrs r5, 16\n\
-	str r5, [sp, 0xC]\n\
-	str r7, [sp, 0x4]\n\
+    lsls r0, r6, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x14]\n\
+    lsrs r5, 16\n\
+    str r5, [sp, 0xC]\n\
+    str r7, [sp, 0x4]\n\
 _0817E5A0:\n\
-	mov r6, r9\n\
-	cmp r6, 0x5\n\
-	bgt _0817E5A8\n\
-	b _0817E48E\n\
+    mov r6, r9\n\
+    cmp r6, 0x5\n\
+    bgt _0817E5A8\n\
+    b _0817E48E\n\
 _0817E5A8:\n\
-	movs r4, 0\n\
-	movs r6, 0\n\
-	movs r3, 0\n\
-	ldr r5, =gPlayerParty\n\
-	ldr r7, [sp, 0x10]\n\
-	lsls r0, r7, 3\n\
-	mov r1, r10\n\
-	adds r2, r0, r1\n\
+    movs r4, 0\n\
+    movs r6, 0\n\
+    movs r3, 0\n\
+    ldr r5, =gPlayerParty\n\
+    ldr r7, [sp, 0x10]\n\
+    lsls r0, r7, 3\n\
+    mov r1, r10\n\
+    adds r2, r0, r1\n\
 _0817E5B8:\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	movs r7, 0\n\
-	ldrsh r1, [r2, r7]\n\
-	cmp r0, r1\n\
-	bge _0817E5C8\n\
-	ldrh r4, [r2]\n\
-	adds r6, r3, 0\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    movs r7, 0\n\
+    ldrsh r1, [r2, r7]\n\
+    cmp r0, r1\n\
+    bge _0817E5C8\n\
+    ldrh r4, [r2]\n\
+    adds r6, r3, 0\n\
 _0817E5C8:\n\
-	adds r2, 0x2\n\
-	adds r3, 0x1\n\
-	cmp r3, 0x3\n\
-	ble _0817E5B8\n\
-	movs r0, 0x64\n\
-	ldr r1, [sp, 0x10]\n\
-	muls r0, r1\n\
-	adds r0, r5\n\
-	adds r1, r6, 0\n\
-	adds r1, 0xD\n\
-	movs r2, 0\n\
-	bl GetMonData\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	ldr r2, [sp, 0x1C]\n\
-	cmp r2, 0\n\
-	beq _0817E670\n\
-	cmp r4, 0\n\
-	beq _0817E670\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	movs r1, 0x40\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _0817E65C\n\
-	ldr r3, [sp, 0x10]\n\
-	cmp r3, 0x2\n\
-	bhi _0817E620\n\
-	ldr r0, =gBattleScripting\n\
-	adds r0, 0x25\n\
-	ldrb r0, [r0]\n\
-	bl GetLinkTrainerFlankId\n\
-	lsls r0, 16\n\
-	cmp r0, 0\n\
-	beq _0817E630\n\
-	b _0817E670\n\
-	.pool\n\
+    adds r2, 0x2\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x3\n\
+    ble _0817E5B8\n\
+    movs r0, 0x64\n\
+    ldr r1, [sp, 0x10]\n\
+    muls r0, r1\n\
+    adds r0, r5\n\
+    adds r1, r6, 0\n\
+    adds r1, 0xD\n\
+    movs r2, 0\n\
+    bl GetMonData\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    ldr r2, [sp, 0x1C]\n\
+    cmp r2, 0\n\
+    beq _0817E670\n\
+    cmp r4, 0\n\
+    beq _0817E670\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    movs r1, 0x40\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0817E65C\n\
+    ldr r3, [sp, 0x10]\n\
+    cmp r3, 0x2\n\
+    bhi _0817E620\n\
+    ldr r0, =gBattleScripting\n\
+    adds r0, 0x25\n\
+    ldrb r0, [r0]\n\
+    bl GetLinkTrainerFlankId\n\
+    lsls r0, 16\n\
+    cmp r0, 0\n\
+    beq _0817E630\n\
+    b _0817E670\n\
+    .pool\n\
 _0817E620:\n\
-	ldr r0, =gBattleScripting\n\
-	adds r0, 0x25\n\
-	ldrb r0, [r0]\n\
-	bl GetLinkTrainerFlankId\n\
-	lsls r0, 16\n\
-	cmp r0, 0\n\
-	beq _0817E670\n\
+    ldr r0, =gBattleScripting\n\
+    adds r0, 0x25\n\
+    ldrb r0, [r0]\n\
+    bl GetLinkTrainerFlankId\n\
+    lsls r0, 16\n\
+    cmp r0, 0\n\
+    beq _0817E670\n\
 _0817E630:\n\
-	movs r3, 0\n\
-	ldr r7, [sp, 0x14]\n\
-	cmp r7, 0x2\n\
-	bls _0817E63A\n\
-	movs r3, 0x1\n\
+    movs r3, 0\n\
+    ldr r7, [sp, 0x14]\n\
+    cmp r7, 0x2\n\
+    bls _0817E63A\n\
+    movs r3, 0x1\n\
 _0817E63A:\n\
-	lsls r0, r3, 24\n\
-	lsrs r0, 24\n\
-	ldr r1, =gBattleScripting\n\
-	adds r1, 0x25\n\
-	ldrb r1, [r1]\n\
-	bl sub_806EF84\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r1, r4, 0\n\
-	ldr r2, [sp]\n\
-	ldr r3, [sp, 0x4]\n\
-	bl PutBattleUpdateOnTheAir\n\
-	b _0817E670\n\
-	.pool\n\
+    lsls r0, r3, 24\n\
+    lsrs r0, 24\n\
+    ldr r1, =gBattleScripting\n\
+    adds r1, 0x25\n\
+    ldrb r1, [r1]\n\
+    bl sub_806EF84\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r1, r4, 0\n\
+    ldr r2, [sp]\n\
+    ldr r3, [sp, 0x4]\n\
+    bl PutBattleUpdateOnTheAir\n\
+    b _0817E670\n\
+    .pool\n\
 _0817E65C:\n\
-	ldr r0, =gBattleScripting\n\
-	adds r0, 0x25\n\
-	ldrb r1, [r0]\n\
-	movs r0, 0x1\n\
-	eors r0, r1\n\
-	adds r1, r4, 0\n\
-	ldr r2, [sp]\n\
-	ldr r3, [sp, 0x4]\n\
-	bl PutBattleUpdateOnTheAir\n\
+    ldr r0, =gBattleScripting\n\
+    adds r0, 0x25\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x1\n\
+    eors r0, r1\n\
+    adds r1, r4, 0\n\
+    ldr r2, [sp]\n\
+    ldr r3, [sp, 0x4]\n\
+    bl PutBattleUpdateOnTheAir\n\
 _0817E670:\n\
-	add sp, 0x20\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    add sp, 0x20\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 #endif
 

src/battle_util.c

@@ -17,13 +17,13 @@
 #include "string_util.h"
 #include "battle_message.h"
 #include "constants/battle_string_ids.h"
+#include "constants/weather.h"
 #include "battle_ai_script_commands.h"
 #include "battle_controllers.h"
 #include "event_data.h"
 #include "link.h"
 #include "berry.h"
-
-extern u8 weather_get_current(void);
+#include "field_weather.h"
 
 // rom const data
 static const u16 sSoundMovesTable[] =
@@ -1192,7 +1192,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         // fall through
     case 2:
         if ((gBattleTypeFlags & BATTLE_TYPE_ARENA)
-         && gBattleStruct->field_DA == 2
+         && gBattleStruct->arenaTurnCounter == 2
          && gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0)
         {
             s32 i;
@@ -1238,7 +1238,7 @@ bool8 HandleFaintedMonActions(void)
             {
                 gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
                 if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
-                 && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]])
+                 && !(gBattleStruct->givenExpMons & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]])
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
                 {
                     BattleScriptExecute(BattleScript_GiveExp);
@@ -1827,11 +1827,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
             case ABILITYEFFECT_SWITCH_IN_WEATHER:
                 if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
                 {
-                    switch (weather_get_current())
+                    switch (GetCurrentWeather())
                     {
-                    case 3:
-                    case 5:
-                    case 13:
+                    case WEATHER_RAIN_LIGHT:
+                    case WEATHER_RAIN_MED:
+                    case WEATHER_RAIN_HEAVY:
                         if (!(gBattleWeather & WEATHER_RAIN_ANY))
                         {
                             gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
@@ -1840,7 +1840,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                             effect++;
                         }
                         break;
-                    case 8:
+                    case WEATHER_SANDSTORM:
                         if (!(gBattleWeather & WEATHER_SANDSTORM_ANY))
                         {
                             gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
@@ -1849,7 +1849,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                             effect++;
                         }
                         break;
-                    case 12:
+                    case WEATHER_DROUGHT:
                         if (!(gBattleWeather & WEATHER_SUN_ANY))
                         {
                             gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
@@ -1862,7 +1862,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 }
                 if (effect)
                 {
-                    gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current();
+                    gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather();
                     BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
                 }
                 break;

src/battle_util2.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_controllers.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "pokemon.h"
 #include "event_data.h"
 #include "constants/abilities.h"

src/berry.c

@@ -32,7 +32,7 @@ static u16 GetStageDurationByBerryType(u8);
 //.rodata
 static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers.");
 static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy.");
-static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are");
+static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY's thick skin and fruit are");
 static const u8 sBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over.");
 static const u8 sBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious.");
 static const u8 sBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care.");
@@ -44,7 +44,7 @@ static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and
 static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier.");
 static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors.");
 static const u8 sBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day.");
-static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY’s color");
+static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY's color");
 static const u8 sBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun.");
 static const u8 sBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving");
 static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES.");
@@ -113,7 +113,7 @@ static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it c
 static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY.");
 static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy.");
 static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the");
-static const u8 sBerryDescriptionPart2_Starf[] = _("world’s edge. Considered a mirage.");
+static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage.");
 static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY.");
 static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars.");
 

src/berry_blender.c

@@ -12,7 +12,7 @@
 #include "bg.h"
 #include "palette.h"
 #include "decompress.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "text.h"
 #include "text_window.h"
@@ -260,10 +260,10 @@ static const u8 sText_PressAToStart[] = _("Press the A Button to start.");
 static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
 static const u8 sText_CommunicationStandby[] = _("Communication standby…");
 static const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
-static const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
+static const u8 sText_RunOutOfBerriesForBlending[] = _("You've run out of BERRIES for\nblending in the BERRY BLENDER.\p");
 static const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
 static const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
-static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
+static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("'s {POKEBLOCK} CASE is full.\p");
 static const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
 static const u8 sText_BerryUsed[] = _("BERRY USED");
 static const u8 sText_SpaceBerry[] = _(" BERRY");

src/berry_fix_program.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "multiboot.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "bg.h"
 #include "graphics.h"
 #include "main.h"

src/berry_tag_screen.c

@@ -21,7 +21,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "scanline_effect.h"
 #include "gpu_regs.h"
 #include "graphics.h"

src/birch_pc.c

@@ -66,20 +66,20 @@ const u8 *GetPokedexRatingText(u16 count)
         return gBirchDexRatingText_LessThan200;
     if (count == 200)
     {
-        if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1)
-         || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200.
+        if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT)
+         || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200.
             return gBirchDexRatingText_LessThan200;
         return gBirchDexRatingText_DexCompleted;
     }
-    if (count == 201)
+    if (count == HOENN_DEX_COUNT - 1)
     {
-        if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1)
-         && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // If both of these flags are enabled, it means the actual count is less than 200.
+        if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT)
+         && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // If both of these flags are enabled, it means the actual count is less than 200.
             return gBirchDexRatingText_LessThan200;
         return gBirchDexRatingText_DexCompleted;
     }
-    if (count == 202)
-        return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210.
+    if (count == HOENN_DEX_COUNT)
+        return gBirchDexRatingText_DexCompleted;
     return gBirchDexRatingText_LessThan10;
 }
 

src/clock.c

@@ -5,7 +5,7 @@
 #include "lottery_corner.h"
 #include "dewford_trend.h"
 #include "tv.h"
-#include "field_screen.h"
+#include "field_weather.h"
 #include "berry.h"
 #include "main.h"
 #include "overworld.h"

src/contest.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "constants/items.h"
 #include "constants/event_objects.h"
 #include "constants/moves.h"

src/contest_painting.c

@@ -1,8 +1,709 @@
 #include "global.h"
+#include "alloc.h"
+#include "battle.h"
+#include "bg.h"
+#include "contest.h"
+#include "contest_painting.h"
+#include "contest_painting_effects.h"
+#include "battle_gfx_sfx_util.h"
+#include "decompress.h"
+#include "gpu_regs.h"
+#include "international_string_util.h"
+#include "main.h"
+#include "lilycove_lady.h"
+#include "palette.h"
+#include "random.h"
+#include "scanline_effect.h"
+#include "string_util.h"
+#include "strings.h"
+#include "text.h"
+#include "window.h"
+#include "constants/rgb.h"
+
+extern u8 gUnknown_02039F5C;
+extern u8 gUnknown_02039F5D;
+
+extern u16 (*gUnknown_03006190)[][32];
+extern struct ContestWinner *gUnknown_030061C0;
+extern u16 *gContestPaintingMonPalette;
+extern struct Unk030061A0 gUnknown_030061A0;
 
 // IWRAM bss
-IWRAM_DATA u8 gUnknown_030011F0;
-IWRAM_DATA u16 gUnknown_030011F2;
-IWRAM_DATA u16 gUnknown_030011F4;
-IWRAM_DATA u8 gUnknown_030011F6;
-IWRAM_DATA u8 gUnknown_030011F7;
+IWRAM_DATA u8 gContestPaintingState;
+IWRAM_DATA u16 gContestPaintingMosaicVal;
+IWRAM_DATA u16 gContestPaintingFadeCounter;
+IWRAM_DATA bool8 gUnknown_030011F6;
+IWRAM_DATA u8 gContestPaintingWindowId;
+
+static void ShowContestPainting(void);
+static void HoldContestPainting(void);
+static void InitContestPaintingWindow(void);
+static void InitContestPaintingBg(void);
+static void InitContestPaintingVars(bool8);
+static void sub_8130884(u8, u8);
+static void PrintContestPaintingCaption(u8, u8);
+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[];
+extern const u8 gContestSmartness[];
+extern const u8 gContestToughness[];
+extern const u8 gContestRankNormal[];
+extern const u8 gContestRankSuper[];
+extern const u8 gContestRankHyper[];
+extern const u8 gContestRankMaster[];
+extern const u8 gContestLink[];
+extern const u8 gContestPaintingCool1[];
+extern const u8 gContestPaintingCool2[];
+extern const u8 gContestPaintingCool3[];
+extern const u8 gContestPaintingBeauty1[];
+extern const u8 gContestPaintingBeauty2[];
+extern const u8 gContestPaintingBeauty3[];
+extern const u8 gContestPaintingCute1[];
+extern const u8 gContestPaintingCute2[];
+extern const u8 gContestPaintingCute3[];
+extern const u8 gContestPaintingSmart1[];
+extern const u8 gContestPaintingSmart2[];
+extern const u8 gContestPaintingSmart3[];
+extern const u8 gContestPaintingTough1[];
+extern const u8 gContestPaintingTough2[];
+extern const u8 gContestPaintingTough3[];
+
+const u16 gPictureFramePalettes[] = INCBIN_U16("graphics/picture_frame/bg.gbapal");
+const u8 gPictureFrameTiles_0[] = INCBIN_U8("graphics/picture_frame/frame0.4bpp.rl");
+const u8 gPictureFrameTiles_1[] = INCBIN_U8("graphics/picture_frame/frame1.4bpp.rl");
+const u8 gPictureFrameTiles_2[] = INCBIN_U8("graphics/picture_frame/frame2.4bpp.rl");
+const u8 gPictureFrameTiles_3[] = INCBIN_U8("graphics/picture_frame/frame3.4bpp.rl");
+const u8 gPictureFrameTiles_4[] = INCBIN_U8("graphics/picture_frame/frame4.4bpp.rl");
+const u8 gPictureFrameTiles_5[] = INCBIN_U8("graphics/picture_frame/frame5.4bpp.rl");
+const u8 gPictureFrameTilemap_0[] = INCBIN_U8("graphics/picture_frame/frame0_map.bin.rl");
+const u8 gPictureFrameTilemap_1[] = INCBIN_U8("graphics/picture_frame/frame1_map.bin.rl");
+const u8 gPictureFrameTilemap_2[] = INCBIN_U8("graphics/picture_frame/frame2_map.bin.rl");
+const u8 gPictureFrameTilemap_3[] = INCBIN_U8("graphics/picture_frame/frame3_map.bin.rl");
+const u8 gPictureFrameTilemap_4[] = INCBIN_U8("graphics/picture_frame/frame4_map.bin.rl");
+const u8 gPictureFrameTilemap_5[] = INCBIN_U8("graphics/picture_frame/frame5_map.bin.rl");
+
+const u8 *const gUnknown_085B07C0[] =
+{
+    gContestCoolness,
+    gContestBeauty,
+    gContestCuteness,
+    gContestSmartness,
+    gContestToughness,
+};
+
+const u8 *const gContestRankTextPointers[] =
+{
+    gContestRankNormal,
+    gContestRankSuper,
+    gContestRankHyper,
+    gContestRankMaster,
+    gContestLink,
+};
+
+const struct BgTemplate gUnknown_085B07E8[] = 
+{
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 10,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0,
+    },
+};
+
+const struct WindowTemplate gUnknown_085B07EC = 
+{
+    .bg = 1,
+    .tilemapLeft = 2,
+    .tilemapTop = 14,
+    .width = 26,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 1,
+};
+
+const u8 *const gContestPaintingDescriptionPointers[] =
+{
+    gContestPaintingCool1,
+    gContestPaintingCool2,
+    gContestPaintingCool3,
+    gContestPaintingBeauty1,
+    gContestPaintingBeauty2,
+    gContestPaintingBeauty3,
+    gContestPaintingCute1,
+    gContestPaintingCute2,
+    gContestPaintingCute3,
+    gContestPaintingSmart1,
+    gContestPaintingSmart2,
+    gContestPaintingSmart3,
+    gContestPaintingTough1,
+    gContestPaintingTough2,
+    gContestPaintingTough3,
+};
+
+const struct OamData gUnknown_085B0830 =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 1,
+    .bpp = ST_OAM_8BPP,
+    .shape = ST_OAM_SQUARE,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const u16 gUnknown_085B0838[] = {RGB(0, 0, 0), RGB(0, 0, 0)};
+
+void sub_812FDA8(int contestWinner)
+{
+    // probably fakematching
+    u8 *ptr1 = &gUnknown_02039F5D;
+    u8 *ptr2 = &gUnknown_02039F5C;
+	gUnknown_02039F3C = gSaveBlock1Ptr->contestWinners[contestWinner - 1];
+	*ptr1 = contestWinner - 1;
+	*ptr2 = 0;
+}
+
+void CB2_ContestPainting(void)
+{
+    ShowContestPainting();
+}
+
+static void CB2_HoldContestPainting(void)
+{
+    HoldContestPainting();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+static void CB2_QuitContestPainting(void)
+{
+    SetMainCallback2(gMain.savedCallback);
+    FREE_AND_SET_NULL(gContestPaintingMonPalette);
+    FREE_AND_SET_NULL(gUnknown_03006190);
+    RemoveWindow(gContestPaintingWindowId);
+    Free(GetBgTilemapBuffer(1));
+    FreeMonSpritesGfx();
+}
+
+static void ShowContestPainting(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        ScanlineEffect_Stop();
+        SetVBlankCallback(NULL);
+        AllocateMonSpritesGfx();
+        gUnknown_030061C0 = &gUnknown_02039F3C;
+        InitContestPaintingVars(1);
+        InitContestPaintingBg();
+        gMain.state++;
+        break;
+    case 1:
+        ResetPaletteFade();
+        DmaFillLarge32(3, 0, (void *)BG_VRAM, 0x18000, 0x1000);
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 2:
+        SeedRng(gMain.vblankCounter1);
+        InitKeys();
+        InitContestPaintingWindow();
+        gMain.state++;
+        break;
+    case 3:
+        sub_8130884(gUnknown_02039F5D, gUnknown_02039F5C);
+        gMain.state++;
+        break;
+    case 4:
+        PrintContestPaintingCaption(gUnknown_02039F5D, gUnknown_02039F5C);
+        LoadPalette(gUnknown_085B0838, 0, 1 * 2);
+        DmaClear32(3, PLTT, PLTT_SIZE);
+        BeginFastPaletteFade(2);
+        SetVBlankCallback(VBlankCB_ContestPainting);
+        gContestPaintingState = 0;
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON);
+        SetMainCallback2(CB2_HoldContestPainting);
+        break;
+    }
+}
+
+static void HoldContestPainting(void)
+{
+    switch (gContestPaintingState)
+    {
+    case 0:
+        if (!gPaletteFade.active)
+            gContestPaintingState = 1;
+        if (gUnknown_030011F6 && gContestPaintingFadeCounter)
+            gContestPaintingFadeCounter--;
+        break;
+    case 1:
+        if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
+        {
+            u8 two = 2;  //needed to make the asm match
+            gContestPaintingState = two;
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
+        }
+
+        if (gUnknown_030011F6)
+            gContestPaintingFadeCounter = 0;
+        break;
+    case 2:
+        if (!gPaletteFade.active)
+            SetMainCallback2(CB2_QuitContestPainting);
+        if (gUnknown_030011F6 && gContestPaintingFadeCounter < 30)
+            gContestPaintingFadeCounter++;
+        break;
+    }
+}
+
+static void InitContestPaintingWindow(void)
+{
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_085B07E8, ARRAY_COUNT(gUnknown_085B07E8));
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
+    gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC);
+    DeactivateAllTextPrinters();
+    FillWindowPixelBuffer(gContestPaintingWindowId, 0);
+    PutWindowTilemap(gContestPaintingWindowId);
+    CopyWindowToVram(gContestPaintingWindowId, 3);
+    ShowBg(1);
+}
+
+static void PrintContestPaintingCaption(u8 contestType, u8 arg1)
+{
+    int x;
+    u8 category;
+
+    if (arg1 == TRUE)
+        return;
+
+    category = gUnknown_030061C0->contestCategory;
+    if (contestType < 8)
+    {
+        sub_818E868(gStringVar1, category);
+        StringAppend(gStringVar1, gText_Space);
+        StringAppend(gStringVar1, gContestRankTextPointers[gUnknown_030061C0->contestRank]);
+        StringCopy(gStringVar2, gUnknown_030061C0->trainerName);
+        sub_81DB5AC(gStringVar2);
+        StringCopy(gStringVar3, gUnknown_030061C0->monName);
+        StringExpandPlaceholders(gStringVar4, gUnknown_0827EA0C);
+    }
+    else
+    {
+        StringCopy(gStringVar1, gUnknown_030061C0->monName);
+        StringExpandPlaceholders(gStringVar4, gContestPaintingDescriptionPointers[category]);
+    }
+
+    x = GetStringCenterAlignXOffset(1, gStringVar4, 208);
+    AddTextPrinterParameterized(gContestPaintingWindowId, 1, gStringVar4, x, 1, 0, 0);
+    CopyBgTilemapBufferToVram(1);
+}
+
+static void InitContestPaintingBg(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    REG_IE |= INTR_FLAG_VBLANK;
+    SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(12) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256);
+    SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(10) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+    SetGpuReg(REG_OFFSET_BLDY, 0);
+}
+
+static void InitContestPaintingVars(bool8 arg0)
+{
+    if (arg0 == FALSE)
+    {
+        gUnknown_030011F6 = FALSE;
+        gContestPaintingMosaicVal = 0;
+        gContestPaintingFadeCounter = 0;
+    }
+    else
+    {
+        gUnknown_030011F6 = TRUE;
+        gContestPaintingMosaicVal = 15;
+        gContestPaintingFadeCounter = 30;
+    }
+}
+
+static void UpdateContestPaintingMosaicEffect(void)
+{
+    if (!gUnknown_030011F6)
+    {
+        SetGpuReg(REG_OFFSET_MOSAIC, 0);
+    }
+    else
+    {
+        SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(10) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256);
+        gContestPaintingMosaicVal = gContestPaintingFadeCounter / 2;
+        SetGpuReg(REG_OFFSET_MOSAIC, (gContestPaintingMosaicVal << 12) | (gContestPaintingMosaicVal << 8) | (gContestPaintingMosaicVal << 4) | (gContestPaintingMosaicVal << 0));
+    }
+}
+
+static void VBlankCB_ContestPainting(void)
+{
+    UpdateContestPaintingMosaicEffect();
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_81302E8(u16 species, u8 arg1)
+{
+    const void *pal = GetFrontSpritePalFromSpeciesAndPersonality(species, gUnknown_030061C0->trainerId, gUnknown_030061C0->personality);
+    LZDecompressVram(pal, gContestPaintingMonPalette);
+    if (!arg1)
+    {
+        HandleLoadSpecialPokePic_DontHandleDeoxys(
+            &gMonFrontPicTable[species],
+            gMonSpritesGfxPtr->sprites[1],
+            species,
+            gUnknown_030061C0->personality);
+        sub_8130380(gMonSpritesGfxPtr->sprites[1], gContestPaintingMonPalette, (void *)gUnknown_03006190);
+    }
+    else
+    {
+        HandleLoadSpecialPokePic_DontHandleDeoxys(
+            &gMonBackPicTable[species],
+            gMonSpritesGfxPtr->sprites[0],
+            species,
+            gUnknown_030061C0->personality);
+        sub_8130380(gMonSpritesGfxPtr->sprites[0], gContestPaintingMonPalette, (void *)gUnknown_03006190);
+    }
+}
+
+#ifdef NONMATCHING
+// functionally equivalent.
+static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64])
+{
+    u16 tileY, tileX, pixelY, pixelX;
+    u8 colorIndex;
+
+    for (tileY = 0; tileY < 8; tileY++)
+    {
+        for (tileX = 0; tileX < 8; tileX++)
+        {
+            for (pixelY = 0; pixelY < 8; pixelY++)
+            {
+                for (pixelX = 0; pixelX < 8; pixelX++)
+                {
+                    int offset = 32 * (8 * tileY + tileX) + (pixelY * 4 + pixelX / 2);
+                    colorIndex = spritePixels[offset];
+                    if (pixelX & 1)
+                        colorIndex >>= 4;
+                    else
+                        colorIndex &= 0xF;
+
+                    if (colorIndex == 0) // transparent pixel
+                        (*destColorBuffer)[8 * tileY + pixelY][tileX * 8 + pixelX] = 0x8000;
+                    else
+                        (*destColorBuffer)[8 * tileY + pixelY][tileX * 8 + pixelX] = palette[colorIndex];
+                }
+            }
+        }
+    }
+}
+#else
+NAKED
+static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64])
+{
+    asm_unified("\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0xC\n\
+    mov r10, r0\n\
+    mov r9, r1\n\
+    str r2, [sp]\n\
+    movs r0, 0\n\
+_08130394:\n\
+    movs r3, 0\n\
+    adds r1, r0, 0x1\n\
+    str r1, [sp, 0x4]\n\
+    lsls r0, 3\n\
+    str r0, [sp, 0x8]\n\
+_0813039E:\n\
+    movs r1, 0\n\
+    adds r2, r3, 0x1\n\
+    mov r8, r2\n\
+    ldr r7, [sp, 0x8]\n\
+    adds r0, r7, r3\n\
+    lsls r0, 5\n\
+    mov r12, r0\n\
+    lsls r4, r3, 3\n\
+_081303AE:\n\
+    movs r3, 0\n\
+    lsls r0, r1, 2\n\
+    adds r6, r1, 0x1\n\
+    mov r2, r12\n\
+    adds r5, r2, r0\n\
+    ldr r7, [sp, 0x8]\n\
+    adds r0, r7, r1\n\
+    lsls r0, 7\n\
+    ldr r1, [sp]\n\
+    adds r2, r0, r1\n\
+_081303C2:\n\
+    lsrs r0, r3, 1\n\
+    adds r0, r5, r0\n\
+    add r0, r10\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _081303D6\n\
+    lsrs r1, 4\n\
+    b _081303DA\n\
+_081303D6:\n\
+    movs r0, 0xF\n\
+    ands r1, r0\n\
+_081303DA:\n\
+    cmp r1, 0\n\
+    bne _081303EC\n\
+    adds r0, r4, r3\n\
+    lsls r0, 1\n\
+    adds r0, r2\n\
+    movs r7, 0x80\n\
+    lsls r7, 8\n\
+    adds r1, r7, 0\n\
+    b _081303F8\n\
+_081303EC:\n\
+    adds r0, r4, r3\n\
+    lsls r0, 1\n\
+    adds r0, r2\n\
+    lsls r1, 1\n\
+    add r1, r9\n\
+    ldrh r1, [r1]\n\
+_081303F8:\n\
+    strh r1, [r0]\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    cmp r3, 0x7\n\
+    bls _081303C2\n\
+    lsls r0, r6, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r1, 0x7\n\
+    bls _081303AE\n\
+    mov r1, r8\n\
+    lsls r0, r1, 16\n\
+    lsrs r3, r0, 16\n\
+    cmp r3, 0x7\n\
+    bls _0813039E\n\
+    ldr r2, [sp, 0x4]\n\
+    lsls r0, r2, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x7\n\
+    bls _08130394\n\
+    add sp, 0xC\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0");
+}
+#endif
+
+static void sub_8130430(u8 arg0, u8 arg1)
+{
+    u8 x, y;
+
+    LoadPalette(gPictureFramePalettes, 0, 0x100);
+    if (arg1 == 1)
+    {
+        switch (gUnknown_030061C0->contestCategory / 3)
+        {
+        case CONTEST_CATEGORY_COOL:
+            RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM);
+            RLUnCompWram(gPictureFrameTilemap_0, gUnknown_03006190);
+            break;
+        case CONTEST_CATEGORY_BEAUTY:
+            RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM);
+            RLUnCompWram(gPictureFrameTilemap_1, gUnknown_03006190);
+            break;
+        case CONTEST_CATEGORY_CUTE:
+            RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM);
+            RLUnCompWram(gPictureFrameTilemap_2, gUnknown_03006190);
+            break;
+        case CONTEST_CATEGORY_SMART:
+            RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM);
+            RLUnCompWram(gPictureFrameTilemap_3, gUnknown_03006190);
+            break;
+        case CONTEST_CATEGORY_TOUGH:
+            RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM);
+            RLUnCompWram(gPictureFrameTilemap_4, gUnknown_03006190);
+            break;
+        }
+
+#define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)])
+
+        // Set the background
+        for (y = 0; y < 20; y++)
+        {
+            for (x = 0; x < 32; x++)
+                VRAM_PICTURE_DATA(x, y) = 0x1015;
+        }
+
+        // Copy the image frame
+        for (y = 0; y < 10; y++)
+        {
+            for (x = 0; x < 18; x++)
+                VRAM_PICTURE_DATA(x + 6, y + 2) = (*gUnknown_03006190)[y + 2][x + 6];
+        }
+
+        // Re-set the entire top row to the first top frame part
+        for (x = 0; x < 16; x++)
+            VRAM_PICTURE_DATA(x + 7, 2) = (*gUnknown_03006190)[2][7];
+
+#undef VRAM_PICTURE_DATA
+    }
+    else if (arg0 < 8)
+    {
+        RLUnCompVram(gPictureFrameTiles_5, (void *)VRAM);
+        RLUnCompVram(gPictureFrameTilemap_5, (void *)(VRAM + 0x6000));
+    }
+    else
+    {
+        switch (gUnknown_030061C0->contestCategory / 3)
+        {
+        case CONTEST_CATEGORY_COOL:
+            RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM);
+            RLUnCompVram(gPictureFrameTilemap_0, (void *)(VRAM + 0x6000));
+            break;
+        case CONTEST_CATEGORY_BEAUTY:
+            RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM);
+            RLUnCompVram(gPictureFrameTilemap_1, (void *)(VRAM + 0x6000));
+            break;
+        case CONTEST_CATEGORY_CUTE:
+            RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM);
+            RLUnCompVram(gPictureFrameTilemap_2, (void *)(VRAM + 0x6000));
+            break;
+        case CONTEST_CATEGORY_SMART:
+            RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM);
+            RLUnCompVram(gPictureFrameTilemap_3, (void *)(VRAM + 0x6000));
+            break;
+        case CONTEST_CATEGORY_TOUGH:
+            RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM);
+            RLUnCompVram(gPictureFrameTilemap_4, (void *)(VRAM + 0x6000));
+            break;
+        }
+    }
+}
+
+static void sub_8130688(u8 arg0)
+{
+    //Some hacks just to get the asm to match
+#ifndef NONMATCHING
+    asm(""::"r"(arg0));
+#endif
+
+    gMain.oamBuffer[0] = gUnknown_085B0830;
+    gMain.oamBuffer[0].tileNum = 0;
+
+#ifndef NONMATCHING
+    if (arg0) arg0 = gMain.oamBuffer[0].tileNum;
+#endif
+
+    gMain.oamBuffer[0].x = 88;
+    gMain.oamBuffer[0].y = 24;
+}
+
+static u8 sub_81306CC(u8 arg0)
+{
+    u8 contestCategory;
+
+    if (arg0 < 8)
+        contestCategory = gUnknown_030061C0->contestCategory;
+    else
+        contestCategory = gUnknown_030061C0->contestCategory / 3;
+
+    switch (contestCategory)
+    {
+    case CONTEST_CATEGORY_COOL:
+        return CONTESTRESULT_COOL;
+    case CONTEST_CATEGORY_BEAUTY:
+        return CONTESTRESULT_BEAUTY;
+    case CONTEST_CATEGORY_CUTE:
+        return CONTESTRESULT_CUTE;
+    case CONTEST_CATEGORY_SMART:
+        return CONTESTRESULT_SMART;
+    case CONTEST_CATEGORY_TOUGH:
+        return CONTESTRESULT_TOUGH;
+    }
+
+    return contestCategory;
+}
+
+static void sub_8130738(void)
+{
+    gContestPaintingMonPalette = AllocZeroed(0x200);
+    gUnknown_03006190 = AllocZeroed(0x2000);
+}
+
+static void sub_8130760(u8 contestResult)
+{
+    gUnknown_030061A0.var_4 = gUnknown_03006190;
+    gUnknown_030061A0.var_8 = gContestPaintingMonPalette;
+    gUnknown_030061A0.var_18 = 0;
+    gUnknown_030061A0.var_1F = gUnknown_030061C0->personality % 256;
+    gUnknown_030061A0.var_19 = 0;
+    gUnknown_030061A0.var_1A = 0;
+    gUnknown_030061A0.var_1B = 64;
+    gUnknown_030061A0.var_1C = 64;
+    gUnknown_030061A0.var_1D = 64;
+    gUnknown_030061A0.var_1E = 64;
+
+    switch (contestResult)
+    {
+    case CONTESTRESULT_SMART:
+    case CONTESTRESULT_TOUGH:
+        gUnknown_030061A0.var_14 = 3;
+        break;
+    case CONTESTRESULT_COOL:
+    case CONTESTRESULT_BEAUTY:
+    case CONTESTRESULT_CUTE:
+    default:
+        gUnknown_030061A0.var_14 = 1;
+        break;
+    }
+
+    gUnknown_030061A0.var_16 = 2;
+    gUnknown_030061A0.var_0 = contestResult;
+    gUnknown_030061A0.var_10 = 0x6010000;
+
+    sub_8124F2C(&gUnknown_030061A0);
+    sub_81261A4(&gUnknown_030061A0);
+    sub_8126058(&gUnknown_030061A0);
+
+    LoadPalette(gContestPaintingMonPalette, 0x100, 0x200);
+}
+
+static void sub_8130884(u8 arg0, u8 arg1)
+{
+    sub_8130738();
+    sub_81302E8(gUnknown_030061C0->species, 0);
+    sub_8130760(sub_81306CC(arg0));
+    sub_8130688(arg0);
+    sub_8130430(arg0, arg1);
+}

src/credits.c

@@ -3,7 +3,7 @@
 #include "main.h"
 #include "task.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "window.h"
 #include "text.h"
 #include "menu.h"
@@ -135,7 +135,7 @@ struct Unk201C000
     u16 unk90;
     u16 unk92;
     u16 unk94;
-    u16 unk96[386];
+    u16 unk96[NATIONAL_DEX_COUNT];
     u16 unk39A;
     u16 unk39C[7];
 };
@@ -2254,12 +2254,12 @@ static void sub_8177050(struct Sprite *sprite)
     }
 }
 
-static u8 sub_8177224(u16 species, s16 x, s16 y, u16 position)
+static u8 sub_8177224(u16 nationalDexNum, s16 x, s16 y, u16 position)
 {
     u8 spriteId;
     u8 spriteId2;
 
-    spriteId = sub_80C0E9C(species, x, y, position);
+    spriteId = CreateMonSpriteFromNationalDexNumber(nationalDexNum, x, y, position);
     gSprites[spriteId].oam.priority = 1;
     gSprites[spriteId].data[1] = position + 1;
     gSprites[spriteId].invisible = TRUE;
@@ -2297,16 +2297,16 @@ static void sub_8177388(void)
     u16 dexNum;
     u16 j;
 
-    for (dexNum = 1, j = 0; dexNum < 386; dexNum++)
+    for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++)
     {
-        if (GetSetPokedexFlag(dexNum, 1))
+        if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
         {
             gUnknown_0203BCE8->unk96[j] = dexNum;
             j++;
         }
     }
 
-    for (dexNum = j; dexNum < 386; dexNum++)
+    for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++)
         gUnknown_0203BCE8->unk96[dexNum] = 0;
 
     gUnknown_0203BCE8->unk39A = j;

src/data/decoration/description.h

@@ -1,10 +1,3 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_DATA_DECORATION_DESCRIPTION_H
-#define GUARD_DATA_DECORATION_DESCRIPTION_H
-
 const u8 DecorDesc_SMALL_DESK[] = _(
     "A small desk built\n"
         "for one.");
@@ -578,4 +571,3 @@ const u8 DecorDesc_REGISTEEL_DOLL[] = _(
     "A large doll.\n"
         "Place it on a mat\n"
         "or a desk.");
-#endif //GUARD_DATA_DECORATION_DESCRIPTION_H

src/data/decoration/header.h

@@ -1,10 +1,3 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_DATA_DECORATION_HEADER_H
-#define GUARD_DATA_DECORATION_HEADER_H
-
 const struct Decoration gDecorations[] = {
     {
         DECOR_NONE,
@@ -1096,5 +1089,3 @@ const struct Decoration gDecorations[] = {
         DecorDesc_REGISTEEL_DOLL,
         DecorGfx_REGISTEEL_DOLL}
 };
-
-#endif //GUARD_DATA_DECORATION_HEADER_H

src/data/decoration/icon.h

@@ -1,10 +1,3 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_ICON_H
-#define GUARD_ICON_H
-
 const u32 *const gUnknown_085A6BE8[][2] = {
     {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
     {NULL, NULL},
@@ -128,5 +121,3 @@ const u32 *const gUnknown_085A6BE8[][2] = {
     {gUnknown_08DB9DD4, gUnknown_08DB9EE4},
     {gUnknown_08DBA020, gUnknown_08DBA12C}
 };
-
-#endif //GUARD_ICON_H

src/data/decoration/tilemaps.h

@@ -1,10 +1,3 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_TILEMAPS_H
-#define GUARD_TILEMAPS_H
-
 const u8 Unknown_085A6FB0[] = {
     0x00, 0x01, 0x02, 0x03
 };
@@ -235,5 +228,3 @@ const struct {
         Unknown_085A7198,
         0x18
     }};
-
-#endif //GUARD_TILEMAPS_H

src/data/decoration/tiles.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_DATA_DECORATION_TILES
-#define GUARD_DATA_DECORATION_TILES
-
 const u16 DecorGfx_SMALL_DESK[] = {
     0x87
 };
@@ -642,5 +639,3 @@ const u16 DecorGfx_REGICE_DOLL[] = {
 const u16 DecorGfx_REGISTEEL_DOLL[] = {
     EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL
 };
-
-#endif // GUARD_DATA_DECORATION_TILES

src/data/field_event_obj/base_oam.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_BASE_OAM_H
-#define GUARD_BASE_OAM_H
-
 const struct OamData gEventObjectBaseOam_8x8 = {
     .shape = 0,
     .size = 0,
@@ -48,5 +45,3 @@ const struct OamData gEventObjectBaseOam_64x64 = {
     .size = 3,
     .priority = 2
 };
-
-#endif //GUARD_BASE_OAM_H

src/data/field_event_obj/berry_tree_graphics_tables.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H
-#define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
-
 const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
     overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
     overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
@@ -565,6 +562,3 @@ const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
     gBerryTreeEventObjectGraphicsIdTable,
     gBerryTreeEventObjectGraphicsIdTable,
 };
-
-
-#endif //GUARD_BERRY_TREE_GRAPHICS_TABLES_H

src/data/field_event_obj/event_object_anims.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_EVENT_OBJECT_ANIMS_H
-#define GUARD_EVENT_OBJECT_ANIMS_H
-
 const union AnimCmd gEventObjectImageAnim_StayStill[] =
 {
     ANIMCMD_FRAME(0, 8),
@@ -1172,5 +1169,3 @@ const struct UnkStruct_085094AC gUnknown_085094AC[] = {
         {0, 0, 0, 0},
     },
 };
-
-#endif //GUARD_EVENT_OBJECT_ANIMS_H

src/data/field_event_obj/event_object_graphics.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_EVENT_OBJECT_GFX_H
-#define GUARD_EVENT_OBJECT_GFX_H
-
 const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp");
 const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp");
 const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal");
@@ -307,7 +304,7 @@ const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/pale
 const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal");
 const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp");
 const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp");
-const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp");	
+const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp");
 const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp");
 const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp");
 const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp");
@@ -363,5 +360,3 @@ const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/poke
 const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal");
 const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp");
 const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal");
-
-#endif //GUARD_EVENT_OBJECT_GFX_H

src/data/field_event_obj/event_object_graphics_info.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
-#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H
-
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
@@ -246,5 +243,3 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrenda
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable};
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable};
-
-#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_H

src/data/field_event_obj/event_object_graphics_info_pointers.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
-#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
-
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike;
 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing;
@@ -250,255 +247,253 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldM
 
 
 const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = {
-	&gEventObjectGraphicsInfo_BrendanNormal,
-	&gEventObjectGraphicsInfo_BrendanMachBike,
-	&gEventObjectGraphicsInfo_BrendanSurfing,
-	&gEventObjectGraphicsInfo_BrendanFieldMove,
-	&gEventObjectGraphicsInfo_QuintyPlump,
-	&gEventObjectGraphicsInfo_NinjaBoy,
-	&gEventObjectGraphicsInfo_Twin,
-	&gEventObjectGraphicsInfo_Boy1,
-	&gEventObjectGraphicsInfo_Girl1,
-	&gEventObjectGraphicsInfo_Boy2,
-	&gEventObjectGraphicsInfo_Girl2,
-	&gEventObjectGraphicsInfo_LittleBoy,
-	&gEventObjectGraphicsInfo_LittleGirl,
-	&gEventObjectGraphicsInfo_Boy3,
-	&gEventObjectGraphicsInfo_Girl3,
-	&gEventObjectGraphicsInfo_RichBoy,
-	&gEventObjectGraphicsInfo_Woman1,
-	&gEventObjectGraphicsInfo_FatMan,
-	&gEventObjectGraphicsInfo_PokefanF,
-	&gEventObjectGraphicsInfo_Man1,
-	&gEventObjectGraphicsInfo_Woman2,
-	&gEventObjectGraphicsInfo_ExpertM,
-	&gEventObjectGraphicsInfo_ExpertF,
-	&gEventObjectGraphicsInfo_Man2,
-	&gEventObjectGraphicsInfo_Woman3,
-	&gEventObjectGraphicsInfo_PokefanM,
-	&gEventObjectGraphicsInfo_Woman4,
-	&gEventObjectGraphicsInfo_Cook,
-	&gEventObjectGraphicsInfo_LinkReceptionist,
-	&gEventObjectGraphicsInfo_OldMan,
-	&gEventObjectGraphicsInfo_OldWoman,
-	&gEventObjectGraphicsInfo_Camper,
-	&gEventObjectGraphicsInfo_Picnicker,
-	&gEventObjectGraphicsInfo_Man3,
-	&gEventObjectGraphicsInfo_Woman5,
-	&gEventObjectGraphicsInfo_Youngster,
-	&gEventObjectGraphicsInfo_BugCatcher,
-	&gEventObjectGraphicsInfo_PsychicM,
-	&gEventObjectGraphicsInfo_SchoolKidM,
-	&gEventObjectGraphicsInfo_Maniac,
-	&gEventObjectGraphicsInfo_HexManiac,
-	&gEventObjectGraphicsInfo_Rayquaza1,
-	&gEventObjectGraphicsInfo_SwimmerM,
-	&gEventObjectGraphicsInfo_SwimmerF,
-	&gEventObjectGraphicsInfo_BlackBelt,
-	&gEventObjectGraphicsInfo_Beauty,
-	&gEventObjectGraphicsInfo_Scientist1,
-	&gEventObjectGraphicsInfo_Lass,
-	&gEventObjectGraphicsInfo_Gentleman,
-	&gEventObjectGraphicsInfo_Sailor,
-	&gEventObjectGraphicsInfo_Fisherman,
-	&gEventObjectGraphicsInfo_RunningTriathleteM,
-	&gEventObjectGraphicsInfo_RunningTriathleteF,
-	&gEventObjectGraphicsInfo_TuberF,
-	&gEventObjectGraphicsInfo_TuberM,
-	&gEventObjectGraphicsInfo_Hiker,
-	&gEventObjectGraphicsInfo_CyclingTriathleteM,
-	&gEventObjectGraphicsInfo_CyclingTriathleteF,
-	&gEventObjectGraphicsInfo_Nurse,
-	&gEventObjectGraphicsInfo_ItemBall,
-	&gEventObjectGraphicsInfo_BerryTree,
-	&gEventObjectGraphicsInfo_BerryTreeEarlyStages,
-	&gEventObjectGraphicsInfo_BerryTreeLateStages,
-	&gEventObjectGraphicsInfo_BrendanAcroBike,
-	&gEventObjectGraphicsInfo_ProfBirch,
-	&gEventObjectGraphicsInfo_Man4,
-	&gEventObjectGraphicsInfo_Man5,
-	&gEventObjectGraphicsInfo_ReporterM,
-	&gEventObjectGraphicsInfo_ReporterF,
-	&gEventObjectGraphicsInfo_Bard,
-	&gEventObjectGraphicsInfo_Anabel,
-	&gEventObjectGraphicsInfo_Tucker,
-	&gEventObjectGraphicsInfo_Greta,
-	&gEventObjectGraphicsInfo_Spenser,
-	&gEventObjectGraphicsInfo_Noland,
-	&gEventObjectGraphicsInfo_Lucy,
-	&gEventObjectGraphicsInfo_UnusedNatuDoll,
-	&gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
-	&gEventObjectGraphicsInfo_UnusedSquirtleDoll,
-	&gEventObjectGraphicsInfo_UnusedWooperDoll,
-	&gEventObjectGraphicsInfo_UnusedPikachuDoll,
-	&gEventObjectGraphicsInfo_UnusedPorygon2Doll,
-	&gEventObjectGraphicsInfo_CuttableTree,
-	&gEventObjectGraphicsInfo_MartEmployee,
-	&gEventObjectGraphicsInfo_RooftopSaleWoman,
-	&gEventObjectGraphicsInfo_Teala,
-	&gEventObjectGraphicsInfo_BreakableRock,
-	&gEventObjectGraphicsInfo_PushableBoulder,
-	&gEventObjectGraphicsInfo_MrBrineysBoat,
-	&gEventObjectGraphicsInfo_MayNormal,
-	&gEventObjectGraphicsInfo_MayMachBike,
-	&gEventObjectGraphicsInfo_MayAcroBike,
-	&gEventObjectGraphicsInfo_MaySurfing,
-	&gEventObjectGraphicsInfo_MayFieldMove,
-	&gEventObjectGraphicsInfo_Truck,
-	&gEventObjectGraphicsInfo_VigorothCarryingBox,
-	&gEventObjectGraphicsInfo_VigorothFacingAway,
-	&gEventObjectGraphicsInfo_BirchsBag,
-	&gEventObjectGraphicsInfo_EnemyZigzagoon,
-	&gEventObjectGraphicsInfo_Artist,
-	&gEventObjectGraphicsInfo_RivalBrendanNormal,
-	&gEventObjectGraphicsInfo_RivalBrendanMachBike,
-	&gEventObjectGraphicsInfo_RivalBrendanAcroBike,
-	&gEventObjectGraphicsInfo_RivalBrendanSurfing,
-	&gEventObjectGraphicsInfo_RivalBrendanFieldMove,
-	&gEventObjectGraphicsInfo_RivalMayNormal,
-	&gEventObjectGraphicsInfo_RivalMayMachBike,
-	&gEventObjectGraphicsInfo_RivalMayAcroBike,
-	&gEventObjectGraphicsInfo_RivalMaySurfing,
-	&gEventObjectGraphicsInfo_RivalMayFieldMove,
-	&gEventObjectGraphicsInfo_Cameraman,
-	&gEventObjectGraphicsInfo_BrendanUnderwater,
-	&gEventObjectGraphicsInfo_MayUnderwater,
-	&gEventObjectGraphicsInfo_MovingBox,
-	&gEventObjectGraphicsInfo_CableCar,
-	&gEventObjectGraphicsInfo_Scientist2,
-	&gEventObjectGraphicsInfo_DevonEmployee,
-	&gEventObjectGraphicsInfo_AquaMemberM,
-	&gEventObjectGraphicsInfo_AquaMemberF,
-	&gEventObjectGraphicsInfo_MagmaMemberM,
-	&gEventObjectGraphicsInfo_MagmaMemberF,
-	&gEventObjectGraphicsInfo_Sidney,
-	&gEventObjectGraphicsInfo_Phoebe,
-	&gEventObjectGraphicsInfo_Glacia,
-	&gEventObjectGraphicsInfo_Drake,
-	&gEventObjectGraphicsInfo_Roxanne,
-	&gEventObjectGraphicsInfo_Brawly,
-	&gEventObjectGraphicsInfo_Wattson,
-	&gEventObjectGraphicsInfo_Flannery,
-	&gEventObjectGraphicsInfo_Norman,
-	&gEventObjectGraphicsInfo_Winona,
-	&gEventObjectGraphicsInfo_Liza,
-	&gEventObjectGraphicsInfo_Tate,
-	&gEventObjectGraphicsInfo_Wallace,
-	&gEventObjectGraphicsInfo_Steven,
-	&gEventObjectGraphicsInfo_Wally,
-	&gEventObjectGraphicsInfo_RubySapphireLittleBoy,
-	&gEventObjectGraphicsInfo_BrendanFishing,
-	&gEventObjectGraphicsInfo_MayFishing,
-	&gEventObjectGraphicsInfo_HotSpringsOldWoman,
-	&gEventObjectGraphicsInfo_SSTidal,
-	&gEventObjectGraphicsInfo_SubmarineShadow,
-	&gEventObjectGraphicsInfo_PichuDoll,
-	&gEventObjectGraphicsInfo_PikachuDoll,
-	&gEventObjectGraphicsInfo_MarillDoll,
-	&gEventObjectGraphicsInfo_TogepiDoll,
-	&gEventObjectGraphicsInfo_CyndaquilDoll,
-	&gEventObjectGraphicsInfo_ChikoritaDoll,
-	&gEventObjectGraphicsInfo_TotodileDoll,
-	&gEventObjectGraphicsInfo_JigglypuffDoll,
-	&gEventObjectGraphicsInfo_MeowthDoll,
-	&gEventObjectGraphicsInfo_ClefairyDoll,
-	&gEventObjectGraphicsInfo_DittoDoll,
-	&gEventObjectGraphicsInfo_SmoochumDoll,
-	&gEventObjectGraphicsInfo_TreeckoDoll,
-	&gEventObjectGraphicsInfo_TorchicDoll,
-	&gEventObjectGraphicsInfo_MudkipDoll,
-	&gEventObjectGraphicsInfo_DuskullDoll,
-	&gEventObjectGraphicsInfo_WynautDoll,
-	&gEventObjectGraphicsInfo_BaltoyDoll,
-	&gEventObjectGraphicsInfo_KecleonDoll,
-	&gEventObjectGraphicsInfo_AzurillDoll,
-	&gEventObjectGraphicsInfo_SkittyDoll,
-	&gEventObjectGraphicsInfo_SwabluDoll,
-	&gEventObjectGraphicsInfo_GulpinDoll,
-	&gEventObjectGraphicsInfo_LotadDoll,
-	&gEventObjectGraphicsInfo_SeedotDoll,
-	&gEventObjectGraphicsInfo_PikaCushion,
-	&gEventObjectGraphicsInfo_RoundCushion,
-	&gEventObjectGraphicsInfo_KissCushion,
-	&gEventObjectGraphicsInfo_ZigzagCushion,
-	&gEventObjectGraphicsInfo_SpinCushion,
-	&gEventObjectGraphicsInfo_DiamondCushion,
-	&gEventObjectGraphicsInfo_BallCushion,
-	&gEventObjectGraphicsInfo_GrassCushion,
-	&gEventObjectGraphicsInfo_FireCushion,
-	&gEventObjectGraphicsInfo_WaterCushion,
-	&gEventObjectGraphicsInfo_BigSnorlaxDoll,
-	&gEventObjectGraphicsInfo_BigRhydonDoll,
-	&gEventObjectGraphicsInfo_BigLaprasDoll,
-	&gEventObjectGraphicsInfo_BigVenusaurDoll,
-	&gEventObjectGraphicsInfo_BigCharizardDoll,
-	&gEventObjectGraphicsInfo_BigBlastoiseDoll,
-	&gEventObjectGraphicsInfo_BigWailmerDoll,
-	&gEventObjectGraphicsInfo_BigRegirockDoll,
-	&gEventObjectGraphicsInfo_BigRegiceDoll,
-	&gEventObjectGraphicsInfo_BigRegisteelDoll,
-	&gEventObjectGraphicsInfo_Latias,
-	&gEventObjectGraphicsInfo_Latios,
-	&gEventObjectGraphicsInfo_GameboyKid,
-	&gEventObjectGraphicsInfo_ContestJudge,
-	&gEventObjectGraphicsInfo_BrendanWatering,
-	&gEventObjectGraphicsInfo_MayWatering,
-	&gEventObjectGraphicsInfo_BrendanDecorating,
-	&gEventObjectGraphicsInfo_MayDecorating,
-	&gEventObjectGraphicsInfo_Archie,
-	&gEventObjectGraphicsInfo_Maxie,
-	&gEventObjectGraphicsInfo_Kyogre1,
-	&gEventObjectGraphicsInfo_Groudon1,
-	&gEventObjectGraphicsInfo_Fossil,
-	&gEventObjectGraphicsInfo_Regirock,
-	&gEventObjectGraphicsInfo_Regice,
-	&gEventObjectGraphicsInfo_Registeel,
-	&gEventObjectGraphicsInfo_Skitty,
-	&gEventObjectGraphicsInfo_Kecleon1,
-	&gEventObjectGraphicsInfo_Kyogre2,
-	&gEventObjectGraphicsInfo_Groudon2,
-	&gEventObjectGraphicsInfo_Rayquaza2,
-	&gEventObjectGraphicsInfo_Zigzagoon,
-	&gEventObjectGraphicsInfo_Pikachu,
-	&gEventObjectGraphicsInfo_Azumarill,
-	&gEventObjectGraphicsInfo_Wingull,
-	&gEventObjectGraphicsInfo_Kecleon2,
-	&gEventObjectGraphicsInfo_TuberMSwimming,
-	&gEventObjectGraphicsInfo_Azurill,
-	&gEventObjectGraphicsInfo_Mom,
-	&gEventObjectGraphicsInfo_LinkBrendan,
-	&gEventObjectGraphicsInfo_LinkMay,
-	&gEventObjectGraphicsInfo_Juan,
-	&gEventObjectGraphicsInfo_Scott,
-	&gEventObjectGraphicsInfo_Poochyena,
-	&gEventObjectGraphicsInfo_Kyogre3,
-	&gEventObjectGraphicsInfo_Groudon3,
-	&gEventObjectGraphicsInfo_MysteryEventDeliveryman,
-	&gEventObjectGraphicsInfo_Statue,
-	&gEventObjectGraphicsInfo_Kirlia,
-	&gEventObjectGraphicsInfo_Dusclops,
-	&gEventObjectGraphicsInfo_UnionRoomAttendant,
-	&gEventObjectGraphicsInfo_Sudowoodo,
-	&gEventObjectGraphicsInfo_Mew,
-	&gEventObjectGraphicsInfo_Red,
-	&gEventObjectGraphicsInfo_Leaf,
-	&gEventObjectGraphicsInfo_Deoxys,
-	&gEventObjectGraphicsInfo_BirthIslandStone,
-	&gEventObjectGraphicsInfo_Brandon,
-	&gEventObjectGraphicsInfo_RubySapphireBrendan,
-	&gEventObjectGraphicsInfo_RubySapphireMay,
-	&gEventObjectGraphicsInfo_Lugia,
-	&gEventObjectGraphicsInfo_HoOh,
+    &gEventObjectGraphicsInfo_BrendanNormal,
+    &gEventObjectGraphicsInfo_BrendanMachBike,
+    &gEventObjectGraphicsInfo_BrendanSurfing,
+    &gEventObjectGraphicsInfo_BrendanFieldMove,
+    &gEventObjectGraphicsInfo_QuintyPlump,
+    &gEventObjectGraphicsInfo_NinjaBoy,
+    &gEventObjectGraphicsInfo_Twin,
+    &gEventObjectGraphicsInfo_Boy1,
+    &gEventObjectGraphicsInfo_Girl1,
+    &gEventObjectGraphicsInfo_Boy2,
+    &gEventObjectGraphicsInfo_Girl2,
+    &gEventObjectGraphicsInfo_LittleBoy,
+    &gEventObjectGraphicsInfo_LittleGirl,
+    &gEventObjectGraphicsInfo_Boy3,
+    &gEventObjectGraphicsInfo_Girl3,
+    &gEventObjectGraphicsInfo_RichBoy,
+    &gEventObjectGraphicsInfo_Woman1,
+    &gEventObjectGraphicsInfo_FatMan,
+    &gEventObjectGraphicsInfo_PokefanF,
+    &gEventObjectGraphicsInfo_Man1,
+    &gEventObjectGraphicsInfo_Woman2,
+    &gEventObjectGraphicsInfo_ExpertM,
+    &gEventObjectGraphicsInfo_ExpertF,
+    &gEventObjectGraphicsInfo_Man2,
+    &gEventObjectGraphicsInfo_Woman3,
+    &gEventObjectGraphicsInfo_PokefanM,
+    &gEventObjectGraphicsInfo_Woman4,
+    &gEventObjectGraphicsInfo_Cook,
+    &gEventObjectGraphicsInfo_LinkReceptionist,
+    &gEventObjectGraphicsInfo_OldMan,
+    &gEventObjectGraphicsInfo_OldWoman,
+    &gEventObjectGraphicsInfo_Camper,
+    &gEventObjectGraphicsInfo_Picnicker,
+    &gEventObjectGraphicsInfo_Man3,
+    &gEventObjectGraphicsInfo_Woman5,
+    &gEventObjectGraphicsInfo_Youngster,
+    &gEventObjectGraphicsInfo_BugCatcher,
+    &gEventObjectGraphicsInfo_PsychicM,
+    &gEventObjectGraphicsInfo_SchoolKidM,
+    &gEventObjectGraphicsInfo_Maniac,
+    &gEventObjectGraphicsInfo_HexManiac,
+    &gEventObjectGraphicsInfo_Rayquaza1,
+    &gEventObjectGraphicsInfo_SwimmerM,
+    &gEventObjectGraphicsInfo_SwimmerF,
+    &gEventObjectGraphicsInfo_BlackBelt,
+    &gEventObjectGraphicsInfo_Beauty,
+    &gEventObjectGraphicsInfo_Scientist1,
+    &gEventObjectGraphicsInfo_Lass,
+    &gEventObjectGraphicsInfo_Gentleman,
+    &gEventObjectGraphicsInfo_Sailor,
+    &gEventObjectGraphicsInfo_Fisherman,
+    &gEventObjectGraphicsInfo_RunningTriathleteM,
+    &gEventObjectGraphicsInfo_RunningTriathleteF,
+    &gEventObjectGraphicsInfo_TuberF,
+    &gEventObjectGraphicsInfo_TuberM,
+    &gEventObjectGraphicsInfo_Hiker,
+    &gEventObjectGraphicsInfo_CyclingTriathleteM,
+    &gEventObjectGraphicsInfo_CyclingTriathleteF,
+    &gEventObjectGraphicsInfo_Nurse,
+    &gEventObjectGraphicsInfo_ItemBall,
+    &gEventObjectGraphicsInfo_BerryTree,
+    &gEventObjectGraphicsInfo_BerryTreeEarlyStages,
+    &gEventObjectGraphicsInfo_BerryTreeLateStages,
+    &gEventObjectGraphicsInfo_BrendanAcroBike,
+    &gEventObjectGraphicsInfo_ProfBirch,
+    &gEventObjectGraphicsInfo_Man4,
+    &gEventObjectGraphicsInfo_Man5,
+    &gEventObjectGraphicsInfo_ReporterM,
+    &gEventObjectGraphicsInfo_ReporterF,
+    &gEventObjectGraphicsInfo_Bard,
+    &gEventObjectGraphicsInfo_Anabel,
+    &gEventObjectGraphicsInfo_Tucker,
+    &gEventObjectGraphicsInfo_Greta,
+    &gEventObjectGraphicsInfo_Spenser,
+    &gEventObjectGraphicsInfo_Noland,
+    &gEventObjectGraphicsInfo_Lucy,
+    &gEventObjectGraphicsInfo_UnusedNatuDoll,
+    &gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
+    &gEventObjectGraphicsInfo_UnusedSquirtleDoll,
+    &gEventObjectGraphicsInfo_UnusedWooperDoll,
+    &gEventObjectGraphicsInfo_UnusedPikachuDoll,
+    &gEventObjectGraphicsInfo_UnusedPorygon2Doll,
+    &gEventObjectGraphicsInfo_CuttableTree,
+    &gEventObjectGraphicsInfo_MartEmployee,
+    &gEventObjectGraphicsInfo_RooftopSaleWoman,
+    &gEventObjectGraphicsInfo_Teala,
+    &gEventObjectGraphicsInfo_BreakableRock,
+    &gEventObjectGraphicsInfo_PushableBoulder,
+    &gEventObjectGraphicsInfo_MrBrineysBoat,
+    &gEventObjectGraphicsInfo_MayNormal,
+    &gEventObjectGraphicsInfo_MayMachBike,
+    &gEventObjectGraphicsInfo_MayAcroBike,
+    &gEventObjectGraphicsInfo_MaySurfing,
+    &gEventObjectGraphicsInfo_MayFieldMove,
+    &gEventObjectGraphicsInfo_Truck,
+    &gEventObjectGraphicsInfo_VigorothCarryingBox,
+    &gEventObjectGraphicsInfo_VigorothFacingAway,
+    &gEventObjectGraphicsInfo_BirchsBag,
+    &gEventObjectGraphicsInfo_EnemyZigzagoon,
+    &gEventObjectGraphicsInfo_Artist,
+    &gEventObjectGraphicsInfo_RivalBrendanNormal,
+    &gEventObjectGraphicsInfo_RivalBrendanMachBike,
+    &gEventObjectGraphicsInfo_RivalBrendanAcroBike,
+    &gEventObjectGraphicsInfo_RivalBrendanSurfing,
+    &gEventObjectGraphicsInfo_RivalBrendanFieldMove,
+    &gEventObjectGraphicsInfo_RivalMayNormal,
+    &gEventObjectGraphicsInfo_RivalMayMachBike,
+    &gEventObjectGraphicsInfo_RivalMayAcroBike,
+    &gEventObjectGraphicsInfo_RivalMaySurfing,
+    &gEventObjectGraphicsInfo_RivalMayFieldMove,
+    &gEventObjectGraphicsInfo_Cameraman,
+    &gEventObjectGraphicsInfo_BrendanUnderwater,
+    &gEventObjectGraphicsInfo_MayUnderwater,
+    &gEventObjectGraphicsInfo_MovingBox,
+    &gEventObjectGraphicsInfo_CableCar,
+    &gEventObjectGraphicsInfo_Scientist2,
+    &gEventObjectGraphicsInfo_DevonEmployee,
+    &gEventObjectGraphicsInfo_AquaMemberM,
+    &gEventObjectGraphicsInfo_AquaMemberF,
+    &gEventObjectGraphicsInfo_MagmaMemberM,
+    &gEventObjectGraphicsInfo_MagmaMemberF,
+    &gEventObjectGraphicsInfo_Sidney,
+    &gEventObjectGraphicsInfo_Phoebe,
+    &gEventObjectGraphicsInfo_Glacia,
+    &gEventObjectGraphicsInfo_Drake,
+    &gEventObjectGraphicsInfo_Roxanne,
+    &gEventObjectGraphicsInfo_Brawly,
+    &gEventObjectGraphicsInfo_Wattson,
+    &gEventObjectGraphicsInfo_Flannery,
+    &gEventObjectGraphicsInfo_Norman,
+    &gEventObjectGraphicsInfo_Winona,
+    &gEventObjectGraphicsInfo_Liza,
+    &gEventObjectGraphicsInfo_Tate,
+    &gEventObjectGraphicsInfo_Wallace,
+    &gEventObjectGraphicsInfo_Steven,
+    &gEventObjectGraphicsInfo_Wally,
+    &gEventObjectGraphicsInfo_RubySapphireLittleBoy,
+    &gEventObjectGraphicsInfo_BrendanFishing,
+    &gEventObjectGraphicsInfo_MayFishing,
+    &gEventObjectGraphicsInfo_HotSpringsOldWoman,
+    &gEventObjectGraphicsInfo_SSTidal,
+    &gEventObjectGraphicsInfo_SubmarineShadow,
+    &gEventObjectGraphicsInfo_PichuDoll,
+    &gEventObjectGraphicsInfo_PikachuDoll,
+    &gEventObjectGraphicsInfo_MarillDoll,
+    &gEventObjectGraphicsInfo_TogepiDoll,
+    &gEventObjectGraphicsInfo_CyndaquilDoll,
+    &gEventObjectGraphicsInfo_ChikoritaDoll,
+    &gEventObjectGraphicsInfo_TotodileDoll,
+    &gEventObjectGraphicsInfo_JigglypuffDoll,
+    &gEventObjectGraphicsInfo_MeowthDoll,
+    &gEventObjectGraphicsInfo_ClefairyDoll,
+    &gEventObjectGraphicsInfo_DittoDoll,
+    &gEventObjectGraphicsInfo_SmoochumDoll,
+    &gEventObjectGraphicsInfo_TreeckoDoll,
+    &gEventObjectGraphicsInfo_TorchicDoll,
+    &gEventObjectGraphicsInfo_MudkipDoll,
+    &gEventObjectGraphicsInfo_DuskullDoll,
+    &gEventObjectGraphicsInfo_WynautDoll,
+    &gEventObjectGraphicsInfo_BaltoyDoll,
+    &gEventObjectGraphicsInfo_KecleonDoll,
+    &gEventObjectGraphicsInfo_AzurillDoll,
+    &gEventObjectGraphicsInfo_SkittyDoll,
+    &gEventObjectGraphicsInfo_SwabluDoll,
+    &gEventObjectGraphicsInfo_GulpinDoll,
+    &gEventObjectGraphicsInfo_LotadDoll,
+    &gEventObjectGraphicsInfo_SeedotDoll,
+    &gEventObjectGraphicsInfo_PikaCushion,
+    &gEventObjectGraphicsInfo_RoundCushion,
+    &gEventObjectGraphicsInfo_KissCushion,
+    &gEventObjectGraphicsInfo_ZigzagCushion,
+    &gEventObjectGraphicsInfo_SpinCushion,
+    &gEventObjectGraphicsInfo_DiamondCushion,
+    &gEventObjectGraphicsInfo_BallCushion,
+    &gEventObjectGraphicsInfo_GrassCushion,
+    &gEventObjectGraphicsInfo_FireCushion,
+    &gEventObjectGraphicsInfo_WaterCushion,
+    &gEventObjectGraphicsInfo_BigSnorlaxDoll,
+    &gEventObjectGraphicsInfo_BigRhydonDoll,
+    &gEventObjectGraphicsInfo_BigLaprasDoll,
+    &gEventObjectGraphicsInfo_BigVenusaurDoll,
+    &gEventObjectGraphicsInfo_BigCharizardDoll,
+    &gEventObjectGraphicsInfo_BigBlastoiseDoll,
+    &gEventObjectGraphicsInfo_BigWailmerDoll,
+    &gEventObjectGraphicsInfo_BigRegirockDoll,
+    &gEventObjectGraphicsInfo_BigRegiceDoll,
+    &gEventObjectGraphicsInfo_BigRegisteelDoll,
+    &gEventObjectGraphicsInfo_Latias,
+    &gEventObjectGraphicsInfo_Latios,
+    &gEventObjectGraphicsInfo_GameboyKid,
+    &gEventObjectGraphicsInfo_ContestJudge,
+    &gEventObjectGraphicsInfo_BrendanWatering,
+    &gEventObjectGraphicsInfo_MayWatering,
+    &gEventObjectGraphicsInfo_BrendanDecorating,
+    &gEventObjectGraphicsInfo_MayDecorating,
+    &gEventObjectGraphicsInfo_Archie,
+    &gEventObjectGraphicsInfo_Maxie,
+    &gEventObjectGraphicsInfo_Kyogre1,
+    &gEventObjectGraphicsInfo_Groudon1,
+    &gEventObjectGraphicsInfo_Fossil,
+    &gEventObjectGraphicsInfo_Regirock,
+    &gEventObjectGraphicsInfo_Regice,
+    &gEventObjectGraphicsInfo_Registeel,
+    &gEventObjectGraphicsInfo_Skitty,
+    &gEventObjectGraphicsInfo_Kecleon1,
+    &gEventObjectGraphicsInfo_Kyogre2,
+    &gEventObjectGraphicsInfo_Groudon2,
+    &gEventObjectGraphicsInfo_Rayquaza2,
+    &gEventObjectGraphicsInfo_Zigzagoon,
+    &gEventObjectGraphicsInfo_Pikachu,
+    &gEventObjectGraphicsInfo_Azumarill,
+    &gEventObjectGraphicsInfo_Wingull,
+    &gEventObjectGraphicsInfo_Kecleon2,
+    &gEventObjectGraphicsInfo_TuberMSwimming,
+    &gEventObjectGraphicsInfo_Azurill,
+    &gEventObjectGraphicsInfo_Mom,
+    &gEventObjectGraphicsInfo_LinkBrendan,
+    &gEventObjectGraphicsInfo_LinkMay,
+    &gEventObjectGraphicsInfo_Juan,
+    &gEventObjectGraphicsInfo_Scott,
+    &gEventObjectGraphicsInfo_Poochyena,
+    &gEventObjectGraphicsInfo_Kyogre3,
+    &gEventObjectGraphicsInfo_Groudon3,
+    &gEventObjectGraphicsInfo_MysteryEventDeliveryman,
+    &gEventObjectGraphicsInfo_Statue,
+    &gEventObjectGraphicsInfo_Kirlia,
+    &gEventObjectGraphicsInfo_Dusclops,
+    &gEventObjectGraphicsInfo_UnionRoomAttendant,
+    &gEventObjectGraphicsInfo_Sudowoodo,
+    &gEventObjectGraphicsInfo_Mew,
+    &gEventObjectGraphicsInfo_Red,
+    &gEventObjectGraphicsInfo_Leaf,
+    &gEventObjectGraphicsInfo_Deoxys,
+    &gEventObjectGraphicsInfo_BirthIslandStone,
+    &gEventObjectGraphicsInfo_Brandon,
+    &gEventObjectGraphicsInfo_RubySapphireBrendan,
+    &gEventObjectGraphicsInfo_RubySapphireMay,
+    &gEventObjectGraphicsInfo_Lugia,
+    &gEventObjectGraphicsInfo_HoOh,
 };
 
 const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
-	&gEventObjectGraphicsInfo_Bard,
-	&gEventObjectGraphicsInfo_Hipster,
-	&gEventObjectGraphicsInfo_Trader,
-	&gEventObjectGraphicsInfo_Storyteller,
-	&gEventObjectGraphicsInfo_Giddy,
-	&gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
-	&gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+    &gEventObjectGraphicsInfo_Bard,
+    &gEventObjectGraphicsInfo_Hipster,
+    &gEventObjectGraphicsInfo_Trader,
+    &gEventObjectGraphicsInfo_Storyteller,
+    &gEventObjectGraphicsInfo_Giddy,
+    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
 };
-
-#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H

src/data/field_event_obj/event_object_pic_tables.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H
-#define GUARD_EVENT_OBJECT_PIC_TABLES_H
-
 const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = {
     overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0),
     overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1),
@@ -2175,5 +2172,3 @@ const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = {
     overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7),
     overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8),
 };
-
-#endif //GUARD_EVENT_OBJECT_PIC_TABLES_H

src/data/field_event_obj/event_object_subsprites.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H
-#define GUARD_EVENT_OBJECT_SUBSPRITES_H
-
 const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = {
     { -8,  -8, 0, 1, 0, 2}
 };
@@ -338,5 +335,3 @@ const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = {
     {16, gEventObjectSpriteOamTable_SubmarineShadow_3},
     {16, gEventObjectSpriteOamTable_SubmarineShadow_3}
 };
-
-#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H

src/data/field_event_obj/field_effect_object_template_pointers.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
-#define GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
-
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall;
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium;
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge;
@@ -78,5 +75,3 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
     &gFieldEffectObjectTemplate_Unknown35,
     &gFieldEffectObjectTemplate_Rayquaza,
 };
-
-#endif //GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H

src/data/field_event_obj/field_effect_objects.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_FIELD_EFFECT_OBJECTS_H
-#define GUARD_FIELD_EFFECT_OBJECTS_H
-
 const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004};
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005};
@@ -993,5 +990,3 @@ const struct SpriteFrameImage  gFieldEffectObjectPicTable_Rayquaza[] = {
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
 
 const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011};
-
-#endif //GUARD_FIELD_EFFECT_OBJECTS_H

src/data/field_event_obj/movement_type_func_tables.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
-#define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H
-
 u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = {
     MovementType_WanderAround_Step0,
     MovementType_WanderAround_Step1,
@@ -439,5 +436,3 @@ u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *
     MovementType_Invisible_Step1,
     MovementType_Invisible_Step2,
 };
-
-#endif //GUARD_MOVEMENT_TYPE_FUNC_TABLES_H

src/data/graphics/items.h

@@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett
 const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz");
 const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz");
 
-const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz");	
+const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz");
 const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz");
 const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz");
 const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz");

src/data/graphics/trainers.h

@@ -151,11 +151,11 @@ const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/palettes/
 const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz");
 const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/palettes/sr_and_jr.gbapal.lz");
 
-const u32 gTrainerFrontPic_WinstrateM[] = INCBIN_U32("graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz");
-const u32 gTrainerPalette_WinstrateM[] = INCBIN_U32("graphics/trainers/palettes/winstrate_m.gbapal.lz");
+const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/palettes/pokefan_m.gbapal.lz");
 
-const u32 gTrainerFrontPic_WinstrateF[] = INCBIN_U32("graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz");
-const u32 gTrainerPalette_WinstrateF[] = INCBIN_U32("graphics/trainers/palettes/winstrate_f.gbapal.lz");
+const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz");
+const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/palettes/pokefan_f.gbapal.lz");
 
 const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster_front_pic.4bpp.lz");
 const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/palettes/youngster.gbapal.lz");

src/data/item_icon_table.h

@@ -1,414 +1,407 @@
-#ifndef GUARD_DATA_ITEM_ICON_TABLE_H
-#define GUARD_DATA_ITEM_ICON_TABLE_H
-
-#include "global.h"
-#include "graphics.h"
-
-const u32 *const gItemIconTable[][2] = 
+const u32 *const gItemIconTable[][2] =
 {
-    gItemIcon_QuestionMark,    gItemIconPalette_QuestionMark,
-// Pokeballs
-    gItemIcon_MasterBall,     gItemIconPalette_MasterBall,
-    gItemIcon_UltraBall,      gItemIconPalette_UltraBall,
-    gItemIcon_GreatBall,      gItemIconPalette_GreatBall,
-    gItemIcon_PokeBall,       gItemIconPalette_PokeBall,
-    gItemIcon_SafariBall,     gItemIconPalette_SafariBall,
-    gItemIcon_NetBall,        gItemIconPalette_NetBall,
-    gItemIcon_DiveBall,       gItemIconPalette_DiveBall,
-    gItemIcon_NestBall,       gItemIconPalette_NestBall,
-    gItemIcon_RepeatBall,     gItemIconPalette_RepeatBall,
-    gItemIcon_TimerBall,      gItemIconPalette_RepeatBall,
-    gItemIcon_LuxuryBall,     gItemIconPalette_LuxuryBall,
-    gItemIcon_PremierBall,    gItemIconPalette_LuxuryBall,
-// Medicine
-    gItemIcon_Potion,         gItemIconPalette_Potion,
-    gItemIcon_Antidote,       gItemIconPalette_Antidote,
-    gItemIcon_StatusHeal,     gItemIconPalette_BurnHeal,
-    gItemIcon_StatusHeal,     gItemIconPalette_IceHeal,
-    gItemIcon_StatusHeal,     gItemIconPalette_Awakening,
-    gItemIcon_StatusHeal,     gItemIconPalette_ParalyzeHeal,
-    gItemIcon_LargePotion,    gItemIconPalette_FullRestore,
-    gItemIcon_LargePotion,    gItemIconPalette_MaxPotion,
-    gItemIcon_Potion,         gItemIconPalette_HyperPotion,
-    gItemIcon_Potion,         gItemIconPalette_SuperPotion,
-    gItemIcon_FullHeal,       gItemIconPalette_FullHeal,
-    gItemIcon_Revive,         gItemIconPalette_Revive,
-    gItemIcon_MaxRevive,      gItemIconPalette_Revive,
-    gItemIcon_FreshWater,     gItemIconPalette_FreshWater,
-    gItemIcon_SodaPop,        gItemIconPalette_SodaPop,
-    gItemIcon_Lemonade,       gItemIconPalette_Lemonade,
-    gItemIcon_MoomooMilk,     gItemIconPalette_MoomooMilk,
-    gItemIcon_Powder,         gItemIconPalette_EnergyPowder,
-    gItemIcon_EnergyRoot,     gItemIconPalette_EnergyRoot,
-    gItemIcon_Powder,         gItemIconPalette_HealPowder,
-    gItemIcon_RevivalHerb,    gItemIconPalette_RevivalHerb,
-    gItemIcon_Ether,          gItemIconPalette_Ether,
-    gItemIcon_Ether,          gItemIconPalette_MaxEther,
-    gItemIcon_Ether,          gItemIconPalette_Elixir,
-    gItemIcon_Ether,          gItemIconPalette_MaxElixir,
-    gItemIcon_LavaCookie,     gItemIconPalette_LavaCookieAndLetter,
-    gItemIcon_Flute,          gItemIconPalette_BlueFlute,
-    gItemIcon_Flute,          gItemIconPalette_YellowFlute,
-    gItemIcon_Flute,          gItemIconPalette_RedFlute,
-    gItemIcon_Flute,          gItemIconPalette_BlackFlute,
-    gItemIcon_Flute,          gItemIconPalette_WhiteFlute,
-    gItemIcon_BerryJuice,     gItemIconPalette_BerryJuice,
-    gItemIcon_SacredAsh,      gItemIconPalette_SacredAsh,
-// Collectibles
-    gItemIcon_Powder,        gItemIconPalette_ShoalSalt,
-    gItemIcon_ShoalShell,    gItemIconPalette_Shell,
-    gItemIcon_Shard,         gItemIconPalette_RedShard,
-    gItemIcon_Shard,         gItemIconPalette_BlueShard,
-    gItemIcon_Shard,         gItemIconPalette_YellowShard,
-    gItemIcon_Shard,         gItemIconPalette_GreenShard,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Vitamins
-    gItemIcon_HPUp,         gItemIconPalette_HPUp,
-    gItemIcon_Vitamin,      gItemIconPalette_Protein,
-    gItemIcon_Vitamin,      gItemIconPalette_Iron,
-    gItemIcon_Vitamin,      gItemIconPalette_Carbos,
-    gItemIcon_Vitamin,      gItemIconPalette_Calcium,
-    gItemIcon_RareCandy,    gItemIconPalette_RareCandy,
-    gItemIcon_PPUp,         gItemIconPalette_PPUp,
-    gItemIcon_Vitamin,      gItemIconPalette_Zinc,
-    gItemIcon_PPMax,        gItemIconPalette_PPMax,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Battle items
-    gItemIcon_BattleStatItem,    gItemIconPalette_GuardSpec,
-    gItemIcon_BattleStatItem,    gItemIconPalette_DireHit,
-    gItemIcon_BattleStatItem,    gItemIconPalette_XAttack,
-    gItemIcon_BattleStatItem,    gItemIconPalette_XDefend,
-    gItemIcon_BattleStatItem,    gItemIconPalette_XSpeed,
-    gItemIcon_BattleStatItem,    gItemIconPalette_XAccuracy,
-    gItemIcon_BattleStatItem,    gItemIconPalette_XSpecial,
-    gItemIcon_PokeDoll,          gItemIconPalette_PokeDoll,
-    gItemIcon_FluffyTail,        gItemIconPalette_FluffyTail,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Field items
-    gItemIcon_Repel,         gItemIconPalette_SuperRepel,
-    gItemIcon_Repel,         gItemIconPalette_MaxRepel,
-    gItemIcon_EscapeRope,    gItemIconPalette_EscapeRope,
-    gItemIcon_Repel,         gItemIconPalette_Repel,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Evolution stones
-    gItemIcon_SunStone,      gItemIconPalette_SunStone,
-    gItemIcon_MoonStone,     gItemIconPalette_MoonStone,
-    gItemIcon_FireStone,     gItemIconPalette_FireStone,
-    gItemIcon_ThunderStone,  gItemIconPalette_ThunderStone,
-    gItemIcon_WaterStone,    gItemIconPalette_WaterStone,
-    gItemIcon_LeafStone,     gItemIconPalette_LeafStone,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Valuables
-    gItemIcon_TinyMushroom,    gItemIconPalette_Mushroom,
-    gItemIcon_BigMushroom,     gItemIconPalette_Mushroom,
-    gItemIcon_QuestionMark,    gItemIconPalette_QuestionMark,
-    gItemIcon_Pearl,           gItemIconPalette_Pearl,
-    gItemIcon_BigPearl,        gItemIconPalette_Pearl,
-    gItemIcon_Stardust,        gItemIconPalette_Star,
-    gItemIcon_StarPiece,       gItemIconPalette_Star,
-    gItemIcon_Nugget,          gItemIconPalette_Nugget,
-    gItemIcon_HeartScale,      gItemIconPalette_HeartScale,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Mail
-    gItemIcon_OrangeMail,     gItemIconPalette_OrangeMail,
-    gItemIcon_HarborMail,     gItemIconPalette_HarborMail,
-    gItemIcon_GlitterMail,    gItemIconPalette_GlitterMail,
-    gItemIcon_MechMail,       gItemIconPalette_MechMail,
-    gItemIcon_WoodMail,       gItemIconPalette_WoodMail,
-    gItemIcon_WaveMail,       gItemIconPalette_WaveMail,
-    gItemIcon_BeadMail,       gItemIconPalette_BeadMail,
-    gItemIcon_ShadowMail,     gItemIconPalette_ShadowMail,
-    gItemIcon_TropicMail,     gItemIconPalette_TropicMail,
-    gItemIcon_DreamMail,      gItemIconPalette_DreamMail,
-    gItemIcon_FabMail,        gItemIconPalette_FabMail,
-    gItemIcon_RetroMail,      gItemIconPalette_RetroMail,
-// Berries
-    gItemIcon_CheriBerry,     gItemIconPalette_CheriBerry,
-    gItemIcon_ChestoBerry,    gItemIconPalette_ChestoBerry,
-    gItemIcon_PechaBerry,     gItemIconPalette_PechaBerry,
-    gItemIcon_RawstBerry,     gItemIconPalette_RawstBerry,
-    gItemIcon_AspearBerry,    gItemIconPalette_AspearBerry,
-    gItemIcon_LeppaBerry,     gItemIconPalette_LeppaBerry,
-    gItemIcon_OranBerry,      gItemIconPalette_OranBerry,
-    gItemIcon_PersimBerry,    gItemIconPalette_PersimBerry,
-    gItemIcon_LumBerry,       gItemIconPalette_LumBerry,
-    gItemIcon_SitrusBerry,    gItemIconPalette_SitrusBerry,
-    gItemIcon_FigyBerry,      gItemIconPalette_FigyBerry,
-    gItemIcon_WikiBerry,      gItemIconPalette_WikiBerry,
-    gItemIcon_MagoBerry,      gItemIconPalette_MagoBerry,
-    gItemIcon_AguavBerry,     gItemIconPalette_AguavBerry,
-    gItemIcon_IapapaBerry,    gItemIconPalette_IapapaBerry,
-    gItemIcon_RazzBerry,      gItemIconPalette_RazzBerry,
-    gItemIcon_BlukBerry,      gItemIconPalette_BlukBerry,
-    gItemIcon_NanabBerry,     gItemIconPalette_NanabBerry,
-    gItemIcon_WepearBerry,    gItemIconPalette_WepearBerry,
-    gItemIcon_PinapBerry,     gItemIconPalette_PinapBerry,
-    gItemIcon_PomegBerry,     gItemIconPalette_PomegBerry,
-    gItemIcon_KelpsyBerry,    gItemIconPalette_KelpsyBerry,
-    gItemIcon_QualotBerry,    gItemIconPalette_QualotBerry,
-    gItemIcon_HondewBerry,    gItemIconPalette_HondewBerry,
-    gItemIcon_GrepaBerry,     gItemIconPalette_GrepaBerry,
-    gItemIcon_TamatoBerry,    gItemIconPalette_TamatoBerry,
-    gItemIcon_CornnBerry,     gItemIconPalette_CornnBerry,
-    gItemIcon_MagostBerry,    gItemIconPalette_MagostBerry,
-    gItemIcon_RabutaBerry,    gItemIconPalette_RabutaBerry,
-    gItemIcon_NomelBerry,     gItemIconPalette_NomelBerry,
-    gItemIcon_SpelonBerry,    gItemIconPalette_SpelonBerry,
-    gItemIcon_PamtreBerry,    gItemIconPalette_PamtreBerry,
-    gItemIcon_WatmelBerry,    gItemIconPalette_WatmelBerry,
-    gItemIcon_DurinBerry,     gItemIconPalette_DurinBerry,
-    gItemIcon_BelueBerry,     gItemIconPalette_BelueBerry,
-    gItemIcon_LiechiBerry,    gItemIconPalette_LiechiBerry,
-    gItemIcon_GanlonBerry,    gItemIconPalette_GanlonBerry,
-    gItemIcon_SalacBerry,     gItemIconPalette_SalacBerry,
-    gItemIcon_PetayaBerry,    gItemIconPalette_PetayaBerry,
-    gItemIcon_ApicotBerry,    gItemIconPalette_ApicotBerry,
-    gItemIcon_LansatBerry,    gItemIconPalette_LansatBerry,
-    gItemIcon_StarfBerry,     gItemIconPalette_StarfBerry,
-    gItemIcon_EnigmaBerry,    gItemIconPalette_EnigmaBerry,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Hold items
-    gItemIcon_BrightPowder,    gItemIconPalette_BrightPowder,
-    gItemIcon_InBattleHerb,    gItemIconPalette_WhiteHerb,
-    gItemIcon_MachoBrace,      gItemIconPalette_MachoBrace,
-    gItemIcon_ExpShare,        gItemIconPalette_ExpShare,
-    gItemIcon_QuickClaw,       gItemIconPalette_QuickClaw,
-    gItemIcon_SootheBell,      gItemIconPalette_SootheBell,
-    gItemIcon_InBattleHerb,    gItemIconPalette_MentalHerb,
-    gItemIcon_ChoiceBand,      gItemIconPalette_ChoiceBand,
-    gItemIcon_KingsRock,       gItemIconPalette_KingsRock,
-    gItemIcon_SilverPowder,    gItemIconPalette_SilverPowder,
-    gItemIcon_AmuletCoin,      gItemIconPalette_AmuletCoin,
-    gItemIcon_CleanseTag,      gItemIconPalette_CleanseTag,
-    gItemIcon_SoulDew,         gItemIconPalette_SoulDew,
-    gItemIcon_DeepSeaTooth,    gItemIconPalette_DeepSeaTooth,
-    gItemIcon_DeepSeaScale,    gItemIconPalette_DeepSeaScale,
-    gItemIcon_SmokeBall,       gItemIconPalette_SmokeBall,
-    gItemIcon_Everstone,       gItemIconPalette_Everstone,
-    gItemIcon_FocusBand,       gItemIconPalette_FocusBand,
-    gItemIcon_LuckyEgg,        gItemIconPalette_LuckyEgg,
-    gItemIcon_ScopeLens,       gItemIconPalette_ScopeLens,
-    gItemIcon_MetalCoat,       gItemIconPalette_MetalCoat,
-    gItemIcon_Leftovers,       gItemIconPalette_Leftovers,
-    gItemIcon_DragonScale,     gItemIconPalette_DragonScale,
-    gItemIcon_LightBall,       gItemIconPalette_LightBall,
-    gItemIcon_SoftSand,        gItemIconPalette_SoftSand,
-    gItemIcon_HardStone,       gItemIconPalette_HardStone,
-    gItemIcon_MiracleSeed,     gItemIconPalette_MiracleSeed,
-    gItemIcon_BlackGlasses,    gItemIconPalette_BlackTypeEnhancingItem,
-    gItemIcon_BlackBelt,       gItemIconPalette_BlackTypeEnhancingItem,
-    gItemIcon_Magnet,          gItemIconPalette_Magnet,
-    gItemIcon_MysticWater,     gItemIconPalette_MysticWater,
-    gItemIcon_SharpBeak,       gItemIconPalette_SharpBeak,
-    gItemIcon_PoisonBarb,      gItemIconPalette_PoisonBarb,
-    gItemIcon_NeverMeltIce,    gItemIconPalette_NeverMeltIce,
-    gItemIcon_SpellTag,        gItemIconPalette_SpellTag,
-    gItemIcon_TwistedSpoon,    gItemIconPalette_TwistedSpoon,
-    gItemIcon_Charcoal,        gItemIconPalette_Charcoal,
-    gItemIcon_DragonFang,      gItemIconPalette_DragonFang,
-    gItemIcon_SilkScarf,       gItemIconPalette_SilkScarf,
-    gItemIcon_UpGrade,         gItemIconPalette_UpGrade,
-    gItemIcon_ShellBell,       gItemIconPalette_Shell,
-    gItemIcon_SeaIncense,      gItemIconPalette_SeaIncense,
-    gItemIcon_LaxIncense,      gItemIconPalette_LaxIncense,
-    gItemIcon_LuckyPunch,      gItemIconPalette_LuckyPunch,
-    gItemIcon_MetalPowder,     gItemIconPalette_MetalPowder,
-    gItemIcon_ThickClub,       gItemIconPalette_ThickClub,
-    gItemIcon_Stick,           gItemIconPalette_Stick,
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// Contest hold items
-    gItemIcon_Scarf, gItemIconPalette_RedScarf,
-    gItemIcon_Scarf, gItemIconPalette_BlueScarf,
-    gItemIcon_Scarf, gItemIconPalette_PinkScarf,
-    gItemIcon_Scarf, gItemIconPalette_GreenScarf,
-    gItemIcon_Scarf, gItemIconPalette_YellowScarf,
-// Key items
-    gItemIcon_MachBike,         gItemIconPalette_MachBike,
-    gItemIcon_CoinCase,         gItemIconPalette_CoinCase,
-    gItemIcon_Itemfinder,       gItemIconPalette_Itemfinder,
-    gItemIcon_OldRod,           gItemIconPalette_OldRod,
-    gItemIcon_GoodRod,          gItemIconPalette_GoodRod,
-    gItemIcon_SuperRod,         gItemIconPalette_SuperRod,
-    gItemIcon_SSTicket,         gItemIconPalette_SSTicket,
-    gItemIcon_ContestPass,      gItemIconPalette_ContestPass,
-    gItemIcon_QuestionMark,     gItemIconPalette_QuestionMark,
-    gItemIcon_WailmerPail,      gItemIconPalette_WailmerPail,
-    gItemIcon_DevonGoods,       gItemIconPalette_DevonGoods,
-    gItemIcon_SootSack,         gItemIconPalette_SootSack,
-    gItemIcon_BasementKey,      gItemIconPalette_OldKey,
-    gItemIcon_AcroBike,         gItemIconPalette_AcroBike,
-    gItemIcon_PokeblockCase,    gItemIconPalette_PokeblockCase,
-    gItemIcon_Letter,           gItemIconPalette_LavaCookieAndLetter,
-    gItemIcon_EonTicket,        gItemIconPalette_EonTicket,
-    gItemIcon_Orb,              gItemIconPalette_RedOrb,
-    gItemIcon_Orb,              gItemIconPalette_BlueOrb,
-    gItemIcon_Scanner,          gItemIconPalette_Scanner,
-    gItemIcon_GoGoggles,        gItemIconPalette_GoGoggles,
-    gItemIcon_Meteorite,        gItemIconPalette_Meteorite,
-    gItemIcon_Room1Key,         gItemIconPalette_Key,
-    gItemIcon_Room2Key,         gItemIconPalette_Key,
-    gItemIcon_Room4Key,         gItemIconPalette_Key,
-    gItemIcon_Room6Key,         gItemIconPalette_Key,
-    gItemIcon_StorageKey,       gItemIconPalette_OldKey,
-    gItemIcon_RootFossil,       gItemIconPalette_HoennFossil,
-    gItemIcon_ClawFossil,       gItemIconPalette_HoennFossil,
-    gItemIcon_DevonScope,       gItemIconPalette_DevonScope,
-// TMs/HMs
-    gItemIcon_TM, gItemIconPalette_FightingTMHM,    // TM01
-    gItemIcon_TM, gItemIconPalette_DragonTMHM,      // TM02
-    gItemIcon_TM, gItemIconPalette_WaterTMHM,       // TM03
-    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM04
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM05
-    gItemIcon_TM, gItemIconPalette_PoisonTMHM,      // TM06
-    gItemIcon_TM, gItemIconPalette_IceTMHM,         // TM07
-    gItemIcon_TM, gItemIconPalette_FightingTMHM,    // TM08
-    gItemIcon_TM, gItemIconPalette_GrassTMHM,       // TM09
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM10
-    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM11
-    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM12
-    gItemIcon_TM, gItemIconPalette_IceTMHM,         // TM13
-    gItemIcon_TM, gItemIconPalette_IceTMHM,         // TM14
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM15
-    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM16
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM17
-    gItemIcon_TM, gItemIconPalette_WaterTMHM,       // TM18
-    gItemIcon_TM, gItemIconPalette_GrassTMHM,       // TM19
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM20
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM21
-    gItemIcon_TM, gItemIconPalette_GrassTMHM,       // TM22
-    gItemIcon_TM, gItemIconPalette_SteelTMHM,       // TM23
-    gItemIcon_TM, gItemIconPalette_ElectricTMHM,    // TM24
-    gItemIcon_TM, gItemIconPalette_ElectricTMHM,    // TM25
-    gItemIcon_TM, gItemIconPalette_GroundTMHM,      // TM26
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM27
-    gItemIcon_TM, gItemIconPalette_GroundTMHM,      // TM28
-    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM29
-    gItemIcon_TM, gItemIconPalette_GhostTMHM,       // TM30
-    gItemIcon_TM, gItemIconPalette_FightingTMHM,    // TM31
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM32
-    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM33
-    gItemIcon_TM, gItemIconPalette_ElectricTMHM,    // TM34
-    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM35
-    gItemIcon_TM, gItemIconPalette_PoisonTMHM,      // TM36
-    gItemIcon_TM, gItemIconPalette_RockTMHM,        // TM37
-    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM38
-    gItemIcon_TM, gItemIconPalette_RockTMHM,        // TM39
-    gItemIcon_TM, gItemIconPalette_FlyingTMHM,      // TM40
-    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM41
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM42
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM43
-    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM44
-    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM45
-    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM46
-    gItemIcon_TM, gItemIconPalette_SteelTMHM,       // TM47
-    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM48
-    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM49
-    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM50
-    gItemIcon_HM, gItemIconPalette_NormalTMHM,      // HM01
-    gItemIcon_HM, gItemIconPalette_FlyingTMHM,      // HM02
-    gItemIcon_HM, gItemIconPalette_WaterTMHM,       // HM03
-    gItemIcon_HM, gItemIconPalette_NormalTMHM,      // HM04
-    gItemIcon_HM, gItemIconPalette_NormalTMHM,      // HM05
-    gItemIcon_HM, gItemIconPalette_FightingTMHM,    // HM06
-    gItemIcon_HM, gItemIconPalette_WaterTMHM,       // HM07
-    gItemIcon_HM, gItemIconPalette_WaterTMHM,       // HM08
-// ????????
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-// FireRed/LeafGreen key items
-    gItemIcon_OaksParcel,      gItemIconPalette_OaksParcel,
-    gItemIcon_PokeFlute,       gItemIconPalette_PokeFlute,
-    gItemIcon_SecretKey,       gItemIconPalette_SecretKey,
-    gItemIcon_BikeVoucher,     gItemIconPalette_BikeVoucher,
-    gItemIcon_GoldTeeth,       gItemIconPalette_GoldTeeth,
-    gItemIcon_OldAmber,        gItemIconPalette_OldAmber,
-    gItemIcon_CardKey,         gItemIconPalette_CardKey,
-    gItemIcon_LiftKey,         gItemIconPalette_Key,
-    gItemIcon_HelixFossil,     gItemIconPalette_KantoFossil,
-    gItemIcon_DomeFossil,      gItemIconPalette_KantoFossil,
-    gItemIcon_SilphScope,      gItemIconPalette_SilphScope,
-    gItemIcon_Bicycle,         gItemIconPalette_Bicycle,
-    gItemIcon_TownMap,         gItemIconPalette_TownMap,
-    gItemIcon_VSSeeker,        gItemIconPalette_VSSeeker,
-    gItemIcon_FameChecker,     gItemIconPalette_FameChecker,
-    gItemIcon_TMCase,          gItemIconPalette_TMCase,
-    gItemIcon_BerryPouch,      gItemIconPalette_BerryPouch,
-    gItemIcon_TeachyTV,        gItemIconPalette_TeachyTV,
-    gItemIcon_TriPass,         gItemIconPalette_TriPass,
-    gItemIcon_RainbowPass,     gItemIconPalette_RainbowPass,
-    gItemIcon_Tea,             gItemIconPalette_Tea,
-    gItemIcon_MysticTicket,    gItemIconPalette_MysticTicket,
-    gItemIcon_AuroraTicket,    gItemIconPalette_AuroraTicket,
-    gItemIcon_PowderJar,       gItemIconPalette_PowderJar,
-    gItemIcon_Gem,             gItemIconPalette_Ruby,
-    gItemIcon_Gem,             gItemIconPalette_Sapphire,
-// Emerald-only key items
-    gItemIcon_MagmaEmblem,     gItemIconPalette_MagmaEmblem,
-    gItemIcon_OldSeaMap,       gItemIconPalette_OldSeaMap,
-// Return to field arrow
-    gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow,
+    [ITEM_NONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Pokeballs
+    [ITEM_MASTER_BALL] = {gItemIcon_MasterBall, gItemIconPalette_MasterBall},
+    [ITEM_ULTRA_BALL] = {gItemIcon_UltraBall, gItemIconPalette_UltraBall},
+    [ITEM_GREAT_BALL] = {gItemIcon_GreatBall, gItemIconPalette_GreatBall},
+    [ITEM_POKE_BALL] = {gItemIcon_PokeBall, gItemIconPalette_PokeBall},
+    [ITEM_SAFARI_BALL] = {gItemIcon_SafariBall, gItemIconPalette_SafariBall},
+    [ITEM_NET_BALL] = {gItemIcon_NetBall, gItemIconPalette_NetBall},
+    [ITEM_DIVE_BALL] = {gItemIcon_DiveBall, gItemIconPalette_DiveBall},
+    [ITEM_NEST_BALL] = {gItemIcon_NestBall, gItemIconPalette_NestBall},
+    [ITEM_REPEAT_BALL] = {gItemIcon_RepeatBall, gItemIconPalette_RepeatBall},
+    [ITEM_TIMER_BALL] = {gItemIcon_TimerBall, gItemIconPalette_RepeatBall},
+    [ITEM_LUXURY_BALL] = {gItemIcon_LuxuryBall, gItemIconPalette_LuxuryBall},
+    [ITEM_PREMIER_BALL] = {gItemIcon_PremierBall, gItemIconPalette_LuxuryBall},
+    // Medicine
+    [ITEM_POTION] = {gItemIcon_Potion, gItemIconPalette_Potion},
+    [ITEM_ANTIDOTE] = {gItemIcon_Antidote, gItemIconPalette_Antidote},
+    [ITEM_BURN_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_BurnHeal},
+    [ITEM_ICE_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_IceHeal},
+    [ITEM_AWAKENING] = {gItemIcon_StatusHeal, gItemIconPalette_Awakening},
+    [ITEM_PARALYZE_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_ParalyzeHeal},
+    [ITEM_FULL_RESTORE] = {gItemIcon_LargePotion, gItemIconPalette_FullRestore},
+    [ITEM_MAX_POTION] = {gItemIcon_LargePotion, gItemIconPalette_MaxPotion},
+    [ITEM_HYPER_POTION] = {gItemIcon_Potion, gItemIconPalette_HyperPotion},
+    [ITEM_SUPER_POTION] = {gItemIcon_Potion, gItemIconPalette_SuperPotion},
+    [ITEM_FULL_HEAL] = {gItemIcon_FullHeal, gItemIconPalette_FullHeal},
+    [ITEM_REVIVE] = {gItemIcon_Revive, gItemIconPalette_Revive},
+    [ITEM_MAX_REVIVE] = {gItemIcon_MaxRevive, gItemIconPalette_Revive},
+    [ITEM_FRESH_WATER] = {gItemIcon_FreshWater, gItemIconPalette_FreshWater},
+    [ITEM_SODA_POP] = {gItemIcon_SodaPop, gItemIconPalette_SodaPop},
+    [ITEM_LEMONADE] = {gItemIcon_Lemonade, gItemIconPalette_Lemonade},
+    [ITEM_MOOMOO_MILK] = {gItemIcon_MoomooMilk, gItemIconPalette_MoomooMilk},
+    [ITEM_ENERGY_POWDER] = {gItemIcon_Powder, gItemIconPalette_EnergyPowder},
+    [ITEM_ENERGY_ROOT] = {gItemIcon_EnergyRoot, gItemIconPalette_EnergyRoot},
+    [ITEM_HEAL_POWDER] = {gItemIcon_Powder, gItemIconPalette_HealPowder},
+    [ITEM_REVIVAL_HERB] = {gItemIcon_RevivalHerb, gItemIconPalette_RevivalHerb},
+    [ITEM_ETHER] = {gItemIcon_Ether, gItemIconPalette_Ether},
+    [ITEM_MAX_ETHER] = {gItemIcon_Ether, gItemIconPalette_MaxEther},
+    [ITEM_ELIXIR] = {gItemIcon_Ether, gItemIconPalette_Elixir},
+    [ITEM_MAX_ELIXIR] = {gItemIcon_Ether, gItemIconPalette_MaxElixir},
+    [ITEM_LAVA_COOKIE] = {gItemIcon_LavaCookie, gItemIconPalette_LavaCookieAndLetter},
+    [ITEM_BLUE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlueFlute},
+    [ITEM_YELLOW_FLUTE] = {gItemIcon_Flute, gItemIconPalette_YellowFlute},
+    [ITEM_RED_FLUTE] = {gItemIcon_Flute, gItemIconPalette_RedFlute},
+    [ITEM_BLACK_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlackFlute},
+    [ITEM_WHITE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_WhiteFlute},
+    [ITEM_BERRY_JUICE] = {gItemIcon_BerryJuice, gItemIconPalette_BerryJuice},
+    [ITEM_SACRED_ASH] = {gItemIcon_SacredAsh, gItemIconPalette_SacredAsh},
+    // Collectibles
+    [ITEM_SHOAL_SALT] = {gItemIcon_Powder, gItemIconPalette_ShoalSalt},
+    [ITEM_SHOAL_SHELL] = {gItemIcon_ShoalShell, gItemIconPalette_Shell},
+    [ITEM_RED_SHARD] = {gItemIcon_Shard, gItemIconPalette_RedShard},
+    [ITEM_BLUE_SHARD] = {gItemIcon_Shard, gItemIconPalette_BlueShard},
+    [ITEM_YELLOW_SHARD] = {gItemIcon_Shard, gItemIconPalette_YellowShard},
+    [ITEM_GREEN_SHARD] = {gItemIcon_Shard, gItemIconPalette_GreenShard},
+    // ????????
+    [ITEM_034] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_035] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_036] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_037] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_038] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_039] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_03A] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_03B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_03C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_03D] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_03E] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Vitamins
+    [ITEM_HP_UP] = {gItemIcon_HPUp, gItemIconPalette_HPUp},
+    [ITEM_PROTEIN] = {gItemIcon_Vitamin, gItemIconPalette_Protein},
+    [ITEM_IRON] = {gItemIcon_Vitamin, gItemIconPalette_Iron},
+    [ITEM_CARBOS] = {gItemIcon_Vitamin, gItemIconPalette_Carbos},
+    [ITEM_CALCIUM] = {gItemIcon_Vitamin, gItemIconPalette_Calcium},
+    [ITEM_RARE_CANDY] = {gItemIcon_RareCandy, gItemIconPalette_RareCandy},
+    [ITEM_PP_UP] = {gItemIcon_PPUp, gItemIconPalette_PPUp},
+    [ITEM_ZINC] = {gItemIcon_Vitamin, gItemIconPalette_Zinc},
+    [ITEM_PP_MAX] = {gItemIcon_PPMax, gItemIconPalette_PPMax},
+    // ????????
+    [ITEM_048] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Battle items
+    [ITEM_GUARD_SPEC] = {gItemIcon_BattleStatItem, gItemIconPalette_GuardSpec},
+    [ITEM_DIRE_HIT] = {gItemIcon_BattleStatItem, gItemIconPalette_DireHit},
+    [ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack},
+    [ITEM_X_DEFEND] = {gItemIcon_BattleStatItem, gItemIconPalette_XDefend},
+    [ITEM_X_SPEED] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpeed},
+    [ITEM_X_ACCURACY] = {gItemIcon_BattleStatItem, gItemIconPalette_XAccuracy},
+    [ITEM_X_SPECIAL] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpecial},
+    [ITEM_POKE_DOLL] = {gItemIcon_PokeDoll, gItemIconPalette_PokeDoll},
+    [ITEM_FLUFFY_TAIL] = {gItemIcon_FluffyTail, gItemIconPalette_FluffyTail},
+    // ????????
+    [ITEM_052] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Field items
+    [ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel},
+    [ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel},
+    [ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope},
+    [ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel},
+    // ????????
+    [ITEM_057] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_058] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_059] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_05A] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_05B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_05C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Evolution stones
+    [ITEM_SUN_STONE] = {gItemIcon_SunStone, gItemIconPalette_SunStone},
+    [ITEM_MOON_STONE] = {gItemIcon_MoonStone, gItemIconPalette_MoonStone},
+    [ITEM_FIRE_STONE] = {gItemIcon_FireStone, gItemIconPalette_FireStone},
+    [ITEM_THUNDER_STONE] = {gItemIcon_ThunderStone, gItemIconPalette_ThunderStone},
+    [ITEM_WATER_STONE] = {gItemIcon_WaterStone, gItemIconPalette_WaterStone},
+    [ITEM_LEAF_STONE] = {gItemIcon_LeafStone, gItemIconPalette_LeafStone},
+    // ????????
+    [ITEM_063] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_064] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_065] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_066] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Valuables
+    [ITEM_TINY_MUSHROOM] = {gItemIcon_TinyMushroom, gItemIconPalette_Mushroom},
+    [ITEM_BIG_MUSHROOM] = {gItemIcon_BigMushroom, gItemIconPalette_Mushroom},
+    [ITEM_069] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_PEARL] = {gItemIcon_Pearl, gItemIconPalette_Pearl},
+    [ITEM_BIG_PEARL] = {gItemIcon_BigPearl, gItemIconPalette_Pearl},
+    [ITEM_STARDUST] = {gItemIcon_Stardust, gItemIconPalette_Star},
+    [ITEM_STAR_PIECE] = {gItemIcon_StarPiece, gItemIconPalette_Star},
+    [ITEM_NUGGET] = {gItemIcon_Nugget, gItemIconPalette_Nugget},
+    [ITEM_HEART_SCALE] = {gItemIcon_HeartScale, gItemIconPalette_HeartScale},
+    // ????????
+    [ITEM_070] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_071] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_072] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_073] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_074] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_075] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_076] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_077] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_078] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Mail
+    [ITEM_ORANGE_MAIL] = {gItemIcon_OrangeMail, gItemIconPalette_OrangeMail},
+    [ITEM_HARBOR_MAIL] = {gItemIcon_HarborMail, gItemIconPalette_HarborMail},
+    [ITEM_GLITTER_MAIL] = {gItemIcon_GlitterMail, gItemIconPalette_GlitterMail},
+    [ITEM_MECH_MAIL] = {gItemIcon_MechMail, gItemIconPalette_MechMail},
+    [ITEM_WOOD_MAIL] = {gItemIcon_WoodMail, gItemIconPalette_WoodMail},
+    [ITEM_WAVE_MAIL] = {gItemIcon_WaveMail, gItemIconPalette_WaveMail},
+    [ITEM_BEAD_MAIL] = {gItemIcon_BeadMail, gItemIconPalette_BeadMail},
+    [ITEM_SHADOW_MAIL] = {gItemIcon_ShadowMail, gItemIconPalette_ShadowMail},
+    [ITEM_TROPIC_MAIL] = {gItemIcon_TropicMail, gItemIconPalette_TropicMail},
+    [ITEM_DREAM_MAIL] = {gItemIcon_DreamMail, gItemIconPalette_DreamMail},
+    [ITEM_FAB_MAIL] = {gItemIcon_FabMail, gItemIconPalette_FabMail},
+    [ITEM_RETRO_MAIL] = {gItemIcon_RetroMail, gItemIconPalette_RetroMail},
+    // Berries
+    [ITEM_CHERI_BERRY] = {gItemIcon_CheriBerry, gItemIconPalette_CheriBerry},
+    [ITEM_CHESTO_BERRY] = {gItemIcon_ChestoBerry, gItemIconPalette_ChestoBerry},
+    [ITEM_PECHA_BERRY] = {gItemIcon_PechaBerry, gItemIconPalette_PechaBerry},
+    [ITEM_RAWST_BERRY] = {gItemIcon_RawstBerry, gItemIconPalette_RawstBerry},
+    [ITEM_ASPEAR_BERRY] = {gItemIcon_AspearBerry, gItemIconPalette_AspearBerry},
+    [ITEM_LEPPA_BERRY] = {gItemIcon_LeppaBerry, gItemIconPalette_LeppaBerry},
+    [ITEM_ORAN_BERRY] = {gItemIcon_OranBerry, gItemIconPalette_OranBerry},
+    [ITEM_PERSIM_BERRY] = {gItemIcon_PersimBerry, gItemIconPalette_PersimBerry},
+    [ITEM_LUM_BERRY] = {gItemIcon_LumBerry, gItemIconPalette_LumBerry},
+    [ITEM_SITRUS_BERRY] = {gItemIcon_SitrusBerry, gItemIconPalette_SitrusBerry},
+    [ITEM_FIGY_BERRY] = {gItemIcon_FigyBerry, gItemIconPalette_FigyBerry},
+    [ITEM_WIKI_BERRY] = {gItemIcon_WikiBerry, gItemIconPalette_WikiBerry},
+    [ITEM_MAGO_BERRY] = {gItemIcon_MagoBerry, gItemIconPalette_MagoBerry},
+    [ITEM_AGUAV_BERRY] = {gItemIcon_AguavBerry, gItemIconPalette_AguavBerry},
+    [ITEM_IAPAPA_BERRY] = {gItemIcon_IapapaBerry, gItemIconPalette_IapapaBerry},
+    [ITEM_RAZZ_BERRY] = {gItemIcon_RazzBerry, gItemIconPalette_RazzBerry},
+    [ITEM_BLUK_BERRY] = {gItemIcon_BlukBerry, gItemIconPalette_BlukBerry},
+    [ITEM_NANAB_BERRY] = {gItemIcon_NanabBerry, gItemIconPalette_NanabBerry},
+    [ITEM_WEPEAR_BERRY] = {gItemIcon_WepearBerry, gItemIconPalette_WepearBerry},
+    [ITEM_PINAP_BERRY] = {gItemIcon_PinapBerry, gItemIconPalette_PinapBerry},
+    [ITEM_POMEG_BERRY] = {gItemIcon_PomegBerry, gItemIconPalette_PomegBerry},
+    [ITEM_KELPSY_BERRY] = {gItemIcon_KelpsyBerry, gItemIconPalette_KelpsyBerry},
+    [ITEM_QUALOT_BERRY] = {gItemIcon_QualotBerry, gItemIconPalette_QualotBerry},
+    [ITEM_HONDEW_BERRY] = {gItemIcon_HondewBerry, gItemIconPalette_HondewBerry},
+    [ITEM_GREPA_BERRY] = {gItemIcon_GrepaBerry, gItemIconPalette_GrepaBerry},
+    [ITEM_TAMATO_BERRY] = {gItemIcon_TamatoBerry, gItemIconPalette_TamatoBerry},
+    [ITEM_CORNN_BERRY] = {gItemIcon_CornnBerry, gItemIconPalette_CornnBerry},
+    [ITEM_MAGOST_BERRY] = {gItemIcon_MagostBerry, gItemIconPalette_MagostBerry},
+    [ITEM_RABUTA_BERRY] = {gItemIcon_RabutaBerry, gItemIconPalette_RabutaBerry},
+    [ITEM_NOMEL_BERRY] = {gItemIcon_NomelBerry, gItemIconPalette_NomelBerry},
+    [ITEM_SPELON_BERRY] = {gItemIcon_SpelonBerry, gItemIconPalette_SpelonBerry},
+    [ITEM_PAMTRE_BERRY] = {gItemIcon_PamtreBerry, gItemIconPalette_PamtreBerry},
+    [ITEM_WATMEL_BERRY] = {gItemIcon_WatmelBerry, gItemIconPalette_WatmelBerry},
+    [ITEM_DURIN_BERRY] = {gItemIcon_DurinBerry, gItemIconPalette_DurinBerry},
+    [ITEM_BELUE_BERRY] = {gItemIcon_BelueBerry, gItemIconPalette_BelueBerry},
+    [ITEM_LIECHI_BERRY] = {gItemIcon_LiechiBerry, gItemIconPalette_LiechiBerry},
+    [ITEM_GANLON_BERRY] = {gItemIcon_GanlonBerry, gItemIconPalette_GanlonBerry},
+    [ITEM_SALAC_BERRY] = {gItemIcon_SalacBerry, gItemIconPalette_SalacBerry},
+    [ITEM_PETAYA_BERRY] = {gItemIcon_PetayaBerry, gItemIconPalette_PetayaBerry},
+    [ITEM_APICOT_BERRY] = {gItemIcon_ApicotBerry, gItemIconPalette_ApicotBerry},
+    [ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry},
+    [ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry},
+    [ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry},
+    // ????????
+    [ITEM_0B0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0B1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0B2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Hold items
+    [ITEM_BRIGHT_POWDER] = {gItemIcon_BrightPowder, gItemIconPalette_BrightPowder},
+    [ITEM_WHITE_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb},
+    [ITEM_MACHO_BRACE] = {gItemIcon_MachoBrace, gItemIconPalette_MachoBrace},
+    [ITEM_EXP_SHARE] = {gItemIcon_ExpShare, gItemIconPalette_ExpShare},
+    [ITEM_QUICK_CLAW] = {gItemIcon_QuickClaw, gItemIconPalette_QuickClaw},
+    [ITEM_SOOTHE_BELL] = {gItemIcon_SootheBell, gItemIconPalette_SootheBell},
+    [ITEM_MENTAL_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_MentalHerb},
+    [ITEM_CHOICE_BAND] = {gItemIcon_ChoiceBand, gItemIconPalette_ChoiceBand},
+    [ITEM_KINGS_ROCK] = {gItemIcon_KingsRock, gItemIconPalette_KingsRock},
+    [ITEM_SILVER_POWDER] = {gItemIcon_SilverPowder, gItemIconPalette_SilverPowder},
+    [ITEM_AMULET_COIN] = {gItemIcon_AmuletCoin, gItemIconPalette_AmuletCoin},
+    [ITEM_CLEANSE_TAG] = {gItemIcon_CleanseTag, gItemIconPalette_CleanseTag},
+    [ITEM_SOUL_DEW] = {gItemIcon_SoulDew, gItemIconPalette_SoulDew},
+    [ITEM_DEEP_SEA_TOOTH] = {gItemIcon_DeepSeaTooth, gItemIconPalette_DeepSeaTooth},
+    [ITEM_DEEP_SEA_SCALE] = {gItemIcon_DeepSeaScale, gItemIconPalette_DeepSeaScale},
+    [ITEM_SMOKE_BALL] = {gItemIcon_SmokeBall, gItemIconPalette_SmokeBall},
+    [ITEM_EVERSTONE] = {gItemIcon_Everstone, gItemIconPalette_Everstone},
+    [ITEM_FOCUS_BAND] = {gItemIcon_FocusBand, gItemIconPalette_FocusBand},
+    [ITEM_LUCKY_EGG] = {gItemIcon_LuckyEgg, gItemIconPalette_LuckyEgg},
+    [ITEM_SCOPE_LENS] = {gItemIcon_ScopeLens, gItemIconPalette_ScopeLens},
+    [ITEM_METAL_COAT] = {gItemIcon_MetalCoat, gItemIconPalette_MetalCoat},
+    [ITEM_LEFTOVERS] = {gItemIcon_Leftovers, gItemIconPalette_Leftovers},
+    [ITEM_DRAGON_SCALE] = {gItemIcon_DragonScale, gItemIconPalette_DragonScale},
+    [ITEM_LIGHT_BALL] = {gItemIcon_LightBall, gItemIconPalette_LightBall},
+    [ITEM_SOFT_SAND] = {gItemIcon_SoftSand, gItemIconPalette_SoftSand},
+    [ITEM_HARD_STONE] = {gItemIcon_HardStone, gItemIconPalette_HardStone},
+    [ITEM_MIRACLE_SEED] = {gItemIcon_MiracleSeed, gItemIconPalette_MiracleSeed},
+    [ITEM_BLACK_GLASSES] = {gItemIcon_BlackGlasses, gItemIconPalette_BlackTypeEnhancingItem},
+    [ITEM_BLACK_BELT] = {gItemIcon_BlackBelt, gItemIconPalette_BlackTypeEnhancingItem},
+    [ITEM_MAGNET] = {gItemIcon_Magnet, gItemIconPalette_Magnet},
+    [ITEM_MYSTIC_WATER] = {gItemIcon_MysticWater, gItemIconPalette_MysticWater},
+    [ITEM_SHARP_BEAK] = {gItemIcon_SharpBeak, gItemIconPalette_SharpBeak},
+    [ITEM_POISON_BARB] = {gItemIcon_PoisonBarb, gItemIconPalette_PoisonBarb},
+    [ITEM_NEVER_MELT_ICE] = {gItemIcon_NeverMeltIce, gItemIconPalette_NeverMeltIce},
+    [ITEM_SPELL_TAG] = {gItemIcon_SpellTag, gItemIconPalette_SpellTag},
+    [ITEM_TWISTED_SPOON] = {gItemIcon_TwistedSpoon, gItemIconPalette_TwistedSpoon},
+    [ITEM_CHARCOAL] = {gItemIcon_Charcoal, gItemIconPalette_Charcoal},
+    [ITEM_DRAGON_FANG] = {gItemIcon_DragonFang, gItemIconPalette_DragonFang},
+    [ITEM_SILK_SCARF] = {gItemIcon_SilkScarf, gItemIconPalette_SilkScarf},
+    [ITEM_UP_GRADE] = {gItemIcon_UpGrade, gItemIconPalette_UpGrade},
+    [ITEM_SHELL_BELL] = {gItemIcon_ShellBell, gItemIconPalette_Shell},
+    [ITEM_SEA_INCENSE] = {gItemIcon_SeaIncense, gItemIconPalette_SeaIncense},
+    [ITEM_LAX_INCENSE] = {gItemIcon_LaxIncense, gItemIconPalette_LaxIncense},
+    [ITEM_LUCKY_PUNCH] = {gItemIcon_LuckyPunch, gItemIconPalette_LuckyPunch},
+    [ITEM_METAL_POWDER] = {gItemIcon_MetalPowder, gItemIconPalette_MetalPowder},
+    [ITEM_THICK_CLUB] = {gItemIcon_ThickClub, gItemIconPalette_ThickClub},
+    [ITEM_STICK] = {gItemIcon_Stick, gItemIconPalette_Stick},
+    // ????????
+    [ITEM_0E2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E4] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E5] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E6] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E7] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E8] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0E9] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0EA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0EB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0EC] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0ED] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0EE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0EF] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F4] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F5] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F6] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F7] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F8] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0F9] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0FA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0FB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0FC] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_0FD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // Contest hold items
+    [ITEM_RED_SCARF] = {gItemIcon_Scarf, gItemIconPalette_RedScarf},
+    [ITEM_BLUE_SCARF] = {gItemIcon_Scarf, gItemIconPalette_BlueScarf},
+    [ITEM_PINK_SCARF] = {gItemIcon_Scarf, gItemIconPalette_PinkScarf},
+    [ITEM_GREEN_SCARF] = {gItemIcon_Scarf, gItemIconPalette_GreenScarf},
+    [ITEM_YELLOW_SCARF] = {gItemIcon_Scarf, gItemIconPalette_YellowScarf},
+    // Key items
+    [ITEM_MACH_BIKE] = {gItemIcon_MachBike, gItemIconPalette_MachBike},
+    [ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase},
+    [ITEM_ITEMFINDER] = {gItemIcon_Itemfinder, gItemIconPalette_Itemfinder},
+    [ITEM_OLD_ROD] = {gItemIcon_OldRod, gItemIconPalette_OldRod},
+    [ITEM_GOOD_ROD] = {gItemIcon_GoodRod, gItemIconPalette_GoodRod},
+    [ITEM_SUPER_ROD] = {gItemIcon_SuperRod, gItemIconPalette_SuperRod},
+    [ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket},
+    [ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass},
+    [ITEM_10B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail},
+    [ITEM_DEVON_GOODS] = {gItemIcon_DevonGoods, gItemIconPalette_DevonGoods},
+    [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack},
+    [ITEM_BASEMENT_KEY] = {gItemIcon_BasementKey, gItemIconPalette_OldKey},
+    [ITEM_ACRO_BIKE] = {gItemIcon_AcroBike, gItemIconPalette_AcroBike},
+    [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase},
+    [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter},
+    [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket},
+    [ITEM_RED_ORB] = {gItemIcon_Orb, gItemIconPalette_RedOrb},
+    [ITEM_BLUE_ORB] = {gItemIcon_Orb, gItemIconPalette_BlueOrb},
+    [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner},
+    [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles},
+    [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite},
+    [ITEM_ROOM_1_KEY] = {gItemIcon_Room1Key, gItemIconPalette_Key},
+    [ITEM_ROOM_2_KEY] = {gItemIcon_Room2Key, gItemIconPalette_Key},
+    [ITEM_ROOM_4_KEY] = {gItemIcon_Room4Key, gItemIconPalette_Key},
+    [ITEM_ROOM_6_KEY] = {gItemIcon_Room6Key, gItemIconPalette_Key},
+    [ITEM_STORAGE_KEY] = {gItemIcon_StorageKey, gItemIconPalette_OldKey},
+    [ITEM_ROOT_FOSSIL] = {gItemIcon_RootFossil, gItemIconPalette_HoennFossil},
+    [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil},
+    [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope},
+    // TMs / HMs
+    [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
+    [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM},
+    [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
+    [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
+    [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
+    [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
+    [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
+    [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
+    [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
+    [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
+    [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
+    [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
+    [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
+    [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
+    [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
+    [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
+    [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
+    [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
+    [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
+    [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
+    [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
+    [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
+    [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM},
+    [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
+    [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
+    [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
+    [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
+    [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
+    [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
+    [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
+    [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
+    [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM},
+    [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
+    [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
+    [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
+    [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
+    [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
+    [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
+    [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
+    [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
+    [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
+    [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM},
+    [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
+    [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
+    [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
+    [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM},
+    [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
+    [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
+    // ????????
+    [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    // FireRed/LeafGreen key items
+    [ITEM_OAKS_PARCEL] = {gItemIcon_OaksParcel, gItemIconPalette_OaksParcel},
+    [ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute},
+    [ITEM_SECRET_KEY] = {gItemIcon_SecretKey, gItemIconPalette_SecretKey},
+    [ITEM_BIKE_VOUCHER] = {gItemIcon_BikeVoucher, gItemIconPalette_BikeVoucher},
+    [ITEM_GOLD_TEETH] = {gItemIcon_GoldTeeth, gItemIconPalette_GoldTeeth},
+    [ITEM_OLD_AMBER] = {gItemIcon_OldAmber, gItemIconPalette_OldAmber},
+    [ITEM_CARD_KEY] = {gItemIcon_CardKey, gItemIconPalette_CardKey},
+    [ITEM_LIFT_KEY] = {gItemIcon_LiftKey, gItemIconPalette_Key},
+    [ITEM_HELIX_FOSSIL] = {gItemIcon_HelixFossil, gItemIconPalette_KantoFossil},
+    [ITEM_DOME_FOSSIL] = {gItemIcon_DomeFossil, gItemIconPalette_KantoFossil},
+    [ITEM_SILPH_SCOPE] = {gItemIcon_SilphScope, gItemIconPalette_SilphScope},
+    [ITEM_BICYCLE] = {gItemIcon_Bicycle, gItemIconPalette_Bicycle},
+    [ITEM_TOWN_MAP] = {gItemIcon_TownMap, gItemIconPalette_TownMap},
+    [ITEM_VS_SEEKER] = {gItemIcon_VSSeeker, gItemIconPalette_VSSeeker},
+    [ITEM_FAME_CHECKER] = {gItemIcon_FameChecker, gItemIconPalette_FameChecker},
+    [ITEM_TM_CASE] = {gItemIcon_TMCase, gItemIconPalette_TMCase},
+    [ITEM_BERRY_POUCH] = {gItemIcon_BerryPouch, gItemIconPalette_BerryPouch},
+    [ITEM_TEACHY_TV] = {gItemIcon_TeachyTV, gItemIconPalette_TeachyTV},
+    [ITEM_TRI_PASS] = {gItemIcon_TriPass, gItemIconPalette_TriPass},
+    [ITEM_RAINBOW_PASS] = {gItemIcon_RainbowPass, gItemIconPalette_RainbowPass},
+    [ITEM_TEA] = {gItemIcon_Tea, gItemIconPalette_Tea},
+    [ITEM_MYSTIC_TICKET] = {gItemIcon_MysticTicket, gItemIconPalette_MysticTicket},
+    [ITEM_AURORA_TICKET] = {gItemIcon_AuroraTicket, gItemIconPalette_AuroraTicket},
+    [ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar},
+    [ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby},
+    [ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire},
+    // Emerald-only key items
+    [ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem},
+    [ITEM_OLD_SEA_MAP] = {gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap},
+    // Return to field arrow
+    [ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
 };
-#endif // GUARD_DATA_ITEM_ICON_TABLE_H

src/data/pokemon/base_stats.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_BASE_STATS_H
-#define GUARD_BASE_STATS_H
-
 // Maximum value for a female pokemon is 254 (MON_FEMALE) which is 100% female.
 // 255 (MON_GENDERLESS) is reserved for genderless pokemon.
 #define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100))
@@ -13572,5 +13569,3 @@ const struct BaseStats gBaseStats[] =
         .noFlip = FALSE,
     }
 };
-
-#endif //GUARD_BASE_STATS_H

src/data/pokemon/cry_ids.h

@@ -1,143 +1,138 @@
-#ifndef POKEEMERALD_CRY_IDS_H
-#define POKEEMERALD_CRY_IDS_H
-
 const u16 gSpeciesIdToCryId[] =
 {
-    273, // TREECKO
-    274, // GROVYLE
-    275, // SCEPTILE
-    270, // TORCHIC
-    271, // COMBUSKEN
-    272, // BLAZIKEN
-    276, // MUDKIP
-    277, // MARSHTOMP
-    278, // SWAMPERT
-    359, // POOCHYENA
-    360, // MIGHTYENA
-    378, // ZIGZAGOON
-    375, // LINOONE
-    290, // WURMPLE
-    291, // SILCOON
-    292, // BEAUTIFLY
-    293, // CASCOON
-    294, // DUSTOX
-    283, // LOTAD
-    284, // LOMBRE
-    285, // LUDICOLO
-    286, // SEEDOT
-    287, // NUZLEAF
-    288, // SHIFTRY
-    301, // NINCADA
-    302, // NINJASK
-    303, // SHEDINJA
-    266, // TAILLOW
-    267, // SWELLOW
-    374, // SHROOMISH
-    373, // BRELOOM
-    269, // SPINDA
-    280, // WINGULL
-    279, // PELIPPER
-    310, // SURSKIT
-    311, // MASQUERAIN
-    377, // WAILMER
-    381, // WAILORD
-    312, // SKITTY
-    313, // DELCATTY
-    251, // KECLEON
-    329, // BALTOY
-    330, // CLAYDOL
-    306, // NOSEPASS
-    253, // TORKOAL
-    362, // SABLEYE
-    318, // BARBOACH
-    319, // WHISCASH
-    368, // LUVDISC
-    320, // CORPHISH
-    321, // CRAWDAUNT
-    333, // FEEBAS
-    334, // MILOTIC
-    289, // CARVANHA
-    260, // SHARPEDO
-    324, // TRAPINCH
-    325, // VIBRAVA
-    326, // FLYGON
-    304, // MAKUHITA
-    305, // HARIYAMA
-    254, // ELECTRIKE
-    255, // MANECTRIC
-    316, // NUMEL
-    317, // CAMERUPT
-    338, // SPHEAL
-    339, // SEALEO
-    340, // WALREIN
-    327, // CACNEA
-    328, // CACTURNE
-    383, // SNORUNT
-    307, // GLALIE
-    331, // LUNATONE
-    332, // SOLROCK
-    262, // AZURILL
-    322, // SPOINK
-    323, // GRUMPIG
-    308, // PLUSLE
-    309, // MINUN
-    363, // MAWILE
-    336, // MEDITITE
-    337, // MEDICHAM
-    263, // SWABLU
-    264, // ALTARIA
-    258, // WYNAUT
-    256, // DUSKULL
-    361, // DUSCLOPS
-    252, // ROSELIA
-    298, // SLAKOTH
-    299, // VIGOROTH
-    300, // SLAKING
-    314, // GULPIN
-    315, // SWALOT
-    376, // TROPIUS
-    382, // WHISMUR
-    380, // LOUDRED
-    379, // EXPLOUD
-    341, // CLAMPERL
-    342, // HUNTAIL
-    343, // GOREBYSS
-    335, // ABSOL
-    282, // SHUPPET
-    281, // BANETTE
-    259, // SEVIPER
-    261, // ZANGOOSE
-    367, // RELICANTH
-    364, // ARON
-    365, // LAIRON
-    366, // AGGRON
-    356, // CASTFORM
-    357, // VOLBEAT
-    358, // ILLUMISE
-    344, // LILEEP
-    345, // CRADILY
-    346, // ANORITH
-    347, // ARMALDO
-    295, // RALTS
-    296, // KIRLIA
-    297, // GARDEVOIR
-    351, // BAGON
-    352, // SHELGON
-    372, // SALAMENCE
-    348, // BELDUM
-    349, // METANG
-    350, // METAGROSS
-    353, // REGIROCK
-    354, // REGICE
-    355, // REGISTEEL
-    370, // KYOGRE
-    369, // GROUDON
-    371, // RAYQUAZA
-    257, // LATIAS
-    384, // LATIOS
-    385, // JIRACHI
-    386, // DEOXYS
-    387  // CHIMECHO
+    [SPECIES_TREECKO - 277] = 273,
+    [SPECIES_GROVYLE - 277] = 274,
+    [SPECIES_SCEPTILE - 277] = 275,
+    [SPECIES_TORCHIC - 277] = 270,
+    [SPECIES_COMBUSKEN - 277] = 271,
+    [SPECIES_BLAZIKEN - 277] = 272,
+    [SPECIES_MUDKIP - 277] = 276,
+    [SPECIES_MARSHTOMP - 277] = 277,
+    [SPECIES_SWAMPERT - 277] = 278,
+    [SPECIES_POOCHYENA - 277] = 359,
+    [SPECIES_MIGHTYENA - 277] = 360,
+    [SPECIES_ZIGZAGOON - 277] = 378,
+    [SPECIES_LINOONE - 277] = 375,
+    [SPECIES_WURMPLE - 277] = 290,
+    [SPECIES_SILCOON - 277] = 291,
+    [SPECIES_BEAUTIFLY - 277] = 292,
+    [SPECIES_CASCOON - 277] = 293,
+    [SPECIES_DUSTOX - 277] = 294,
+    [SPECIES_LOTAD - 277] = 283,
+    [SPECIES_LOMBRE - 277] = 284,
+    [SPECIES_LUDICOLO - 277] = 285,
+    [SPECIES_SEEDOT - 277] = 286,
+    [SPECIES_NUZLEAF - 277] = 287,
+    [SPECIES_SHIFTRY - 277] = 288,
+    [SPECIES_NINCADA - 277] = 301,
+    [SPECIES_NINJASK - 277] = 302,
+    [SPECIES_SHEDINJA - 277] = 303,
+    [SPECIES_TAILLOW - 277] = 266,
+    [SPECIES_SWELLOW - 277] = 267,
+    [SPECIES_SHROOMISH - 277] = 374,
+    [SPECIES_BRELOOM - 277] = 373,
+    [SPECIES_SPINDA - 277] = 269,
+    [SPECIES_WINGULL - 277] = 280,
+    [SPECIES_PELIPPER - 277] = 279,
+    [SPECIES_SURSKIT - 277] = 310,
+    [SPECIES_MASQUERAIN - 277] = 311,
+    [SPECIES_WAILMER - 277] = 377,
+    [SPECIES_WAILORD - 277] = 381,
+    [SPECIES_SKITTY - 277] = 312,
+    [SPECIES_DELCATTY - 277] = 313,
+    [SPECIES_KECLEON - 277] = 251,
+    [SPECIES_BALTOY - 277] = 329,
+    [SPECIES_CLAYDOL - 277] = 330,
+    [SPECIES_NOSEPASS - 277] = 306,
+    [SPECIES_TORKOAL - 277] = 253,
+    [SPECIES_SABLEYE - 277] = 362,
+    [SPECIES_BARBOACH - 277] = 318,
+    [SPECIES_WHISCASH - 277] = 319,
+    [SPECIES_LUVDISC - 277] = 368,
+    [SPECIES_CORPHISH - 277] = 320,
+    [SPECIES_CRAWDAUNT - 277] = 321,
+    [SPECIES_FEEBAS - 277] = 333,
+    [SPECIES_MILOTIC - 277] = 334,
+    [SPECIES_CARVANHA - 277] = 289,
+    [SPECIES_SHARPEDO - 277] = 260,
+    [SPECIES_TRAPINCH - 277] = 324,
+    [SPECIES_VIBRAVA - 277] = 325,
+    [SPECIES_FLYGON - 277] = 326,
+    [SPECIES_MAKUHITA - 277] = 304,
+    [SPECIES_HARIYAMA - 277] = 305,
+    [SPECIES_ELECTRIKE - 277] = 254,
+    [SPECIES_MANECTRIC - 277] = 255,
+    [SPECIES_NUMEL - 277] = 316,
+    [SPECIES_CAMERUPT - 277] = 317,
+    [SPECIES_SPHEAL - 277] = 338,
+    [SPECIES_SEALEO - 277] = 339,
+    [SPECIES_WALREIN - 277] = 340,
+    [SPECIES_CACNEA - 277] = 327,
+    [SPECIES_CACTURNE - 277] = 328,
+    [SPECIES_SNORUNT - 277] = 383,
+    [SPECIES_GLALIE - 277] = 307,
+    [SPECIES_LUNATONE - 277] = 331,
+    [SPECIES_SOLROCK - 277] = 332,
+    [SPECIES_AZURILL - 277] = 262,
+    [SPECIES_SPOINK - 277] = 322,
+    [SPECIES_GRUMPIG - 277] = 323,
+    [SPECIES_PLUSLE - 277] = 308,
+    [SPECIES_MINUN - 277] = 309,
+    [SPECIES_MAWILE - 277] = 363,
+    [SPECIES_MEDITITE - 277] = 336,
+    [SPECIES_MEDICHAM - 277] = 337,
+    [SPECIES_SWABLU - 277] = 263,
+    [SPECIES_ALTARIA - 277] = 264,
+    [SPECIES_WYNAUT - 277] = 258,
+    [SPECIES_DUSKULL - 277] = 256,
+    [SPECIES_DUSCLOPS - 277] = 361,
+    [SPECIES_ROSELIA - 277] = 252,
+    [SPECIES_SLAKOTH - 277] = 298,
+    [SPECIES_VIGOROTH - 277] = 299,
+    [SPECIES_SLAKING - 277] = 300,
+    [SPECIES_GULPIN - 277] = 314,
+    [SPECIES_SWALOT - 277] = 315,
+    [SPECIES_TROPIUS - 277] = 376,
+    [SPECIES_WHISMUR - 277] = 382,
+    [SPECIES_LOUDRED - 277] = 380,
+    [SPECIES_EXPLOUD - 277] = 379,
+    [SPECIES_CLAMPERL - 277] = 341,
+    [SPECIES_HUNTAIL - 277] = 342,
+    [SPECIES_GOREBYSS - 277] = 343,
+    [SPECIES_ABSOL - 277] = 335,
+    [SPECIES_SHUPPET - 277] = 282,
+    [SPECIES_BANETTE - 277] = 281,
+    [SPECIES_SEVIPER - 277] = 259,
+    [SPECIES_ZANGOOSE - 277] = 261,
+    [SPECIES_RELICANTH - 277] = 367,
+    [SPECIES_ARON - 277] = 364,
+    [SPECIES_LAIRON - 277] = 365,
+    [SPECIES_AGGRON - 277] = 366,
+    [SPECIES_CASTFORM - 277] = 356,
+    [SPECIES_VOLBEAT - 277] = 357,
+    [SPECIES_ILLUMISE - 277] = 358,
+    [SPECIES_LILEEP - 277] = 344,
+    [SPECIES_CRADILY - 277] = 345,
+    [SPECIES_ANORITH - 277] = 346,
+    [SPECIES_ARMALDO - 277] = 347,
+    [SPECIES_RALTS - 277] = 295,
+    [SPECIES_KIRLIA - 277] = 296,
+    [SPECIES_GARDEVOIR - 277] = 297,
+    [SPECIES_BAGON - 277] = 351,
+    [SPECIES_SHELGON - 277] = 352,
+    [SPECIES_SALAMENCE - 277] = 372,
+    [SPECIES_BELDUM - 277] = 348,
+    [SPECIES_METANG - 277] = 349,
+    [SPECIES_METAGROSS - 277] = 350,
+    [SPECIES_REGIROCK - 277] = 353,
+    [SPECIES_REGICE - 277] = 354,
+    [SPECIES_REGISTEEL - 277] = 355,
+    [SPECIES_KYOGRE - 277] = 370,
+    [SPECIES_GROUDON - 277] = 369,
+    [SPECIES_RAYQUAZA - 277] = 371,
+    [SPECIES_LATIAS - 277] = 257,
+    [SPECIES_LATIOS - 277] = 384,
+    [SPECIES_JIRACHI - 277] = 385,
+    [SPECIES_DEOXYS - 277] = 386,
+    [SPECIES_CHIMECHO - 277] = 387,
 };
-
-#endif //POKEEMERALD_CRY_IDS_H

src/data/pokemon/egg_moves.h

@@ -1,12 +1,7 @@
-#ifndef POKEEMERALD_DAYCARE_H
-#define POKEEMERALD_DAYCARE_H
-
 #define EGG_MOVES_SPECIES_OFFSET 20000
 #define EGG_MOVES_TERMINATOR 0xFFFF
 #define egg_moves(species, moves...) (SPECIES_##species + EGG_MOVES_SPECIES_OFFSET), moves
 
-#endif // POKEEMERALD_DAYCARE_H
-
 const u16 gEggMoves[] = {
     egg_moves(BULBASAUR,
               MOVE_LIGHT_SCREEN,

src/data/pokemon/evolution.h

@@ -1,6 +1,3 @@
-#ifndef POKEEMERALD_EVOLUTION_H
-#define POKEEMERALD_EVOLUTION_H
-
 const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 {
     [SPECIES_BULBASAUR]  = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}},
@@ -188,5 +185,3 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
     [SPECIES_BELDUM]     = {{EVO_LEVEL, 20, SPECIES_METANG}},
     [SPECIES_METANG]     = {{EVO_LEVEL, 45, SPECIES_METAGROSS}},
 };
-
-#endif //POKEEMERALD_EVOLUTION_H

src/data/pokemon/experience_tables.h

@@ -1,6 +1,3 @@
-#ifndef POKEEMERALD_EXPERIENCE_TABLES_H
-#define POKEEMERALD_EXPERIENCE_TABLES_H
-
 #define SQUARE(n)(n * n)
 #define CUBE(n)(n * n * n)
 
@@ -845,5 +842,3 @@ const u32 gExperienceTables[][MAX_LEVEL + 1] =
         EXP_MEDIUM_FAST(100),
     }
 };
-
-#endif //POKEEMERALD_EXPERIENCE_TABLES_H

src/data/pokemon/item_effects.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_ITEM_EFFECTS_H
-#define GUARD_ITEM_EFFECTS_H
-
 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};
@@ -237,5 +234,3 @@ const u8 *const gItemEffectTable[] =
     NULL,
     NULL
 };
-
-#endif //GUARD_ITEM_EFFECTS_H

src/data/pokemon/level_up_learnset_pointers.h

@@ -1,6 +1,3 @@
-#ifndef POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H
-#define POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H
-
 const u16 *const gLevelUpLearnsets[NUM_SPECIES] =
 {
     [SPECIES_NONE] = sBulbasaurLevelUpLearnset,
@@ -416,5 +413,3 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] =
     [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset,
     [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset,
 };
-
-#endif //POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H

src/data/pokemon/level_up_learnsets.h

@@ -1,6 +1,3 @@
-#ifndef POKEEMERALD_LEVEL_UP_LEARNSETS_H
-#define POKEEMERALD_LEVEL_UP_LEARNSETS_H
-
 #define LEVEL_UP_MOVE(lvl, move) ((lvl << 9) | move)
 #define LEVEL_UP_END 0xffff
 
@@ -5619,5 +5616,3 @@ static const u16 sChimechoLevelUpLearnset[] = {
     LEVEL_UP_MOVE(46, MOVE_PSYCHIC),
     LEVEL_UP_END
 };
-
-#endif //POKEEMERALD_LEVEL_UP_LEARNSETS_H

src/data/pokemon/pokedex_text.h

@@ -7,19 +7,19 @@ const u8 gDummyPokedexText[] = _(
 const u8 gBulbasaurPokedexText[] = _(
     "BULBASAUR can be seen napping in bright\n"
     "sunlight. There is a seed on its back.\n"
-    "By soaking up the sun’s rays, the seed\n"
+    "By soaking up the sun's rays, the seed\n"
     "grows progressively larger.");
 
 const u8 gIvysaurPokedexText[] = _(
-    "To support its bulb, IVYSAUR’s legs\n"
+    "To support its bulb, IVYSAUR's legs\n"
     "grow sturdy. If it spends more time lying in\n"
     "the sunlight, the bud will soon bloom into\n"
     "a large flower.");
 
 const u8 gVenusaurPokedexText[] = _(
-    "VENUSAUR’s flower is said to take on vivid\n"
+    "VENUSAUR's flower is said to take on vivid\n"
     "colors if it gets plenty of nutrition and\n"
-    "sunlight. The flower’s aroma soothes the\n"
+    "sunlight. The flower's aroma soothes the\n"
     "emotions of people.");
 
 const u8 gCharmanderPokedexText[] = _(
@@ -50,7 +50,7 @@ const u8 gWartortlePokedexText[] = _(
     "Its large tail is covered with rich, thick\n"
     "fur that deepens in color with age.\n"
     "The scratches on its shell are evidence\n"
-    "of this POKéMON’s toughness in battle.");
+    "of this POKéMON's toughness in battle.");
 
 const u8 gBlastoisePokedexText[] = _(
     "The waterspouts that protrude from its\n"
@@ -119,7 +119,7 @@ const u8 gRattataPokedexText[] = _(
     "It will make its nest anywhere.");
 
 const u8 gRaticatePokedexText[] = _(
-    "A RATICATE’s sturdy fangs grow steadily.\n"
+    "A RATICATE's sturdy fangs grow steadily.\n"
     "To keep them ground down, it gnaws on\n"
     "rocks and logs. It may even chew on the\n"
     "walls of houses.");
@@ -194,7 +194,7 @@ const u8 gNidoranMPokedexText[] = _(
     "The male NIDORAN has developed muscles\n"
     "that freely move its ears in any direction.\n"
     "Even the slightest sound does not escape\n"
-    "this POKéMON’s notice.");
+    "this POKéMON's notice.");
 
 const u8 gNidorinoPokedexText[] = _(
     "Its horn is harder than a diamond.\n"
@@ -203,7 +203,7 @@ const u8 gNidorinoPokedexText[] = _(
     "challenges the foe with all its might.");
 
 const u8 gNidokingPokedexText[] = _(
-    "A NIDOKING’s thick tail packs enormously\n"
+    "A NIDOKING's thick tail packs enormously\n"
     "destructive power capable of toppling\n"
     "a metal transmission tower. Once it goes\n"
     "on a rampage, there is no stopping it.");
@@ -222,7 +222,7 @@ const u8 gClefablePokedexText[] = _(
 
 const u8 gVulpixPokedexText[] = _(
     "It can freely control fire, making fiery\n"
-    "orbs fly like will-o’-the-wisps. Just\n"
+    "orbs fly like will-o'-the-wisps. Just\n"
     "before evolution, its six tails grow hot \n"
     "as if on fire.");
 
@@ -234,7 +234,7 @@ const u8 gNinetalesPokedexText[] = _(
 
 const u8 gJigglypuffPokedexText[] = _(
     "Nothing can avoid falling asleep hearing a\n"
-    "JIGGLYPUFF’s song. The sound waves of its\n"
+    "JIGGLYPUFF's song. The sound waves of its\n"
     "singing voice match the brain waves of\n"
     "someone in a deep sleep.");
 
@@ -317,7 +317,7 @@ const u8 gMeowthPokedexText[] = _(
     "shiny coins that glitter with light.");
 
 const u8 gPersianPokedexText[] = _(
-    "A PERSIAN’s six bold whiskers sense air\n"
+    "A PERSIAN's six bold whiskers sense air\n"
     "movements to determine what is in its\n"
     "vicinity. It becomes docile if grabbed\n"
     "by the whiskers.");
@@ -336,7 +336,7 @@ const u8 gGolduckPokedexText[] = _(
 
 const u8 gMankeyPokedexText[] = _(
     "When it starts shaking and its nasal\n"
-    "breathing turns rough, it’s a sure sign\n"
+    "breathing turns rough, it's a sure sign\n"
     "of anger. However, since this happens\n"
     "instantly, there is no time to flee.");
 
@@ -348,7 +348,7 @@ const u8 gPrimeapePokedexText[] = _(
 
 const u8 gGrowlithePokedexText[] = _(
     "Its superb sense of smell ensures that\n"
-    "this POKéMON won’t forget any scent,\n"
+    "this POKéMON won't forget any scent,\n"
     "no matter what. It uses its sense of smell\n"
     "to detect the emotions of others.");
 
@@ -359,7 +359,7 @@ const u8 gArcaninePokedexText[] = _(
     "is its source of power.");
 
 const u8 gPoliwagPokedexText[] = _(
-    "It is possible to see this POKéMON’s spiral\n"
+    "It is possible to see this POKéMON's spiral\n"
     "innards right through its thin skin.\n"
     "However, the skin is also very flexible.\n"
     "Even sharp fangs bounce right off it.");
@@ -390,7 +390,7 @@ const u8 gKadabraPokedexText[] = _(
 
 const u8 gAlakazamPokedexText[] = _(
     "While it has strong psychic abilities and\n"
-    "high intelligence, an ALAKAZAM’s muscles\n"
+    "high intelligence, an ALAKAZAM's muscles\n"
     "are very weak. It uses psychic power to\n"
     "move its body.");
 
@@ -413,7 +413,7 @@ const u8 gMachampPokedexText[] = _(
     "a tough opponent.");
 
 const u8 gBellsproutPokedexText[] = _(
-    "A BELLSPROUT’s thin and flexible body lets\n"
+    "A BELLSPROUT's thin and flexible body lets\n"
     "it bend and sway to avoid any attack,\n"
     "however strong it may be. From its mouth,\n"
     "it leaks a fluid that melts even iron.");
@@ -476,11 +476,11 @@ const u8 gSlowpokePokedexText[] = _(
     "It catches prey by dipping its tail in\n"
     "water at the side of a river. But it often\n"
     "forgets what it is doing and spends entire\n"
-    "days just loafing at water’s edge.");
+    "days just loafing at water's edge.");
 
 const u8 gSlowbroPokedexText[] = _(
     "Its tail has a SHELLDER firmly attached\n"
-    "with a bite. As a result, the tail can’t be\n"
+    "with a bite. As a result, the tail can't be\n"
     "used for fishing anymore. This forces it\n"
     "to reluctantly swim and catch prey.");
 
@@ -528,7 +528,7 @@ const u8 gDewgongPokedexText[] = _(
 
 const u8 gGrimerPokedexText[] = _(
     "Born from polluted sludge in the sea,\n"
-    "GRIMER’s favorite food is anything filthy.\n"
+    "GRIMER's favorite food is anything filthy.\n"
     "They feed on wastewater pumped out from\n"
     "factories.");
 
@@ -551,14 +551,14 @@ const u8 gCloysterPokedexText[] = _(
     "shell using the same system.");
 
 const u8 gGastlyPokedexText[] = _(
-    "When exposed to a strong wind, a GASTLY’s\n"
+    "When exposed to a strong wind, a GASTLY's\n"
     "gaseous body quickly dwindles away.\n"
     "They cluster under the eaves of houses\n"
     "to escape the ravages of wind.");
 
 const u8 gHaunterPokedexText[] = _(
     "If a HAUNTER beckons you while it is\n"
-    "floating in darkness, don’t approach it.\n"
+    "floating in darkness, don't approach it.\n"
     "This POKéMON will try to lick you with its\n"
     "tongue and steal your life away.");
 
@@ -576,13 +576,13 @@ const u8 gOnixPokedexText[] = _(
 
 const u8 gDrowzeePokedexText[] = _(
     "If your nose becomes itchy while you are\n"
-    "sleeping, it’s a sure sign that a DROWZEE is\n"
+    "sleeping, it's a sure sign that a DROWZEE is\n"
     "standing above your pillow and trying to\n"
     "eat your dream through your nostrils.");
 
 const u8 gHypnoPokedexText[] = _(
     "The arcing movement and glitter of the\n"
-    "pendulum in a HYPNO’s hand lull the foe\n"
+    "pendulum in a HYPNO's hand lull the foe\n"
     "into deep hypnosis. While searching for\n"
     "prey, it polishes the pendulum.");
 
@@ -617,7 +617,7 @@ const u8 gExeggcutePokedexText[] = _(
     "appear, it is close to evolution.");
 
 const u8 gExeggutorPokedexText[] = _(
-    "Originally from the tropics, EXEGGUTOR’s\n"
+    "Originally from the tropics, EXEGGUTOR's\n"
     "heads grow larger from exposure to strong\n"
     "sunlight. It is said that when the heads\n"
     "fall, they group to form an EXEGGCUTE.");
@@ -665,9 +665,9 @@ const u8 gWeezingPokedexText[] = _(
     "from garbage are the ultimate feast.");
 
 const u8 gRhyhornPokedexText[] = _(
-    "Once it starts running, it doesn’t stop.\n"
+    "Once it starts running, it doesn't stop.\n"
     "Its tiny brain makes it so stupid that it\n"
-    "can’t remember why it started running in\n"
+    "can't remember why it started running in\n"
     "the first place.");
 
 const u8 gRhydonPokedexText[] = _(
@@ -691,7 +691,7 @@ const u8 gTangelaPokedexText[] = _(
 const u8 gKangaskhanPokedexText[] = _(
     "If you come across a young KANGASKHAN\n"
     "playing by itself, never try to catch it.\n"
-    "The baby’s parent is sure to be in the area,\n"
+    "The baby's parent is sure to be in the area,\n"
     "and it will become violently enraged.");
 
 const u8 gHorseaPokedexText[] = _(
@@ -810,12 +810,12 @@ const u8 gVaporeonPokedexText[] = _(
 
 const u8 gJolteonPokedexText[] = _(
     "Its cells generate weak power that is\n"
-    "amplified by its fur’s static electricity\n"
+    "amplified by its fur's static electricity\n"
     "to drop thunderbolts. The bristling fur is\n"
     "made of electrically charged needles.");
 
 const u8 gFlareonPokedexText[] = _(
-    "FLAREON’s fluffy fur releases heat into\n"
+    "FLAREON's fluffy fur releases heat into\n"
     "the air so that its body does not get\n"
     "excessively hot. Its body temperature can\n"
     "rise to a maximum of 1,650 degrees F.");
@@ -857,7 +857,7 @@ const u8 gAerodactylPokedexText[] = _(
     "have been the king of the skies.");
 
 const u8 gSnorlaxPokedexText[] = _(
-    "SNORLAX’s typical day consists of nothing\n"
+    "SNORLAX's typical day consists of nothing\n"
     "more than eating and sleeping. It is such\n"
     "a docile POKéMON that there are children\n"
     "who use its big belly as a place to play.");
@@ -917,16 +917,16 @@ const u8 gChikoritaPokedexText[] = _(
     "atmosphere that becalms the battlers.");
 
 const u8 gBayleefPokedexText[] = _(
-    "A BAYLEEF’s neck is ringed by curled-up\n"
+    "A BAYLEEF's neck is ringed by curled-up\n"
     "leaves. Inside each leaf is a small tree\n"
     "shoot. The fragrance of this shoot\n"
     "makes people peppy.");
 
 const u8 gMeganiumPokedexText[] = _(
-    "The fragrance of a MEGANIUM’s flower\n"
+    "The fragrance of a MEGANIUM's flower\n"
     "soothes and calms emotions. In battle,\n"
     "it gives off more of its becalming scent\n"
-    "to blunt the foe’s fighting spirit.");
+    "to blunt the foe's fighting spirit.");
 
 const u8 gCyndaquilPokedexText[] = _(
     "It flares flames from its back to protect\n"
@@ -947,7 +947,7 @@ const u8 gTyphlosionPokedexText[] = _(
     "blasts that burn everything to cinders.");
 
 const u8 gTotodilePokedexText[] = _(
-    "Despite its small body, TOTODILE’s jaws\n"
+    "Despite its small body, TOTODILE's jaws\n"
     "are very powerful. While it may think it is\n"
     "just playfully nipping, its bite has enough\n"
     "strength to cause serious injury.");
@@ -978,7 +978,7 @@ const u8 gFurretPokedexText[] = _(
 
 const u8 gHoothootPokedexText[] = _(
     "It has an internal organ that senses\n"
-    "the earth’s rotation. Using this special\n"
+    "the earth's rotation. Using this special\n"
     "organ, a HOOTHOOT begins hooting at\n"
     "precisely the same time every day.");
 
@@ -992,7 +992,7 @@ const u8 gLedybaPokedexText[] = _(
     "LEDYBA communicate using a fluid that\n"
     "they secrete from where the legs join the\n"
     "body. They are said to convey feelings to\n"
-    "others by altering the fluid’s scent.");
+    "others by altering the fluid's scent.");
 
 const u8 gLedianPokedexText[] = _(
     "It is said that in lands with clean air,\n"
@@ -1022,7 +1022,7 @@ const u8 gChinchouPokedexText[] = _(
     "When it senses danger, it discharges\n"
     "positive and negative electricity from its\n"
     "two antennae. It lives in depths beyond\n"
-    "sunlight’s reach.");
+    "sunlight's reach.");
 
 const u8 gLanturnPokedexText[] = _(
     "The light-emitting orbs on its back are\n"
@@ -1063,7 +1063,7 @@ const u8 gTogeticPokedexText[] = _(
 const u8 gNatuPokedexText[] = _(
     "It runs up short trees that grow on the\n"
     "savanna to peck at new shoots.\n"
-    "A NATU’s eyes look as if they are\n"
+    "A NATU's eyes look as if they are\n"
     "always observing something.");
 
 const u8 gXatuPokedexText[] = _(
@@ -1100,7 +1100,7 @@ const u8 gMarillPokedexText[] = _(
     "Its body is covered with water-repellent\n"
     "fur. Because of the fur, it can swim\n"
     "through water at high speed without being\n"
-    "slowed by the water’s resistance.");
+    "slowed by the water's resistance.");
 
 const u8 gAzumarillPokedexText[] = _(
     "It lives in water virtually all day long.\n"
@@ -1128,7 +1128,7 @@ const u8 gHoppipPokedexText[] = _(
 
 const u8 gSkiploomPokedexText[] = _(
     "It blossoms when the temperature rises\n"
-    "above 64 degrees F. Because its flower’s\n"
+    "above 64 degrees F. Because its flower's\n"
     "blooming changes with the temperature,\n"
     "it is sometimes used as a thermometer.");
 
@@ -1141,7 +1141,7 @@ const u8 gJumpluffPokedexText[] = _(
 const u8 gAipomPokedexText[] = _(
     "Its tail ends with a dexterous, handlike\n"
     "appendage. However, because it uses the\n"
-    "tail so much, AIPOM’s real hands have\n"
+    "tail so much, AIPOM's real hands have\n"
     "become rather clumsy.");
 
 const u8 gSunkernPokedexText[] = _(
@@ -1171,7 +1171,7 @@ const u8 gWooperPokedexText[] = _(
 const u8 gQuagsirePokedexText[] = _(
     "A QUAGSIRE hunts by leaving its mouth wide\n"
     "open in water and waiting for its prey to\n"
-    "blunder in. Because it doesn’t move, it\n"
+    "blunder in. Because it doesn't move, it\n"
     "does not get very hungry.");
 
 const u8 gEspeonPokedexText[] = _(
@@ -1182,7 +1182,7 @@ const u8 gEspeonPokedexText[] = _(
 
 const u8 gUmbreonPokedexText[] = _(
     "UMBREON evolved from exposure to the\n"
-    "moon’s energy pulses. It lurks in darkness\n"
+    "moon's energy pulses. It lurks in darkness\n"
     "and waits for its foes to move. The rings\n"
     "on its body glow when it leaps to attack.");
 
@@ -1231,7 +1231,7 @@ const u8 gPinecoPokedexText[] = _(
 const u8 gForretressPokedexText[] = _(
     "It keeps itself inside its steel shell.\n"
     "The shell is opened when it is catching\n"
-    "prey, but it is so quick that the shell’s\n"
+    "prey, but it is so quick that the shell's\n"
     "inside cannot be seen.");
 
 const u8 gDunsparcePokedexText[] = _(
@@ -1249,7 +1249,7 @@ const u8 gGligarPokedexText[] = _(
 const u8 gSteelixPokedexText[] = _(
     "STEELIX live even further underground\n"
     "than ONIX. This POKéMON is known to dig\n"
-    "toward the earth’s core, reaching a depth\n"
+    "toward the earth's core, reaching a depth\n"
     "of over six-tenths of a mile underground.");
 
 const u8 gSnubbullPokedexText[] = _(
@@ -1316,7 +1316,7 @@ const u8 gMagcargoPokedexText[] = _(
     "The shell on its back is made of hardened\n"
     "magma. Tens of thousands of years spent\n"
     "living in volcanic craters have turned\n"
-    "MAGCARGO’s bodies into magma.");
+    "MAGCARGO's bodies into magma.");
 
 const u8 gSwinubPokedexText[] = _(
     "It roots for food by rubbing its snout\n"
@@ -1369,7 +1369,7 @@ const u8 gSkarmoryPokedexText[] = _(
 const u8 gHoundourPokedexText[] = _(
     "HOUNDOUR communicate with each other\n"
     "using a variety of cries to corner their\n"
-    "prey. This POKéMON’s remarkable teamwork\n"
+    "prey. This POKéMON's remarkable teamwork\n"
     "is simply unparalleled.");
 
 const u8 gHoundoomPokedexText[] = _(
@@ -1385,7 +1385,7 @@ const u8 gKingdraPokedexText[] = _(
     "even ships.");
 
 const u8 gPhanpyPokedexText[] = _(
-    "PHANPY’s big ears serve as broad fans.\n"
+    "PHANPY's big ears serve as broad fans.\n"
     "When it becomes hot, it flaps the ears\n"
     "busily to cool down. Even the young are\n"
     "very strong.");
@@ -1394,7 +1394,7 @@ const u8 gDonphanPokedexText[] = _(
     "A DONPHAN is so strong it can easily haul\n"
     "a dump truck. Its hide has toughened to a\n"
     "rock-hard state. An ordinary sort of\n"
-    "attack won’t even leave a scratch.");
+    "attack won't even leave a scratch.");
 
 const u8 gPorygon2PokedexText[] = _(
     "It was created by humans using the power\n"
@@ -1403,7 +1403,7 @@ const u8 gPorygon2PokedexText[] = _(
     "gestures and emotions on its own.");
 
 const u8 gStantlerPokedexText[] = _(
-    "STANTLER’s magnificent antlers were\n"
+    "STANTLER's magnificent antlers were\n"
     "once traded at high prices as works of art.\n"
     "As a result, this POKéMON was hunted\n"
     "close to extinction.");
@@ -1429,8 +1429,8 @@ const u8 gHitmontopPokedexText[] = _(
 const u8 gSmoochumPokedexText[] = _(
     "It actively runs about, but also falls\n"
     "often. Whenever it falls, it will check its\n"
-    "reflection on a lake’s surface to make\n"
-    "sure its face hasn’t become dirty.");
+    "reflection on a lake's surface to make\n"
+    "sure its face hasn't become dirty.");
 
 const u8 gElekidPokedexText[] = _(
     "If it touches metal and discharges the\n"
@@ -1447,7 +1447,7 @@ const u8 gMagbyPokedexText[] = _(
 const u8 gMiltankPokedexText[] = _(
     "It gives over five gallons of milk daily.\n"
     "Its sweet milk is enjoyed by children and\n"
-    "grown-ups alike. People who can’t drink\n"
+    "grown-ups alike. People who can't drink\n"
     "milk turn it into yogurt and eat it instead.");
 
 const u8 gBlisseyPokedexText[] = _(
@@ -1478,7 +1478,7 @@ const u8 gLarvitarPokedexText[] = _(
     "A LARVITAR is born deep under the ground.\n"
     "It must eat its way through the soil above\n"
     "and reach the surface for it to see its\n"
-    "parents’ faces.");
+    "parents' faces.");
 
 const u8 gPupitarPokedexText[] = _(
     "A PUPITAR creates a gas inside its body\n"
@@ -1514,10 +1514,10 @@ const u8 gTreeckoPokedexText[] = _(
     "It makes its nest in a giant tree in the\n"
     "forest. It ferociously guards against\n"
     "anything nearing its territory. It is said\n"
-    "to be the protector of the forest’s trees.");
+    "to be the protector of the forest's trees.");
 
 const u8 gGrovylePokedexText[] = _(
-    "Leaves grow out of this POKéMON’s body.\n"
+    "Leaves grow out of this POKéMON's body.\n"
     "They help obscure a GROVYLE from the eyes\n"
     "of its enemies while it is in a thickly\n"
     "overgrown forest.");
@@ -1532,7 +1532,7 @@ const u8 gTorchicPokedexText[] = _(
     "If attacked, it strikes back by spitting\n"
     "balls of fire it forms in its stomach.\n"
     "A TORCHIC dislikes darkness because it\n"
-    "can’t see its surroundings.");
+    "can't see its surroundings.");
 
 const u8 gCombuskenPokedexText[] = _(
     "It lashes out with 10 kicks per second.\n"
@@ -1550,7 +1550,7 @@ const u8 gMudkipPokedexText[] = _(
     "On land, it can powerfully lift large\n"
     "boulders by planting its four feet and\n"
     "heaving. It sleeps by burying itself in soil\n"
-    "at the water’s edge.");
+    "at the water's edge.");
 
 const u8 gMarshtompPokedexText[] = _(
     "Its toughened hind legs enable it to stand\n"
@@ -1572,7 +1572,7 @@ const u8 gPoochyenaPokedexText[] = _(
 
 const u8 gMightyenaPokedexText[] = _(
     "In the wild, MIGHTYENA live in a pack.\n"
-    "They never defy their leader’s orders.\n"
+    "They never defy their leader's orders.\n"
     "They defeat foes with perfectly\n"
     "coordinated teamwork.");
 
@@ -1704,7 +1704,7 @@ const u8 gSurskitPokedexText[] = _(
 
 const u8 gMasquerainPokedexText[] = _(
     "It intimidates foes with the large eyelike\n"
-    "patterns on its antennae. Because it can’t\n"
+    "patterns on its antennae. Because it can't\n"
     "fly if its wings get wet, it shelters itself\n"
     "from rain under large trees and eaves.");
 
@@ -1722,15 +1722,15 @@ const u8 gBreloomPokedexText[] = _(
 
 const u8 gSlakothPokedexText[] = _(
     "It sleeps virtually all day and night long.\n"
-    "It doesn’t change its nest its entire life,\n"
+    "It doesn't change its nest its entire life,\n"
     "but it sometimes travels great distances\n"
     "by swimming in rivers.");
 
 const u8 gVigorothPokedexText[] = _(
-    "It can’t keep still because its blood boils\n"
+    "It can't keep still because its blood boils\n"
     "with energy. It runs through the fields\n"
     "and mountains all day to calm itself. If it\n"
-    "doesn’t, it can’t sleep at night.");
+    "doesn't, it can't sleep at night.");
 
 const u8 gSlakingPokedexText[] = _(
     "Hordes of SLAKING gather around trees\n"
@@ -1783,7 +1783,7 @@ const u8 gMakuhitaPokedexText[] = _(
 const u8 gHariyamaPokedexText[] = _(
     "It has the habit of challenging others\n"
     "without hesitation to tests of strength.\n"
-    "It’s been known to stand on train tracks\n"
+    "It's been known to stand on train tracks\n"
     "and stop trains using forearm thrusts.");
 
 const u8 gAzurillPokedexText[] = _(
@@ -1799,7 +1799,7 @@ const u8 gNosepassPokedexText[] = _(
     "seasons.");
 
 const u8 gSkittyPokedexText[] = _(
-    "A SKITTY’s adorably cute behavior makes it\n"
+    "A SKITTY's adorably cute behavior makes it\n"
     "highly popular. In battle, it makes its tail\n"
     "puff out. It threatens foes with a sharp\n"
     "growl.");
@@ -1837,7 +1837,7 @@ const u8 gLaironPokedexText[] = _(
 const u8 gAggronPokedexText[] = _(
     "Its iron horns grow longer a little at\n"
     "a time. They are used to determine the\n"
-    "AGGRON’s age. The gouges in its armor are\n"
+    "AGGRON's age. The gouges in its armor are\n"
     "worn with pride as mementos from battles.");
 
 const u8 gMedititePokedexText[] = _(
@@ -1848,7 +1848,7 @@ const u8 gMedititePokedexText[] = _(
 
 const u8 gMedichamPokedexText[] = _(
     "Through crushingly harsh yoga training, it\n"
-    "gained the power to foretell its foe’s\n"
+    "gained the power to foretell its foe's\n"
     "actions. It battles with elegant, dance-\n"
     "like movement.");
 
@@ -1895,7 +1895,7 @@ const u8 gRoseliaPokedexText[] = _(
     "effect of making its foes careless.");
 
 const u8 gGulpinPokedexText[] = _(
-    "This POKéMON’s stomach fluid can even\n"
+    "This POKéMON's stomach fluid can even\n"
     "digest scrap iron. In one gulp, it can\n"
     "swallow something that is as large as\n"
     "itself.");
@@ -1903,7 +1903,7 @@ const u8 gGulpinPokedexText[] = _(
 const u8 gSwalotPokedexText[] = _(
     "Its powerful stomach acid is capable of\n"
     "digesting almost anything. The one thing\n"
-    "in the whole world a SWALOT can’t digest is\n"
+    "in the whole world a SWALOT can't digest is\n"
     "its own stomach.");
 
 const u8 gCarvanhaPokedexText[] = _(
@@ -1946,11 +1946,11 @@ const u8 gTorkoalPokedexText[] = _(
     "It battles using energy it gets from\n"
     "burning coal. When loosing smoke from its\n"
     "nostrils, it lets off a sound that is\n"
-    "similar to a locomotive’s horn.");
+    "similar to a locomotive's horn.");
 
 const u8 gSpoinkPokedexText[] = _(
     "A POKéMON that manipulates psychic power\n"
-    "at will. It doesn’t stop bouncing even when\n"
+    "at will. It doesn't stop bouncing even when\n"
     "it is asleep. It loves eating mushrooms\n"
     "that grow underground.");
 
@@ -1964,7 +1964,7 @@ const u8 gSpindaPokedexText[] = _(
     "It is distinguished by a pattern of\n"
     "spots that is always different. Its\n"
     "unsteady, tottering walk has the\n"
-    "effect of fouling its foe’s aim.");
+    "effect of fouling its foe's aim.");
 
 const u8 gTrapinchPokedexText[] = _(
     "Its big jaws crunch through boulders.\n"
@@ -1974,7 +1974,7 @@ const u8 gTrapinchPokedexText[] = _(
 
 const u8 gVibravaPokedexText[] = _(
     "It looses ultrasonic waves by rubbing its\n"
-    "wings together. Since a VIBRAVA’s wings\n"
+    "wings together. Since a VIBRAVA's wings\n"
     "are still in the process of growing, it can\n"
     "only fly short distances.");
 
@@ -2016,7 +2016,7 @@ const u8 gZangoosePokedexText[] = _(
 
 const u8 gSeviperPokedexText[] = _(
     "SEVIPER and ZANGOOSE are eternal rivals.\n"
-    "It counters a ZANGOOSE’s dazzling agility\n"
+    "It counters a ZANGOOSE's dazzling agility\n"
     "with its swordlike tail, which also oozes\n"
     "a horrible poison.");
 
@@ -2028,7 +2028,7 @@ const u8 gLunatonePokedexText[] = _(
 
 const u8 gSolrockPokedexText[] = _(
     "Solar energy is the source of this \n"
-    "POKéMON’s power. On sunny days, groups of\n"
+    "POKéMON's power. On sunny days, groups of\n"
     "SOLROCK line up facing the sun and absorb\n"
     "its light.");
 
@@ -2036,7 +2036,7 @@ const u8 gBarboachPokedexText[] = _(
     "Its body is covered with a slimy film.\n"
     "The film acts as a barrier to prevent germs\n"
     "in muddy water from entering the\n"
-    "BARBOACH’s body.");
+    "BARBOACH's body.");
 
 const u8 gWhiscashPokedexText[] = _(
     "Mysteriously, it can foretell earthquakes.\n"
@@ -2065,7 +2065,7 @@ const u8 gBaltoyPokedexText[] = _(
 const u8 gClaydolPokedexText[] = _(
     "A CLAYDOL sleeps while hovering in midair.\n"
     "Its arms are separate from its body.\n"
-    "They are kept floating by the POKéMON’s\n"
+    "They are kept floating by the POKéMON's\n"
     "manipulation of psychic power.");
 
 const u8 gLileepPokedexText[] = _(
@@ -2222,7 +2222,7 @@ const u8 gLuvdiscPokedexText[] = _(
     "LUVDISC make the branches of CORSOLA\n"
     "their nests. There is a custom from long\n"
     "ago of giving a LUVDISC as a gift to\n"
-    "express one’s feelings of love.");
+    "express one's feelings of love.");
 
 const u8 gBagonPokedexText[] = _(
     "Although it is small, this POKéMON is very\n"

src/data/pokemon/tmhm_learnsets.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_TMHM_LEARNSETS_H
-#define GUARD_TMHM_LEARNSETS_H
-
 #define TMHM_LEARNSET(moves) {(u32)(moves), ((u64)(moves) >> 32)}
 #define TMHM(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM01_FOCUS_PUNCH))
 
@@ -9389,5 +9386,3 @@ const u32 gTMHMLearnsets[][2] =
                                         | TMHM(HM05_FLASH)),
 
 };
-
-#endif  // GUARD_TMHM_LEARNSETS_H

src/data/pokemon/trainer_class_lookups.h

@@ -1,176 +1,172 @@
-#ifndef POKEEMERALD_TRAINER_CLASS_LOOKUPS_H
-#define POKEEMERALD_TRAINER_CLASS_LOOKUPS_H
-
 const u8 gFacilityClassToPicIndex[] =
 {
-    TRAINER_PIC_HIKER,                  // FACILITY_CLASS_HIKER
-    TRAINER_PIC_AQUA_GRUNT_M,           // FACILITY_CLASS_TEAM_AQUA_1
-    TRAINER_PIC_POKEMON_BREEDER_F,      // FACILITY_CLASS_PKMN_BREEDER_1
-    TRAINER_PIC_COOL_TRAINER_M,         // FACILITY_CLASS_COOLTRAINER_M
-    TRAINER_PIC_BIRD_KEEPER,            // FACILITY_CLASS_BIRD_KEEPER
-    TRAINER_PIC_COLLECTOR,              // FACILITY_CLASS_COLLECTOR
-    TRAINER_PIC_AQUA_GRUNT_F,           // FACILITY_CLASS_TEAM_AQUA_2
-    TRAINER_PIC_SWIMMER_M,              // FACILITY_CLASS_SWIMMER_M
-    TRAINER_PIC_MAGMA_GRUNT_M, // FACILITY_CLASS_TEAM_MAGMA_1
-    TRAINER_PIC_EXPERT_M, // FACILITY_CLASS_EXPERT_M
-    TRAINER_PIC_BLACK_BELT, // FACILITY_CLASS_BLACK_BELT
-    TRAINER_PIC_AQUA_LEADER_ARCHIE, // FACILITY_CLASS_AQUA_LEADER
-    TRAINER_PIC_HEX_MANIAC, // FACILITY_CLASS_HEX_MANIAC
-    TRAINER_PIC_AROMA_LADY, // FACILITY_CLASS_AROMA_LADY
-    TRAINER_PIC_RUIN_MANIAC, // FACILITY_CLASS_RUIN_MANIAC
-    TRAINER_PIC_INTERVIEWER, // FACILITY_CLASS_INTERVIEWER
-    TRAINER_PIC_TUBER_F, // FACILITY_CLASS_TUBER_1
-    TRAINER_PIC_TUBER_M, // FACILITY_CLASS_TUBER_2
-    TRAINER_PIC_COOL_TRAINER_F, // FACILITY_CLASS_COOLTRAINER_F
-    TRAINER_PIC_LADY, // FACILITY_CLASS_LADY
-    TRAINER_PIC_BEAUTY, // FACILITY_CLASS_BEAUTY
-    TRAINER_PIC_RICH_BOY, // FACILITY_CLASS_RICH_BOY
-    TRAINER_PIC_EXPERT_F, // FACILITY_CLASS_EXPERT_2
-    TRAINER_PIC_POKEMANIAC, // FACILITY_CLASS_POKEMANIAC
-    TRAINER_PIC_MAGMA_GRUNT_F, // FACILITY_CLASS_TEAM_MAGMA_2
-    TRAINER_PIC_GUITARIST, // FACILITY_CLASS_GUITARIST
-    TRAINER_PIC_KINDLER, // FACILITY_CLASS_KINDLER
-    TRAINER_PIC_CAMPER, // FACILITY_CLASS_CAMPER
-    TRAINER_PIC_PICNICKER, // FACILITY_CLASS_PICNICKER
-    TRAINER_PIC_BUG_MANIAC, // FACILITY_CLASS_BUG_MANIAC
-    TRAINER_PIC_PSYCHIC_M, // FACILITY_CLASS_PSYCHIC_M
-    TRAINER_PIC_PSYCHIC_F, // FACILITY_CLASS_PSYCHIC_F
-    TRAINER_PIC_GENTLEMAN, // FACILITY_CLASS_GENTLEMAN
-    TRAINER_PIC_ELITE_FOUR_SIDNEY, // FACILITY_CLASS_ELITE_FOUR_1
-    TRAINER_PIC_ELITE_FOUR_PHOEBE, // FACILITY_CLASS_ELITE_FOUR_2
-    TRAINER_PIC_LEADER_ROXANNE, // FACILITY_CLASS_LEADER_1
-    TRAINER_PIC_LEADER_BRAWLY, // FACILITY_CLASS_LEADER_2
-    TRAINER_PIC_LEADER_TATE_AND_LIZA, // FACILITY_CLASS_LEADER_3
-    TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M
-    TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F
-    TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR
-    TRAINER_PIC_WINSTRATE_M, // FACILITY_CLASS_POKEFAN_1
-    TRAINER_PIC_WINSTRATE_F, // FACILITY_CLASS_POKEFAN_2
-    TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER
-    TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION
-    TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN
-    TRAINER_PIC_CYCLING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_1
-    TRAINER_PIC_CYCLING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_2
-    TRAINER_PIC_RUNNING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_3
-    TRAINER_PIC_RUNNING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_4
-    TRAINER_PIC_SWIMMING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_5
-    TRAINER_PIC_SWIMMING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_6
-    TRAINER_PIC_DRAGON_TAMER, // FACILITY_CLASS_DRAGON_TAMER
-    TRAINER_PIC_NINJA_BOY, // FACILITY_CLASS_NINJA_BOY
-    TRAINER_PIC_BATTLE_GIRL, // FACILITY_CLASS_BATTLE_GIRL
-    TRAINER_PIC_PARASOL_LADY, // FACILITY_CLASS_PARASOL_LADY
-    TRAINER_PIC_SWIMMER_F, // FACILITY_CLASS_SWIMMER_F
-    TRAINER_PIC_TWINS, // FACILITY_CLASS_TWINS
-    TRAINER_PIC_SAILOR, // FACILITY_CLASS_SAILOR
-    TRAINER_PIC_WALLY, // FACILITY_CLASS_PKMN_TRAINER_1
-    TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN
-    TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_3
-    TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_4
-    TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_MAY
-    TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_6
-    TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_7
-    TRAINER_PIC_POKEMON_BREEDER_M, // FACILITY_CLASS_PKMN_BREEDER_2
-    TRAINER_PIC_BUG_CATCHER, // FACILITY_CLASS_BUG_CATCHER
-    TRAINER_PIC_POKEMON_RANGER_M, // FACILITY_CLASS_PKMN_RANGER_M
-    TRAINER_PIC_POKEMON_RANGER_F, // FACILITY_CLASS_PKMN_RANGER_F
-    TRAINER_PIC_MAGMA_LEADER_MAXIE, // FACILITY_CLASS_MAGMA_LEADER
-    TRAINER_PIC_LASS, // FACILITY_CLASS_LASS
-    TRAINER_PIC_YOUNG_COUPLE, // FACILITY_CLASS_YOUNG_COUPLE
-    TRAINER_PIC_OLD_COUPLE, // FACILITY_CLASS_OLD_COUPLE
-    TRAINER_PIC_SIS_AND_BRO, // FACILITY_CLASS_SIS_AND_BRO
-    TRAINER_PIC_STEVEN, // FACILITY_CLASS_PKMN_TRAINER_STEVEN
-    TRAINER_PIC_SALON_MAIDEN_ANABEL, // FACILITY_CLASS_SALON_MAIDEN
-    TRAINER_PIC_DOME_ACE_TUCKER, // FACILITY_CLASS_DOME_ACE
-    TRAINER_PIC_RED, // FACILITY_CLASS_PKMN_TRAINER_RED
-    TRAINER_PIC_LEAF, // FACILITY_CLASS_PKMN_TRAINER_LEAF
-    TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN
-    TRAINER_PIC_RUBY_SAPPHIRE_MAY, // FACILITY_CLASS_PKMN_TRAINER_RS_MAY
+    [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER,
+    [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M,
+    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F,
+    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M,
+    [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER,
+    [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR,
+    [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_PIC_AQUA_GRUNT_F,
+    [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M,
+    [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_PIC_MAGMA_GRUNT_M,
+    [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M,
+    [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_PIC_AQUA_LEADER_ARCHIE,
+    [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC,
+    [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY,
+    [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC,
+    [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER,
+    [FACILITY_CLASS_TUBER_F] = TRAINER_PIC_TUBER_F,
+    [FACILITY_CLASS_TUBER_M] = TRAINER_PIC_TUBER_M,
+    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOLTRAINER_F,
+    [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY,
+    [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY,
+    [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY,
+    [FACILITY_CLASS_EXPERT_F] = TRAINER_PIC_EXPERT_F,
+    [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC,
+    [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_PIC_MAGMA_GRUNT_F,
+    [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST,
+    [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER,
+    [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER,
+    [FACILITY_CLASS_PICNICKER] = TRAINER_PIC_PICNICKER,
+    [FACILITY_CLASS_BUG_MANIAC] = TRAINER_PIC_BUG_MANIAC,
+    [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M,
+    [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F,
+    [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_PIC_ELITE_FOUR_SIDNEY,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_PIC_ELITE_FOUR_PHOEBE,
+    [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_PIC_LEADER_ROXANNE,
+    [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_PIC_LEADER_BRAWLY,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_PIC_LEADER_TATE_AND_LIZA,
+    [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M,
+    [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F,
+    [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR,
+    [FACILITY_CLASS_POKEFAN_M] = TRAINER_PIC_POKEFAN_M,
+    [FACILITY_CLASS_POKEFAN_F] = TRAINER_PIC_POKEFAN_F,
+    [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER,
+    [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_PIC_CHAMPION_WALLACE,
+    [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_PIC_CYCLING_TRIATHLETE_M,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_PIC_CYCLING_TRIATHLETE_F,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_PIC_RUNNING_TRIATHLETE_M,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_PIC_RUNNING_TRIATHLETE_F,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
+    [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER,
+    [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY,
+    [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL,
+    [FACILITY_CLASS_PARASOL_LADY] = TRAINER_PIC_PARASOL_LADY,
+    [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F,
+    [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS,
+    [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR,
+    [FACILITY_CLASS_WALLY] = TRAINER_PIC_WALLY,
+    [FACILITY_CLASS_BRENDAN] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_BRENDAN_2] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_BRENDAN_3] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_MAY] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_MAY_2] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_MAY_3] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M,
+    [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER,
+    [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M,
+    [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_PIC_MAGMA_LEADER_MAXIE,
+    [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS,
+    [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE,
+    [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE,
+    [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO,
+    [FACILITY_CLASS_STEVEN] = TRAINER_PIC_STEVEN,
+    [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_PIC_SALON_MAIDEN_ANABEL,
+    [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_PIC_DOME_ACE_TUCKER,
+    [FACILITY_CLASS_RED] = TRAINER_PIC_RED,
+    [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF,
+    [FACILITY_CLASS_RS_BRENDAN] = TRAINER_PIC_RS_BRENDAN,
+    [FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY,
 };
 
 const u8 gFacilityClassToTrainerClass[] =
 {
-    TRAINER_CLASS_HIKER,                    // FACILITY_CLASS_HIKER
-    TRAINER_CLASS_TEAM_AQUA,                // FACILITY_CLASS_TEAM_AQUA_1
-    TRAINER_CLASS_PKMN_BREEDER, // FACILITY_CLASS_PKMN_BREEDER_1
-    TRAINER_CLASS_COOLTRAINER_1, // FACILITY_CLASS_COOLTRAINER_M
-    TRAINER_CLASS_BIRD_KEEPER, // FACILITY_CLASS_BIRD_KEEPER
-    TRAINER_CLASS_COLLECTOR, // FACILITY_CLASS_COLLECTOR
-    TRAINER_CLASS_TEAM_AQUA, // FACILITY_CLASS_TEAM_AQUA_2
-    TRAINER_CLASS_SWIMMER_M, // FACILITY_CLASS_SWIMMER_M
-    TRAINER_CLASS_TEAM_MAGMA, // FACILITY_CLASS_TEAM_MAGMA_1
-    TRAINER_CLASS_EXPERT, // FACILITY_CLASS_EXPERT_M
-    TRAINER_CLASS_BLACK_BELT, // FACILITY_CLASS_BLACK_BELT
-    TRAINER_CLASS_AQUA_LEADER, // FACILITY_CLASS_AQUA_LEADER
-    TRAINER_CLASS_HEX_MANIAC, // FACILITY_CLASS_HEX_MANIAC
-    TRAINER_CLASS_AROMA_LADY, // FACILITY_CLASS_AROMA_LADY
-    TRAINER_CLASS_RUIN_MANIAC, // FACILITY_CLASS_RUIN_MANIAC
-    TRAINER_CLASS_INTERVIEWER, // FACILITY_CLASS_INTERVIEWER
-    TRAINER_CLASS_TUBER_1, // FACILITY_CLASS_TUBER_1
-    TRAINER_CLASS_TUBER_2, // FACILITY_CLASS_TUBER_2
-    TRAINER_CLASS_COOLTRAINER_1, // FACILITY_CLASS_COOLTRAINER_F
-    TRAINER_CLASS_LADY, // FACILITY_CLASS_LADY
-    TRAINER_CLASS_BEAUTY, // FACILITY_CLASS_BEAUTY
-    TRAINER_CLASS_RICH_BOY, // FACILITY_CLASS_RICH_BOY
-    TRAINER_CLASS_EXPERT, // FACILITY_CLASS_EXPERT_2
-    TRAINER_CLASS_POKEMANIAC, // FACILITY_CLASS_POKEMANIAC
-    TRAINER_CLASS_TEAM_MAGMA, // FACILITY_CLASS_TEAM_MAGMA_2
-    TRAINER_CLASS_GUITARIST, // FACILITY_CLASS_GUITARIST
-    TRAINER_CLASS_KINDLER, // FACILITY_CLASS_KINDLER
-    TRAINER_CLASS_CAMPER, // FACILITY_CLASS_CAMPER
-    TRAINER_CLASS_PICNICKER, // FACILITY_CLASS_PICNICKER
-    TRAINER_CLASS_BUG_MANIAC, // FACILITY_CLASS_BUG_MANIAC
-    TRAINER_CLASS_PSYCHIC, // FACILITY_CLASS_PSYCHIC_M
-    TRAINER_CLASS_PSYCHIC, // FACILITY_CLASS_PSYCHIC_F
-    TRAINER_CLASS_GENTLEMAN, // FACILITY_CLASS_GENTLEMAN
-    TRAINER_CLASS_ELITE_FOUR, // FACILITY_CLASS_ELITE_FOUR_1
-    TRAINER_CLASS_ELITE_FOUR, // FACILITY_CLASS_ELITE_FOUR_2
-    TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_1
-    TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_2
-    TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_3
-    TRAINER_CLASS_SCHOOL_KID, // FACILITY_CLASS_SCHOOL_KID_M
-    TRAINER_CLASS_SCHOOL_KID, // FACILITY_CLASS_SCHOOL_KID_F
-    TRAINER_CLASS_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR
-    TRAINER_CLASS_POKEFAN, // FACILITY_CLASS_POKEFAN_1
-    TRAINER_CLASS_POKEFAN, // FACILITY_CLASS_POKEFAN_2
-    TRAINER_CLASS_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER
-    TRAINER_CLASS_CHAMPION, // FACILITY_CLASS_CHAMPION
-    TRAINER_CLASS_FISHERMAN, // FACILITY_CLASS_FISHERMAN
-    TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_1
-    TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_2
-    TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_3
-    TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_4
-    TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_5
-    TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_6
-    TRAINER_CLASS_DRAGON_TAMER, // FACILITY_CLASS_DRAGON_TAMER
-    TRAINER_CLASS_NINJA_BOY, // FACILITY_CLASS_NINJA_BOY
-    TRAINER_CLASS_BATTLE_GIRL, // FACILITY_CLASS_BATTLE_GIRL
-    TRAINER_CLASS_PARASOL_LADY, // FACILITY_CLASS_PARASOL_LADY
-    TRAINER_CLASS_SWIMMER_F, // FACILITY_CLASS_SWIMMER_F
-    TRAINER_CLASS_TWINS, // FACILITY_CLASS_TWINS
-    TRAINER_CLASS_SAILOR, // FACILITY_CLASS_SAILOR
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_1
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_MAY
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_3
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_4
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_6
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_7
-    TRAINER_CLASS_PKMN_BREEDER, // FACILITY_CLASS_PKMN_BREEDER_2
-    TRAINER_CLASS_BUG_CATCHER, // FACILITY_CLASS_BUG_CATCHER
-    TRAINER_CLASS_PKMN_RANGER, // FACILITY_CLASS_PKMN_RANGER_M
-    TRAINER_CLASS_PKMN_RANGER, // FACILITY_CLASS_PKMN_RANGER_F
-    TRAINER_CLASS_MAGMA_LEADER, // FACILITY_CLASS_MAGMA_LEADER
-    TRAINER_CLASS_LASS, // FACILITY_CLASS_LASS
-    TRAINER_CLASS_YOUNG_COUPLE, // FACILITY_CLASS_YOUNG_COUPLE
-    TRAINER_CLASS_OLD_COUPLE, // FACILITY_CLASS_OLD_COUPLE
-    TRAINER_CLASS_SIS_AND_BRO, // FACILITY_CLASS_SIS_AND_BRO
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_STEVEN
-    TRAINER_CLASS_SALON_MAIDEN, // FACILITY_CLASS_SALON_MAIDEN
-    TRAINER_CLASS_DOME_ACE, // FACILITY_CLASS_DOME_ACE
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_RED
-    TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_LEAF
-    TRAINER_CLASS_PKMN_TRAINER_4, // FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN
-    TRAINER_CLASS_PKMN_TRAINER_4, // FACILITY_CLASS_PKMN_TRAINER_RS_MAY
+    [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER,
+    [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER,
+    [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER,
+    [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR,
+    [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M,
+    [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT,
+    [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_CLASS_AQUA_LEADER,
+    [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC,
+    [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY,
+    [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC,
+    [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER,
+    [FACILITY_CLASS_TUBER_F] = TRAINER_CLASS_TUBER_F,
+    [FACILITY_CLASS_TUBER_M] = TRAINER_CLASS_TUBER_M,
+    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER,
+    [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY,
+    [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY,
+    [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY,
+    [FACILITY_CLASS_EXPERT_F] = TRAINER_CLASS_EXPERT,
+    [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC,
+    [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST,
+    [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER,
+    [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER,
+    [FACILITY_CLASS_PICNICKER] = TRAINER_CLASS_PICNICKER,
+    [FACILITY_CLASS_BUG_MANIAC] = TRAINER_CLASS_BUG_MANIAC,
+    [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC,
+    [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC,
+    [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID,
+    [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID,
+    [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR,
+    [FACILITY_CLASS_POKEFAN_M] = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_POKEFAN_F] = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER,
+    [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_CLASS_CHAMPION,
+    [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER,
+    [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY,
+    [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL,
+    [FACILITY_CLASS_PARASOL_LADY] = TRAINER_CLASS_PARASOL_LADY,
+    [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F,
+    [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS,
+    [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR,
+    [FACILITY_CLASS_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER,
+    [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER,
+    [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_CLASS_MAGMA_LEADER,
+    [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS,
+    [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE,
+    [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE,
+    [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO,
+    [FACILITY_CLASS_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_CLASS_SALON_MAIDEN,
+    [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE,
+    [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4,
+    [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4,
 };
 
-#endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H

src/data/pokemon_graphics/back_pic_table.h

@@ -1,443 +1,444 @@
 const struct CompressedSpriteSheet gMonBackPicTable[] =
 {
-    gMonBackPic_CircledQuestionMark, 0x800, 0,
-    gMonBackPic_Bulbasaur, 0x800, 1,
-    gMonBackPic_Ivysaur, 0x800, 2,
-    gMonBackPic_Venusaur, 0x800, 3,
-    gMonBackPic_Charmander, 0x800, 4,
-    gMonBackPic_Charmeleon, 0x800, 5,
-    gMonBackPic_Charizard, 0x800, 6,
-    gMonBackPic_Squirtle, 0x800, 7,
-    gMonBackPic_Wartortle, 0x800, 8,
-    gMonBackPic_Blastoise, 0x800, 9,
-    gMonBackPic_Caterpie, 0x800, 10,
-    gMonBackPic_Metapod, 0x800, 11,
-    gMonBackPic_Butterfree, 0x800, 12,
-    gMonBackPic_Weedle, 0x800, 13,
-    gMonBackPic_Kakuna, 0x800, 14,
-    gMonBackPic_Beedrill, 0x800, 15,
-    gMonBackPic_Pidgey, 0x800, 16,
-    gMonBackPic_Pidgeotto, 0x800, 17,
-    gMonBackPic_Pidgeot, 0x800, 18,
-    gMonBackPic_Rattata, 0x800, 19,
-    gMonBackPic_Raticate, 0x800, 20,
-    gMonBackPic_Spearow, 0x800, 21,
-    gMonBackPic_Fearow, 0x800, 22,
-    gMonBackPic_Ekans, 0x800, 23,
-    gMonBackPic_Arbok, 0x800, 24,
-    gMonBackPic_Pikachu, 0x800, 25,
-    gMonBackPic_Raichu, 0x800, 26,
-    gMonBackPic_Sandshrew, 0x800, 27,
-    gMonBackPic_Sandslash, 0x800, 28,
-    gMonBackPic_NidoranF, 0x800, 29,
-    gMonBackPic_Nidorina, 0x800, 30,
-    gMonBackPic_Nidoqueen, 0x800, 31,
-    gMonBackPic_NidoranM, 0x800, 32,
-    gMonBackPic_Nidorino, 0x800, 33,
-    gMonBackPic_Nidoking, 0x800, 34,
-    gMonBackPic_Clefairy, 0x800, 35,
-    gMonBackPic_Clefable, 0x800, 36,
-    gMonBackPic_Vulpix, 0x800, 37,
-    gMonBackPic_Ninetales, 0x800, 38,
-    gMonBackPic_Jigglypuff, 0x800, 39,
-    gMonBackPic_Wigglytuff, 0x800, 40,
-    gMonBackPic_Zubat, 0x800, 41,
-    gMonBackPic_Golbat, 0x800, 42,
-    gMonBackPic_Oddish, 0x800, 43,
-    gMonBackPic_Gloom, 0x800, 44,
-    gMonBackPic_Vileplume, 0x800, 45,
-    gMonBackPic_Paras, 0x800, 46,
-    gMonBackPic_Parasect, 0x800, 47,
-    gMonBackPic_Venonat, 0x800, 48,
-    gMonBackPic_Venomoth, 0x800, 49,
-    gMonBackPic_Diglett, 0x800, 50,
-    gMonBackPic_Dugtrio, 0x800, 51,
-    gMonBackPic_Meowth, 0x800, 52,
-    gMonBackPic_Persian, 0x800, 53,
-    gMonBackPic_Psyduck, 0x800, 54,
-    gMonBackPic_Golduck, 0x800, 55,
-    gMonBackPic_Mankey, 0x800, 56,
-    gMonBackPic_Primeape, 0x800, 57,
-    gMonBackPic_Growlithe, 0x800, 58,
-    gMonBackPic_Arcanine, 0x800, 59,
-    gMonBackPic_Poliwag, 0x800, 60,
-    gMonBackPic_Poliwhirl, 0x800, 61,
-    gMonBackPic_Poliwrath, 0x800, 62,
-    gMonBackPic_Abra, 0x800, 63,
-    gMonBackPic_Kadabra, 0x800, 64,
-    gMonBackPic_Alakazam, 0x800, 65,
-    gMonBackPic_Machop, 0x800, 66,
-    gMonBackPic_Machoke, 0x800, 67,
-    gMonBackPic_Machamp, 0x800, 68,
-    gMonBackPic_Bellsprout, 0x800, 69,
-    gMonBackPic_Weepinbell, 0x800, 70,
-    gMonBackPic_Victreebel, 0x800, 71,
-    gMonBackPic_Tentacool, 0x800, 72,
-    gMonBackPic_Tentacruel, 0x800, 73,
-    gMonBackPic_Geodude, 0x800, 74,
-    gMonBackPic_Graveler, 0x800, 75,
-    gMonBackPic_Golem, 0x800, 76,
-    gMonBackPic_Ponyta, 0x800, 77,
-    gMonBackPic_Rapidash, 0x800, 78,
-    gMonBackPic_Slowpoke, 0x800, 79,
-    gMonBackPic_Slowbro, 0x800, 80,
-    gMonBackPic_Magnemite, 0x800, 81,
-    gMonBackPic_Magneton, 0x800, 82,
-    gMonBackPic_Farfetchd, 0x800, 83,
-    gMonBackPic_Doduo, 0x800, 84,
-    gMonBackPic_Dodrio, 0x800, 85,
-    gMonBackPic_Seel, 0x800, 86,
-    gMonBackPic_Dewgong, 0x800, 87,
-    gMonBackPic_Grimer, 0x800, 88,
-    gMonBackPic_Muk, 0x800, 89,
-    gMonBackPic_Shellder, 0x800, 90,
-    gMonBackPic_Cloyster, 0x800, 91,
-    gMonBackPic_Gastly, 0x800, 92,
-    gMonBackPic_Haunter, 0x800, 93,
-    gMonBackPic_Gengar, 0x800, 94,
-    gMonBackPic_Onix, 0x800, 95,
-    gMonBackPic_Drowzee, 0x800, 96,
-    gMonBackPic_Hypno, 0x800, 97,
-    gMonBackPic_Krabby, 0x800, 98,
-    gMonBackPic_Kingler, 0x800, 99,
-    gMonBackPic_Voltorb, 0x800, 100,
-    gMonBackPic_Electrode, 0x800, 101,
-    gMonBackPic_Exeggcute, 0x800, 102,
-    gMonBackPic_Exeggutor, 0x800, 103,
-    gMonBackPic_Cubone, 0x800, 104,
-    gMonBackPic_Marowak, 0x800, 105,
-    gMonBackPic_Hitmonlee, 0x800, 106,
-    gMonBackPic_Hitmonchan, 0x800, 107,
-    gMonBackPic_Lickitung, 0x800, 108,
-    gMonBackPic_Koffing, 0x800, 109,
-    gMonBackPic_Weezing, 0x800, 110,
-    gMonBackPic_Rhyhorn, 0x800, 111,
-    gMonBackPic_Rhydon, 0x800, 112,
-    gMonBackPic_Chansey, 0x800, 113,
-    gMonBackPic_Tangela, 0x800, 114,
-    gMonBackPic_Kangaskhan, 0x800, 115,
-    gMonBackPic_Horsea, 0x800, 116,
-    gMonBackPic_Seadra, 0x800, 117,
-    gMonBackPic_Goldeen, 0x800, 118,
-    gMonBackPic_Seaking, 0x800, 119,
-    gMonBackPic_Staryu, 0x800, 120,
-    gMonBackPic_Starmie, 0x800, 121,
-    gMonBackPic_Mrmime, 0x800, 122,
-    gMonBackPic_Scyther, 0x800, 123,
-    gMonBackPic_Jynx, 0x800, 124,
-    gMonBackPic_Electabuzz, 0x800, 125,
-    gMonBackPic_Magmar, 0x800, 126,
-    gMonBackPic_Pinsir, 0x800, 127,
-    gMonBackPic_Tauros, 0x800, 128,
-    gMonBackPic_Magikarp, 0x800, 129,
-    gMonBackPic_Gyarados, 0x800, 130,
-    gMonBackPic_Lapras, 0x800, 131,
-    gMonBackPic_Ditto, 0x800, 132,
-    gMonBackPic_Eevee, 0x800, 133,
-    gMonBackPic_Vaporeon, 0x800, 134,
-    gMonBackPic_Jolteon, 0x800, 135,
-    gMonBackPic_Flareon, 0x800, 136,
-    gMonBackPic_Porygon, 0x800, 137,
-    gMonBackPic_Omanyte, 0x800, 138,
-    gMonBackPic_Omastar, 0x800, 139,
-    gMonBackPic_Kabuto, 0x800, 140,
-    gMonBackPic_Kabutops, 0x800, 141,
-    gMonBackPic_Aerodactyl, 0x800, 142,
-    gMonBackPic_Snorlax, 0x800, 143,
-    gMonBackPic_Articuno, 0x800, 144,
-    gMonBackPic_Zapdos, 0x800, 145,
-    gMonBackPic_Moltres, 0x800, 146,
-    gMonBackPic_Dratini, 0x800, 147,
-    gMonBackPic_Dragonair, 0x800, 148,
-    gMonBackPic_Dragonite, 0x800, 149,
-    gMonBackPic_Mewtwo, 0x800, 150,
-    gMonBackPic_Mew, 0x800, 151,
-    gMonBackPic_Chikorita, 0x800, 152,
-    gMonBackPic_Bayleef, 0x800, 153,
-    gMonBackPic_Meganium, 0x800, 154,
-    gMonBackPic_Cyndaquil, 0x800, 155,
-    gMonBackPic_Quilava, 0x800, 156,
-    gMonBackPic_Typhlosion, 0x800, 157,
-    gMonBackPic_Totodile, 0x800, 158,
-    gMonBackPic_Croconaw, 0x800, 159,
-    gMonBackPic_Feraligatr, 0x800, 160,
-    gMonBackPic_Sentret, 0x800, 161,
-    gMonBackPic_Furret, 0x800, 162,
-    gMonBackPic_Hoothoot, 0x800, 163,
-    gMonBackPic_Noctowl, 0x800, 164,
-    gMonBackPic_Ledyba, 0x800, 165,
-    gMonBackPic_Ledian, 0x800, 166,
-    gMonBackPic_Spinarak, 0x800, 167,
-    gMonBackPic_Ariados, 0x800, 168,
-    gMonBackPic_Crobat, 0x800, 169,
-    gMonBackPic_Chinchou, 0x800, 170,
-    gMonBackPic_Lanturn, 0x800, 171,
-    gMonBackPic_Pichu, 0x800, 172,
-    gMonBackPic_Cleffa, 0x800, 173,
-    gMonBackPic_Igglybuff, 0x800, 174,
-    gMonBackPic_Togepi, 0x800, 175,
-    gMonBackPic_Togetic, 0x800, 176,
-    gMonBackPic_Natu, 0x800, 177,
-    gMonBackPic_Xatu, 0x800, 178,
-    gMonBackPic_Mareep, 0x800, 179,
-    gMonBackPic_Flaaffy, 0x800, 180,
-    gMonBackPic_Ampharos, 0x800, 181,
-    gMonBackPic_Bellossom, 0x800, 182,
-    gMonBackPic_Marill, 0x800, 183,
-    gMonBackPic_Azumarill, 0x800, 184,
-    gMonBackPic_Sudowoodo, 0x800, 185,
-    gMonBackPic_Politoed, 0x800, 186,
-    gMonBackPic_Hoppip, 0x800, 187,
-    gMonBackPic_Skiploom, 0x800, 188,
-    gMonBackPic_Jumpluff, 0x800, 189,
-    gMonBackPic_Aipom, 0x800, 190,
-    gMonBackPic_Sunkern, 0x800, 191,
-    gMonBackPic_Sunflora, 0x800, 192,
-    gMonBackPic_Yanma, 0x800, 193,
-    gMonBackPic_Wooper, 0x800, 194,
-    gMonBackPic_Quagsire, 0x800, 195,
-    gMonBackPic_Espeon, 0x800, 196,
-    gMonBackPic_Umbreon, 0x800, 197,
-    gMonBackPic_Murkrow, 0x800, 198,
-    gMonBackPic_Slowking, 0x800, 199,
-    gMonBackPic_Misdreavus, 0x800, 200,
-    gMonBackPic_UnownA, 0x800, 201,
-    gMonBackPic_Wobbuffet, 0x800, 202,
-    gMonBackPic_Girafarig, 0x800, 203,
-    gMonBackPic_Pineco, 0x800, 204,
-    gMonBackPic_Forretress, 0x800, 205,
-    gMonBackPic_Dunsparce, 0x800, 206,
-    gMonBackPic_Gligar, 0x800, 207,
-    gMonBackPic_Steelix, 0x800, 208,
-    gMonBackPic_Snubbull, 0x800, 209,
-    gMonBackPic_Granbull, 0x800, 210,
-    gMonBackPic_Qwilfish, 0x800, 211,
-    gMonBackPic_Scizor, 0x800, 212,
-    gMonBackPic_Shuckle, 0x800, 213,
-    gMonBackPic_Heracross, 0x800, 214,
-    gMonBackPic_Sneasel, 0x800, 215,
-    gMonBackPic_Teddiursa, 0x800, 216,
-    gMonBackPic_Ursaring, 0x800, 217,
-    gMonBackPic_Slugma, 0x800, 218,
-    gMonBackPic_Magcargo, 0x800, 219,
-    gMonBackPic_Swinub, 0x800, 220,
-    gMonBackPic_Piloswine, 0x800, 221,
-    gMonBackPic_Corsola, 0x800, 222,
-    gMonBackPic_Remoraid, 0x800, 223,
-    gMonBackPic_Octillery, 0x800, 224,
-    gMonBackPic_Delibird, 0x800, 225,
-    gMonBackPic_Mantine, 0x800, 226,
-    gMonBackPic_Skarmory, 0x800, 227,
-    gMonBackPic_Houndour, 0x800, 228,
-    gMonBackPic_Houndoom, 0x800, 229,
-    gMonBackPic_Kingdra, 0x800, 230,
-    gMonBackPic_Phanpy, 0x800, 231,
-    gMonBackPic_Donphan, 0x800, 232,
-    gMonBackPic_Porygon2, 0x800, 233,
-    gMonBackPic_Stantler, 0x800, 234,
-    gMonBackPic_Smeargle, 0x800, 235,
-    gMonBackPic_Tyrogue, 0x800, 236,
-    gMonBackPic_Hitmontop, 0x800, 237,
-    gMonBackPic_Smoochum, 0x800, 238,
-    gMonBackPic_Elekid, 0x800, 239,
-    gMonBackPic_Magby, 0x800, 240,
-    gMonBackPic_Miltank, 0x800, 241,
-    gMonBackPic_Blissey, 0x800, 242,
-    gMonBackPic_Raikou, 0x800, 243,
-    gMonBackPic_Entei, 0x800, 244,
-    gMonBackPic_Suicune, 0x800, 245,
-    gMonBackPic_Larvitar, 0x800, 246,
-    gMonBackPic_Pupitar, 0x800, 247,
-    gMonBackPic_Tyranitar, 0x800, 248,
-    gMonBackPic_Lugia, 0x800, 249,
-    gMonBackPic_HoOh, 0x800, 250,
-    gMonBackPic_Celebi, 0x800, 251,
-    gMonBackPic_DoubleQuestionMark, 0x800, 252,
-    gMonBackPic_DoubleQuestionMark, 0x800, 253,
-    gMonBackPic_DoubleQuestionMark, 0x800, 254,
-    gMonBackPic_DoubleQuestionMark, 0x800, 255,
-    gMonBackPic_DoubleQuestionMark, 0x800, 256,
-    gMonBackPic_DoubleQuestionMark, 0x800, 257,
-    gMonBackPic_DoubleQuestionMark, 0x800, 258,
-    gMonBackPic_DoubleQuestionMark, 0x800, 259,
-    gMonBackPic_DoubleQuestionMark, 0x800, 260,
-    gMonBackPic_DoubleQuestionMark, 0x800, 261,
-    gMonBackPic_DoubleQuestionMark, 0x800, 262,
-    gMonBackPic_DoubleQuestionMark, 0x800, 263,
-    gMonBackPic_DoubleQuestionMark, 0x800, 264,
-    gMonBackPic_DoubleQuestionMark, 0x800, 265,
-    gMonBackPic_DoubleQuestionMark, 0x800, 266,
-    gMonBackPic_DoubleQuestionMark, 0x800, 267,
-    gMonBackPic_DoubleQuestionMark, 0x800, 268,
-    gMonBackPic_DoubleQuestionMark, 0x800, 269,
-    gMonBackPic_DoubleQuestionMark, 0x800, 270,
-    gMonBackPic_DoubleQuestionMark, 0x800, 271,
-    gMonBackPic_DoubleQuestionMark, 0x800, 272,
-    gMonBackPic_DoubleQuestionMark, 0x800, 273,
-    gMonBackPic_DoubleQuestionMark, 0x800, 274,
-    gMonBackPic_DoubleQuestionMark, 0x800, 275,
-    gMonBackPic_DoubleQuestionMark, 0x800, 276,
-    gMonBackPic_Treecko, 0x800, 277,
-    gMonBackPic_Grovyle, 0x800, 278,
-    gMonBackPic_Sceptile, 0x800, 279,
-    gMonBackPic_Torchic, 0x800, 280,
-    gMonBackPic_Combusken, 0x800, 281,
-    gMonBackPic_Blaziken, 0x800, 282,
-    gMonBackPic_Mudkip, 0x800, 283,
-    gMonBackPic_Marshtomp, 0x800, 284,
-    gMonBackPic_Swampert, 0x800, 285,
-    gMonBackPic_Poochyena, 0x800, 286,
-    gMonBackPic_Mightyena, 0x800, 287,
-    gMonBackPic_Zigzagoon, 0x800, 288,
-    gMonBackPic_Linoone, 0x800, 289,
-    gMonBackPic_Wurmple, 0x800, 290,
-    gMonBackPic_Silcoon, 0x800, 291,
-    gMonBackPic_Beautifly, 0x800, 292,
-    gMonBackPic_Cascoon, 0x800, 293,
-    gMonBackPic_Dustox, 0x800, 294,
-    gMonBackPic_Lotad, 0x800, 295,
-    gMonBackPic_Lombre, 0x800, 296,
-    gMonBackPic_Ludicolo, 0x800, 297,
-    gMonBackPic_Seedot, 0x800, 298,
-    gMonBackPic_Nuzleaf, 0x800, 299,
-    gMonBackPic_Shiftry, 0x800, 300,
-    gMonBackPic_Nincada, 0x800, 301,
-    gMonBackPic_Ninjask, 0x800, 302,
-    gMonBackPic_Shedinja, 0x800, 303,
-    gMonBackPic_Taillow, 0x800, 304,
-    gMonBackPic_Swellow, 0x800, 305,
-    gMonBackPic_Shroomish, 0x800, 306,
-    gMonBackPic_Breloom, 0x800, 307,
-    gMonBackPic_Spinda, 0x800, 308,
-    gMonBackPic_Wingull, 0x800, 309,
-    gMonBackPic_Pelipper, 0x800, 310,
-    gMonBackPic_Surskit, 0x800, 311,
-    gMonBackPic_Masquerain, 0x800, 312,
-    gMonBackPic_Wailmer, 0x800, 313,
-    gMonBackPic_Wailord, 0x800, 314,
-    gMonBackPic_Skitty, 0x800, 315,
-    gMonBackPic_Delcatty, 0x800, 316,
-    gMonBackPic_Kecleon, 0x800, 317,
-    gMonBackPic_Baltoy, 0x800, 318,
-    gMonBackPic_Claydol, 0x800, 319,
-    gMonBackPic_Nosepass, 0x800, 320,
-    gMonBackPic_Torkoal, 0x800, 321,
-    gMonBackPic_Sableye, 0x800, 322,
-    gMonBackPic_Barboach, 0x800, 323,
-    gMonBackPic_Whiscash, 0x800, 324,
-    gMonBackPic_Luvdisc, 0x800, 325,
-    gMonBackPic_Corphish, 0x800, 326,
-    gMonBackPic_Crawdaunt, 0x800, 327,
-    gMonBackPic_Feebas, 0x800, 328,
-    gMonBackPic_Milotic, 0x800, 329,
-    gMonBackPic_Carvanha, 0x800, 330,
-    gMonBackPic_Sharpedo, 0x800, 331,
-    gMonBackPic_Trapinch, 0x800, 332,
-    gMonBackPic_Vibrava, 0x800, 333,
-    gMonBackPic_Flygon, 0x800, 334,
-    gMonBackPic_Makuhita, 0x800, 335,
-    gMonBackPic_Hariyama, 0x800, 336,
-    gMonBackPic_Electrike, 0x800, 337,
-    gMonBackPic_Manectric, 0x800, 338,
-    gMonBackPic_Numel, 0x800, 339,
-    gMonBackPic_Camerupt, 0x800, 340,
-    gMonBackPic_Spheal, 0x800, 341,
-    gMonBackPic_Sealeo, 0x800, 342,
-    gMonBackPic_Walrein, 0x800, 343,
-    gMonBackPic_Cacnea, 0x800, 344,
-    gMonBackPic_Cacturne, 0x800, 345,
-    gMonBackPic_Snorunt, 0x800, 346,
-    gMonBackPic_Glalie, 0x800, 347,
-    gMonBackPic_Lunatone, 0x800, 348,
-    gMonBackPic_Solrock, 0x800, 349,
-    gMonBackPic_Azurill, 0x800, 350,
-    gMonBackPic_Spoink, 0x800, 351,
-    gMonBackPic_Grumpig, 0x800, 352,
-    gMonBackPic_Plusle, 0x800, 353,
-    gMonBackPic_Minun, 0x800, 354,
-    gMonBackPic_Mawile, 0x800, 355,
-    gMonBackPic_Meditite, 0x800, 356,
-    gMonBackPic_Medicham, 0x800, 357,
-    gMonBackPic_Swablu, 0x800, 358,
-    gMonBackPic_Altaria, 0x800, 359,
-    gMonBackPic_Wynaut, 0x800, 360,
-    gMonBackPic_Duskull, 0x800, 361,
-    gMonBackPic_Dusclops, 0x800, 362,
-    gMonBackPic_Roselia, 0x800, 363,
-    gMonBackPic_Slakoth, 0x800, 364,
-    gMonBackPic_Vigoroth, 0x800, 365,
-    gMonBackPic_Slaking, 0x800, 366,
-    gMonBackPic_Gulpin, 0x800, 367,
-    gMonBackPic_Swalot, 0x800, 368,
-    gMonBackPic_Tropius, 0x800, 369,
-    gMonBackPic_Whismur, 0x800, 370,
-    gMonBackPic_Loudred, 0x800, 371,
-    gMonBackPic_Exploud, 0x800, 372,
-    gMonBackPic_Clamperl, 0x800, 373,
-    gMonBackPic_Huntail, 0x800, 374,
-    gMonBackPic_Gorebyss, 0x800, 375,
-    gMonBackPic_Absol, 0x800, 376,
-    gMonBackPic_Shuppet, 0x800, 377,
-    gMonBackPic_Banette, 0x800, 378,
-    gMonBackPic_Seviper, 0x800, 379,
-    gMonBackPic_Zangoose, 0x800, 380,
-    gMonBackPic_Relicanth, 0x800, 381,
-    gMonBackPic_Aron, 0x800, 382,
-    gMonBackPic_Lairon, 0x800, 383,
-    gMonBackPic_Aggron, 0x800, 384,
-    gMonBackPic_Castform, 0x800, 385,
-    gMonBackPic_Volbeat, 0x800, 386,
-    gMonBackPic_Illumise, 0x800, 387,
-    gMonBackPic_Lileep, 0x800, 388,
-    gMonBackPic_Cradily, 0x800, 389,
-    gMonBackPic_Anorith, 0x800, 390,
-    gMonBackPic_Armaldo, 0x800, 391,
-    gMonBackPic_Ralts, 0x800, 392,
-    gMonBackPic_Kirlia, 0x800, 393,
-    gMonBackPic_Gardevoir, 0x800, 394,
-    gMonBackPic_Bagon, 0x800, 395,
-    gMonBackPic_Shelgon, 0x800, 396,
-    gMonBackPic_Salamence, 0x800, 397,
-    gMonBackPic_Beldum, 0x800, 398,
-    gMonBackPic_Metang, 0x800, 399,
-    gMonBackPic_Metagross, 0x800, 400,
-    gMonBackPic_Regirock, 0x800, 401,
-    gMonBackPic_Regice, 0x800, 402,
-    gMonBackPic_Registeel, 0x800, 403,
-    gMonBackPic_Kyogre, 0x800, 404,
-    gMonBackPic_Groudon, 0x800, 405,
-    gMonBackPic_Rayquaza, 0x800, 406,
-    gMonBackPic_Latias, 0x800, 407,
-    gMonBackPic_Latios, 0x800, 408,
-    gMonBackPic_Jirachi, 0x800, 409,
-    gMonBackPic_Deoxys, 0x800, 410,
-    gMonBackPic_Chimecho, 0x800, 411,
-    gMonStillFrontPic_Egg, 0x800, 412,
-    gMonBackPic_UnownB, 0x800, 413,
-    gMonBackPic_UnownC, 0x800, 414,
-    gMonBackPic_UnownD, 0x800, 415,
-    gMonBackPic_UnownE, 0x800, 416,
-    gMonBackPic_UnownF, 0x800, 417,
-    gMonBackPic_UnownG, 0x800, 418,
-    gMonBackPic_UnownH, 0x800, 419,
-    gMonBackPic_UnownI, 0x800, 420,
-    gMonBackPic_UnownJ, 0x800, 421,
-    gMonBackPic_UnownK, 0x800, 422,
-    gMonBackPic_UnownL, 0x800, 423,
-    gMonBackPic_UnownM, 0x800, 424,
-    gMonBackPic_UnownN, 0x800, 425,
-    gMonBackPic_UnownO, 0x800, 426,
-    gMonBackPic_UnownP, 0x800, 427,
-    gMonBackPic_UnownQ, 0x800, 428,
-    gMonBackPic_UnownR, 0x800, 429,
-    gMonBackPic_UnownS, 0x800, 430,
-    gMonBackPic_UnownT, 0x800, 431,
-    gMonBackPic_UnownU, 0x800, 432,
-    gMonBackPic_UnownV, 0x800, 433,
-    gMonBackPic_UnownW, 0x800, 434,
-    gMonBackPic_UnownX, 0x800, 435,
-    gMonBackPic_UnownY, 0x800, 436,
-    gMonBackPic_UnownZ, 0x800, 437,
-    gMonBackPic_UnownExclamationMark, 0x800, 438,
-    gMonBackPic_UnownQuestionMark, 0x800, 439,
+    [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},
 };
+

src/data/pokemon_graphics/enemy_mon_elevation.h

@@ -1,417 +1,419 @@
+#include "constants/species.h"
+
 // This determines how much higher above the usual position the enemy Pokémon
 // is during battle. Species that float or fly have nonzero values.
 const u8 gEnemyMonElevation[] =
 {
-    0, // 0
-    0, // SPECIES_BULBASAUR
-    0, // SPECIES_IVYSAUR
-    0, // SPECIES_VENUSAUR
-    0, // SPECIES_CHARMANDER
-    0, // SPECIES_CHARMELEON
-    0, // SPECIES_CHARIZARD
-    0, // SPECIES_SQUIRTLE
-    0, // SPECIES_WARTORTLE
-    0, // SPECIES_BLASTOISE
-    0, // SPECIES_CATERPIE
-    0, // SPECIES_METAPOD
-    8, // SPECIES_BUTTERFREE
-    0, // SPECIES_WEEDLE
-    0, // SPECIES_KAKUNA
-    8, // SPECIES_BEEDRILL
-    16, // SPECIES_PIDGEY
-    0, // SPECIES_PIDGEOTTO
-    4, // SPECIES_PIDGEOT
-    0, // SPECIES_RATTATA
-    0, // SPECIES_RATICATE
-    0, // SPECIES_SPEAROW
-    6, // SPECIES_FEAROW
-    0, // SPECIES_EKANS
-    0, // SPECIES_ARBOK
-    0, // SPECIES_PIKACHU
-    0, // SPECIES_RAICHU
-    0, // SPECIES_SANDSHREW
-    0, // SPECIES_SANDSLASH
-    0, // SPECIES_NIDORAN_F
-    0, // SPECIES_NIDORINA
-    0, // SPECIES_NIDOQUEEN
-    0, // SPECIES_NIDORAN_M
-    0, // SPECIES_NIDORINO
-    0, // SPECIES_NIDOKING
-    0, // SPECIES_CLEFAIRY
-    0, // SPECIES_CLEFABLE
-    0, // SPECIES_VULPIX
-    0, // SPECIES_NINETALES
-    0, // SPECIES_JIGGLYPUFF
-    0, // SPECIES_WIGGLYTUFF
-    8, // SPECIES_ZUBAT
-    8, // SPECIES_GOLBAT
-    0, // SPECIES_ODDISH
-    0, // SPECIES_GLOOM
-    0, // SPECIES_VILEPLUME
-    0, // SPECIES_PARAS
-    0, // SPECIES_PARASECT
-    0, // SPECIES_VENONAT
-    8, // SPECIES_VENOMOTH
-    0, // SPECIES_DIGLETT
-    0, // SPECIES_DUGTRIO
-    0, // SPECIES_MEOWTH
-    0, // SPECIES_PERSIAN
-    0, // SPECIES_PSYDUCK
-    0, // SPECIES_GOLDUCK
-    0, // SPECIES_MANKEY
-    0, // SPECIES_PRIMEAPE
-    0, // SPECIES_GROWLITHE
-    0, // SPECIES_ARCANINE
-    0, // SPECIES_POLIWAG
-    0, // SPECIES_POLIWHIRL
-    0, // SPECIES_POLIWRATH
-    0, // SPECIES_ABRA
-    0, // SPECIES_KADABRA
-    0, // SPECIES_ALAKAZAM
-    0, // SPECIES_MACHOP
-    0, // SPECIES_MACHOKE
-    0, // SPECIES_MACHAMP
-    0, // SPECIES_BELLSPROUT
-    0, // SPECIES_WEEPINBELL
-    0, // SPECIES_VICTREEBEL
-    0, // SPECIES_TENTACOOL
-    0, // SPECIES_TENTACRUEL
-    16, // SPECIES_GEODUDE
-    0, // SPECIES_GRAVELER
-    0, // SPECIES_GOLEM
-    0, // SPECIES_PONYTA
-    0, // SPECIES_RAPIDASH
-    0, // SPECIES_SLOWPOKE
-    0, // SPECIES_SLOWBRO
-    16, // SPECIES_MAGNEMITE
-    8, // SPECIES_MAGNETON
-    0, // SPECIES_FARFETCHD
-    0, // SPECIES_DODUO
-    0, // SPECIES_DODRIO
-    0, // SPECIES_SEEL
-    0, // SPECIES_DEWGONG
-    0, // SPECIES_GRIMER
-    0, // SPECIES_MUK
-    0, // SPECIES_SHELLDER
-    0, // SPECIES_CLOYSTER
-    4, // SPECIES_GASTLY
-    4, // SPECIES_HAUNTER
-    0, // SPECIES_GENGAR
-    0, // SPECIES_ONIX
-    0, // SPECIES_DROWZEE
-    0, // SPECIES_HYPNO
-    0, // SPECIES_KRABBY
-    0, // SPECIES_KINGLER
-    10, // SPECIES_VOLTORB
-    12, // SPECIES_ELECTRODE
-    0, // SPECIES_EXEGGCUTE
-    0, // SPECIES_EXEGGUTOR
-    0, // SPECIES_CUBONE
-    0, // SPECIES_MAROWAK
-    0, // SPECIES_HITMONLEE
-    0, // SPECIES_HITMONCHAN
-    0, // SPECIES_LICKITUNG
-    8, // SPECIES_KOFFING
-    6, // SPECIES_WEEZING
-    0, // SPECIES_RHYHORN
-    0, // SPECIES_RHYDON
-    0, // SPECIES_CHANSEY
-    0, // SPECIES_TANGELA
-    0, // SPECIES_KANGASKHAN
-    0, // SPECIES_HORSEA
-    0, // SPECIES_SEADRA
-    0, // SPECIES_GOLDEEN
-    0, // SPECIES_SEAKING
-    0, // SPECIES_STARYU
-    0, // SPECIES_STARMIE
-    0, // SPECIES_MR_MIME
-    0, // SPECIES_SCYTHER
-    0, // SPECIES_JYNX
-    0, // SPECIES_ELECTABUZZ
-    0, // SPECIES_MAGMAR
-    0, // SPECIES_PINSIR
-    0, // SPECIES_TAUROS
-    0, // SPECIES_MAGIKARP
-    0, // SPECIES_GYARADOS
-    0, // SPECIES_LAPRAS
-    0, // SPECIES_DITTO
-    0, // SPECIES_EEVEE
-    0, // SPECIES_VAPOREON
-    0, // SPECIES_JOLTEON
-    0, // SPECIES_FLAREON
-    0, // SPECIES_PORYGON
-    0, // SPECIES_OMANYTE
-    0, // SPECIES_OMASTAR
-    0, // SPECIES_KABUTO
-    0, // SPECIES_KABUTOPS
-    7, // SPECIES_AERODACTYL
-    0, // SPECIES_SNORLAX
-    6, // SPECIES_ARTICUNO
-    8, // SPECIES_ZAPDOS
-    5, // SPECIES_MOLTRES
-    0, // SPECIES_DRATINI
-    0, // SPECIES_DRAGONAIR
-    6, // SPECIES_DRAGONITE
-    0, // SPECIES_MEWTWO
-    8, // SPECIES_MEW
-    0, // SPECIES_CHIKORITA
-    0, // SPECIES_BAYLEEF
-    0, // SPECIES_MEGANIUM
-    0, // SPECIES_CYNDAQUIL
-    0, // SPECIES_QUILAVA
-    0, // SPECIES_TYPHLOSION
-    0, // SPECIES_TOTODILE
-    0, // SPECIES_CROCONAW
-    0, // SPECIES_FERALIGATR
-    0, // SPECIES_SENTRET
-    0, // SPECIES_FURRET
-    0, // SPECIES_HOOTHOOT
-    0, // SPECIES_NOCTOWL
-    0, // SPECIES_LEDYBA
-    8, // SPECIES_LEDIAN
-    0, // SPECIES_SPINARAK
-    0, // SPECIES_ARIADOS
-    6, // SPECIES_CROBAT
-    0, // SPECIES_CHINCHOU
-    0, // SPECIES_LANTURN
-    0, // SPECIES_PICHU
-    0, // SPECIES_CLEFFA
-    0, // SPECIES_IGGLYBUFF
-    0, // SPECIES_TOGEPI
-    0, // SPECIES_TOGETIC
-    0, // SPECIES_NATU
-    0, // SPECIES_XATU
-    0, // SPECIES_MAREEP
-    0, // SPECIES_FLAAFFY
-    0, // SPECIES_AMPHAROS
-    0, // SPECIES_BELLOSSOM
-    0, // SPECIES_MARILL
-    0, // SPECIES_AZUMARILL
-    0, // SPECIES_SUDOWOODO
-    0, // SPECIES_POLITOED
-    11, // SPECIES_HOPPIP
-    12, // SPECIES_SKIPLOOM
-    9, // SPECIES_JUMPLUFF
-    0, // SPECIES_AIPOM
-    0, // SPECIES_SUNKERN
-    0, // SPECIES_SUNFLORA
-    8, // SPECIES_YANMA
-    0, // SPECIES_WOOPER
-    0, // SPECIES_QUAGSIRE
-    0, // SPECIES_ESPEON
-    0, // SPECIES_UMBREON
-    0, // SPECIES_MURKROW
-    0, // SPECIES_SLOWKING
-    8, // SPECIES_MISDREAVUS
-    8, // SPECIES_UNOWN
-    0, // SPECIES_WOBBUFFET
-    0, // SPECIES_GIRAFARIG
-    0, // SPECIES_PINECO
-    0, // SPECIES_FORRETRESS
-    0, // SPECIES_DUNSPARCE
-    6, // SPECIES_GLIGAR
-    0, // SPECIES_STEELIX
-    0, // SPECIES_SNUBBULL
-    0, // SPECIES_GRANBULL
-    0, // SPECIES_QWILFISH
-    0, // SPECIES_SCIZOR
-    0, // SPECIES_SHUCKLE
-    0, // SPECIES_HERACROSS
-    0, // SPECIES_SNEASEL
-    0, // SPECIES_TEDDIURSA
-    0, // SPECIES_URSARING
-    0, // SPECIES_SLUGMA
-    0, // SPECIES_MAGCARGO
-    0, // SPECIES_SWINUB
-    0, // SPECIES_PILOSWINE
-    0, // SPECIES_CORSOLA
-    0, // SPECIES_REMORAID
-    0, // SPECIES_OCTILLERY
-    0, // SPECIES_DELIBIRD
-    0, // SPECIES_MANTINE
-    0, // SPECIES_SKARMORY
-    0, // SPECIES_HOUNDOUR
-    0, // SPECIES_HOUNDOOM
-    0, // SPECIES_KINGDRA
-    0, // SPECIES_PHANPY
-    0, // SPECIES_DONPHAN
-    0, // SPECIES_PORYGON2
-    0, // SPECIES_STANTLER
-    0, // SPECIES_SMEARGLE
-    0, // SPECIES_TYROGUE
-    0, // SPECIES_HITMONTOP
-    0, // SPECIES_SMOOCHUM
-    0, // SPECIES_ELEKID
-    0, // SPECIES_MAGBY
-    0, // SPECIES_MILTANK
-    0, // SPECIES_BLISSEY
-    0, // SPECIES_RAIKOU
-    0, // SPECIES_ENTEI
-    0, // SPECIES_SUICUNE
-    0, // SPECIES_LARVITAR
-    0, // SPECIES_PUPITAR
-    0, // SPECIES_TYRANITAR
-    6, // SPECIES_LUGIA
-    6, // SPECIES_HO_OH
-    15, // SPECIES_CELEBI
-    0, // 252
-    0, // 253
-    0, // 254
-    0, // 255
-    0, // 256
-    0, // 257
-    0, // 258
-    0, // 259
-    0, // 260
-    0, // 261
-    0, // 262
-    0, // 263
-    0, // 264
-    0, // 265
-    0, // 266
-    0, // 267
-    0, // 268
-    0, // 269
-    0, // 270
-    0, // 271
-    0, // 272
-    0, // 273
-    0, // 274
-    0, // 275
-    0, // 276
-    0, // SPECIES_TREECKO
-    0, // SPECIES_GROVYLE
-    0, // SPECIES_SCEPTILE
-    0, // SPECIES_TORCHIC
-    0, // SPECIES_COMBUSKEN
-    0, // SPECIES_BLAZIKEN
-    0, // SPECIES_MUDKIP
-    0, // SPECIES_MARSHTOMP
-    0, // SPECIES_SWAMPERT
-    0, // SPECIES_POOCHYENA
-    0, // SPECIES_MIGHTYENA
-    0, // SPECIES_ZIGZAGOON
-    0, // SPECIES_LINOONE
-    0, // SPECIES_WURMPLE
-    0, // SPECIES_SILCOON
-    8, // SPECIES_BEAUTIFLY
-    0, // SPECIES_CASCOON
-    10, // SPECIES_DUSTOX
-    0, // SPECIES_LOTAD
-    0, // SPECIES_LOMBRE
-    0, // SPECIES_LUDICOLO
-    0, // SPECIES_SEEDOT
-    0, // SPECIES_NUZLEAF
-    0, // SPECIES_SHIFTRY
-    0, // SPECIES_NINCADA
-    10, // SPECIES_NINJASK
-    8, // SPECIES_SHEDINJA
-    0, // SPECIES_TAILLOW
-    0, // SPECIES_SWELLOW
-    0, // SPECIES_SHROOMISH
-    0, // SPECIES_BRELOOM
-    0, // SPECIES_SPINDA
-    16, // SPECIES_WINGULL
-    8, // SPECIES_PELIPPER
-    0, // SPECIES_SURSKIT
-    10, // SPECIES_MASQUERAIN
-    0, // SPECIES_WAILMER
-    0, // SPECIES_WAILORD
-    0, // SPECIES_SKITTY
-    0, // SPECIES_DELCATTY
-    0, // SPECIES_KECLEON
-    4, // SPECIES_BALTOY
-    10, // SPECIES_CLAYDOL
-    0, // SPECIES_NOSEPASS
-    0, // SPECIES_TORKOAL
-    0, // SPECIES_SABLEYE
-    0, // SPECIES_BARBOACH
-    0, // SPECIES_WHISCASH
-    0, // SPECIES_LUVDISC
-    0, // SPECIES_CORPHISH
-    0, // SPECIES_CRAWDAUNT
-    0, // SPECIES_FEEBAS
-    0, // SPECIES_MILOTIC
-    0, // SPECIES_CARVANHA
-    0, // SPECIES_SHARPEDO
-    0, // SPECIES_TRAPINCH
-    0, // SPECIES_VIBRAVA
-    7, // SPECIES_FLYGON
-    0, // SPECIES_MAKUHITA
-    0, // SPECIES_HARIYAMA
-    0, // SPECIES_ELECTRIKE
-    0, // SPECIES_MANECTRIC
-    0, // SPECIES_NUMEL
-    0, // SPECIES_CAMERUPT
-    0, // SPECIES_SPHEAL
-    0, // SPECIES_SEALEO
-    0, // SPECIES_WALREIN
-    0, // SPECIES_CACNEA
-    0, // SPECIES_CACTURNE
-    0, // SPECIES_SNORUNT
-    12, // SPECIES_GLALIE
-    13, // SPECIES_LUNATONE
-    4, // SPECIES_SOLROCK
-    0, // SPECIES_AZURILL
-    0, // SPECIES_SPOINK
-    0, // SPECIES_GRUMPIG
-    0, // SPECIES_PLUSLE
-    0, // SPECIES_MINUN
-    0, // SPECIES_MAWILE
-    0, // SPECIES_MEDITITE
-    0, // SPECIES_MEDICHAM
-    12, // SPECIES_SWABLU
-    8, // SPECIES_ALTARIA
-    0, // SPECIES_WYNAUT
-    9, // SPECIES_DUSKULL
-    0, // SPECIES_DUSCLOPS
-    0, // SPECIES_ROSELIA
-    0, // SPECIES_SLAKOTH
-    0, // SPECIES_VIGOROTH
-    0, // SPECIES_SLAKING
-    0, // SPECIES_GULPIN
-    0, // SPECIES_SWALOT
-    0, // SPECIES_TROPIUS
-    0, // SPECIES_WHISMUR
-    0, // SPECIES_LOUDRED
-    0, // SPECIES_EXPLOUD
-    0, // SPECIES_CLAMPERL
-    0, // SPECIES_HUNTAIL
-    0, // SPECIES_GOREBYSS
-    0, // SPECIES_ABSOL
-    12, // SPECIES_SHUPPET
-    8, // SPECIES_BANETTE
-    0, // SPECIES_SEVIPER
-    0, // SPECIES_ZANGOOSE
-    0, // SPECIES_RELICANTH
-    0, // SPECIES_ARON
-    0, // SPECIES_LAIRON
-    0, // SPECIES_AGGRON
-    16, // SPECIES_CASTFORM
-    0, // SPECIES_VOLBEAT
-    0, // SPECIES_ILLUMISE
-    0, // SPECIES_LILEEP
-    0, // SPECIES_CRADILY
-    0, // SPECIES_ANORITH
-    0, // SPECIES_ARMALDO
-    0, // SPECIES_RALTS
-    0, // SPECIES_KIRLIA
-    0, // SPECIES_GARDEVOIR
-    0, // SPECIES_BAGON
-    0, // SPECIES_SHELGON
-    0, // SPECIES_SALAMENCE
-    8, // SPECIES_BELDUM
-    0, // SPECIES_METANG
-    0, // SPECIES_METAGROSS
-    0, // SPECIES_REGIROCK
-    0, // SPECIES_REGICE
-    0, // SPECIES_REGISTEEL
-    0, // SPECIES_KYOGRE
-    0, // SPECIES_GROUDON
-    6, // SPECIES_RAYQUAZA
-    6, // SPECIES_LATIAS
-    6, // SPECIES_LATIOS
-    12, // SPECIES_JIRACHI
-    8, // SPECIES_DEOXYS
-    12, // SPECIES_CHIMECHO
+    [SPECIES_NONE] = 0,
+    [SPECIES_BULBASAUR] = 0,
+    [SPECIES_IVYSAUR] = 0,
+    [SPECIES_VENUSAUR] = 0,
+    [SPECIES_CHARMANDER] = 0,
+    [SPECIES_CHARMELEON] = 0,
+    [SPECIES_CHARIZARD] = 0,
+    [SPECIES_SQUIRTLE] = 0,
+    [SPECIES_WARTORTLE] = 0,
+    [SPECIES_BLASTOISE] = 0,
+    [SPECIES_CATERPIE] = 0,
+    [SPECIES_METAPOD] = 0,
+    [SPECIES_BUTTERFREE] = 8,
+    [SPECIES_WEEDLE] = 0,
+    [SPECIES_KAKUNA] = 0,
+    [SPECIES_BEEDRILL] = 8,
+    [SPECIES_PIDGEY] = 16,
+    [SPECIES_PIDGEOTTO] = 0,
+    [SPECIES_PIDGEOT] = 4,
+    [SPECIES_RATTATA] = 0,
+    [SPECIES_RATICATE] = 0,
+    [SPECIES_SPEAROW] = 0,
+    [SPECIES_FEAROW] = 6,
+    [SPECIES_EKANS] = 0,
+    [SPECIES_ARBOK] = 0,
+    [SPECIES_PIKACHU] = 0,
+    [SPECIES_RAICHU] = 0,
+    [SPECIES_SANDSHREW] = 0,
+    [SPECIES_SANDSLASH] = 0,
+    [SPECIES_NIDORAN_F] = 0,
+    [SPECIES_NIDORINA] = 0,
+    [SPECIES_NIDOQUEEN] = 0,
+    [SPECIES_NIDORAN_M] = 0,
+    [SPECIES_NIDORINO] = 0,
+    [SPECIES_NIDOKING] = 0,
+    [SPECIES_CLEFAIRY] = 0,
+    [SPECIES_CLEFABLE] = 0,
+    [SPECIES_VULPIX] = 0,
+    [SPECIES_NINETALES] = 0,
+    [SPECIES_JIGGLYPUFF] = 0,
+    [SPECIES_WIGGLYTUFF] = 0,
+    [SPECIES_ZUBAT] = 8,
+    [SPECIES_GOLBAT] = 8,
+    [SPECIES_ODDISH] = 0,
+    [SPECIES_GLOOM] = 0,
+    [SPECIES_VILEPLUME] = 0,
+    [SPECIES_PARAS] = 0,
+    [SPECIES_PARASECT] = 0,
+    [SPECIES_VENONAT] = 0,
+    [SPECIES_VENOMOTH] = 8,
+    [SPECIES_DIGLETT] = 0,
+    [SPECIES_DUGTRIO] = 0,
+    [SPECIES_MEOWTH] = 0,
+    [SPECIES_PERSIAN] = 0,
+    [SPECIES_PSYDUCK] = 0,
+    [SPECIES_GOLDUCK] = 0,
+    [SPECIES_MANKEY] = 0,
+    [SPECIES_PRIMEAPE] = 0,
+    [SPECIES_GROWLITHE] = 0,
+    [SPECIES_ARCANINE] = 0,
+    [SPECIES_POLIWAG] = 0,
+    [SPECIES_POLIWHIRL] = 0,
+    [SPECIES_POLIWRATH] = 0,
+    [SPECIES_ABRA] = 0,
+    [SPECIES_KADABRA] = 0,
+    [SPECIES_ALAKAZAM] = 0,
+    [SPECIES_MACHOP] = 0,
+    [SPECIES_MACHOKE] = 0,
+    [SPECIES_MACHAMP] = 0,
+    [SPECIES_BELLSPROUT] = 0,
+    [SPECIES_WEEPINBELL] = 0,
+    [SPECIES_VICTREEBEL] = 0,
+    [SPECIES_TENTACOOL] = 0,
+    [SPECIES_TENTACRUEL] = 0,
+    [SPECIES_GEODUDE] = 16,
+    [SPECIES_GRAVELER] = 0,
+    [SPECIES_GOLEM] = 0,
+    [SPECIES_PONYTA] = 0,
+    [SPECIES_RAPIDASH] = 0,
+    [SPECIES_SLOWPOKE] = 0,
+    [SPECIES_SLOWBRO] = 0,
+    [SPECIES_MAGNEMITE] = 16,
+    [SPECIES_MAGNETON] = 8,
+    [SPECIES_FARFETCHD] = 0,
+    [SPECIES_DODUO] = 0,
+    [SPECIES_DODRIO] = 0,
+    [SPECIES_SEEL] = 0,
+    [SPECIES_DEWGONG] = 0,
+    [SPECIES_GRIMER] = 0,
+    [SPECIES_MUK] = 0,
+    [SPECIES_SHELLDER] = 0,
+    [SPECIES_CLOYSTER] = 0,
+    [SPECIES_GASTLY] = 4,
+    [SPECIES_HAUNTER] = 4,
+    [SPECIES_GENGAR] = 0,
+    [SPECIES_ONIX] = 0,
+    [SPECIES_DROWZEE] = 0,
+    [SPECIES_HYPNO] = 0,
+    [SPECIES_KRABBY] = 0,
+    [SPECIES_KINGLER] = 0,
+    [SPECIES_VOLTORB] = 10,
+    [SPECIES_ELECTRODE] = 12,
+    [SPECIES_EXEGGCUTE] = 0,
+    [SPECIES_EXEGGUTOR] = 0,
+    [SPECIES_CUBONE] = 0,
+    [SPECIES_MAROWAK] = 0,
+    [SPECIES_HITMONLEE] = 0,
+    [SPECIES_HITMONCHAN] = 0,
+    [SPECIES_LICKITUNG] = 0,
+    [SPECIES_KOFFING] = 8,
+    [SPECIES_WEEZING] = 6,
+    [SPECIES_RHYHORN] = 0,
+    [SPECIES_RHYDON] = 0,
+    [SPECIES_CHANSEY] = 0,
+    [SPECIES_TANGELA] = 0,
+    [SPECIES_KANGASKHAN] = 0,
+    [SPECIES_HORSEA] = 0,
+    [SPECIES_SEADRA] = 0,
+    [SPECIES_GOLDEEN] = 0,
+    [SPECIES_SEAKING] = 0,
+    [SPECIES_STARYU] = 0,
+    [SPECIES_STARMIE] = 0,
+    [SPECIES_MR_MIME] = 0,
+    [SPECIES_SCYTHER] = 0,
+    [SPECIES_JYNX] = 0,
+    [SPECIES_ELECTABUZZ] = 0,
+    [SPECIES_MAGMAR] = 0,
+    [SPECIES_PINSIR] = 0,
+    [SPECIES_TAUROS] = 0,
+    [SPECIES_MAGIKARP] = 0,
+    [SPECIES_GYARADOS] = 0,
+    [SPECIES_LAPRAS] = 0,
+    [SPECIES_DITTO] = 0,
+    [SPECIES_EEVEE] = 0,
+    [SPECIES_VAPOREON] = 0,
+    [SPECIES_JOLTEON] = 0,
+    [SPECIES_FLAREON] = 0,
+    [SPECIES_PORYGON] = 0,
+    [SPECIES_OMANYTE] = 0,
+    [SPECIES_OMASTAR] = 0,
+    [SPECIES_KABUTO] = 0,
+    [SPECIES_KABUTOPS] = 0,
+    [SPECIES_AERODACTYL] = 7,
+    [SPECIES_SNORLAX] = 0,
+    [SPECIES_ARTICUNO] = 6,
+    [SPECIES_ZAPDOS] = 8,
+    [SPECIES_MOLTRES] = 5,
+    [SPECIES_DRATINI] = 0,
+    [SPECIES_DRAGONAIR] = 0,
+    [SPECIES_DRAGONITE] = 6,
+    [SPECIES_MEWTWO] = 0,
+    [SPECIES_MEW] = 8,
+    [SPECIES_CHIKORITA] = 0,
+    [SPECIES_BAYLEEF] = 0,
+    [SPECIES_MEGANIUM] = 0,
+    [SPECIES_CYNDAQUIL] = 0,
+    [SPECIES_QUILAVA] = 0,
+    [SPECIES_TYPHLOSION] = 0,
+    [SPECIES_TOTODILE] = 0,
+    [SPECIES_CROCONAW] = 0,
+    [SPECIES_FERALIGATR] = 0,
+    [SPECIES_SENTRET] = 0,
+    [SPECIES_FURRET] = 0,
+    [SPECIES_HOOTHOOT] = 0,
+    [SPECIES_NOCTOWL] = 0,
+    [SPECIES_LEDYBA] = 0,
+    [SPECIES_LEDIAN] = 8,
+    [SPECIES_SPINARAK] = 0,
+    [SPECIES_ARIADOS] = 0,
+    [SPECIES_CROBAT] = 6,
+    [SPECIES_CHINCHOU] = 0,
+    [SPECIES_LANTURN] = 0,
+    [SPECIES_PICHU] = 0,
+    [SPECIES_CLEFFA] = 0,
+    [SPECIES_IGGLYBUFF] = 0,
+    [SPECIES_TOGEPI] = 0,
+    [SPECIES_TOGETIC] = 0,
+    [SPECIES_NATU] = 0,
+    [SPECIES_XATU] = 0,
+    [SPECIES_MAREEP] = 0,
+    [SPECIES_FLAAFFY] = 0,
+    [SPECIES_AMPHAROS] = 0,
+    [SPECIES_BELLOSSOM] = 0,
+    [SPECIES_MARILL] = 0,
+    [SPECIES_AZUMARILL] = 0,
+    [SPECIES_SUDOWOODO] = 0,
+    [SPECIES_POLITOED] = 0,
+    [SPECIES_HOPPIP] = 11,
+    [SPECIES_SKIPLOOM] = 12,
+    [SPECIES_JUMPLUFF] = 9,
+    [SPECIES_AIPOM] = 0,
+    [SPECIES_SUNKERN] = 0,
+    [SPECIES_SUNFLORA] = 0,
+    [SPECIES_YANMA] = 8,
+    [SPECIES_WOOPER] = 0,
+    [SPECIES_QUAGSIRE] = 0,
+    [SPECIES_ESPEON] = 0,
+    [SPECIES_UMBREON] = 0,
+    [SPECIES_MURKROW] = 0,
+    [SPECIES_SLOWKING] = 0,
+    [SPECIES_MISDREAVUS] = 8,
+    [SPECIES_UNOWN] = 8,
+    [SPECIES_WOBBUFFET] = 0,
+    [SPECIES_GIRAFARIG] = 0,
+    [SPECIES_PINECO] = 0,
+    [SPECIES_FORRETRESS] = 0,
+    [SPECIES_DUNSPARCE] = 0,
+    [SPECIES_GLIGAR] = 6,
+    [SPECIES_STEELIX] = 0,
+    [SPECIES_SNUBBULL] = 0,
+    [SPECIES_GRANBULL] = 0,
+    [SPECIES_QWILFISH] = 0,
+    [SPECIES_SCIZOR] = 0,
+    [SPECIES_SHUCKLE] = 0,
+    [SPECIES_HERACROSS] = 0,
+    [SPECIES_SNEASEL] = 0,
+    [SPECIES_TEDDIURSA] = 0,
+    [SPECIES_URSARING] = 0,
+    [SPECIES_SLUGMA] = 0,
+    [SPECIES_MAGCARGO] = 0,
+    [SPECIES_SWINUB] = 0,
+    [SPECIES_PILOSWINE] = 0,
+    [SPECIES_CORSOLA] = 0,
+    [SPECIES_REMORAID] = 0,
+    [SPECIES_OCTILLERY] = 0,
+    [SPECIES_DELIBIRD] = 0,
+    [SPECIES_MANTINE] = 0,
+    [SPECIES_SKARMORY] = 0,
+    [SPECIES_HOUNDOUR] = 0,
+    [SPECIES_HOUNDOOM] = 0,
+    [SPECIES_KINGDRA] = 0,
+    [SPECIES_PHANPY] = 0,
+    [SPECIES_DONPHAN] = 0,
+    [SPECIES_PORYGON2] = 0,
+    [SPECIES_STANTLER] = 0,
+    [SPECIES_SMEARGLE] = 0,
+    [SPECIES_TYROGUE] = 0,
+    [SPECIES_HITMONTOP] = 0,
+    [SPECIES_SMOOCHUM] = 0,
+    [SPECIES_ELEKID] = 0,
+    [SPECIES_MAGBY] = 0,
+    [SPECIES_MILTANK] = 0,
+    [SPECIES_BLISSEY] = 0,
+    [SPECIES_RAIKOU] = 0,
+    [SPECIES_ENTEI] = 0,
+    [SPECIES_SUICUNE] = 0,
+    [SPECIES_LARVITAR] = 0,
+    [SPECIES_PUPITAR] = 0,
+    [SPECIES_TYRANITAR] = 0,
+    [SPECIES_LUGIA] = 6,
+    [SPECIES_HO_OH] = 6,
+    [SPECIES_CELEBI] = 15,
+    [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,
+    [SPECIES_JIRACHI] = 12,
+    [SPECIES_DEOXYS] = 8,
+    [SPECIES_CHIMECHO] = 12,
 };

src/data/pokemon_graphics/front_pic_table.h

@@ -1,446 +1,443 @@
-const struct CompressedSpriteSheet gMonFrontPicTable[] = 
-{   //.data                .size             .tag
-    gMonFrontPic_CircledQuestionMark, 0x800, 0,
-    gMonFrontPic_Bulbasaur, 0x800, 1,
-    gMonFrontPic_Ivysaur, 0x800, 2,
-    gMonFrontPic_Venusaur, 0x800, 3,
-    gMonFrontPic_Charmander, 0x800, 4,
-    gMonFrontPic_Charmeleon, 0x800, 5,
-    gMonFrontPic_Charizard, 0x800, 6,
-    gMonFrontPic_Squirtle, 0x800, 7,
-    gMonFrontPic_Wartortle, 0x800, 8,
-    gMonFrontPic_Blastoise, 0x800, 9,
-    gMonFrontPic_Caterpie, 0x800, 10,
-    gMonFrontPic_Metapod, 0x800, 11,
-    gMonFrontPic_Butterfree, 0x800, 12,
-    gMonFrontPic_Weedle, 0x800, 13,
-    gMonFrontPic_Kakuna, 0x800, 14,
-    gMonFrontPic_Beedrill, 0x800, 15,
-    gMonFrontPic_Pidgey, 0x800, 16,
-    gMonFrontPic_Pidgeotto, 0x800, 17,
-    gMonFrontPic_Pidgeot, 0x800, 18,
-    gMonFrontPic_Rattata, 0x800, 19,
-    gMonFrontPic_Raticate, 0x800, 20,
-    gMonFrontPic_Spearow, 0x800, 21,
-    gMonFrontPic_Fearow, 0x800, 22,
-    gMonFrontPic_Ekans, 0x800, 23,
-    gMonFrontPic_Arbok, 0x800, 24,
-    gMonFrontPic_Pikachu, 0x800, 25,
-    gMonFrontPic_Raichu, 0x800, 26,
-    gMonFrontPic_Sandshrew, 0x800, 27,
-    gMonFrontPic_Sandslash, 0x800, 28,
-    gMonFrontPic_NidoranF, 0x800, 29,
-    gMonFrontPic_Nidorina, 0x800, 30,
-    gMonFrontPic_Nidoqueen, 0x800, 31,
-    gMonFrontPic_NidoranM, 0x800, 32,
-    gMonFrontPic_Nidorino, 0x800, 33,
-    gMonFrontPic_Nidoking, 0x800, 34,
-    gMonFrontPic_Clefairy, 0x800, 35,
-    gMonFrontPic_Clefable, 0x800, 36,
-    gMonFrontPic_Vulpix, 0x800, 37,
-    gMonFrontPic_Ninetales, 0x800, 38,
-    gMonFrontPic_Jigglypuff, 0x800, 39,
-    gMonFrontPic_Wigglytuff, 0x800, 40,
-    gMonFrontPic_Zubat, 0x800, 41,
-    gMonFrontPic_Golbat, 0x800, 42,
-    gMonFrontPic_Oddish, 0x800, 43,
-    gMonFrontPic_Gloom, 0x800, 44,
-    gMonFrontPic_Vileplume, 0x800, 45,
-    gMonFrontPic_Paras, 0x800, 46,
-    gMonFrontPic_Parasect, 0x800, 47,
-    gMonFrontPic_Venonat, 0x800, 48,
-    gMonFrontPic_Venomoth, 0x800, 49,
-    gMonFrontPic_Diglett, 0x800, 50,
-    gMonFrontPic_Dugtrio, 0x800, 51,
-    gMonFrontPic_Meowth, 0x800, 52,
-    gMonFrontPic_Persian, 0x800, 53,
-    gMonFrontPic_Psyduck, 0x800, 54,
-    gMonFrontPic_Golduck, 0x800, 55,
-    gMonFrontPic_Mankey, 0x800, 56,
-    gMonFrontPic_Primeape, 0x800, 57,
-    gMonFrontPic_Growlithe, 0x800, 58,
-    gMonFrontPic_Arcanine, 0x800, 59,
-    gMonFrontPic_Poliwag, 0x800, 60,
-    gMonFrontPic_Poliwhirl, 0x800, 61,
-    gMonFrontPic_Poliwrath, 0x800, 62,
-    gMonFrontPic_Abra, 0x800, 63,
-    gMonFrontPic_Kadabra, 0x800, 64,
-    gMonFrontPic_Alakazam, 0x800, 65,
-    gMonFrontPic_Machop, 0x800, 66,
-    gMonFrontPic_Machoke, 0x800, 67,
-    gMonFrontPic_Machamp, 0x800, 68,
-    gMonFrontPic_Bellsprout, 0x800, 69,
-    gMonFrontPic_Weepinbell, 0x800, 70,
-    gMonFrontPic_Victreebel, 0x800, 71,
-    gMonFrontPic_Tentacool, 0x800, 72,
-    gMonFrontPic_Tentacruel, 0x800, 73,
-    gMonFrontPic_Geodude, 0x800, 74,
-    gMonFrontPic_Graveler, 0x800, 75,
-    gMonFrontPic_Golem, 0x800, 76,
-    gMonFrontPic_Ponyta, 0x800, 77,
-    gMonFrontPic_Rapidash, 0x800, 78,
-    gMonFrontPic_Slowpoke, 0x800, 79,
-    gMonFrontPic_Slowbro, 0x800, 80,
-    gMonFrontPic_Magnemite, 0x800, 81,
-    gMonFrontPic_Magneton, 0x800, 82,
-    gMonFrontPic_Farfetchd, 0x800, 83,
-    gMonFrontPic_Doduo, 0x800, 84,
-    gMonFrontPic_Dodrio, 0x800, 85,
-    gMonFrontPic_Seel, 0x800, 86,
-    gMonFrontPic_Dewgong, 0x800, 87,
-    gMonFrontPic_Grimer, 0x800, 88,
-    gMonFrontPic_Muk, 0x800, 89,
-    gMonFrontPic_Shellder, 0x800, 90,
-    gMonFrontPic_Cloyster, 0x800, 91,
-    gMonFrontPic_Gastly, 0x800, 92,
-    gMonFrontPic_Haunter, 0x800, 93,
-    gMonFrontPic_Gengar, 0x800, 94,
-    gMonFrontPic_Onix, 0x800, 95,
-    gMonFrontPic_Drowzee, 0x800, 96,
-    gMonFrontPic_Hypno, 0x800, 97,
-    gMonFrontPic_Krabby, 0x800, 98,
-    gMonFrontPic_Kingler, 0x800, 99,
-    gMonFrontPic_Voltorb, 0x800, 100,
-    gMonFrontPic_Electrode, 0x800, 101,
-    gMonFrontPic_Exeggcute, 0x800, 102,
-    gMonFrontPic_Exeggutor, 0x800, 103,
-    gMonFrontPic_Cubone, 0x800, 104,
-    gMonFrontPic_Marowak, 0x800, 105,
-    gMonFrontPic_Hitmonlee, 0x800, 106,
-    gMonFrontPic_Hitmonchan, 0x800, 107,
-    gMonFrontPic_Lickitung, 0x800, 108,
-    gMonFrontPic_Koffing, 0x800, 109,
-    gMonFrontPic_Weezing, 0x800, 110,
-    gMonFrontPic_Rhyhorn, 0x800, 111,
-    gMonFrontPic_Rhydon, 0x800, 112,
-    gMonFrontPic_Chansey, 0x800, 113,
-    gMonFrontPic_Tangela, 0x800, 114,
-    gMonFrontPic_Kangaskhan, 0x800, 115,
-    gMonFrontPic_Horsea, 0x800, 116,
-    gMonFrontPic_Seadra, 0x800, 117,
-    gMonFrontPic_Goldeen, 0x800, 118,
-    gMonFrontPic_Seaking, 0x800, 119,
-    gMonFrontPic_Staryu, 0x800, 120,
-    gMonFrontPic_Starmie, 0x800, 121,
-    gMonFrontPic_Mrmime, 0x800, 122,
-    gMonFrontPic_Scyther, 0x800, 123,
-    gMonFrontPic_Jynx, 0x800, 124,
-    gMonFrontPic_Electabuzz, 0x800, 125,
-    gMonFrontPic_Magmar, 0x800, 126,
-    gMonFrontPic_Pinsir, 0x800, 127,
-    gMonFrontPic_Tauros, 0x800, 128,
-    gMonFrontPic_Magikarp, 0x800, 129,
-    gMonFrontPic_Gyarados, 0x800, 130,
-    gMonFrontPic_Lapras, 0x800, 131,
-    gMonFrontPic_Ditto, 0x800, 132,
-    gMonFrontPic_Eevee, 0x800, 133,
-    gMonFrontPic_Vaporeon, 0x800, 134,
-    gMonFrontPic_Jolteon, 0x800, 135,
-    gMonFrontPic_Flareon, 0x800, 136,
-    gMonFrontPic_Porygon, 0x800, 137,
-    gMonFrontPic_Omanyte, 0x800, 138,
-    gMonFrontPic_Omastar, 0x800, 139,
-    gMonFrontPic_Kabuto, 0x800, 140,
-    gMonFrontPic_Kabutops, 0x800, 141,
-    gMonFrontPic_Aerodactyl, 0x800, 142,
-    gMonFrontPic_Snorlax, 0x800, 143,
-    gMonFrontPic_Articuno, 0x800, 144,
-    gMonFrontPic_Zapdos, 0x800, 145,
-    gMonFrontPic_Moltres, 0x800, 146,
-    gMonFrontPic_Dratini, 0x800, 147,
-    gMonFrontPic_Dragonair, 0x800, 148,
-    gMonFrontPic_Dragonite, 0x800, 149,
-    gMonFrontPic_Mewtwo, 0x800, 150,
-    gMonFrontPic_Mew, 0x800, 151,
-// Gen II
-    gMonFrontPic_Chikorita, 0x800, 152,
-    gMonFrontPic_Bayleef, 0x800, 153,
-    gMonFrontPic_Meganium, 0x800, 154,
-    gMonFrontPic_Cyndaquil, 0x800, 155,
-    gMonFrontPic_Quilava, 0x800, 156,
-    gMonFrontPic_Typhlosion, 0x800, 157,
-    gMonFrontPic_Totodile, 0x800, 158,
-    gMonFrontPic_Croconaw, 0x800, 159,
-    gMonFrontPic_Feraligatr, 0x800, 160,
-    gMonFrontPic_Sentret, 0x800, 161,
-    gMonFrontPic_Furret, 0x800, 162,
-    gMonFrontPic_Hoothoot, 0x800, 163,
-    gMonFrontPic_Noctowl, 0x800, 164,
-    gMonFrontPic_Ledyba, 0x800, 165,
-    gMonFrontPic_Ledian, 0x800, 166,
-    gMonFrontPic_Spinarak, 0x800, 167,
-    gMonFrontPic_Ariados, 0x800, 168,
-    gMonFrontPic_Crobat, 0x800, 169,
-    gMonFrontPic_Chinchou, 0x800, 170,
-    gMonFrontPic_Lanturn, 0x800, 171,
-    gMonFrontPic_Pichu, 0x800, 172,
-    gMonFrontPic_Cleffa, 0x800, 173,
-    gMonFrontPic_Igglybuff, 0x800, 174,
-    gMonFrontPic_Togepi, 0x800, 175,
-    gMonFrontPic_Togetic, 0x800, 176,
-    gMonFrontPic_Natu, 0x800, 177,
-    gMonFrontPic_Xatu, 0x800, 178,
-    gMonFrontPic_Mareep, 0x800, 179,
-    gMonFrontPic_Flaaffy, 0x800, 180,
-    gMonFrontPic_Ampharos, 0x800, 181,
-    gMonFrontPic_Bellossom, 0x800, 182,
-    gMonFrontPic_Marill, 0x800, 183,
-    gMonFrontPic_Azumarill, 0x800, 184,
-    gMonFrontPic_Sudowoodo, 0x800, 185,
-    gMonFrontPic_Politoed, 0x800, 186,
-    gMonFrontPic_Hoppip, 0x800, 187,
-    gMonFrontPic_Skiploom, 0x800, 188,
-    gMonFrontPic_Jumpluff, 0x800, 189,
-    gMonFrontPic_Aipom, 0x800, 190,
-    gMonFrontPic_Sunkern, 0x800, 191,
-    gMonFrontPic_Sunflora, 0x800, 192,
-    gMonFrontPic_Yanma, 0x800, 193,
-    gMonFrontPic_Wooper, 0x800, 194,
-    gMonFrontPic_Quagsire, 0x800, 195,
-    gMonFrontPic_Espeon, 0x800, 196,
-    gMonFrontPic_Umbreon, 0x800, 197,
-    gMonFrontPic_Murkrow, 0x800, 198,
-    gMonFrontPic_Slowking, 0x800, 199,
-    gMonFrontPic_Misdreavus, 0x800, 200,
-    gMonFrontPic_UnownA, 0x800, 201,
-    gMonFrontPic_Wobbuffet, 0x800, 202,
-    gMonFrontPic_Girafarig, 0x800, 203,
-    gMonFrontPic_Pineco, 0x800, 204,
-    gMonFrontPic_Forretress, 0x800, 205,
-    gMonFrontPic_Dunsparce, 0x800, 206,
-    gMonFrontPic_Gligar, 0x800, 207,
-    gMonFrontPic_Steelix, 0x800, 208,
-    gMonFrontPic_Snubbull, 0x800, 209,
-    gMonFrontPic_Granbull, 0x800, 210,
-    gMonFrontPic_Qwilfish, 0x800, 211,
-    gMonFrontPic_Scizor, 0x800, 212,
-    gMonFrontPic_Shuckle, 0x800, 213,
-    gMonFrontPic_Heracross, 0x800, 214,
-    gMonFrontPic_Sneasel, 0x800, 215,
-    gMonFrontPic_Teddiursa, 0x800, 216,
-    gMonFrontPic_Ursaring, 0x800, 217,
-    gMonFrontPic_Slugma, 0x800, 218,
-    gMonFrontPic_Magcargo, 0x800, 219,
-    gMonFrontPic_Swinub, 0x800, 220,
-    gMonFrontPic_Piloswine, 0x800, 221,
-    gMonFrontPic_Corsola, 0x800, 222,
-    gMonFrontPic_Remoraid, 0x800, 223,
-    gMonFrontPic_Octillery, 0x800, 224,
-    gMonFrontPic_Delibird, 0x800, 225,
-    gMonFrontPic_Mantine, 0x800, 226,
-    gMonFrontPic_Skarmory, 0x800, 227,
-    gMonFrontPic_Houndour, 0x800, 228,
-    gMonFrontPic_Houndoom, 0x800, 229,
-    gMonFrontPic_Kingdra, 0x800, 230,
-    gMonFrontPic_Phanpy, 0x800, 231,
-    gMonFrontPic_Donphan, 0x800, 232,
-    gMonFrontPic_Porygon2, 0x800, 233,
-    gMonFrontPic_Stantler, 0x800, 234,
-    gMonFrontPic_Smeargle, 0x800, 235,
-    gMonFrontPic_Tyrogue, 0x800, 236,
-    gMonFrontPic_Hitmontop, 0x800, 237,
-    gMonFrontPic_Smoochum, 0x800, 238,
-    gMonFrontPic_Elekid, 0x800, 239,
-    gMonFrontPic_Magby, 0x800, 240,
-    gMonFrontPic_Miltank, 0x800, 241,
-    gMonFrontPic_Blissey, 0x800, 242,
-    gMonFrontPic_Raikou, 0x800, 243,
-    gMonFrontPic_Entei, 0x800, 244,
-    gMonFrontPic_Suicune, 0x800, 245,
-    gMonFrontPic_Larvitar, 0x800, 246,
-    gMonFrontPic_Pupitar, 0x800, 247,
-    gMonFrontPic_Tyranitar, 0x800, 248,
-    gMonFrontPic_Lugia, 0x800, 249,
-    gMonFrontPic_HoOh, 0x800, 250,
-    gMonFrontPic_Celebi, 0x800, 251,
-// Empty slots
-    gMonFrontPic_DoubleQuestionMark, 0x800, 252,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 253,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 254,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 255,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 256,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 257,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 258,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 259,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 260,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 261,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 262,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 263,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 264,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 265,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 266,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 267,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 268,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 269,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 270,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 271,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 272,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 273,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 274,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 275,
-    gMonFrontPic_DoubleQuestionMark, 0x800, 276,
-// Gen III
-    gMonFrontPic_Treecko, 0x800, 277,
-    gMonFrontPic_Grovyle, 0x800, 278,
-    gMonFrontPic_Sceptile, 0x800, 279,
-    gMonFrontPic_Torchic, 0x800, 280,
-    gMonFrontPic_Combusken, 0x800, 281,
-    gMonFrontPic_Blaziken, 0x800, 282,
-    gMonFrontPic_Mudkip, 0x800, 283,
-    gMonFrontPic_Marshtomp, 0x800, 284,
-    gMonFrontPic_Swampert, 0x800, 285,
-    gMonFrontPic_Poochyena, 0x800, 286,
-    gMonFrontPic_Mightyena, 0x800, 287,
-    gMonFrontPic_Zigzagoon, 0x800, 288,
-    gMonFrontPic_Linoone, 0x800, 289,
-    gMonFrontPic_Wurmple, 0x800, 290,
-    gMonFrontPic_Silcoon, 0x800, 291,
-    gMonFrontPic_Beautifly, 0x800, 292,
-    gMonFrontPic_Cascoon, 0x800, 293,
-    gMonFrontPic_Dustox, 0x800, 294,
-    gMonFrontPic_Lotad, 0x800, 295,
-    gMonFrontPic_Lombre, 0x800, 296,
-    gMonFrontPic_Ludicolo, 0x800, 297,
-    gMonFrontPic_Seedot, 0x800, 298,
-    gMonFrontPic_Nuzleaf, 0x800, 299,
-    gMonFrontPic_Shiftry, 0x800, 300,
-    gMonFrontPic_Nincada, 0x800, 301,
-    gMonFrontPic_Ninjask, 0x800, 302,
-    gMonFrontPic_Shedinja, 0x800, 303,
-    gMonFrontPic_Taillow, 0x800, 304,
-    gMonFrontPic_Swellow, 0x800, 305,
-    gMonFrontPic_Shroomish, 0x800, 306,
-    gMonFrontPic_Breloom, 0x800, 307,
-    gMonFrontPic_Spinda, 0x800, 308,
-    gMonFrontPic_Wingull, 0x800, 309,
-    gMonFrontPic_Pelipper, 0x800, 310,
-    gMonFrontPic_Surskit, 0x800, 311,
-    gMonFrontPic_Masquerain, 0x800, 312,
-    gMonFrontPic_Wailmer, 0x800, 313,
-    gMonFrontPic_Wailord, 0x800, 314,
-    gMonFrontPic_Skitty, 0x800, 315,
-    gMonFrontPic_Delcatty, 0x800, 316,
-    gMonFrontPic_Kecleon, 0x800, 317,
-    gMonFrontPic_Baltoy, 0x800, 318,
-    gMonFrontPic_Claydol, 0x800, 319,
-    gMonFrontPic_Nosepass, 0x800, 320,
-    gMonFrontPic_Torkoal, 0x800, 321,
-    gMonFrontPic_Sableye, 0x800, 322,
-    gMonFrontPic_Barboach, 0x800, 323,
-    gMonFrontPic_Whiscash, 0x800, 324,
-    gMonFrontPic_Luvdisc, 0x800, 325,
-    gMonFrontPic_Corphish, 0x800, 326,
-    gMonFrontPic_Crawdaunt, 0x800, 327,
-    gMonFrontPic_Feebas, 0x800, 328,
-    gMonFrontPic_Milotic, 0x800, 329,
-    gMonFrontPic_Carvanha, 0x800, 330,
-    gMonFrontPic_Sharpedo, 0x800, 331,
-    gMonFrontPic_Trapinch, 0x800, 332,
-    gMonFrontPic_Vibrava, 0x800, 333,
-    gMonFrontPic_Flygon, 0x800, 334,
-    gMonFrontPic_Makuhita, 0x800, 335,
-    gMonFrontPic_Hariyama, 0x800, 336,
-    gMonFrontPic_Electrike, 0x800, 337,
-    gMonFrontPic_Manectric, 0x800, 338,
-    gMonFrontPic_Numel, 0x800, 339,
-    gMonFrontPic_Camerupt, 0x800, 340,
-    gMonFrontPic_Spheal, 0x800, 341,
-    gMonFrontPic_Sealeo, 0x800, 342,
-    gMonFrontPic_Walrein, 0x800, 343,
-    gMonFrontPic_Cacnea, 0x800, 344,
-    gMonFrontPic_Cacturne, 0x800, 345,
-    gMonFrontPic_Snorunt, 0x800, 346,
-    gMonFrontPic_Glalie, 0x800, 347,
-    gMonFrontPic_Lunatone, 0x800, 348,
-    gMonFrontPic_Solrock, 0x800, 349,
-    gMonFrontPic_Azurill, 0x800, 350,
-    gMonFrontPic_Spoink, 0x800, 351,
-    gMonFrontPic_Grumpig, 0x800, 352,
-    gMonFrontPic_Plusle, 0x800, 353,
-    gMonFrontPic_Minun, 0x800, 354,
-    gMonFrontPic_Mawile, 0x800, 355,
-    gMonFrontPic_Meditite, 0x800, 356,
-    gMonFrontPic_Medicham, 0x800, 357,
-    gMonFrontPic_Swablu, 0x800, 358,
-    gMonFrontPic_Altaria, 0x800, 359,
-    gMonFrontPic_Wynaut, 0x800, 360,
-    gMonFrontPic_Duskull, 0x800, 361,
-    gMonFrontPic_Dusclops, 0x800, 362,
-    gMonFrontPic_Roselia, 0x800, 363,
-    gMonFrontPic_Slakoth, 0x800, 364,
-    gMonFrontPic_Vigoroth, 0x800, 365,
-    gMonFrontPic_Slaking, 0x800, 366,
-    gMonFrontPic_Gulpin, 0x800, 367,
-    gMonFrontPic_Swalot, 0x800, 368,
-    gMonFrontPic_Tropius, 0x800, 369,
-    gMonFrontPic_Whismur, 0x800, 370,
-    gMonFrontPic_Loudred, 0x800, 371,
-    gMonFrontPic_Exploud, 0x800, 372,
-    gMonFrontPic_Clamperl, 0x800, 373,
-    gMonFrontPic_Huntail, 0x800, 374,
-    gMonFrontPic_Gorebyss, 0x800, 375,
-    gMonFrontPic_Absol, 0x800, 376,
-    gMonFrontPic_Shuppet, 0x800, 377,
-    gMonFrontPic_Banette, 0x800, 378,
-    gMonFrontPic_Seviper, 0x800, 379,
-    gMonFrontPic_Zangoose, 0x800, 380,
-    gMonFrontPic_Relicanth, 0x800, 381,
-    gMonFrontPic_Aron, 0x800, 382,
-    gMonFrontPic_Lairon, 0x800, 383,
-    gMonFrontPic_Aggron, 0x800, 384,
-    gMonFrontPic_Castform, 0x800, 385,
-    gMonFrontPic_Volbeat, 0x800, 386,
-    gMonFrontPic_Illumise, 0x800, 387,
-    gMonFrontPic_Lileep, 0x800, 388,
-    gMonFrontPic_Cradily, 0x800, 389,
-    gMonFrontPic_Anorith, 0x800, 390,
-    gMonFrontPic_Armaldo, 0x800, 391,
-    gMonFrontPic_Ralts, 0x800, 392,
-    gMonFrontPic_Kirlia, 0x800, 393,
-    gMonFrontPic_Gardevoir, 0x800, 394,
-    gMonFrontPic_Bagon, 0x800, 395,
-    gMonFrontPic_Shelgon, 0x800, 396,
-    gMonFrontPic_Salamence, 0x800, 397,
-    gMonFrontPic_Beldum, 0x800, 398,
-    gMonFrontPic_Metang, 0x800, 399,
-    gMonFrontPic_Metagross, 0x800, 400,
-    gMonFrontPic_Regirock, 0x800, 401,
-    gMonFrontPic_Regice, 0x800, 402,
-    gMonFrontPic_Registeel, 0x800, 403,
-    gMonFrontPic_Kyogre, 0x800, 404,
-    gMonFrontPic_Groudon, 0x800, 405,
-    gMonFrontPic_Rayquaza, 0x800, 406,
-    gMonFrontPic_Latias, 0x800, 407,
-    gMonFrontPic_Latios, 0x800, 408,
-    gMonFrontPic_Jirachi, 0x800, 409,
-    gMonFrontPic_Deoxys, 0x800, 410,
-    gMonFrontPic_Chimecho, 0x800, 411,
-    gMonFrontPic_Egg, 0x800, 412,
-    gMonFrontPic_UnownB, 0x800, 413,
-    gMonFrontPic_UnownC, 0x800, 414,
-    gMonFrontPic_UnownD, 0x800, 415,
-    gMonFrontPic_UnownE, 0x800, 416,
-    gMonFrontPic_UnownF, 0x800, 417,
-    gMonFrontPic_UnownG, 0x800, 418,
-    gMonFrontPic_UnownH, 0x800, 419,
-    gMonFrontPic_UnownI, 0x800, 420,
-    gMonFrontPic_UnownJ, 0x800, 421,
-    gMonFrontPic_UnownK, 0x800, 422,
-    gMonFrontPic_UnownL, 0x800, 423,
-    gMonFrontPic_UnownM, 0x800, 424,
-    gMonFrontPic_UnownN, 0x800, 425,
-    gMonFrontPic_UnownO, 0x800, 426,
-    gMonFrontPic_UnownP, 0x800, 427,
-    gMonFrontPic_UnownQ, 0x800, 428,
-    gMonFrontPic_UnownR, 0x800, 429,
-    gMonFrontPic_UnownS, 0x800, 430,
-    gMonFrontPic_UnownT, 0x800, 431,
-    gMonFrontPic_UnownU, 0x800, 432,
-    gMonFrontPic_UnownV, 0x800, 433,
-    gMonFrontPic_UnownW, 0x800, 434,
-    gMonFrontPic_UnownX, 0x800, 435,
-    gMonFrontPic_UnownY, 0x800, 436,
-    gMonFrontPic_UnownZ, 0x800, 437,
-    gMonFrontPic_UnownExclamationMark, 0x800, 438,
-    gMonFrontPic_UnownQuestionMark, 0x800, 439,
+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},
 };

src/data/pokemon_graphics/palette_table.h

@@ -1,443 +1,443 @@
 const struct CompressedSpritePalette gMonPaletteTable[] =
 {
-    gMonPalette_CircledQuestionMark, 0,
-    gMonPalette_Bulbasaur, 1,
-    gMonPalette_Ivysaur, 2,
-    gMonPalette_Venusaur, 3,
-    gMonPalette_Charmander, 4,
-    gMonPalette_Charmeleon, 5,
-    gMonPalette_Charizard, 6,
-    gMonPalette_Squirtle, 7,
-    gMonPalette_Wartortle, 8,
-    gMonPalette_Blastoise, 9,
-    gMonPalette_Caterpie, 10,
-    gMonPalette_Metapod, 11,
-    gMonPalette_Butterfree, 12,
-    gMonPalette_Weedle, 13,
-    gMonPalette_Kakuna, 14,
-    gMonPalette_Beedrill, 15,
-    gMonPalette_Pidgey, 16,
-    gMonPalette_Pidgeotto, 17,
-    gMonPalette_Pidgeot, 18,
-    gMonPalette_Rattata, 19,
-    gMonPalette_Raticate, 20,
-    gMonPalette_Spearow, 21,
-    gMonPalette_Fearow, 22,
-    gMonPalette_Ekans, 23,
-    gMonPalette_Arbok, 24,
-    gMonPalette_Pikachu, 25,
-    gMonPalette_Raichu, 26,
-    gMonPalette_Sandshrew, 27,
-    gMonPalette_Sandslash, 28,
-    gMonPalette_NidoranF, 29,
-    gMonPalette_Nidorina, 30,
-    gMonPalette_Nidoqueen, 31,
-    gMonPalette_NidoranM, 32,
-    gMonPalette_Nidorino, 33,
-    gMonPalette_Nidoking, 34,
-    gMonPalette_Clefairy, 35,
-    gMonPalette_Clefable, 36,
-    gMonPalette_Vulpix, 37,
-    gMonPalette_Ninetales, 38,
-    gMonPalette_Jigglypuff, 39,
-    gMonPalette_Wigglytuff, 40,
-    gMonPalette_Zubat, 41,
-    gMonPalette_Golbat, 42,
-    gMonPalette_Oddish, 43,
-    gMonPalette_Gloom, 44,
-    gMonPalette_Vileplume, 45,
-    gMonPalette_Paras, 46,
-    gMonPalette_Parasect, 47,
-    gMonPalette_Venonat, 48,
-    gMonPalette_Venomoth, 49,
-    gMonPalette_Diglett, 50,
-    gMonPalette_Dugtrio, 51,
-    gMonPalette_Meowth, 52,
-    gMonPalette_Persian, 53,
-    gMonPalette_Psyduck, 54,
-    gMonPalette_Golduck, 55,
-    gMonPalette_Mankey, 56,
-    gMonPalette_Primeape, 57,
-    gMonPalette_Growlithe, 58,
-    gMonPalette_Arcanine, 59,
-    gMonPalette_Poliwag, 60,
-    gMonPalette_Poliwhirl, 61,
-    gMonPalette_Poliwrath, 62,
-    gMonPalette_Abra, 63,
-    gMonPalette_Kadabra, 64,
-    gMonPalette_Alakazam, 65,
-    gMonPalette_Machop, 66,
-    gMonPalette_Machoke, 67,
-    gMonPalette_Machamp, 68,
-    gMonPalette_Bellsprout, 69,
-    gMonPalette_Weepinbell, 70,
-    gMonPalette_Victreebel, 71,
-    gMonPalette_Tentacool, 72,
-    gMonPalette_Tentacruel, 73,
-    gMonPalette_Geodude, 74,
-    gMonPalette_Graveler, 75,
-    gMonPalette_Golem, 76,
-    gMonPalette_Ponyta, 77,
-    gMonPalette_Rapidash, 78,
-    gMonPalette_Slowpoke, 79,
-    gMonPalette_Slowbro, 80,
-    gMonPalette_Magnemite, 81,
-    gMonPalette_Magneton, 82,
-    gMonPalette_Farfetchd, 83,
-    gMonPalette_Doduo, 84,
-    gMonPalette_Dodrio, 85,
-    gMonPalette_Seel, 86,
-    gMonPalette_Dewgong, 87,
-    gMonPalette_Grimer, 88,
-    gMonPalette_Muk, 89,
-    gMonPalette_Shellder, 90,
-    gMonPalette_Cloyster, 91,
-    gMonPalette_Gastly, 92,
-    gMonPalette_Haunter, 93,
-    gMonPalette_Gengar, 94,
-    gMonPalette_Onix, 95,
-    gMonPalette_Drowzee, 96,
-    gMonPalette_Hypno, 97,
-    gMonPalette_Krabby, 98,
-    gMonPalette_Kingler, 99,
-    gMonPalette_Voltorb, 100,
-    gMonPalette_Electrode, 101,
-    gMonPalette_Exeggcute, 102,
-    gMonPalette_Exeggutor, 103,
-    gMonPalette_Cubone, 104,
-    gMonPalette_Marowak, 105,
-    gMonPalette_Hitmonlee, 106,
-    gMonPalette_Hitmonchan, 107,
-    gMonPalette_Lickitung, 108,
-    gMonPalette_Koffing, 109,
-    gMonPalette_Weezing, 110,
-    gMonPalette_Rhyhorn, 111,
-    gMonPalette_Rhydon, 112,
-    gMonPalette_Chansey, 113,
-    gMonPalette_Tangela, 114,
-    gMonPalette_Kangaskhan, 115,
-    gMonPalette_Horsea, 116,
-    gMonPalette_Seadra, 117,
-    gMonPalette_Goldeen, 118,
-    gMonPalette_Seaking, 119,
-    gMonPalette_Staryu, 120,
-    gMonPalette_Starmie, 121,
-    gMonPalette_Mrmime, 122,
-    gMonPalette_Scyther, 123,
-    gMonPalette_Jynx, 124,
-    gMonPalette_Electabuzz, 125,
-    gMonPalette_Magmar, 126,
-    gMonPalette_Pinsir, 127,
-    gMonPalette_Tauros, 128,
-    gMonPalette_Magikarp, 129,
-    gMonPalette_Gyarados, 130,
-    gMonPalette_Lapras, 131,
-    gMonPalette_Ditto, 132,
-    gMonPalette_Eevee, 133,
-    gMonPalette_Vaporeon, 134,
-    gMonPalette_Jolteon, 135,
-    gMonPalette_Flareon, 136,
-    gMonPalette_Porygon, 137,
-    gMonPalette_Omanyte, 138,
-    gMonPalette_Omastar, 139,
-    gMonPalette_Kabuto, 140,
-    gMonPalette_Kabutops, 141,
-    gMonPalette_Aerodactyl, 142,
-    gMonPalette_Snorlax, 143,
-    gMonPalette_Articuno, 144,
-    gMonPalette_Zapdos, 145,
-    gMonPalette_Moltres, 146,
-    gMonPalette_Dratini, 147,
-    gMonPalette_Dragonair, 148,
-    gMonPalette_Dragonite, 149,
-    gMonPalette_Mewtwo, 150,
-    gMonPalette_Mew, 151,
-    gMonPalette_Chikorita, 152,
-    gMonPalette_Bayleef, 153,
-    gMonPalette_Meganium, 154,
-    gMonPalette_Cyndaquil, 155,
-    gMonPalette_Quilava, 156,
-    gMonPalette_Typhlosion, 157,
-    gMonPalette_Totodile, 158,
-    gMonPalette_Croconaw, 159,
-    gMonPalette_Feraligatr, 160,
-    gMonPalette_Sentret, 161,
-    gMonPalette_Furret, 162,
-    gMonPalette_Hoothoot, 163,
-    gMonPalette_Noctowl, 164,
-    gMonPalette_Ledyba, 165,
-    gMonPalette_Ledian, 166,
-    gMonPalette_Spinarak, 167,
-    gMonPalette_Ariados, 168,
-    gMonPalette_Crobat, 169,
-    gMonPalette_Chinchou, 170,
-    gMonPalette_Lanturn, 171,
-    gMonPalette_Pichu, 172,
-    gMonPalette_Cleffa, 173,
-    gMonPalette_Igglybuff, 174,
-    gMonPalette_Togepi, 175,
-    gMonPalette_Togetic, 176,
-    gMonPalette_Natu, 177,
-    gMonPalette_Xatu, 178,
-    gMonPalette_Mareep, 179,
-    gMonPalette_Flaaffy, 180,
-    gMonPalette_Ampharos, 181,
-    gMonPalette_Bellossom, 182,
-    gMonPalette_Marill, 183,
-    gMonPalette_Azumarill, 184,
-    gMonPalette_Sudowoodo, 185,
-    gMonPalette_Politoed, 186,
-    gMonPalette_Hoppip, 187,
-    gMonPalette_Skiploom, 188,
-    gMonPalette_Jumpluff, 189,
-    gMonPalette_Aipom, 190,
-    gMonPalette_Sunkern, 191,
-    gMonPalette_Sunflora, 192,
-    gMonPalette_Yanma, 193,
-    gMonPalette_Wooper, 194,
-    gMonPalette_Quagsire, 195,
-    gMonPalette_Espeon, 196,
-    gMonPalette_Umbreon, 197,
-    gMonPalette_Murkrow, 198,
-    gMonPalette_Slowking, 199,
-    gMonPalette_Misdreavus, 200,
-    gMonPalette_Unown, 201,
-    gMonPalette_Wobbuffet, 202,
-    gMonPalette_Girafarig, 203,
-    gMonPalette_Pineco, 204,
-    gMonPalette_Forretress, 205,
-    gMonPalette_Dunsparce, 206,
-    gMonPalette_Gligar, 207,
-    gMonPalette_Steelix, 208,
-    gMonPalette_Snubbull, 209,
-    gMonPalette_Granbull, 210,
-    gMonPalette_Qwilfish, 211,
-    gMonPalette_Scizor, 212,
-    gMonPalette_Shuckle, 213,
-    gMonPalette_Heracross, 214,
-    gMonPalette_Sneasel, 215,
-    gMonPalette_Teddiursa, 216,
-    gMonPalette_Ursaring, 217,
-    gMonPalette_Slugma, 218,
-    gMonPalette_Magcargo, 219,
-    gMonPalette_Swinub, 220,
-    gMonPalette_Piloswine, 221,
-    gMonPalette_Corsola, 222,
-    gMonPalette_Remoraid, 223,
-    gMonPalette_Octillery, 224,
-    gMonPalette_Delibird, 225,
-    gMonPalette_Mantine, 226,
-    gMonPalette_Skarmory, 227,
-    gMonPalette_Houndour, 228,
-    gMonPalette_Houndoom, 229,
-    gMonPalette_Kingdra, 230,
-    gMonPalette_Phanpy, 231,
-    gMonPalette_Donphan, 232,
-    gMonPalette_Porygon2, 233,
-    gMonPalette_Stantler, 234,
-    gMonPalette_Smeargle, 235,
-    gMonPalette_Tyrogue, 236,
-    gMonPalette_Hitmontop, 237,
-    gMonPalette_Smoochum, 238,
-    gMonPalette_Elekid, 239,
-    gMonPalette_Magby, 240,
-    gMonPalette_Miltank, 241,
-    gMonPalette_Blissey, 242,
-    gMonPalette_Raikou, 243,
-    gMonPalette_Entei, 244,
-    gMonPalette_Suicune, 245,
-    gMonPalette_Larvitar, 246,
-    gMonPalette_Pupitar, 247,
-    gMonPalette_Tyranitar, 248,
-    gMonPalette_Lugia, 249,
-    gMonPalette_HoOh, 250,
-    gMonPalette_Celebi, 251,
-    gMonPalette_DoubleQuestionMark, 252,
-    gMonPalette_DoubleQuestionMark, 253,
-    gMonPalette_DoubleQuestionMark, 254,
-    gMonPalette_DoubleQuestionMark, 255,
-    gMonPalette_DoubleQuestionMark, 256,
-    gMonPalette_DoubleQuestionMark, 257,
-    gMonPalette_DoubleQuestionMark, 258,
-    gMonPalette_DoubleQuestionMark, 259,
-    gMonPalette_DoubleQuestionMark, 260,
-    gMonPalette_DoubleQuestionMark, 261,
-    gMonPalette_DoubleQuestionMark, 262,
-    gMonPalette_DoubleQuestionMark, 263,
-    gMonPalette_DoubleQuestionMark, 264,
-    gMonPalette_DoubleQuestionMark, 265,
-    gMonPalette_DoubleQuestionMark, 266,
-    gMonPalette_DoubleQuestionMark, 267,
-    gMonPalette_DoubleQuestionMark, 268,
-    gMonPalette_DoubleQuestionMark, 269,
-    gMonPalette_DoubleQuestionMark, 270,
-    gMonPalette_DoubleQuestionMark, 271,
-    gMonPalette_DoubleQuestionMark, 272,
-    gMonPalette_DoubleQuestionMark, 273,
-    gMonPalette_DoubleQuestionMark, 274,
-    gMonPalette_DoubleQuestionMark, 275,
-    gMonPalette_DoubleQuestionMark, 276,
-    gMonPalette_Treecko, 277,
-    gMonPalette_Grovyle, 278,
-    gMonPalette_Sceptile, 279,
-    gMonPalette_Torchic, 280,
-    gMonPalette_Combusken, 281,
-    gMonPalette_Blaziken, 282,
-    gMonPalette_Mudkip, 283,
-    gMonPalette_Marshtomp, 284,
-    gMonPalette_Swampert, 285,
-    gMonPalette_Poochyena, 286,
-    gMonPalette_Mightyena, 287,
-    gMonPalette_Zigzagoon, 288,
-    gMonPalette_Linoone, 289,
-    gMonPalette_Wurmple, 290,
-    gMonPalette_Silcoon, 291,
-    gMonPalette_Beautifly, 292,
-    gMonPalette_Cascoon, 293,
-    gMonPalette_Dustox, 294,
-    gMonPalette_Lotad, 295,
-    gMonPalette_Lombre, 296,
-    gMonPalette_Ludicolo, 297,
-    gMonPalette_Seedot, 298,
-    gMonPalette_Nuzleaf, 299,
-    gMonPalette_Shiftry, 300,
-    gMonPalette_Nincada, 301,
-    gMonPalette_Ninjask, 302,
-    gMonPalette_Shedinja, 303,
-    gMonPalette_Taillow, 304,
-    gMonPalette_Swellow, 305,
-    gMonPalette_Shroomish, 306,
-    gMonPalette_Breloom, 307,
-    gMonPalette_Spinda, 308,
-    gMonPalette_Wingull, 309,
-    gMonPalette_Pelipper, 310,
-    gMonPalette_Surskit, 311,
-    gMonPalette_Masquerain, 312,
-    gMonPalette_Wailmer, 313,
-    gMonPalette_Wailord, 314,
-    gMonPalette_Skitty, 315,
-    gMonPalette_Delcatty, 316,
-    gMonPalette_Kecleon, 317,
-    gMonPalette_Baltoy, 318,
-    gMonPalette_Claydol, 319,
-    gMonPalette_Nosepass, 320,
-    gMonPalette_Torkoal, 321,
-    gMonPalette_Sableye, 322,
-    gMonPalette_Barboach, 323,
-    gMonPalette_Whiscash, 324,
-    gMonPalette_Luvdisc, 325,
-    gMonPalette_Corphish, 326,
-    gMonPalette_Crawdaunt, 327,
-    gMonPalette_Feebas, 328,
-    gMonPalette_Milotic, 329,
-    gMonPalette_Carvanha, 330,
-    gMonPalette_Sharpedo, 331,
-    gMonPalette_Trapinch, 332,
-    gMonPalette_Vibrava, 333,
-    gMonPalette_Flygon, 334,
-    gMonPalette_Makuhita, 335,
-    gMonPalette_Hariyama, 336,
-    gMonPalette_Electrike, 337,
-    gMonPalette_Manectric, 338,
-    gMonPalette_Numel, 339,
-    gMonPalette_Camerupt, 340,
-    gMonPalette_Spheal, 341,
-    gMonPalette_Sealeo, 342,
-    gMonPalette_Walrein, 343,
-    gMonPalette_Cacnea, 344,
-    gMonPalette_Cacturne, 345,
-    gMonPalette_Snorunt, 346,
-    gMonPalette_Glalie, 347,
-    gMonPalette_Lunatone, 348,
-    gMonPalette_Solrock, 349,
-    gMonPalette_Azurill, 350,
-    gMonPalette_Spoink, 351,
-    gMonPalette_Grumpig, 352,
-    gMonPalette_Plusle, 353,
-    gMonPalette_Minun, 354,
-    gMonPalette_Mawile, 355,
-    gMonPalette_Meditite, 356,
-    gMonPalette_Medicham, 357,
-    gMonPalette_Swablu, 358,
-    gMonPalette_Altaria, 359,
-    gMonPalette_Wynaut, 360,
-    gMonPalette_Duskull, 361,
-    gMonPalette_Dusclops, 362,
-    gMonPalette_Roselia, 363,
-    gMonPalette_Slakoth, 364,
-    gMonPalette_Vigoroth, 365,
-    gMonPalette_Slaking, 366,
-    gMonPalette_Gulpin, 367,
-    gMonPalette_Swalot, 368,
-    gMonPalette_Tropius, 369,
-    gMonPalette_Whismur, 370,
-    gMonPalette_Loudred, 371,
-    gMonPalette_Exploud, 372,
-    gMonPalette_Clamperl, 373,
-    gMonPalette_Huntail, 374,
-    gMonPalette_Gorebyss, 375,
-    gMonPalette_Absol, 376,
-    gMonPalette_Shuppet, 377,
-    gMonPalette_Banette, 378,
-    gMonPalette_Seviper, 379,
-    gMonPalette_Zangoose, 380,
-    gMonPalette_Relicanth, 381,
-    gMonPalette_Aron, 382,
-    gMonPalette_Lairon, 383,
-    gMonPalette_Aggron, 384,
-    gMonPalette_Castform, 385,
-    gMonPalette_Volbeat, 386,
-    gMonPalette_Illumise, 387,
-    gMonPalette_Lileep, 388,
-    gMonPalette_Cradily, 389,
-    gMonPalette_Anorith, 390,
-    gMonPalette_Armaldo, 391,
-    gMonPalette_Ralts, 392,
-    gMonPalette_Kirlia, 393,
-    gMonPalette_Gardevoir, 394,
-    gMonPalette_Bagon, 395,
-    gMonPalette_Shelgon, 396,
-    gMonPalette_Salamence, 397,
-    gMonPalette_Beldum, 398,
-    gMonPalette_Metang, 399,
-    gMonPalette_Metagross, 400,
-    gMonPalette_Regirock, 401,
-    gMonPalette_Regice, 402,
-    gMonPalette_Registeel, 403,
-    gMonPalette_Kyogre, 404,
-    gMonPalette_Groudon, 405,
-    gMonPalette_Rayquaza, 406,
-    gMonPalette_Latias, 407,
-    gMonPalette_Latios, 408,
-    gMonPalette_Jirachi, 409,
-    gMonPalette_Deoxys, 410,
-    gMonPalette_Chimecho, 411,
-    gMonPalette_Egg, 412,
-    gMonPalette_Unown, 413,
-    gMonPalette_Unown, 414,
-    gMonPalette_Unown, 415,
-    gMonPalette_Unown, 416,
-    gMonPalette_Unown, 417,
-    gMonPalette_Unown, 418,
-    gMonPalette_Unown, 419,
-    gMonPalette_Unown, 420,
-    gMonPalette_Unown, 421,
-    gMonPalette_Unown, 422,
-    gMonPalette_Unown, 423,
-    gMonPalette_Unown, 424,
-    gMonPalette_Unown, 425,
-    gMonPalette_Unown, 426,
-    gMonPalette_Unown, 427,
-    gMonPalette_Unown, 428,
-    gMonPalette_Unown, 429,
-    gMonPalette_Unown, 430,
-    gMonPalette_Unown, 431,
-    gMonPalette_Unown, 432,
-    gMonPalette_Unown, 433,
-    gMonPalette_Unown, 434,
-    gMonPalette_Unown, 435,
-    gMonPalette_Unown, 436,
-    gMonPalette_Unown, 437,
-    gMonPalette_Unown, 438,
-    gMonPalette_Unown, 439,
+    [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},
 };

src/data/pokemon_graphics/shiny_palette_table.h

@@ -1,443 +1,443 @@
 const struct CompressedSpritePalette gMonShinyPaletteTable[] =
 {
-    gMonShinyPalette_CircledQuestionMark, 500,
-    gMonShinyPalette_Bulbasaur, 501,
-    gMonShinyPalette_Ivysaur, 502,
-    gMonShinyPalette_Venusaur, 503,
-    gMonShinyPalette_Charmander, 504,
-    gMonShinyPalette_Charmeleon, 505,
-    gMonShinyPalette_Charizard, 506,
-    gMonShinyPalette_Squirtle, 507,
-    gMonShinyPalette_Wartortle, 508,
-    gMonShinyPalette_Blastoise, 509,
-    gMonShinyPalette_Caterpie, 510,
-    gMonShinyPalette_Metapod, 511,
-    gMonShinyPalette_Butterfree, 512,
-    gMonShinyPalette_Weedle, 513,
-    gMonShinyPalette_Kakuna, 514,
-    gMonShinyPalette_Beedrill, 515,
-    gMonShinyPalette_Pidgey, 516,
-    gMonShinyPalette_Pidgeotto, 517,
-    gMonShinyPalette_Pidgeot, 518,
-    gMonShinyPalette_Rattata, 519,
-    gMonShinyPalette_Raticate, 520,
-    gMonShinyPalette_Spearow, 521,
-    gMonShinyPalette_Fearow, 522,
-    gMonShinyPalette_Ekans, 523,
-    gMonShinyPalette_Arbok, 524,
-    gMonShinyPalette_Pikachu, 525,
-    gMonShinyPalette_Raichu, 526,
-    gMonShinyPalette_Sandshrew, 527,
-    gMonShinyPalette_Sandslash, 528,
-    gMonShinyPalette_NidoranF, 529,
-    gMonShinyPalette_Nidorina, 530,
-    gMonShinyPalette_Nidoqueen, 531,
-    gMonShinyPalette_NidoranM, 532,
-    gMonShinyPalette_Nidorino, 533,
-    gMonShinyPalette_Nidoking, 534,
-    gMonShinyPalette_Clefairy, 535,
-    gMonShinyPalette_Clefable, 536,
-    gMonShinyPalette_Vulpix, 537,
-    gMonShinyPalette_Ninetales, 538,
-    gMonShinyPalette_Jigglypuff, 539,
-    gMonShinyPalette_Wigglytuff, 540,
-    gMonShinyPalette_Zubat, 541,
-    gMonShinyPalette_Golbat, 542,
-    gMonShinyPalette_Oddish, 543,
-    gMonShinyPalette_Gloom, 544,
-    gMonShinyPalette_Vileplume, 545,
-    gMonShinyPalette_Paras, 546,
-    gMonShinyPalette_Parasect, 547,
-    gMonShinyPalette_Venonat, 548,
-    gMonShinyPalette_Venomoth, 549,
-    gMonShinyPalette_Diglett, 550,
-    gMonShinyPalette_Dugtrio, 551,
-    gMonShinyPalette_Meowth, 552,
-    gMonShinyPalette_Persian, 553,
-    gMonShinyPalette_Psyduck, 554,
-    gMonShinyPalette_Golduck, 555,
-    gMonShinyPalette_Mankey, 556,
-    gMonShinyPalette_Primeape, 557,
-    gMonShinyPalette_Growlithe, 558,
-    gMonShinyPalette_Arcanine, 559,
-    gMonShinyPalette_Poliwag, 560,
-    gMonShinyPalette_Poliwhirl, 561,
-    gMonShinyPalette_Poliwrath, 562,
-    gMonShinyPalette_Abra, 563,
-    gMonShinyPalette_Kadabra, 564,
-    gMonShinyPalette_Alakazam, 565,
-    gMonShinyPalette_Machop, 566,
-    gMonShinyPalette_Machoke, 567,
-    gMonShinyPalette_Machamp, 568,
-    gMonShinyPalette_Bellsprout, 569,
-    gMonShinyPalette_Weepinbell, 570,
-    gMonShinyPalette_Victreebel, 571,
-    gMonShinyPalette_Tentacool, 572,
-    gMonShinyPalette_Tentacruel, 573,
-    gMonShinyPalette_Geodude, 574,
-    gMonShinyPalette_Graveler, 575,
-    gMonShinyPalette_Golem, 576,
-    gMonShinyPalette_Ponyta, 577,
-    gMonShinyPalette_Rapidash, 578,
-    gMonShinyPalette_Slowpoke, 579,
-    gMonShinyPalette_Slowbro, 580,
-    gMonShinyPalette_Magnemite, 581,
-    gMonShinyPalette_Magneton, 582,
-    gMonShinyPalette_Farfetchd, 583,
-    gMonShinyPalette_Doduo, 584,
-    gMonShinyPalette_Dodrio, 585,
-    gMonShinyPalette_Seel, 586,
-    gMonShinyPalette_Dewgong, 587,
-    gMonShinyPalette_Grimer, 588,
-    gMonShinyPalette_Muk, 589,
-    gMonShinyPalette_Shellder, 590,
-    gMonShinyPalette_Cloyster, 591,
-    gMonShinyPalette_Gastly, 592,
-    gMonShinyPalette_Haunter, 593,
-    gMonShinyPalette_Gengar, 594,
-    gMonShinyPalette_Onix, 595,
-    gMonShinyPalette_Drowzee, 596,
-    gMonShinyPalette_Hypno, 597,
-    gMonShinyPalette_Krabby, 598,
-    gMonShinyPalette_Kingler, 599,
-    gMonShinyPalette_Voltorb, 600,
-    gMonShinyPalette_Electrode, 601,
-    gMonShinyPalette_Exeggcute, 602,
-    gMonShinyPalette_Exeggutor, 603,
-    gMonShinyPalette_Cubone, 604,
-    gMonShinyPalette_Marowak, 605,
-    gMonShinyPalette_Hitmonlee, 606,
-    gMonShinyPalette_Hitmonchan, 607,
-    gMonShinyPalette_Lickitung, 608,
-    gMonShinyPalette_Koffing, 609,
-    gMonShinyPalette_Weezing, 610,
-    gMonShinyPalette_Rhyhorn, 611,
-    gMonShinyPalette_Rhydon, 612,
-    gMonShinyPalette_Chansey, 613,
-    gMonShinyPalette_Tangela, 614,
-    gMonShinyPalette_Kangaskhan, 615,
-    gMonShinyPalette_Horsea, 616,
-    gMonShinyPalette_Seadra, 617,
-    gMonShinyPalette_Goldeen, 618,
-    gMonShinyPalette_Seaking, 619,
-    gMonShinyPalette_Staryu, 620,
-    gMonShinyPalette_Starmie, 621,
-    gMonShinyPalette_Mrmime, 622,
-    gMonShinyPalette_Scyther, 623,
-    gMonShinyPalette_Jynx, 624,
-    gMonShinyPalette_Electabuzz, 625,
-    gMonShinyPalette_Magmar, 626,
-    gMonShinyPalette_Pinsir, 627,
-    gMonShinyPalette_Tauros, 628,
-    gMonShinyPalette_Magikarp, 629,
-    gMonShinyPalette_Gyarados, 630,
-    gMonShinyPalette_Lapras, 631,
-    gMonShinyPalette_Ditto, 632,
-    gMonShinyPalette_Eevee, 633,
-    gMonShinyPalette_Vaporeon, 634,
-    gMonShinyPalette_Jolteon, 635,
-    gMonShinyPalette_Flareon, 636,
-    gMonShinyPalette_Porygon, 637,
-    gMonShinyPalette_Omanyte, 638,
-    gMonShinyPalette_Omastar, 639,
-    gMonShinyPalette_Kabuto, 640,
-    gMonShinyPalette_Kabutops, 641,
-    gMonShinyPalette_Aerodactyl, 642,
-    gMonShinyPalette_Snorlax, 643,
-    gMonShinyPalette_Articuno, 644,
-    gMonShinyPalette_Zapdos, 645,
-    gMonShinyPalette_Moltres, 646,
-    gMonShinyPalette_Dratini, 647,
-    gMonShinyPalette_Dragonair, 648,
-    gMonShinyPalette_Dragonite, 649,
-    gMonShinyPalette_Mewtwo, 650,
-    gMonShinyPalette_Mew, 651,
-    gMonShinyPalette_Chikorita, 652,
-    gMonShinyPalette_Bayleef, 653,
-    gMonShinyPalette_Meganium, 654,
-    gMonShinyPalette_Cyndaquil, 655,
-    gMonShinyPalette_Quilava, 656,
-    gMonShinyPalette_Typhlosion, 657,
-    gMonShinyPalette_Totodile, 658,
-    gMonShinyPalette_Croconaw, 659,
-    gMonShinyPalette_Feraligatr, 660,
-    gMonShinyPalette_Sentret, 661,
-    gMonShinyPalette_Furret, 662,
-    gMonShinyPalette_Hoothoot, 663,
-    gMonShinyPalette_Noctowl, 664,
-    gMonShinyPalette_Ledyba, 665,
-    gMonShinyPalette_Ledian, 666,
-    gMonShinyPalette_Spinarak, 667,
-    gMonShinyPalette_Ariados, 668,
-    gMonShinyPalette_Crobat, 669,
-    gMonShinyPalette_Chinchou, 670,
-    gMonShinyPalette_Lanturn, 671,
-    gMonShinyPalette_Pichu, 672,
-    gMonShinyPalette_Cleffa, 673,
-    gMonShinyPalette_Igglybuff, 674,
-    gMonShinyPalette_Togepi, 675,
-    gMonShinyPalette_Togetic, 676,
-    gMonShinyPalette_Natu, 677,
-    gMonShinyPalette_Xatu, 678,
-    gMonShinyPalette_Mareep, 679,
-    gMonShinyPalette_Flaaffy, 680,
-    gMonShinyPalette_Ampharos, 681,
-    gMonShinyPalette_Bellossom, 682,
-    gMonShinyPalette_Marill, 683,
-    gMonShinyPalette_Azumarill, 684,
-    gMonShinyPalette_Sudowoodo, 685,
-    gMonShinyPalette_Politoed, 686,
-    gMonShinyPalette_Hoppip, 687,
-    gMonShinyPalette_Skiploom, 688,
-    gMonShinyPalette_Jumpluff, 689,
-    gMonShinyPalette_Aipom, 690,
-    gMonShinyPalette_Sunkern, 691,
-    gMonShinyPalette_Sunflora, 692,
-    gMonShinyPalette_Yanma, 693,
-    gMonShinyPalette_Wooper, 694,
-    gMonShinyPalette_Quagsire, 695,
-    gMonShinyPalette_Espeon, 696,
-    gMonShinyPalette_Umbreon, 697,
-    gMonShinyPalette_Murkrow, 698,
-    gMonShinyPalette_Slowking, 699,
-    gMonShinyPalette_Misdreavus, 700,
-    gMonShinyPalette_Unown, 701,
-    gMonShinyPalette_Wobbuffet, 702,
-    gMonShinyPalette_Girafarig, 703,
-    gMonShinyPalette_Pineco, 704,
-    gMonShinyPalette_Forretress, 705,
-    gMonShinyPalette_Dunsparce, 706,
-    gMonShinyPalette_Gligar, 707,
-    gMonShinyPalette_Steelix, 708,
-    gMonShinyPalette_Snubbull, 709,
-    gMonShinyPalette_Granbull, 710,
-    gMonShinyPalette_Qwilfish, 711,
-    gMonShinyPalette_Scizor, 712,
-    gMonShinyPalette_Shuckle, 713,
-    gMonShinyPalette_Heracross, 714,
-    gMonShinyPalette_Sneasel, 715,
-    gMonShinyPalette_Teddiursa, 716,
-    gMonShinyPalette_Ursaring, 717,
-    gMonShinyPalette_Slugma, 718,
-    gMonShinyPalette_Magcargo, 719,
-    gMonShinyPalette_Swinub, 720,
-    gMonShinyPalette_Piloswine, 721,
-    gMonShinyPalette_Corsola, 722,
-    gMonShinyPalette_Remoraid, 723,
-    gMonShinyPalette_Octillery, 724,
-    gMonShinyPalette_Delibird, 725,
-    gMonShinyPalette_Mantine, 726,
-    gMonShinyPalette_Skarmory, 727,
-    gMonShinyPalette_Houndour, 728,
-    gMonShinyPalette_Houndoom, 729,
-    gMonShinyPalette_Kingdra, 730,
-    gMonShinyPalette_Phanpy, 731,
-    gMonShinyPalette_Donphan, 732,
-    gMonShinyPalette_Porygon2, 733,
-    gMonShinyPalette_Stantler, 734,
-    gMonShinyPalette_Smeargle, 735,
-    gMonShinyPalette_Tyrogue, 736,
-    gMonShinyPalette_Hitmontop, 737,
-    gMonShinyPalette_Smoochum, 738,
-    gMonShinyPalette_Elekid, 739,
-    gMonShinyPalette_Magby, 740,
-    gMonShinyPalette_Miltank, 741,
-    gMonShinyPalette_Blissey, 742,
-    gMonShinyPalette_Raikou, 743,
-    gMonShinyPalette_Entei, 744,
-    gMonShinyPalette_Suicune, 745,
-    gMonShinyPalette_Larvitar, 746,
-    gMonShinyPalette_Pupitar, 747,
-    gMonShinyPalette_Tyranitar, 748,
-    gMonShinyPalette_Lugia, 749,
-    gMonShinyPalette_HoOh, 750,
-    gMonShinyPalette_Celebi, 751,
-    gMonShinyPalette_DoubleQuestionMark, 752,
-    gMonShinyPalette_DoubleQuestionMark, 753,
-    gMonShinyPalette_DoubleQuestionMark, 754,
-    gMonShinyPalette_DoubleQuestionMark, 755,
-    gMonShinyPalette_DoubleQuestionMark, 756,
-    gMonShinyPalette_DoubleQuestionMark, 757,
-    gMonShinyPalette_DoubleQuestionMark, 758,
-    gMonShinyPalette_DoubleQuestionMark, 759,
-    gMonShinyPalette_DoubleQuestionMark, 760,
-    gMonShinyPalette_DoubleQuestionMark, 761,
-    gMonShinyPalette_DoubleQuestionMark, 762,
-    gMonShinyPalette_DoubleQuestionMark, 763,
-    gMonShinyPalette_DoubleQuestionMark, 764,
-    gMonShinyPalette_DoubleQuestionMark, 765,
-    gMonShinyPalette_DoubleQuestionMark, 766,
-    gMonShinyPalette_DoubleQuestionMark, 767,
-    gMonShinyPalette_DoubleQuestionMark, 768,
-    gMonShinyPalette_DoubleQuestionMark, 769,
-    gMonShinyPalette_DoubleQuestionMark, 770,
-    gMonShinyPalette_DoubleQuestionMark, 771,
-    gMonShinyPalette_DoubleQuestionMark, 772,
-    gMonShinyPalette_DoubleQuestionMark, 773,
-    gMonShinyPalette_DoubleQuestionMark, 774,
-    gMonShinyPalette_DoubleQuestionMark, 775,
-    gMonShinyPalette_DoubleQuestionMark, 776,
-    gMonShinyPalette_Treecko, 777,
-    gMonShinyPalette_Grovyle, 778,
-    gMonShinyPalette_Sceptile, 779,
-    gMonShinyPalette_Torchic, 780,
-    gMonShinyPalette_Combusken, 781,
-    gMonShinyPalette_Blaziken, 782,
-    gMonShinyPalette_Mudkip, 783,
-    gMonShinyPalette_Marshtomp, 784,
-    gMonShinyPalette_Swampert, 785,
-    gMonShinyPalette_Poochyena, 786,
-    gMonShinyPalette_Mightyena, 787,
-    gMonShinyPalette_Zigzagoon, 788,
-    gMonShinyPalette_Linoone, 789,
-    gMonShinyPalette_Wurmple, 790,
-    gMonShinyPalette_Silcoon, 791,
-    gMonShinyPalette_Beautifly, 792,
-    gMonShinyPalette_Cascoon, 793,
-    gMonShinyPalette_Dustox, 794,
-    gMonShinyPalette_Lotad, 795,
-    gMonShinyPalette_Lombre, 796,
-    gMonShinyPalette_Ludicolo, 797,
-    gMonShinyPalette_Seedot, 798,
-    gMonShinyPalette_Nuzleaf, 799,
-    gMonShinyPalette_Shiftry, 800,
-    gMonShinyPalette_Nincada, 801,
-    gMonShinyPalette_Ninjask, 802,
-    gMonShinyPalette_Shedinja, 803,
-    gMonShinyPalette_Taillow, 804,
-    gMonShinyPalette_Swellow, 805,
-    gMonShinyPalette_Shroomish, 806,
-    gMonShinyPalette_Breloom, 807,
-    gMonShinyPalette_Spinda, 808,
-    gMonShinyPalette_Wingull, 809,
-    gMonShinyPalette_Pelipper, 810,
-    gMonShinyPalette_Surskit, 811,
-    gMonShinyPalette_Masquerain, 812,
-    gMonShinyPalette_Wailmer, 813,
-    gMonShinyPalette_Wailord, 814,
-    gMonShinyPalette_Skitty, 815,
-    gMonShinyPalette_Delcatty, 816,
-    gMonShinyPalette_Kecleon, 817,
-    gMonShinyPalette_Baltoy, 818,
-    gMonShinyPalette_Claydol, 819,
-    gMonShinyPalette_Nosepass, 820,
-    gMonShinyPalette_Torkoal, 821,
-    gMonShinyPalette_Sableye, 822,
-    gMonShinyPalette_Barboach, 823,
-    gMonShinyPalette_Whiscash, 824,
-    gMonShinyPalette_Luvdisc, 825,
-    gMonShinyPalette_Corphish, 826,
-    gMonShinyPalette_Crawdaunt, 827,
-    gMonShinyPalette_Feebas, 828,
-    gMonShinyPalette_Milotic, 829,
-    gMonShinyPalette_Carvanha, 830,
-    gMonShinyPalette_Sharpedo, 831,
-    gMonShinyPalette_Trapinch, 832,
-    gMonShinyPalette_Vibrava, 833,
-    gMonShinyPalette_Flygon, 834,
-    gMonShinyPalette_Makuhita, 835,
-    gMonShinyPalette_Hariyama, 836,
-    gMonShinyPalette_Electrike, 837,
-    gMonShinyPalette_Manectric, 838,
-    gMonShinyPalette_Numel, 839,
-    gMonShinyPalette_Camerupt, 840,
-    gMonShinyPalette_Spheal, 841,
-    gMonShinyPalette_Sealeo, 842,
-    gMonShinyPalette_Walrein, 843,
-    gMonShinyPalette_Cacnea, 844,
-    gMonShinyPalette_Cacturne, 845,
-    gMonShinyPalette_Snorunt, 846,
-    gMonShinyPalette_Glalie, 847,
-    gMonShinyPalette_Lunatone, 848,
-    gMonShinyPalette_Solrock, 849,
-    gMonShinyPalette_Azurill, 850,
-    gMonShinyPalette_Spoink, 851,
-    gMonShinyPalette_Grumpig, 852,
-    gMonShinyPalette_Plusle, 853,
-    gMonShinyPalette_Minun, 854,
-    gMonShinyPalette_Mawile, 855,
-    gMonShinyPalette_Meditite, 856,
-    gMonShinyPalette_Medicham, 857,
-    gMonShinyPalette_Swablu, 858,
-    gMonShinyPalette_Altaria, 859,
-    gMonShinyPalette_Wynaut, 860,
-    gMonShinyPalette_Duskull, 861,
-    gMonShinyPalette_Dusclops, 862,
-    gMonShinyPalette_Roselia, 863,
-    gMonShinyPalette_Slakoth, 864,
-    gMonShinyPalette_Vigoroth, 865,
-    gMonShinyPalette_Slaking, 866,
-    gMonShinyPalette_Gulpin, 867,
-    gMonShinyPalette_Swalot, 868,
-    gMonShinyPalette_Tropius, 869,
-    gMonShinyPalette_Whismur, 870,
-    gMonShinyPalette_Loudred, 871,
-    gMonShinyPalette_Exploud, 872,
-    gMonShinyPalette_Clamperl, 873,
-    gMonShinyPalette_Huntail, 874,
-    gMonShinyPalette_Gorebyss, 875,
-    gMonShinyPalette_Absol, 876,
-    gMonShinyPalette_Shuppet, 877,
-    gMonShinyPalette_Banette, 878,
-    gMonShinyPalette_Seviper, 879,
-    gMonShinyPalette_Zangoose, 880,
-    gMonShinyPalette_Relicanth, 881,
-    gMonShinyPalette_Aron, 882,
-    gMonShinyPalette_Lairon, 883,
-    gMonShinyPalette_Aggron, 884,
-    gMonShinyPalette_Castform, 885,
-    gMonShinyPalette_Volbeat, 886,
-    gMonShinyPalette_Illumise, 887,
-    gMonShinyPalette_Lileep, 888,
-    gMonShinyPalette_Cradily, 889,
-    gMonShinyPalette_Anorith, 890,
-    gMonShinyPalette_Armaldo, 891,
-    gMonShinyPalette_Ralts, 892,
-    gMonShinyPalette_Kirlia, 893,
-    gMonShinyPalette_Gardevoir, 894,
-    gMonShinyPalette_Bagon, 895,
-    gMonShinyPalette_Shelgon, 896,
-    gMonShinyPalette_Salamence, 897,
-    gMonShinyPalette_Beldum, 898,
-    gMonShinyPalette_Metang, 899,
-    gMonShinyPalette_Metagross, 900,
-    gMonShinyPalette_Regirock, 901,
-    gMonShinyPalette_Regice, 902,
-    gMonShinyPalette_Registeel, 903,
-    gMonShinyPalette_Kyogre, 904,
-    gMonShinyPalette_Groudon, 905,
-    gMonShinyPalette_Rayquaza, 906,
-    gMonShinyPalette_Latias, 907,
-    gMonShinyPalette_Latios, 908,
-    gMonShinyPalette_Jirachi, 909,
-    gMonShinyPalette_Deoxys, 910,
-    gMonShinyPalette_Chimecho, 911,
-    gMonPalette_Egg, 912,
-    gMonShinyPalette_Unown, 913,
-    gMonShinyPalette_Unown, 914,
-    gMonShinyPalette_Unown, 915,
-    gMonShinyPalette_Unown, 916,
-    gMonShinyPalette_Unown, 917,
-    gMonShinyPalette_Unown, 918,
-    gMonShinyPalette_Unown, 919,
-    gMonShinyPalette_Unown, 920,
-    gMonShinyPalette_Unown, 921,
-    gMonShinyPalette_Unown, 922,
-    gMonShinyPalette_Unown, 923,
-    gMonShinyPalette_Unown, 924,
-    gMonShinyPalette_Unown, 925,
-    gMonShinyPalette_Unown, 926,
-    gMonShinyPalette_Unown, 927,
-    gMonShinyPalette_Unown, 928,
-    gMonShinyPalette_Unown, 929,
-    gMonShinyPalette_Unown, 930,
-    gMonShinyPalette_Unown, 931,
-    gMonShinyPalette_Unown, 932,
-    gMonShinyPalette_Unown, 933,
-    gMonShinyPalette_Unown, 934,
-    gMonShinyPalette_Unown, 935,
-    gMonShinyPalette_Unown, 936,
-    gMonShinyPalette_Unown, 937,
-    gMonShinyPalette_Unown, 938,
-    gMonShinyPalette_Unown, 939,
+    [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},
 };

src/data/region_map/region_map_entries.h

@@ -126,7 +126,7 @@ static const u8 sMapName_MtMoon[] = _("MT. MOON");
 static const u8 sMapName_SSAnne[] = _("S.S. ANNE");
 static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH");
 static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH");
-static const u8 sMapName_DiglettsCave[] = _("DIGLETT’S CAVE");
+static const u8 sMapName_DiglettsCave[] = _("DIGLETT'S CAVE");
 static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD");
 static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT");
 static const u8 sMapName_SilphCo[] = _("SILPH CO.");