Merge branch 'master' into contest-ai-cleanup

154 files changed, 19006 insertions, 14824 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 2944bc1c6..4d1a9fe5c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -178,12 +178,12 @@ void InitHeap(void *heapStart, u32 heapSize)
 
 void *Alloc(u32 size)
 {
-    AllocInternal(sHeapStart, size);
+    return AllocInternal(sHeapStart, size);
 }
 
 void *AllocZeroed(u32 size)
 {
-    AllocZeroedInternal(sHeapStart, size);
+    return AllocZeroedInternal(sHeapStart, size);
 }
 
 void Free(void *pointer)
diff --git a/src/apprentice.c b/src/apprentice.c
index 27ff8e36e..ac2bba48f 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -2,7 +2,7 @@
 #include "apprentice.h"
 #include "battle.h"
 #include "battle_tower.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 61876e0de..5e832aba0 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -4,6 +4,7 @@
 #include "battle_ai_script_commands.h"
 #include "battle_factory.h"
 #include "battle_setup.h"
+#include "data.h"
 #include "item.h"
 #include "pokemon.h"
 #include "random.h"
@@ -2217,7 +2218,7 @@ static void BattleAICmd_if_flash_fired(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
-    if (gBattleResources->flags->flags[battlerId] & UNKNOWN_FLAG_FLASH_FIRE)
+    if (gBattleResources->flags->flags[battlerId] & RESOURCE_FLAG_FLASH_FIRE)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 31ff11ee8..a667c6177 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -26,7 +26,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2;
 
 extern const u16 gMovesWithQuietBGM[];
 extern const u8 *const gBattleAnims_Moves[];
-extern const struct BattleAnimBackground gBattleAnimBackgroundTable[];
 
 // this file's functions
 static void ScriptCmd_loadspritegfx(void);
@@ -117,1269 +116,1628 @@ EWRAM_DATA u8 gUnknown_02038440 = 0;
 
 const struct OamData gUnknown_08524904 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
     .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 
 const struct OamData gUnknown_0852490C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524914 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
     .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852491C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524924 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852492C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
     .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524934 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
     .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852493C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
     .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524944 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
     .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852494C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x32),
+    .x = 0,
     .size = SPRITE_SIZE(8x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524954 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
     .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852495C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
+    .x = 0,
     .size = SPRITE_SIZE(32x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524964 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
     .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852496C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524974 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
     .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852497C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524984 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852498C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
     .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524994 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
     .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_0852499C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
     .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249A4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
     .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249AC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x32),
+    .x = 0,
     .size = SPRITE_SIZE(8x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249B4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
     .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249BC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
+    .x = 0,
     .size = SPRITE_SIZE(32x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249C4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
     .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249CC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249D4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
     .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249DC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249E4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249EC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
     .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249F4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
     .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_085249FC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
     .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A04 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
     .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A0C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x32),
+    .x = 0,
     .size = SPRITE_SIZE(8x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A14 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
     .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A1C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
+    .x = 0,
     .size = SPRITE_SIZE(32x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A24 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
     .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A2C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A34 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
     .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A3C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A44 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A4C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
     .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A54 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
     .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A5C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
     .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A64 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
     .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A6C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x32),
+    .x = 0,
     .size = SPRITE_SIZE(8x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A74 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
     .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A7C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
+    .x = 0,
     .size = SPRITE_SIZE(32x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A84 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
     .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A8C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A94 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
     .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524A9C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AA4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AAC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
     .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AB4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
     .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524ABC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
     .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AC4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
     .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524ACC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x32),
+    .x = 0,
     .size = SPRITE_SIZE(8x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AD4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
     .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524ADC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
+    .x = 0,
     .size = SPRITE_SIZE(32x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AE4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
     .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AEC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AF4 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
     .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524AFC =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B04 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B0C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
     .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B14 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
     .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B1C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
     .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B24 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
     .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B2C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x32),
+    .x = 0,
     .size = SPRITE_SIZE(8x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B34 =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
     .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct OamData gUnknown_08524B3C =
 {
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
+    .x = 0,
     .size = SPRITE_SIZE(32x64),
+    .tileNum = 0,
     .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct CompressedSpriteSheet gBattleAnimPicTable[] =
 {
-    {gBattleAnimSpriteSheet_000, 0x0200, ANIM_TAG_BONE},
-    {gBattleAnimSpriteSheet_001, 0x0300, ANIM_TAG_SPARK},
-    {gBattleAnimSpriteSheet_002, 0x0200, ANIM_TAG_PENCIL},
-    {gBattleAnimSpriteSheet_003, 0x0100, ANIM_TAG_AIR_WAVE},
-    {gBattleAnimSpriteSheet_004, 0x0200, ANIM_TAG_UNUSED_ORB},
-    {gBattleAnimSpriteSheet_005, 0x0400, ANIM_TAG_SWORD},
-    {gBattleAnimSpriteSheet_006, 0x0180, ANIM_TAG_SEED},
-    {gBattleAnimSpriteSheet_007, 0x0800, ANIM_TAG_UNUSED_EXPLOSION},
-    {gBattleAnimSpriteSheet_008, 0x0020, ANIM_TAG_UNUSED_PINK_ORB},
-    {gBattleAnimSpriteSheet_009, 0x0400, ANIM_TAG_GUST},
-    {gBattleAnimSpriteSheet_010, 0x1200, ANIM_TAG_ICE_CUBE},
-    {gBattleAnimSpriteSheet_011, 0x0180, ANIM_TAG_SPARK_2},
-    {gBattleAnimSpriteSheet_012, 0x0080, ANIM_TAG_UNUSED_ORANGE},
-    {gBattleAnimSpriteSheet_013, 0x0080, ANIM_TAG_YELLOW_BALL},
-    {gBattleAnimSpriteSheet_014, 0x0280, ANIM_TAG_LOCK_ON},
-    {gBattleAnimSpriteSheet_015, 0x0080, ANIM_TAG_TIED_BAG},
-    {gBattleAnimSpriteSheet_016, 0x0100, ANIM_TAG_BLACK_SMOKE},
-    {gBattleAnimSpriteSheet_017, 0x0020, ANIM_TAG_BLACK_BALL},
-    {gBattleAnimSpriteSheet_018, 0x0080, ANIM_TAG_CONVERSION},
-    {gBattleAnimSpriteSheet_019, 0x0400, ANIM_TAG_UNUSED_GLASS},
-    {gBattleAnimSpriteSheet_020, 0x0200, ANIM_TAG_HORN_HIT},
-    {gBattleAnimSpriteSheet_021, 0x0A00, ANIM_TAG_UNUSED_HIT},
-    {gBattleAnimSpriteSheet_021, 0x0A00, ANIM_TAG_UNUSED_HIT_2},
-    {gBattleAnimSpriteSheet_023, 0x0380, ANIM_TAG_UNUSED_BLUE_SHARDS},
-    {gBattleAnimSpriteSheet_024, 0x0300, ANIM_TAG_UNUSED_CLOSING_EYE},
-    {gBattleAnimSpriteSheet_025, 0x0A00, ANIM_TAG_UNUSED_WAVING_HAND},
-    {gBattleAnimSpriteSheet_026, 0x0A00, ANIM_TAG_UNUSED_HIT_DUPLICATE},
-    {gBattleAnimSpriteSheet_027, 0x0A00, ANIM_TAG_LEER},
-    {gBattleAnimSpriteSheet_028, 0x0A00, ANIM_TAG_UNUSED_BLUE_BURST},
-    {gBattleAnimSpriteSheet_029, 0x0A00, ANIM_TAG_SMALL_EMBER},
-    {gBattleAnimSpriteSheet_030, 0x0A00, ANIM_TAG_GRAY_SMOKE},
-    {gBattleAnimSpriteSheet_031, 0x0E00, ANIM_TAG_BLUE_STAR},
-    {gBattleAnimSpriteSheet_032, 0x0380, ANIM_TAG_UNUSED_BUBBLE_BURST},
-    {gBattleAnimSpriteSheet_033, 0x1000, ANIM_TAG_FIRE},
-    {gBattleAnimSpriteSheet_034, 0x0800, ANIM_TAG_UNUSED_SPINNING_FIRE},
-    {gBattleAnimSpriteSheet_035, 0x0A00, ANIM_TAG_FIRE_PLUME},
-    {gBattleAnimSpriteSheet_036, 0x0800, ANIM_TAG_UNUSED_LIGHTNING},
-    {gBattleAnimSpriteSheet_037, 0x0A00, ANIM_TAG_LIGHTNING},
-    {gBattleAnimSpriteSheet_038, 0x0A00, ANIM_TAG_UNUSED_CLAW_SLASH},
-    {gBattleAnimSpriteSheet_039, 0x0A00, ANIM_TAG_CLAW_SLASH},
-    {gBattleAnimSpriteSheet_040, 0x0A00, ANIM_TAG_UNUSED_SCRATCH},
-    {gBattleAnimSpriteSheet_041, 0x0A00, ANIM_TAG_UNUSED_SCRATCH_2},
-    {gBattleAnimSpriteSheet_042, 0x0A00, ANIM_TAG_UNUSED_BUBBLE_BURST_2},
-    {gBattleAnimSpriteSheet_043, 0x0A00, ANIM_TAG_ICE_CHUNK},
-    {gBattleAnimSpriteSheet_044, 0x0A00, ANIM_TAG_UNUSED_GLASS_2},
-    {gBattleAnimSpriteSheet_045, 0x0A00, ANIM_TAG_UNUSED_PINK_HEART},
-    {gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP},
-    {gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP_2},
-    {gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_1},
-    {gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_2},
-    {gBattleAnimSpriteSheet_050, 0x0200, ANIM_TAG_HUMANOID_FOOT},
-    {gBattleAnimSpriteSheet_051, 0x0200, ANIM_TAG_UNUSED_MONSTER_FOOT},
-    {gBattleAnimSpriteSheet_052, 0x0200, ANIM_TAG_UNUSED_HUMANOID_HAND},
-    {gBattleAnimSpriteSheet_053, 0x0800, ANIM_TAG_NOISE_LINE},
-    {gBattleAnimSpriteSheet_054, 0x0080, ANIM_TAG_UNUSED_YELLOW_UNK},
-    {gBattleAnimSpriteSheet_055, 0x0200, ANIM_TAG_UNUSED_RED_FIST},
-    {gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_SLAM_HIT},
-    {gBattleAnimSpriteSheet_057, 0x0180, ANIM_TAG_UNUSED_RING},
-    {gBattleAnimSpriteSheet_058, 0x0C00, ANIM_TAG_ROCKS},
-    {gBattleAnimSpriteSheet_059, 0x0100, ANIM_TAG_UNUSED_Z},
-    {gBattleAnimSpriteSheet_060, 0x0040, ANIM_TAG_UNUSED_YELLOW_UNK_2},
-    {gBattleAnimSpriteSheet_061, 0x0180, ANIM_TAG_UNUSED_AIR_SLASH},
-    {gBattleAnimSpriteSheet_062, 0x0800, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS},
-    {gBattleAnimSpriteSheet_063, 0x0480, ANIM_TAG_LEAF},
-    {gBattleAnimSpriteSheet_064, 0x0200, ANIM_TAG_FINGER},
-    {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_POISON_POWDER},
-    {gBattleAnimSpriteSheet_066, 0x0100, ANIM_TAG_UNUSED_BROWN_TRIANGLE},
-    {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_SLEEP_POWDER},
-    {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_STUN_SPORE},
-    {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_UNUSED_POWDER},
-    {gBattleAnimSpriteSheet_070, 0x0200, ANIM_TAG_SPARKLE_3},
-    {gBattleAnimSpriteSheet_071, 0x0A00, ANIM_TAG_SPARKLE_4},
-    {gBattleAnimSpriteSheet_072, 0x0300, ANIM_TAG_MUSIC_NOTES},
-    {gBattleAnimSpriteSheet_073, 0x0180, ANIM_TAG_DUCK},
-    {gBattleAnimSpriteSheet_074, 0x00A0, ANIM_TAG_MUD_SAND},
-    {gBattleAnimSpriteSheet_075, 0x0700, ANIM_TAG_ALERT},
-    {gBattleAnimSpriteSheet_076, 0x0400, ANIM_TAG_UNUSED_BLUE_FLAMES},
-    {gBattleAnimSpriteSheet_077, 0x0200, ANIM_TAG_UNUSED_BLUE_FLAMES_2},
-    {gBattleAnimSpriteSheet_078, 0x0300, ANIM_TAG_UNUSED_SHOCK},
-    {gBattleAnimSpriteSheet_079, 0x0C00, ANIM_TAG_SHOCK},
-    {gBattleAnimSpriteSheet_080, 0x0A00, ANIM_TAG_UNUSED_BELL},
-    {gBattleAnimSpriteSheet_081, 0x0080, ANIM_TAG_UNUSED_PINK_GLOVE},
-    {gBattleAnimSpriteSheet_082, 0x0040, ANIM_TAG_UNUSED_BLUE_LINES},
-    {gBattleAnimSpriteSheet_083, 0x0E00, ANIM_TAG_UNUSED_IMPACT},
-    {gBattleAnimSpriteSheet_084, 0x0E00, ANIM_TAG_UNUSED_IMPACT_2},
-    {gBattleAnimSpriteSheet_085, 0x0280, ANIM_TAG_UNUSED_RETICLE},
-    {gBattleAnimSpriteSheet_086, 0x0200, ANIM_TAG_BREATH},
-    {gBattleAnimSpriteSheet_087, 0x0080, ANIM_TAG_ANGER},
-    {gBattleAnimSpriteSheet_088, 0x00C0, ANIM_TAG_UNUSED_SNOWBALL},
-    {gBattleAnimSpriteSheet_089, 0x0A00, ANIM_TAG_UNUSED_VINE},
-    {gBattleAnimSpriteSheet_090, 0x0200, ANIM_TAG_UNUSED_SWORD},
-    {gBattleAnimSpriteSheet_091, 0x0180, ANIM_TAG_UNUSED_CLAPPING},
-    {gBattleAnimSpriteSheet_092, 0x0080, ANIM_TAG_UNUSED_RED_TUBE},
-    {gBattleAnimSpriteSheet_093, 0x1000, ANIM_TAG_AMNESIA},
-    {gBattleAnimSpriteSheet_094, 0x0A00, ANIM_TAG_UNUSED_STRING},
-    {gBattleAnimSpriteSheet_095, 0x0180, ANIM_TAG_UNUSED_PENCIL},
-    {gBattleAnimSpriteSheet_096, 0x0380, ANIM_TAG_UNUSED_PETAL},
-    {gBattleAnimSpriteSheet_097, 0x0C00, ANIM_TAG_BENT_SPOON},
-    {gBattleAnimSpriteSheet_098, 0x0200, ANIM_TAG_UNUSED_WEB},
-    {gBattleAnimSpriteSheet_099, 0x0200, ANIM_TAG_MILK_BOTTLE},
-    {gBattleAnimSpriteSheet_100, 0x0200, ANIM_TAG_COIN},
-    {gBattleAnimSpriteSheet_101, 0x0200, ANIM_TAG_UNUSED_CRACKED_EGG},
-    {gBattleAnimSpriteSheet_102, 0x0400, ANIM_TAG_UNUSED_HATCHED_EGG},
-    {gBattleAnimSpriteSheet_103, 0x0080, ANIM_TAG_UNUSED_FRESH_EGG},
-    {gBattleAnimSpriteSheet_104, 0x0400, ANIM_TAG_UNUSED_FANGS},
-    {gBattleAnimSpriteSheet_105, 0x0c00, ANIM_TAG_UNUSED_EXPLOSION_2},
-    {gBattleAnimSpriteSheet_106, 0x0200, ANIM_TAG_UNUSED_EXPLOSION_3},
-    {gBattleAnimSpriteSheet_107, 0x1000, ANIM_TAG_UNUSED_WATER_DROPLET},
-    {gBattleAnimSpriteSheet_108, 0x0a00, ANIM_TAG_UNUSED_WATER_DROPLET_2},
-    {gBattleAnimSpriteSheet_109, 0x0020, ANIM_TAG_UNUSED_SEED},
-    {gBattleAnimSpriteSheet_110, 0x0e00, ANIM_TAG_UNUSED_SPROUT},
-    {gBattleAnimSpriteSheet_111, 0x0080, ANIM_TAG_UNUSED_RED_WAND},
-    {gBattleAnimSpriteSheet_112, 0x0a00, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK},
-    {gBattleAnimSpriteSheet_113, 0x0400, ANIM_TAG_UNUSED_WATER_COLUMN},
-    {gBattleAnimSpriteSheet_114, 0x0200, ANIM_TAG_UNUSED_MUD_UNK},
-    {gBattleAnimSpriteSheet_115, 0x0700, ANIM_TAG_RAIN_DROPS},
-    {gBattleAnimSpriteSheet_116, 0x0800, ANIM_TAG_UNUSED_FURY_SWIPES},
-    {gBattleAnimSpriteSheet_117, 0x0a00, ANIM_TAG_UNUSED_VINE_2},
-    {gBattleAnimSpriteSheet_118, 0x0600, ANIM_TAG_UNUSED_TEETH},
-    {gBattleAnimSpriteSheet_119, 0x0800, ANIM_TAG_UNUSED_BONE},
-    {gBattleAnimSpriteSheet_120, 0x0200, ANIM_TAG_UNUSED_WHITE_BAG},
-    {gBattleAnimSpriteSheet_121, 0x0040, ANIM_TAG_UNUSED_UNKNOWN},
-    {gBattleAnimSpriteSheet_122, 0x0180, ANIM_TAG_UNUSED_PURPLE_CORAL},
-    {gBattleAnimSpriteSheet_123, 0x0600, ANIM_TAG_UNUSED_PURPLE_DROPLET},
-    {gBattleAnimSpriteSheet_124, 0x0600, ANIM_TAG_UNUSED_SHOCK_2},
-    {gBattleAnimSpriteSheet_125, 0x0200, ANIM_TAG_UNUSED_CLOSING_EYE_2},
-    {gBattleAnimSpriteSheet_126, 0x0080, ANIM_TAG_UNUSED_METAL_BALL},
-    {gBattleAnimSpriteSheet_127, 0x0200, ANIM_TAG_UNUSED_MONSTER_DOLL},
-    {gBattleAnimSpriteSheet_128, 0x0800, ANIM_TAG_UNUSED_WHIRLWIND},
-    {gBattleAnimSpriteSheet_129, 0x0080, ANIM_TAG_UNUSED_WHIRLWIND_2},
-    {gBattleAnimSpriteSheet_130, 0x0a00, ANIM_TAG_UNUSED_EXPLOSION_4},
-    {gBattleAnimSpriteSheet_131, 0x0280, ANIM_TAG_UNUSED_EXPLOSION_5},
-    {gBattleAnimSpriteSheet_132, 0x0280, ANIM_TAG_UNUSED_TONGUE},
-    {gBattleAnimSpriteSheet_133, 0x0100, ANIM_TAG_UNUSED_SMOKE},
-    {gBattleAnimSpriteSheet_134, 0x0200, ANIM_TAG_UNUSED_SMOKE_2},
-    {gBattleAnimSpriteSheet_135, 0x0200, ANIM_TAG_IMPACT},
-    {gBattleAnimSpriteSheet_136, 0x0020, ANIM_TAG_CIRCLE_IMPACT},
-    {gBattleAnimSpriteSheet_137, 0x0a00, ANIM_TAG_SCRATCH},
-    {gBattleAnimSpriteSheet_138, 0x0800, ANIM_TAG_CUT},
-    {gBattleAnimSpriteSheet_139, 0x0800, ANIM_TAG_SHARP_TEETH},
-    {gBattleAnimSpriteSheet_140, 0x00c0, ANIM_TAG_RAINBOW_RINGS},
-    {gBattleAnimSpriteSheet_141, 0x01c0, ANIM_TAG_ICE_CRYSTALS},
-    {gBattleAnimSpriteSheet_142, 0x0100, ANIM_TAG_ICE_SPIKES},
-    {gBattleAnimSpriteSheet_143, 0x0800, ANIM_TAG_HANDS_AND_FEET},
-    {gBattleAnimSpriteSheet_144, 0x0200, ANIM_TAG_MIST_CLOUD},
-    {gBattleAnimSpriteSheet_145, 0x0800, ANIM_TAG_CLAMP},
-    {gBattleAnimSpriteSheet_146, 0x0180, ANIM_TAG_BUBBLE},
-    {gBattleAnimSpriteSheet_147, 0x0180, ANIM_TAG_ORBS},
-    {gBattleAnimSpriteSheet_148, 0x0200, ANIM_TAG_WATER_IMPACT},
-    {gBattleAnimSpriteSheet_149, 0x0200, ANIM_TAG_WATER_ORB},
-    {gBattleAnimSpriteSheet_150, 0x0180, ANIM_TAG_POISON_BUBBLE},
-    {gBattleAnimSpriteSheet_151, 0x0400, ANIM_TAG_TOXIC_BUBBLE},
-    {gBattleAnimSpriteSheet_152, 0x0080, ANIM_TAG_SPIKES},
-    {gBattleAnimSpriteSheet_153, 0x0100, ANIM_TAG_HORN_HIT_2},
-    {gBattleAnimSpriteSheet_154, 0x0100, ANIM_TAG_AIR_WAVE_2},
-    {gBattleAnimSpriteSheet_155, 0x0140, ANIM_TAG_SMALL_BUBBLES},
-    {gBattleAnimSpriteSheet_156, 0x0800, ANIM_TAG_ROUND_SHADOW},
-    {gBattleAnimSpriteSheet_157, 0x0200, ANIM_TAG_SUNLIGHT},
-    {gBattleAnimSpriteSheet_158, 0x0100, ANIM_TAG_SPORE},
-    {gBattleAnimSpriteSheet_159, 0x00a0, ANIM_TAG_FLOWER},
-    {gBattleAnimSpriteSheet_160, 0x0100, ANIM_TAG_RAZOR_LEAF},
-    {gBattleAnimSpriteSheet_161, 0x0080, ANIM_TAG_NEEDLE},
-    {gBattleAnimSpriteSheet_162, 0x0300, ANIM_TAG_WHIRLWIND_LINES},
-    {gBattleAnimSpriteSheet_163, 0x0100, ANIM_TAG_GOLD_RING},
-    {gBattleAnimSpriteSheet_163, 0x0100, ANIM_TAG_PURPLE_RING},
-    {gBattleAnimSpriteSheet_163, 0x0100, ANIM_TAG_BLUE_RING},
-    {gBattleAnimSpriteSheet_166, 0x0800, ANIM_TAG_GREEN_LIGHT_WALL},
-    {gBattleAnimSpriteSheet_166, 0x0800, ANIM_TAG_BLUE_LIGHT_WALL},
-    {gBattleAnimSpriteSheet_166, 0x0800, ANIM_TAG_RED_LIGHT_WALL},
-    {gBattleAnimSpriteSheet_166, 0x0800, ANIM_TAG_GRAY_LIGHT_WALL},
-    {gBattleAnimSpriteSheet_166, 0x0800, ANIM_TAG_ORANGE_LIGHT_WALL},
-    {gBattleAnimSpriteSheet_171, 0x0080, ANIM_TAG_BLACK_BALL_2},
-    {gBattleAnimSpriteSheet_144, 0x0200, ANIM_TAG_PURPLE_GAS_CLOUD},
-    {gBattleAnimSpriteSheet_173, 0x0200, ANIM_TAG_SPARK_H},
-    {gBattleAnimSpriteSheet_174, 0x0200, ANIM_TAG_YELLOW_STAR},
-    {gBattleAnimSpriteSheet_175, 0x0080, ANIM_TAG_LARGE_FRESH_EGG},
-    {gBattleAnimSpriteSheet_176, 0x0200, ANIM_TAG_SHADOW_BALL},
-    {gBattleAnimSpriteSheet_177, 0x0500, ANIM_TAG_LICK},
-    {gBattleAnimSpriteSheet_178, 0x0800, ANIM_TAG_UNUSED_VOID_LINES},
-    {gBattleAnimSpriteSheet_179, 0x0400, ANIM_TAG_STRING},
-    {gBattleAnimSpriteSheet_180, 0x0020, ANIM_TAG_WEB_THREAD},
-    {gBattleAnimSpriteSheet_181, 0x0800, ANIM_TAG_SPIDER_WEB},
-    {gBattleAnimSpriteSheet_182, 0x0100, ANIM_TAG_UNUSED_LIGHTBULB},
-    {gBattleAnimSpriteSheet_183, 0x0800, ANIM_TAG_SLASH},
-    {gBattleAnimSpriteSheet_184, 0x0400, ANIM_TAG_FOCUS_ENERGY},
-    {gBattleAnimSpriteSheet_185, 0x0a00, ANIM_TAG_SPHERE_TO_CUBE},
-    {gBattleAnimSpriteSheet_186, 0x1000, ANIM_TAG_TENDRILS},
-    {gBattleAnimSpriteSheet_187, 0x0800, ANIM_TAG_EYE},
-    {gBattleAnimSpriteSheet_188, 0x0400, ANIM_TAG_WHITE_SHADOW},
-    {gBattleAnimSpriteSheet_189, 0x0200, ANIM_TAG_TEAL_ALERT},
-    {gBattleAnimSpriteSheet_190, 0x0800, ANIM_TAG_OPENING_EYE},
-    {gBattleAnimSpriteSheet_191, 0x0800, ANIM_TAG_ROUND_WHITE_HALO},
-    {gBattleAnimSpriteSheet_192, 0x0800, ANIM_TAG_FANG_ATTACK},
-    {gBattleAnimSpriteSheet_193, 0x0200, ANIM_TAG_PURPLE_HAND_OUTLINE},
-    {gBattleAnimSpriteSheet_194, 0x0800, ANIM_TAG_MOON},
-    {gBattleAnimSpriteSheet_195, 0x0200, ANIM_TAG_GREEN_SPARKLE},
-    {gBattleAnimSpriteSheet_196, 0x0800, ANIM_TAG_SPIRAL},
-    {gBattleAnimSpriteSheet_197, 0x0200, ANIM_TAG_SNORE_Z},
-    {gBattleAnimSpriteSheet_198, 0x0800, ANIM_TAG_EXPLOSION},
-    {gBattleAnimSpriteSheet_199, 0x0400, ANIM_TAG_NAIL},
-    {gBattleAnimSpriteSheet_200, 0x0200, ANIM_TAG_GHOSTLY_SPIRIT},
-    {gBattleAnimSpriteSheet_201, 0x0a80, ANIM_TAG_WARM_ROCK},
-    {gBattleAnimSpriteSheet_202, 0x0600, ANIM_TAG_BREAKING_EGG},
-    {gBattleAnimSpriteSheet_203, 0x0800, ANIM_TAG_THIN_RING},
-    {gBattleAnimSpriteSheet_204, 0x0200, ANIM_TAG_UNUSED_PUNCH_IMPACT},
-    {gBattleAnimSpriteSheet_205, 0x0600, ANIM_TAG_BELL},
-    {gBattleAnimSpriteSheet_206, 0x0800, ANIM_TAG_MUSIC_NOTES_2},
-    {gBattleAnimSpriteSheet_207, 0x0180, ANIM_TAG_SPEED_DUST},
-    {gBattleAnimSpriteSheet_208, 0x0800, ANIM_TAG_TORN_METAL},
-    {gBattleAnimSpriteSheet_209, 0x0800, ANIM_TAG_THOUGHT_BUBBLE},
-    {gBattleAnimSpriteSheet_210, 0x0080, ANIM_TAG_MAGENTA_HEART},
-    {gBattleAnimSpriteSheet_211, 0x0080, ANIM_TAG_ELECTRIC_ORBS},
-    {gBattleAnimSpriteSheet_212, 0x0800, ANIM_TAG_CIRCLE_OF_LIGHT},
-    {gBattleAnimSpriteSheet_213, 0x0800, ANIM_TAG_ELECTRICITY},
-    {gBattleAnimSpriteSheet_214, 0x0600, ANIM_TAG_FINGER_2},
-    {gBattleAnimSpriteSheet_215, 0x0600, ANIM_TAG_MOVEMENT_WAVES},
-    {gBattleAnimSpriteSheet_210, 0x0080, ANIM_TAG_RED_HEART},
-    {gBattleAnimSpriteSheet_217, 0x0080, ANIM_TAG_RED_ORB},
-    {gBattleAnimSpriteSheet_218, 0x0180, ANIM_TAG_EYE_SPARKLE},
-    {gBattleAnimSpriteSheet_210, 0x0080, ANIM_TAG_PINK_HEART},
-    {gBattleAnimSpriteSheet_220, 0x0200, ANIM_TAG_ANGEL},
-    {gBattleAnimSpriteSheet_221, 0x0400, ANIM_TAG_DEVIL},
-    {gBattleAnimSpriteSheet_222, 0x0a00, ANIM_TAG_SWIPE},
-    {gBattleAnimSpriteSheet_223, 0x0800, ANIM_TAG_ROOTS},
-    {gBattleAnimSpriteSheet_224, 0x0200, ANIM_TAG_ITEM_BAG},
-    {gBattleAnimSpriteSheet_225, 0x0400, ANIM_TAG_JAGGED_MUSIC_NOTE},
-    {gBattleAnimSpriteSheet_226, 0x0080, ANIM_TAG_POKEBALL},
-    {gBattleAnimSpriteSheet_227, 0x0800, ANIM_TAG_SPOTLIGHT},
-    {gBattleAnimSpriteSheet_228, 0x0200, ANIM_TAG_LETTER_Z},
-    {gBattleAnimSpriteSheet_229, 0x0300, ANIM_TAG_RAPID_SPIN},
-    {gBattleAnimSpriteSheet_230, 0x0800, ANIM_TAG_TRI_FORCE_TRIANGLE},
-    {gBattleAnimSpriteSheet_231, 0x0380, ANIM_TAG_WISP_ORB},
-    {gBattleAnimSpriteSheet_232, 0x0800, ANIM_TAG_WISP_FIRE},
-    {gBattleAnimSpriteSheet_233, 0x00c0, ANIM_TAG_GOLD_STARS},
-    {gBattleAnimSpriteSheet_234, 0x0800, ANIM_TAG_ECLIPSING_ORB},
-    {gBattleAnimSpriteSheet_235, 0x0060, ANIM_TAG_GRAY_ORB},
-    {gBattleAnimSpriteSheet_235, 0x0060, ANIM_TAG_BLUE_ORB},
-    {gBattleAnimSpriteSheet_235, 0x0060, ANIM_TAG_RED_ORB_2},
-    {gBattleAnimSpriteSheet_238, 0x0080, ANIM_TAG_PINK_PETAL},
-    {gBattleAnimSpriteSheet_239, 0x0180, ANIM_TAG_PAIN_SPLIT},
-    {gBattleAnimSpriteSheet_240, 0x0180, ANIM_TAG_CONFETTI},
-    {gBattleAnimSpriteSheet_241, 0x0200, ANIM_TAG_GREEN_STAR},
-    {gBattleAnimSpriteSheet_242, 0x0200, ANIM_TAG_PINK_CLOUD},
-    {gBattleAnimSpriteSheet_243, 0x0020, ANIM_TAG_SWEAT_DROP},
-    {gBattleAnimSpriteSheet_244, 0x0400, ANIM_TAG_GUARD_RING},
-    {gBattleAnimSpriteSheet_245, 0x0600, ANIM_TAG_PURPLE_SCRATCH},
-    {gBattleAnimSpriteSheet_246, 0x1000, ANIM_TAG_PURPLE_SWIPE},
-    {gBattleAnimSpriteSheet_247, 0x0400, ANIM_TAG_TAG_HAND},
-    {gBattleAnimSpriteSheet_248, 0x0020, ANIM_TAG_SMALL_RED_EYE},
-    {gBattleAnimSpriteSheet_249, 0x0080, ANIM_TAG_HOLLOW_ORB},
-    {gBattleAnimSpriteSheet_250, 0x0800, ANIM_TAG_X_SIGN},
-    {gBattleAnimSpriteSheet_251, 0x0080, ANIM_TAG_BLUEGREEN_ORB},
-    {gBattleAnimSpriteSheet_252, 0x0200, ANIM_TAG_PAW_PRINT},
-    {gBattleAnimSpriteSheet_253, 0x0400, ANIM_TAG_PURPLE_FLAME},
-    {gBattleAnimSpriteSheet_254, 0x0200, ANIM_TAG_RED_BALL},
-    {gBattleAnimSpriteSheet_255, 0x0200, ANIM_TAG_SMELLINGSALT_EFFECT},
-    {gBattleAnimSpriteSheet_256, 0x0800, ANIM_TAG_METEOR},
-    {gBattleAnimSpriteSheet_257, 0x0280, ANIM_TAG_FLAT_ROCK},
-    {gBattleAnimSpriteSheet_258, 0x0200, ANIM_TAG_MAGNIFYING_GLASS},
-    {gBattleAnimSpriteSheet_149, 0x0200, ANIM_TAG_BROWN_ORB},
-    {gBattleAnimSpriteSheet_260, 0x0400, ANIM_TAG_METAL_SOUND_WAVES},
-    {gBattleAnimSpriteSheet_261, 0x0200, ANIM_TAG_FLYING_DIRT},
-    {gBattleAnimSpriteSheet_262, 0x0200, ANIM_TAG_ICICLE_SPEAR},
-    {gBattleAnimSpriteSheet_263, 0x0080, ANIM_TAG_HAIL},
-    {gBattleAnimSpriteSheet_264, 0x0020, ANIM_TAG_GLOWY_RED_ORB},
-    {gBattleAnimSpriteSheet_264, 0x0020, ANIM_TAG_GLOWY_GREEN_ORB},
-    {gBattleAnimSpriteSheet_266, 0x0080, ANIM_TAG_GREEN_SPIKE},
-    {gBattleAnimSpriteSheet_212, 0x0800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
-    {gBattleAnimSpriteSheet_264, 0x0020, ANIM_TAG_GLOWY_BLUE_ORB},
-    {gBattleAnimSpriteSheet_269, 0x0080, ANIM_TAG_UNUSED_RED_BRICK},
-    {gBattleAnimSpriteSheet_270, 0x0400, ANIM_TAG_WHITE_FEATHER},
-    {gBattleAnimSpriteSheet_271, 0x0080, ANIM_TAG_SPARKLE_6},
-    {gBattleAnimSpriteSheet_272, 0x0800, ANIM_TAG_SPLASH},
-    {gBattleAnimSpriteSheet_273, 0x0020, ANIM_TAG_SWEAT_BEAD},
-    {gBattleAnimSpriteSheet_274, 0x0800, ANIM_TAG_UNUSED_GEM_1},
-    {gBattleAnimSpriteSheet_275, 0x0800, ANIM_TAG_UNUSED_GEM_2},
-    {gBattleAnimSpriteSheet_276, 0x0800, ANIM_TAG_UNUSED_GEM_3},
-    {gBattleAnimSpriteSheet_277, 0x1000, ANIM_TAG_SLAM_HIT_2},
-    {gBattleAnimSpriteSheet_278, 0x0800, ANIM_TAG_RECYCLE},
-    {gBattleAnimSpriteSheet_279, 0x00a0, ANIM_TAG_UNUSED_RED_PARTICLES},
-    {gBattleAnimSpriteSheet_280, 0x0800, ANIM_TAG_PROTECT},
-    {gBattleAnimSpriteSheet_281, 0x0200, ANIM_TAG_DIRT_MOUND},
-    {gBattleAnimSpriteSheet_282, 0x0600, ANIM_TAG_SHOCK_3},
-    {gBattleAnimSpriteSheet_283, 0x0200, ANIM_TAG_WEATHER_BALL},
-    {gBattleAnimSpriteSheet_284, 0x0800, ANIM_TAG_BIRD},
-    {gBattleAnimSpriteSheet_285, 0x0200, ANIM_TAG_CROSS_IMPACT},
-    {gBattleAnimSpriteSheet_183, 0x0800, ANIM_TAG_SLASH_2},
-    {gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_WHIP_HIT},
-    {gBattleAnimSpriteSheet_163, 0x0100, ANIM_TAG_BLUE_RING_2},
+    {gBattleAnimSpriteGfx_Bone, 0x0200, ANIM_TAG_BONE},
+    {gBattleAnimSpriteGfx_Spark, 0x0300, ANIM_TAG_SPARK},
+    {gBattleAnimSpriteGfx_Pencil, 0x0200, ANIM_TAG_PENCIL},
+    {gBattleAnimSpriteGfx_AirWave, 0x0100, ANIM_TAG_AIR_WAVE},
+    {gBattleAnimSpriteGfx_Orb, 0x0200, ANIM_TAG_ORB},
+    {gBattleAnimSpriteGfx_Sword, 0x0400, ANIM_TAG_SWORD},
+    {gBattleAnimSpriteGfx_Seed, 0x0180, ANIM_TAG_SEED},
+    {gBattleAnimSpriteGfx_Explosion6, 0x0800, ANIM_TAG_EXPLOSION_6},
+    {gBattleAnimSpriteGfx_PinkOrb, 0x0020, ANIM_TAG_PINK_ORB},
+    {gBattleAnimSpriteGfx_Gust, 0x0400, ANIM_TAG_GUST},
+    {gBattleAnimSpriteGfx_IceCube, 0x1200, ANIM_TAG_ICE_CUBE},
+    {gBattleAnimSpriteGfx_Spark2, 0x0180, ANIM_TAG_SPARK_2},
+    {gBattleAnimSpriteGfx_Orange, 0x0080, ANIM_TAG_ORANGE},
+    {gBattleAnimSpriteGfx_YellowBall, 0x0080, ANIM_TAG_YELLOW_BALL},
+    {gBattleAnimSpriteGfx_LockOn, 0x0280, ANIM_TAG_LOCK_ON},
+    {gBattleAnimSpriteGfx_TiedBag, 0x0080, ANIM_TAG_TIED_BAG},
+    {gBattleAnimSpriteGfx_BlackSmoke, 0x0100, ANIM_TAG_BLACK_SMOKE},
+    {gBattleAnimSpriteGfx_BlackBall, 0x0020, ANIM_TAG_BLACK_BALL},
+    {gBattleAnimSpriteGfx_Conversion, 0x0080, ANIM_TAG_CONVERSION},
+    {gBattleAnimSpriteGfx_Glass, 0x0400, ANIM_TAG_GLASS},
+    {gBattleAnimSpriteGfx_HornHit, 0x0200, ANIM_TAG_HORN_HIT},
+    {gBattleAnimSpriteGfx_Hit, 0x0A00, ANIM_TAG_HIT},
+    {gBattleAnimSpriteGfx_Hit, 0x0A00, ANIM_TAG_HIT_2},
+    {gBattleAnimSpriteGfx_BlueShards, 0x0380, ANIM_TAG_BLUE_SHARDS},
+    {gBattleAnimSpriteGfx_ClosingEye, 0x0300, ANIM_TAG_CLOSING_EYE},
+    {gBattleAnimSpriteGfx_WavingHand, 0x0A00, ANIM_TAG_WAVING_HAND},
+    {gBattleAnimSpriteGfx_HitDuplicate, 0x0A00, ANIM_TAG_HIT_DUPLICATE},
+    {gBattleAnimSpriteGfx_Leer, 0x0A00, ANIM_TAG_LEER},
+    {gBattleAnimSpriteGfx_BlueBurst, 0x0A00, ANIM_TAG_BLUE_BURST},
+    {gBattleAnimSpriteGfx_SmallEmber, 0x0A00, ANIM_TAG_SMALL_EMBER},
+    {gBattleAnimSpriteGfx_GraySmoke, 0x0A00, ANIM_TAG_GRAY_SMOKE},
+    {gBattleAnimSpriteGfx_BlueStar, 0x0E00, ANIM_TAG_BLUE_STAR},
+    {gBattleAnimSpriteGfx_BubbleBurst, 0x0380, ANIM_TAG_BUBBLE_BURST},
+    {gBattleAnimSpriteGfx_Fire, 0x1000, ANIM_TAG_FIRE},
+    {gBattleAnimSpriteGfx_SpinningFire, 0x0800, ANIM_TAG_SPINNING_FIRE},
+    {gBattleAnimSpriteGfx_FirePlume, 0x0A00, ANIM_TAG_FIRE_PLUME},
+    {gBattleAnimSpriteGfx_Lightning2, 0x0800, ANIM_TAG_LIGHTNING_2},
+    {gBattleAnimSpriteGfx_Lightning, 0x0A00, ANIM_TAG_LIGHTNING},
+    {gBattleAnimSpriteGfx_ClawSlash2, 0x0A00, ANIM_TAG_CLAW_SLASH_2},
+    {gBattleAnimSpriteGfx_ClawSlash, 0x0A00, ANIM_TAG_CLAW_SLASH},
+    {gBattleAnimSpriteGfx_Scratch3, 0x0A00, ANIM_TAG_SCRATCH_3},
+    {gBattleAnimSpriteGfx_Scratch2, 0x0A00, ANIM_TAG_SCRATCH_2},
+    {gBattleAnimSpriteGfx_BubbleBurst2, 0x0A00, ANIM_TAG_BUBBLE_BURST_2},
+    {gBattleAnimSpriteGfx_IceChunk, 0x0A00, ANIM_TAG_ICE_CHUNK},
+    {gBattleAnimSpriteGfx_Glass2, 0x0A00, ANIM_TAG_GLASS_2},
+    {gBattleAnimSpriteGfx_PinkHeart2, 0x0A00, ANIM_TAG_PINK_HEART_2},
+    {gBattleAnimSpriteGfx_SapDrip, 0x1000, ANIM_TAG_SAP_DRIP},
+    {gBattleAnimSpriteGfx_SapDrip, 0x1000, ANIM_TAG_SAP_DRIP_2},
+    {gBattleAnimSpriteGfx_Sparkle1, 0x1000, ANIM_TAG_SPARKLE_1},
+    {gBattleAnimSpriteGfx_Sparkle1, 0x1000, ANIM_TAG_SPARKLE_2},
+    {gBattleAnimSpriteGfx_HumanoidFoot, 0x0200, ANIM_TAG_HUMANOID_FOOT},
+    {gBattleAnimSpriteGfx_MonsterFoot, 0x0200, ANIM_TAG_MONSTER_FOOT},
+    {gBattleAnimSpriteGfx_HumanoidHand, 0x0200, ANIM_TAG_HUMANOID_HAND},
+    {gBattleAnimSpriteGfx_NoiseLine, 0x0800, ANIM_TAG_NOISE_LINE},
+    {gBattleAnimSpriteGfx_YellowUnk, 0x0080, ANIM_TAG_YELLOW_UNK},
+    {gBattleAnimSpriteGfx_RedFist, 0x0200, ANIM_TAG_RED_FIST},
+    {gBattleAnimSpriteGfx_SlamHit, 0x1000, ANIM_TAG_SLAM_HIT},
+    {gBattleAnimSpriteGfx_Ring, 0x0180, ANIM_TAG_RING},
+    {gBattleAnimSpriteGfx_Rocks, 0x0C00, ANIM_TAG_ROCKS},
+    {gBattleAnimSpriteGfx_Z, 0x0100, ANIM_TAG_Z},
+    {gBattleAnimSpriteGfx_YellowUnk2, 0x0040, ANIM_TAG_YELLOW_UNK_2},
+    {gBattleAnimSpriteGfx_AirSlash, 0x0180, ANIM_TAG_AIR_SLASH},
+    {gBattleAnimSpriteGfx_SpinningGreenOrbs, 0x0800, ANIM_TAG_SPINNING_GREEN_ORBS},
+    {gBattleAnimSpriteGfx_Leaf, 0x0480, ANIM_TAG_LEAF},
+    {gBattleAnimSpriteGfx_Finger, 0x0200, ANIM_TAG_FINGER},
+    {gBattleAnimSpriteGfx_PoisonPowder, 0x0200, ANIM_TAG_POISON_POWDER},
+    {gBattleAnimSpriteGfx_BrownTriangle, 0x0100, ANIM_TAG_BROWN_TRIANGLE},
+    {gBattleAnimSpriteGfx_PoisonPowder, 0x0200, ANIM_TAG_SLEEP_POWDER},
+    {gBattleAnimSpriteGfx_PoisonPowder, 0x0200, ANIM_TAG_STUN_SPORE},
+    {gBattleAnimSpriteGfx_PoisonPowder, 0x0200, ANIM_TAG_POWDER},
+    {gBattleAnimSpriteGfx_Sparkle3, 0x0200, ANIM_TAG_SPARKLE_3},
+    {gBattleAnimSpriteGfx_Sparkle4, 0x0A00, ANIM_TAG_SPARKLE_4},
+    {gBattleAnimSpriteGfx_MusicNotes, 0x0300, ANIM_TAG_MUSIC_NOTES},
+    {gBattleAnimSpriteGfx_Duck, 0x0180, ANIM_TAG_DUCK},
+    {gBattleAnimSpriteGfx_MudSand, 0x00A0, ANIM_TAG_MUD_SAND},
+    {gBattleAnimSpriteGfx_Alert, 0x0700, ANIM_TAG_ALERT},
+    {gBattleAnimSpriteGfx_BlueFlames, 0x0400, ANIM_TAG_BLUE_FLAMES},
+    {gBattleAnimSpriteGfx_BlueFlames2, 0x0200, ANIM_TAG_BLUE_FLAMES_2},
+    {gBattleAnimSpriteGfx_Shock4, 0x0300, ANIM_TAG_SHOCK_4},
+    {gBattleAnimSpriteGfx_Shock, 0x0C00, ANIM_TAG_SHOCK},
+    {gBattleAnimSpriteGfx_Bell2, 0x0A00, ANIM_TAG_BELL_2},
+    {gBattleAnimSpriteGfx_PinkGlove, 0x0080, ANIM_TAG_PINK_GLOVE},
+    {gBattleAnimSpriteGfx_BlueLines, 0x0040, ANIM_TAG_BLUE_LINES},
+    {gBattleAnimSpriteGfx_Impact3, 0x0E00, ANIM_TAG_IMPACT_3},
+    {gBattleAnimSpriteGfx_Impact2, 0x0E00, ANIM_TAG_IMPACT_2},
+    {gBattleAnimSpriteGfx_Reticle, 0x0280, ANIM_TAG_RETICLE},
+    {gBattleAnimSpriteGfx_Breath, 0x0200, ANIM_TAG_BREATH},
+    {gBattleAnimSpriteGfx_Anger, 0x0080, ANIM_TAG_ANGER},
+    {gBattleAnimSpriteGfx_Snowball, 0x00C0, ANIM_TAG_SNOWBALL},
+    {gBattleAnimSpriteGfx_Vine, 0x0A00, ANIM_TAG_VINE},
+    {gBattleAnimSpriteGfx_Sword2, 0x0200, ANIM_TAG_SWORD_2},
+    {gBattleAnimSpriteGfx_Clapping, 0x0180, ANIM_TAG_CLAPPING},
+    {gBattleAnimSpriteGfx_RedTube, 0x0080, ANIM_TAG_RED_TUBE},
+    {gBattleAnimSpriteGfx_Amnesia, 0x1000, ANIM_TAG_AMNESIA},
+    {gBattleAnimSpriteGfx_String2, 0x0A00, ANIM_TAG_STRING_2},
+    {gBattleAnimSpriteGfx_Pencil2, 0x0180, ANIM_TAG_PENCIL_2},
+    {gBattleAnimSpriteGfx_Petal, 0x0380, ANIM_TAG_PETAL},
+    {gBattleAnimSpriteGfx_BentSpoon, 0x0C00, ANIM_TAG_BENT_SPOON},
+    {gBattleAnimSpriteGfx_Web, 0x0200, ANIM_TAG_WEB},
+    {gBattleAnimSpriteGfx_MilkBottle, 0x0200, ANIM_TAG_MILK_BOTTLE},
+    {gBattleAnimSpriteGfx_Coin, 0x0200, ANIM_TAG_COIN},
+    {gBattleAnimSpriteGfx_CrackedEgg, 0x0200, ANIM_TAG_CRACKED_EGG},
+    {gBattleAnimSpriteGfx_HatchedEgg, 0x0400, ANIM_TAG_HATCHED_EGG},
+    {gBattleAnimSpriteGfx_FreshEgg, 0x0080, ANIM_TAG_FRESH_EGG},
+    {gBattleAnimSpriteGfx_Fangs, 0x0400, ANIM_TAG_FANGS},
+    {gBattleAnimSpriteGfx_Explosion2, 0x0c00, ANIM_TAG_EXPLOSION_2},
+    {gBattleAnimSpriteGfx_Explosion3, 0x0200, ANIM_TAG_EXPLOSION_3},
+    {gBattleAnimSpriteGfx_WaterDroplet, 0x1000, ANIM_TAG_WATER_DROPLET},
+    {gBattleAnimSpriteGfx_WaterDroplet2, 0x0a00, ANIM_TAG_WATER_DROPLET_2},
+    {gBattleAnimSpriteGfx_Seed2, 0x0020, ANIM_TAG_SEED_2},
+    {gBattleAnimSpriteGfx_Sprout, 0x0e00, ANIM_TAG_SPROUT},
+    {gBattleAnimSpriteGfx_RedWand, 0x0080, ANIM_TAG_RED_WAND},
+    {gBattleAnimSpriteGfx_PurpleGreenUnk, 0x0a00, ANIM_TAG_PURPLE_GREEN_UNK},
+    {gBattleAnimSpriteGfx_WaterColumn, 0x0400, ANIM_TAG_WATER_COLUMN},
+    {gBattleAnimSpriteGfx_MudUnk, 0x0200, ANIM_TAG_MUD_UNK},
+    {gBattleAnimSpriteGfx_RainDrops, 0x0700, ANIM_TAG_RAIN_DROPS},
+    {gBattleAnimSpriteGfx_FurySwipes, 0x0800, ANIM_TAG_FURY_SWIPES},
+    {gBattleAnimSpriteGfx_Vine2, 0x0a00, ANIM_TAG_VINE_2},
+    {gBattleAnimSpriteGfx_Teeth, 0x0600, ANIM_TAG_TEETH},
+    {gBattleAnimSpriteGfx_Bone2, 0x0800, ANIM_TAG_BONE_2},
+    {gBattleAnimSpriteGfx_WhiteBag, 0x0200, ANIM_TAG_WHITE_BAG},
+    {gBattleAnimSpriteGfx_Unknown, 0x0040, ANIM_TAG_UNKNOWN},
+    {gBattleAnimSpriteGfx_PurpleCoral, 0x0180, ANIM_TAG_PURPLE_CORAL},
+    {gBattleAnimSpriteGfx_PurpleDroplet, 0x0600, ANIM_TAG_PURPLE_DROPLET},
+    {gBattleAnimSpriteGfx_Shock2, 0x0600, ANIM_TAG_SHOCK_2},
+    {gBattleAnimSpriteGfx_ClosingEye2, 0x0200, ANIM_TAG_CLOSING_EYE_2},
+    {gBattleAnimSpriteGfx_MetalBall, 0x0080, ANIM_TAG_METAL_BALL},
+    {gBattleAnimSpriteGfx_MonsterDoll, 0x0200, ANIM_TAG_MONSTER_DOLL},
+    {gBattleAnimSpriteGfx_Whirlwind, 0x0800, ANIM_TAG_WHIRLWIND},
+    {gBattleAnimSpriteGfx_Whirlwind2, 0x0080, ANIM_TAG_WHIRLWIND_2},
+    {gBattleAnimSpriteGfx_Explosion4, 0x0a00, ANIM_TAG_EXPLOSION_4},
+    {gBattleAnimSpriteGfx_Explosion5, 0x0280, ANIM_TAG_EXPLOSION_5},
+    {gBattleAnimSpriteGfx_Tongue, 0x0280, ANIM_TAG_TONGUE},
+    {gBattleAnimSpriteGfx_Smoke, 0x0100, ANIM_TAG_SMOKE},
+    {gBattleAnimSpriteGfx_Smoke2, 0x0200, ANIM_TAG_SMOKE_2},
+    {gBattleAnimSpriteGfx_Impact, 0x0200, ANIM_TAG_IMPACT},
+    {gBattleAnimSpriteGfx_CircleImpact, 0x0020, ANIM_TAG_CIRCLE_IMPACT},
+    {gBattleAnimSpriteGfx_Scratch, 0x0a00, ANIM_TAG_SCRATCH},
+    {gBattleAnimSpriteGfx_Cut, 0x0800, ANIM_TAG_CUT},
+    {gBattleAnimSpriteGfx_SharpTeeth, 0x0800, ANIM_TAG_SHARP_TEETH},
+    {gBattleAnimSpriteGfx_RainbowRings, 0x00c0, ANIM_TAG_RAINBOW_RINGS},
+    {gBattleAnimSpriteGfx_IceCrystals, 0x01c0, ANIM_TAG_ICE_CRYSTALS},
+    {gBattleAnimSpriteGfx_IceSpikes, 0x0100, ANIM_TAG_ICE_SPIKES},
+    {gBattleAnimSpriteGfx_HandsAndFeet, 0x0800, ANIM_TAG_HANDS_AND_FEET},
+    {gBattleAnimSpriteGfx_MistCloud, 0x0200, ANIM_TAG_MIST_CLOUD},
+    {gBattleAnimSpriteGfx_Clamp, 0x0800, ANIM_TAG_CLAMP},
+    {gBattleAnimSpriteGfx_Bubble, 0x0180, ANIM_TAG_BUBBLE},
+    {gBattleAnimSpriteGfx_Orbs, 0x0180, ANIM_TAG_ORBS},
+    {gBattleAnimSpriteGfx_WaterImpact, 0x0200, ANIM_TAG_WATER_IMPACT},
+    {gBattleAnimSpriteGfx_WaterOrb, 0x0200, ANIM_TAG_WATER_ORB},
+    {gBattleAnimSpriteGfx_PoisonBubble, 0x0180, ANIM_TAG_POISON_BUBBLE},
+    {gBattleAnimSpriteGfx_ToxicBubble, 0x0400, ANIM_TAG_TOXIC_BUBBLE},
+    {gBattleAnimSpriteGfx_Spikes, 0x0080, ANIM_TAG_SPIKES},
+    {gBattleAnimSpriteGfx_HornHit2, 0x0100, ANIM_TAG_HORN_HIT_2},
+    {gBattleAnimSpriteGfx_AirWave2, 0x0100, ANIM_TAG_AIR_WAVE_2},
+    {gBattleAnimSpriteGfx_SmallBubbles, 0x0140, ANIM_TAG_SMALL_BUBBLES},
+    {gBattleAnimSpriteGfx_RoundShadow, 0x0800, ANIM_TAG_ROUND_SHADOW},
+    {gBattleAnimSpriteGfx_Sunlight, 0x0200, ANIM_TAG_SUNLIGHT},
+    {gBattleAnimSpriteGfx_Spore, 0x0100, ANIM_TAG_SPORE},
+    {gBattleAnimSpriteGfx_Flower, 0x00a0, ANIM_TAG_FLOWER},
+    {gBattleAnimSpriteGfx_RazorLeaf, 0x0100, ANIM_TAG_RAZOR_LEAF},
+    {gBattleAnimSpriteGfx_Needle, 0x0080, ANIM_TAG_NEEDLE},
+    {gBattleAnimSpriteGfx_WhirlwindLines, 0x0300, ANIM_TAG_WHIRLWIND_LINES},
+    {gBattleAnimSpriteGfx_GoldRing, 0x0100, ANIM_TAG_GOLD_RING},
+    {gBattleAnimSpriteGfx_GoldRing, 0x0100, ANIM_TAG_PURPLE_RING},
+    {gBattleAnimSpriteGfx_GoldRing, 0x0100, ANIM_TAG_BLUE_RING},
+    {gBattleAnimSpriteGfx_GreenLightWall, 0x0800, ANIM_TAG_GREEN_LIGHT_WALL},
+    {gBattleAnimSpriteGfx_GreenLightWall, 0x0800, ANIM_TAG_BLUE_LIGHT_WALL},
+    {gBattleAnimSpriteGfx_GreenLightWall, 0x0800, ANIM_TAG_RED_LIGHT_WALL},
+    {gBattleAnimSpriteGfx_GreenLightWall, 0x0800, ANIM_TAG_GRAY_LIGHT_WALL},
+    {gBattleAnimSpriteGfx_GreenLightWall, 0x0800, ANIM_TAG_ORANGE_LIGHT_WALL},
+    {gBattleAnimSpriteGfx_BlackBall2, 0x0080, ANIM_TAG_BLACK_BALL_2},
+    {gBattleAnimSpriteGfx_MistCloud, 0x0200, ANIM_TAG_PURPLE_GAS_CLOUD},
+    {gBattleAnimSpriteGfx_SparkH, 0x0200, ANIM_TAG_SPARK_H},
+    {gBattleAnimSpriteGfx_YellowStar, 0x0200, ANIM_TAG_YELLOW_STAR},
+    {gBattleAnimSpriteGfx_LargeFreshEgg, 0x0080, ANIM_TAG_LARGE_FRESH_EGG},
+    {gBattleAnimSpriteGfx_ShadowBall, 0x0200, ANIM_TAG_SHADOW_BALL},
+    {gBattleAnimSpriteGfx_Lick, 0x0500, ANIM_TAG_LICK},
+    {gBattleAnimSpriteGfx_VoidLines, 0x0800, ANIM_TAG_VOID_LINES},
+    {gBattleAnimSpriteGfx_String, 0x0400, ANIM_TAG_STRING},
+    {gBattleAnimSpriteGfx_WebThread, 0x0020, ANIM_TAG_WEB_THREAD},
+    {gBattleAnimSpriteGfx_SpiderWeb, 0x0800, ANIM_TAG_SPIDER_WEB},
+    {gBattleAnimSpriteGfx_Lightbulb, 0x0100, ANIM_TAG_LIGHTBULB},
+    {gBattleAnimSpriteGfx_Slash, 0x0800, ANIM_TAG_SLASH},
+    {gBattleAnimSpriteGfx_FocusEnergy, 0x0400, ANIM_TAG_FOCUS_ENERGY},
+    {gBattleAnimSpriteGfx_SphereToCube, 0x0a00, ANIM_TAG_SPHERE_TO_CUBE},
+    {gBattleAnimSpriteGfx_Tendrils, 0x1000, ANIM_TAG_TENDRILS},
+    {gBattleAnimSpriteGfx_Eye, 0x0800, ANIM_TAG_EYE},
+    {gBattleAnimSpriteGfx_WhiteShadow, 0x0400, ANIM_TAG_WHITE_SHADOW},
+    {gBattleAnimSpriteGfx_TealAlert, 0x0200, ANIM_TAG_TEAL_ALERT},
+    {gBattleAnimSpriteGfx_OpeningEye, 0x0800, ANIM_TAG_OPENING_EYE},
+    {gBattleAnimSpriteGfx_RoundWhiteHalo, 0x0800, ANIM_TAG_ROUND_WHITE_HALO},
+    {gBattleAnimSpriteGfx_FangAttack, 0x0800, ANIM_TAG_FANG_ATTACK},
+    {gBattleAnimSpriteGfx_PurpleHandOutline, 0x0200, ANIM_TAG_PURPLE_HAND_OUTLINE},
+    {gBattleAnimSpriteGfx_Moon, 0x0800, ANIM_TAG_MOON},
+    {gBattleAnimSpriteGfx_GreenSparkle, 0x0200, ANIM_TAG_GREEN_SPARKLE},
+    {gBattleAnimSpriteGfx_Spiral, 0x0800, ANIM_TAG_SPIRAL},
+    {gBattleAnimSpriteGfx_SnoreZ, 0x0200, ANIM_TAG_SNORE_Z},
+    {gBattleAnimSpriteGfx_Explosion, 0x0800, ANIM_TAG_EXPLOSION},
+    {gBattleAnimSpriteGfx_Nail, 0x0400, ANIM_TAG_NAIL},
+    {gBattleAnimSpriteGfx_GhostlySpirit, 0x0200, ANIM_TAG_GHOSTLY_SPIRIT},
+    {gBattleAnimSpriteGfx_WarmRock, 0x0a80, ANIM_TAG_WARM_ROCK},
+    {gBattleAnimSpriteGfx_BreakingEgg, 0x0600, ANIM_TAG_BREAKING_EGG},
+    {gBattleAnimSpriteGfx_ThinRing, 0x0800, ANIM_TAG_THIN_RING},
+    {gBattleAnimSpriteGfx_PunchImpact, 0x0200, ANIM_TAG_PUNCH_IMPACT},
+    {gBattleAnimSpriteGfx_Bell, 0x0600, ANIM_TAG_BELL},
+    {gBattleAnimSpriteGfx_MusicNotes2, 0x0800, ANIM_TAG_MUSIC_NOTES_2},
+    {gBattleAnimSpriteGfx_SpeedDust, 0x0180, ANIM_TAG_SPEED_DUST},
+    {gBattleAnimSpriteGfx_TornMetal, 0x0800, ANIM_TAG_TORN_METAL},
+    {gBattleAnimSpriteGfx_ThoughtBubble, 0x0800, ANIM_TAG_THOUGHT_BUBBLE},
+    {gBattleAnimSpriteGfx_MagentaHeart, 0x0080, ANIM_TAG_MAGENTA_HEART},
+    {gBattleAnimSpriteGfx_ElectricOrbs, 0x0080, ANIM_TAG_ELECTRIC_ORBS},
+    {gBattleAnimSpriteGfx_CircleOfLight, 0x0800, ANIM_TAG_CIRCLE_OF_LIGHT},
+    {gBattleAnimSpriteGfx_Electricity, 0x0800, ANIM_TAG_ELECTRICITY},
+    {gBattleAnimSpriteGfx_Finger2, 0x0600, ANIM_TAG_FINGER_2},
+    {gBattleAnimSpriteGfx_MovementWaves, 0x0600, ANIM_TAG_MOVEMENT_WAVES},
+    {gBattleAnimSpriteGfx_MagentaHeart, 0x0080, ANIM_TAG_RED_HEART},
+    {gBattleAnimSpriteGfx_RedOrb, 0x0080, ANIM_TAG_RED_ORB},
+    {gBattleAnimSpriteGfx_EyeSparkle, 0x0180, ANIM_TAG_EYE_SPARKLE},
+    {gBattleAnimSpriteGfx_MagentaHeart, 0x0080, ANIM_TAG_PINK_HEART},
+    {gBattleAnimSpriteGfx_Angel, 0x0200, ANIM_TAG_ANGEL},
+    {gBattleAnimSpriteGfx_Devil, 0x0400, ANIM_TAG_DEVIL},
+    {gBattleAnimSpriteGfx_Swipe, 0x0a00, ANIM_TAG_SWIPE},
+    {gBattleAnimSpriteGfx_Roots, 0x0800, ANIM_TAG_ROOTS},
+    {gBattleAnimSpriteGfx_ItemBag, 0x0200, ANIM_TAG_ITEM_BAG},
+    {gBattleAnimSpriteGfx_JaggedMusicNote, 0x0400, ANIM_TAG_JAGGED_MUSIC_NOTE},
+    {gBattleAnimSpriteGfx_Pokeball, 0x0080, ANIM_TAG_POKEBALL},
+    {gBattleAnimSpriteGfx_Spotlight, 0x0800, ANIM_TAG_SPOTLIGHT},
+    {gBattleAnimSpriteGfx_LetterZ, 0x0200, ANIM_TAG_LETTER_Z},
+    {gBattleAnimSpriteGfx_RapidSpin, 0x0300, ANIM_TAG_RAPID_SPIN},
+    {gBattleAnimSpriteGfx_TriForceTriangle, 0x0800, ANIM_TAG_TRI_FORCE_TRIANGLE},
+    {gBattleAnimSpriteGfx_WispOrb, 0x0380, ANIM_TAG_WISP_ORB},
+    {gBattleAnimSpriteGfx_WispFire, 0x0800, ANIM_TAG_WISP_FIRE},
+    {gBattleAnimSpriteGfx_GoldStars, 0x00c0, ANIM_TAG_GOLD_STARS},
+    {gBattleAnimSpriteGfx_EclipsingOrb, 0x0800, ANIM_TAG_ECLIPSING_ORB},
+    {gBattleAnimSpriteGfx_GrayOrb, 0x0060, ANIM_TAG_GRAY_ORB},
+    {gBattleAnimSpriteGfx_GrayOrb, 0x0060, ANIM_TAG_BLUE_ORB},
+    {gBattleAnimSpriteGfx_GrayOrb, 0x0060, ANIM_TAG_RED_ORB_2},
+    {gBattleAnimSpriteGfx_PinkPetal, 0x0080, ANIM_TAG_PINK_PETAL},
+    {gBattleAnimSpriteGfx_PainSplit, 0x0180, ANIM_TAG_PAIN_SPLIT},
+    {gBattleAnimSpriteGfx_Confetti, 0x0180, ANIM_TAG_CONFETTI},
+    {gBattleAnimSpriteGfx_GreenStar, 0x0200, ANIM_TAG_GREEN_STAR},
+    {gBattleAnimSpriteGfx_PinkCloud, 0x0200, ANIM_TAG_PINK_CLOUD},
+    {gBattleAnimSpriteGfx_SweatDrop, 0x0020, ANIM_TAG_SWEAT_DROP},
+    {gBattleAnimSpriteGfx_GuardRing, 0x0400, ANIM_TAG_GUARD_RING},
+    {gBattleAnimSpriteGfx_PurpleScratch, 0x0600, ANIM_TAG_PURPLE_SCRATCH},
+    {gBattleAnimSpriteGfx_PurpleSwipe, 0x1000, ANIM_TAG_PURPLE_SWIPE},
+    {gBattleAnimSpriteGfx_TagHand, 0x0400, ANIM_TAG_TAG_HAND},
+    {gBattleAnimSpriteGfx_SmallRedEye, 0x0020, ANIM_TAG_SMALL_RED_EYE},
+    {gBattleAnimSpriteGfx_HollowOrb, 0x0080, ANIM_TAG_HOLLOW_ORB},
+    {gBattleAnimSpriteGfx_XSign, 0x0800, ANIM_TAG_X_SIGN},
+    {gBattleAnimSpriteGfx_BluegreenOrb, 0x0080, ANIM_TAG_BLUEGREEN_ORB},
+    {gBattleAnimSpriteGfx_PawPrint, 0x0200, ANIM_TAG_PAW_PRINT},
+    {gBattleAnimSpriteGfx_PurpleFlame, 0x0400, ANIM_TAG_PURPLE_FLAME},
+    {gBattleAnimSpriteGfx_RedBall, 0x0200, ANIM_TAG_RED_BALL},
+    {gBattleAnimSpriteGfx_SmellingsaltEffect, 0x0200, ANIM_TAG_SMELLINGSALT_EFFECT},
+    {gBattleAnimSpriteGfx_Meteor, 0x0800, ANIM_TAG_METEOR},
+    {gBattleAnimSpriteGfx_FlatRock, 0x0280, ANIM_TAG_FLAT_ROCK},
+    {gBattleAnimSpriteGfx_MagnifyingGlass, 0x0200, ANIM_TAG_MAGNIFYING_GLASS},
+    {gBattleAnimSpriteGfx_WaterOrb, 0x0200, ANIM_TAG_BROWN_ORB},
+    {gBattleAnimSpriteGfx_MetalSoundWaves, 0x0400, ANIM_TAG_METAL_SOUND_WAVES},
+    {gBattleAnimSpriteGfx_FlyingDirt, 0x0200, ANIM_TAG_FLYING_DIRT},
+    {gBattleAnimSpriteGfx_IcicleSpear, 0x0200, ANIM_TAG_ICICLE_SPEAR},
+    {gBattleAnimSpriteGfx_Hail, 0x0080, ANIM_TAG_HAIL},
+    {gBattleAnimSpriteGfx_GlowyRedOrb, 0x0020, ANIM_TAG_GLOWY_RED_ORB},
+    {gBattleAnimSpriteGfx_GlowyRedOrb, 0x0020, ANIM_TAG_GLOWY_GREEN_ORB},
+    {gBattleAnimSpriteGfx_GreenSpike, 0x0080, ANIM_TAG_GREEN_SPIKE},
+    {gBattleAnimSpriteGfx_CircleOfLight, 0x0800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
+    {gBattleAnimSpriteGfx_GlowyRedOrb, 0x0020, ANIM_TAG_GLOWY_BLUE_ORB},
+    {gBattleAnimSpriteGfx_RedBrick, 0x0080, ANIM_TAG_RED_BRICK},
+    {gBattleAnimSpriteGfx_WhiteFeather, 0x0400, ANIM_TAG_WHITE_FEATHER},
+    {gBattleAnimSpriteGfx_Sparkle6, 0x0080, ANIM_TAG_SPARKLE_6},
+    {gBattleAnimSpriteGfx_Splash, 0x0800, ANIM_TAG_SPLASH},
+    {gBattleAnimSpriteGfx_SweatBead, 0x0020, ANIM_TAG_SWEAT_BEAD},
+    {gBattleAnimSpriteGfx_Gem1, 0x0800, ANIM_TAG_GEM_1},
+    {gBattleAnimSpriteGfx_Gem2, 0x0800, ANIM_TAG_GEM_2},
+    {gBattleAnimSpriteGfx_Gem3, 0x0800, ANIM_TAG_GEM_3},
+    {gBattleAnimSpriteGfx_SlamHit2, 0x1000, ANIM_TAG_SLAM_HIT_2},
+    {gBattleAnimSpriteGfx_Recycle, 0x0800, ANIM_TAG_RECYCLE},
+    {gBattleAnimSpriteGfx_RedParticles, 0x00a0, ANIM_TAG_RED_PARTICLES},
+    {gBattleAnimSpriteGfx_Protect, 0x0800, ANIM_TAG_PROTECT},
+    {gBattleAnimSpriteGfx_DirtMound, 0x0200, ANIM_TAG_DIRT_MOUND},
+    {gBattleAnimSpriteGfx_Shock3, 0x0600, ANIM_TAG_SHOCK_3},
+    {gBattleAnimSpriteGfx_WeatherBall, 0x0200, ANIM_TAG_WEATHER_BALL},
+    {gBattleAnimSpriteGfx_Bird, 0x0800, ANIM_TAG_BIRD},
+    {gBattleAnimSpriteGfx_CrossImpact, 0x0200, ANIM_TAG_CROSS_IMPACT},
+    {gBattleAnimSpriteGfx_Slash, 0x0800, ANIM_TAG_SLASH_2},
+    {gBattleAnimSpriteGfx_SlamHit, 0x1000, ANIM_TAG_WHIP_HIT},
+    {gBattleAnimSpriteGfx_GoldRing, 0x0100, ANIM_TAG_BLUE_RING_2},
 };
 
-
 const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
 {
-    {gBattleAnimSpritePalette_000, ANIM_TAG_BONE},
-    {gBattleAnimSpritePalette_001, ANIM_TAG_SPARK},
-    {gBattleAnimSpritePalette_002, ANIM_TAG_PENCIL},
-    {gBattleAnimSpritePalette_003, ANIM_TAG_AIR_WAVE},
-    {gBattleAnimSpritePalette_004, ANIM_TAG_UNUSED_ORB},
-    {gBattleAnimSpritePalette_005, ANIM_TAG_SWORD},
-    {gBattleAnimSpritePalette_006, ANIM_TAG_SEED},
-    {gBattleAnimSpritePalette_007, ANIM_TAG_UNUSED_EXPLOSION},
-    {gBattleAnimSpritePalette_008, ANIM_TAG_UNUSED_PINK_ORB},
-    {gBattleAnimSpritePalette_009, ANIM_TAG_GUST},
-    {gBattleAnimSpritePalette_010, ANIM_TAG_ICE_CUBE},
-    {gBattleAnimSpritePalette_011, ANIM_TAG_SPARK_2},
-    {gBattleAnimSpritePalette_012, ANIM_TAG_UNUSED_ORANGE},
-    {gBattleAnimSpritePalette_013, ANIM_TAG_YELLOW_BALL},
-    {gBattleAnimSpritePalette_014, ANIM_TAG_LOCK_ON},
-    {gBattleAnimSpritePalette_015, ANIM_TAG_TIED_BAG},
-    {gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_SMOKE},
-    {gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_BALL},
-    {gBattleAnimSpritePalette_018, ANIM_TAG_CONVERSION},
-    {gBattleAnimSpritePalette_019, ANIM_TAG_UNUSED_GLASS},
-    {gBattleAnimSpritePalette_020, ANIM_TAG_HORN_HIT},
-    {gBattleAnimSpritePalette_021, ANIM_TAG_UNUSED_HIT},
-    {gBattleAnimSpritePalette_022, ANIM_TAG_UNUSED_HIT_2},
-    {gBattleAnimSpritePalette_023, ANIM_TAG_UNUSED_BLUE_SHARDS},
-    {gBattleAnimSpritePalette_024, ANIM_TAG_UNUSED_CLOSING_EYE},
-    {gBattleAnimSpritePalette_025, ANIM_TAG_UNUSED_WAVING_HAND},
-    {gBattleAnimSpritePalette_026, ANIM_TAG_UNUSED_HIT_DUPLICATE},
-    {gBattleAnimSpritePalette_027, ANIM_TAG_LEER},
-    {gBattleAnimSpritePalette_028, ANIM_TAG_UNUSED_BLUE_BURST},
-    {gBattleAnimSpritePalette_029, ANIM_TAG_SMALL_EMBER},
-    {gBattleAnimSpritePalette_030, ANIM_TAG_GRAY_SMOKE},
-    {gBattleAnimSpritePalette_031, ANIM_TAG_BLUE_STAR},
-    {gBattleAnimSpritePalette_032, ANIM_TAG_UNUSED_BUBBLE_BURST},
-    {gBattleAnimSpritePalette_033, ANIM_TAG_FIRE},
-    {gBattleAnimSpritePalette_033, ANIM_TAG_UNUSED_SPINNING_FIRE},
-    {gBattleAnimSpritePalette_033, ANIM_TAG_FIRE_PLUME},
-    {gBattleAnimSpritePalette_036, ANIM_TAG_UNUSED_LIGHTNING},
-    {gBattleAnimSpritePalette_036, ANIM_TAG_LIGHTNING},
-    {gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_CLAW_SLASH},
-    {gBattleAnimSpritePalette_039, ANIM_TAG_CLAW_SLASH},
-    {gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH},
-    {gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH_2},
-    {gBattleAnimSpritePalette_042, ANIM_TAG_UNUSED_BUBBLE_BURST_2},
-    {gBattleAnimSpritePalette_043, ANIM_TAG_ICE_CHUNK},
-    {gBattleAnimSpritePalette_044, ANIM_TAG_UNUSED_GLASS_2},
-    {gBattleAnimSpritePalette_045, ANIM_TAG_UNUSED_PINK_HEART},
-    {gBattleAnimSpritePalette_046, ANIM_TAG_UNUSED_SAP_DRIP},
-    {gBattleAnimSpritePalette_047, ANIM_TAG_UNUSED_SAP_DRIP},
-    {gBattleAnimSpritePalette_048, ANIM_TAG_SPARKLE_1},
-    {gBattleAnimSpritePalette_049, ANIM_TAG_SPARKLE_2},
-    {gBattleAnimSpritePalette_050, ANIM_TAG_HUMANOID_FOOT},
-    {gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_MONSTER_FOOT},
-    {gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_HUMANOID_HAND},
-    {gBattleAnimSpritePalette_026, ANIM_TAG_NOISE_LINE},
-    {gBattleAnimSpritePalette_054, ANIM_TAG_UNUSED_YELLOW_UNK},
-    {gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_RED_FIST},
-    {gBattleAnimSpritePalette_056, ANIM_TAG_SLAM_HIT},
-    {gBattleAnimSpritePalette_057, ANIM_TAG_UNUSED_RING},
-    {gBattleAnimSpritePalette_058, ANIM_TAG_ROCKS},
-    {gBattleAnimSpritePalette_059, ANIM_TAG_UNUSED_Z},
-    {gBattleAnimSpritePalette_060, ANIM_TAG_UNUSED_YELLOW_UNK_2},
-    {gBattleAnimSpritePalette_061, ANIM_TAG_UNUSED_AIR_SLASH},
-    {gBattleAnimSpritePalette_062, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS},
-    {gBattleAnimSpritePalette_063, ANIM_TAG_LEAF},
-    {gBattleAnimSpritePalette_064, ANIM_TAG_FINGER},
-    {gBattleAnimSpritePalette_065, ANIM_TAG_POISON_POWDER},
-    {gBattleAnimSpritePalette_066, ANIM_TAG_UNUSED_BROWN_TRIANGLE},
-    {gBattleAnimSpritePalette_067, ANIM_TAG_SLEEP_POWDER},
-    {gBattleAnimSpritePalette_068, ANIM_TAG_STUN_SPORE},
-    {gBattleAnimSpritePalette_065, ANIM_TAG_UNUSED_POWDER},
-    {gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_3},
-    {gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_4},
-    {gBattleAnimSpritePalette_072, ANIM_TAG_MUSIC_NOTES},
-    {gBattleAnimSpritePalette_073, ANIM_TAG_DUCK},
-    {gBattleAnimSpritePalette_074, ANIM_TAG_MUD_SAND},
-    {gBattleAnimSpritePalette_075, ANIM_TAG_ALERT},
-    {gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES},
-    {gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES_2},
-    {gBattleAnimSpritePalette_078, ANIM_TAG_UNUSED_SHOCK},
-    {gBattleAnimSpritePalette_078, ANIM_TAG_SHOCK},
-    {gBattleAnimSpritePalette_080, ANIM_TAG_UNUSED_BELL},
-    {gBattleAnimSpritePalette_081, ANIM_TAG_UNUSED_PINK_GLOVE},
-    {gBattleAnimSpritePalette_082, ANIM_TAG_UNUSED_BLUE_LINES},
-    {gBattleAnimSpritePalette_083, ANIM_TAG_UNUSED_IMPACT},
-    {gBattleAnimSpritePalette_084, ANIM_TAG_UNUSED_IMPACT_2},
-    {gBattleAnimSpritePalette_085, ANIM_TAG_UNUSED_RETICLE},
-    {gBattleAnimSpritePalette_086, ANIM_TAG_BREATH},
-    {gBattleAnimSpritePalette_087, ANIM_TAG_ANGER},
-    {gBattleAnimSpritePalette_088, ANIM_TAG_UNUSED_SNOWBALL},
-    {gBattleAnimSpritePalette_089, ANIM_TAG_UNUSED_VINE},
-    {gBattleAnimSpritePalette_090, ANIM_TAG_UNUSED_SWORD},
-    {gBattleAnimSpritePalette_091, ANIM_TAG_UNUSED_CLAPPING},
-    {gBattleAnimSpritePalette_092, ANIM_TAG_UNUSED_RED_TUBE},
-    {gBattleAnimSpritePalette_093, ANIM_TAG_AMNESIA},
-    {gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_STRING},
-    {gBattleAnimSpritePalette_095, ANIM_TAG_UNUSED_PENCIL},
-    {gBattleAnimSpritePalette_096, ANIM_TAG_UNUSED_PETAL},
-    {gBattleAnimSpritePalette_097, ANIM_TAG_BENT_SPOON},
-    {gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_WEB},
-    {gBattleAnimSpritePalette_099, ANIM_TAG_MILK_BOTTLE},
-    {gBattleAnimSpritePalette_100, ANIM_TAG_COIN},
-    {gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_CRACKED_EGG},
-    {gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_HATCHED_EGG},
-    {gBattleAnimSpritePalette_103, ANIM_TAG_UNUSED_FRESH_EGG},
-    {gBattleAnimSpritePalette_104, ANIM_TAG_UNUSED_FANGS},
-    {gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_2},
-    {gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_3},
-    {gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET},
-    {gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET_2},
-    {gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SEED},
-    {gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SPROUT},
-    {gBattleAnimSpritePalette_111, ANIM_TAG_UNUSED_RED_WAND},
-    {gBattleAnimSpritePalette_112, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK},
-    {gBattleAnimSpritePalette_113, ANIM_TAG_UNUSED_WATER_COLUMN},
-    {gBattleAnimSpritePalette_114, ANIM_TAG_UNUSED_MUD_UNK},
-    {gBattleAnimSpritePalette_115, ANIM_TAG_RAIN_DROPS},
-    {gBattleAnimSpritePalette_116, ANIM_TAG_UNUSED_FURY_SWIPES},
-    {gBattleAnimSpritePalette_117, ANIM_TAG_UNUSED_VINE_2},
-    {gBattleAnimSpritePalette_118, ANIM_TAG_UNUSED_TEETH},
-    {gBattleAnimSpritePalette_119, ANIM_TAG_UNUSED_BONE},
-    {gBattleAnimSpritePalette_120, ANIM_TAG_UNUSED_WHITE_BAG},
-    {gBattleAnimSpritePalette_121, ANIM_TAG_UNUSED_UNKNOWN},
-    {gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_CORAL},
-    {gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_DROPLET},
-    {gBattleAnimSpritePalette_124, ANIM_TAG_UNUSED_SHOCK_2},
-    {gBattleAnimSpritePalette_125, ANIM_TAG_UNUSED_CLOSING_EYE_2},
-    {gBattleAnimSpritePalette_126, ANIM_TAG_UNUSED_METAL_BALL},
-    {gBattleAnimSpritePalette_127, ANIM_TAG_UNUSED_MONSTER_DOLL},
-    {gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND},
-    {gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND_2},
-    {gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_4},
-    {gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_5},
-    {gBattleAnimSpritePalette_132, ANIM_TAG_UNUSED_TONGUE},
-    {gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE},
-    {gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE_2},
-    {gBattleAnimSpritePalette_135, ANIM_TAG_IMPACT},
-    {gBattleAnimSpritePalette_136, ANIM_TAG_CIRCLE_IMPACT},
-    {gBattleAnimSpritePalette_135, ANIM_TAG_SCRATCH},
-    {gBattleAnimSpritePalette_135, ANIM_TAG_CUT},
-    {gBattleAnimSpritePalette_139, ANIM_TAG_SHARP_TEETH},
-    {gBattleAnimSpritePalette_140, ANIM_TAG_RAINBOW_RINGS},
-    {gBattleAnimSpritePalette_141, ANIM_TAG_ICE_CRYSTALS},
-    {gBattleAnimSpritePalette_141, ANIM_TAG_ICE_SPIKES},
-    {gBattleAnimSpritePalette_143, ANIM_TAG_HANDS_AND_FEET},
-    {gBattleAnimSpritePalette_144, ANIM_TAG_MIST_CLOUD},
-    {gBattleAnimSpritePalette_139, ANIM_TAG_CLAMP},
-    {gBattleAnimSpritePalette_115, ANIM_TAG_BUBBLE},
-    {gBattleAnimSpritePalette_147, ANIM_TAG_ORBS},
-    {gBattleAnimSpritePalette_148, ANIM_TAG_WATER_IMPACT},
-    {gBattleAnimSpritePalette_148, ANIM_TAG_WATER_ORB},
-    {gBattleAnimSpritePalette_150, ANIM_TAG_POISON_BUBBLE},
-    {gBattleAnimSpritePalette_150, ANIM_TAG_TOXIC_BUBBLE},
-    {gBattleAnimSpritePalette_152, ANIM_TAG_SPIKES},
-    {gBattleAnimSpritePalette_153, ANIM_TAG_HORN_HIT_2},
-    {gBattleAnimSpritePalette_154, ANIM_TAG_AIR_WAVE_2},
-    {gBattleAnimSpritePalette_155, ANIM_TAG_SMALL_BUBBLES},
-    {gBattleAnimSpritePalette_156, ANIM_TAG_ROUND_SHADOW},
-    {gBattleAnimSpritePalette_157, ANIM_TAG_SUNLIGHT},
-    {gBattleAnimSpritePalette_158, ANIM_TAG_SPORE},
-    {gBattleAnimSpritePalette_159, ANIM_TAG_FLOWER},
-    {gBattleAnimSpritePalette_160, ANIM_TAG_RAZOR_LEAF},
-    {gBattleAnimSpritePalette_161, ANIM_TAG_NEEDLE},
-    {gBattleAnimSpritePalette_162, ANIM_TAG_WHIRLWIND_LINES},
-    {gBattleAnimSpritePalette_163, ANIM_TAG_GOLD_RING},
-    {gBattleAnimSpritePalette_164, ANIM_TAG_PURPLE_RING},
-    {gBattleAnimSpritePalette_165, ANIM_TAG_BLUE_RING},
-    {gBattleAnimSpritePalette_166, ANIM_TAG_GREEN_LIGHT_WALL},
-    {gBattleAnimSpritePalette_167, ANIM_TAG_BLUE_LIGHT_WALL},
-    {gBattleAnimSpritePalette_168, ANIM_TAG_RED_LIGHT_WALL},
-    {gBattleAnimSpritePalette_169, ANIM_TAG_GRAY_LIGHT_WALL},
-    {gBattleAnimSpritePalette_170, ANIM_TAG_ORANGE_LIGHT_WALL},
-    {gBattleAnimSpritePalette_171, ANIM_TAG_BLACK_BALL_2},
-    {gBattleAnimSpritePalette_172, ANIM_TAG_PURPLE_GAS_CLOUD},
-    {gBattleAnimSpritePalette_001, ANIM_TAG_SPARK_H},
-    {gBattleAnimSpritePalette_174, ANIM_TAG_YELLOW_STAR},
-    {gBattleAnimSpritePalette_175, ANIM_TAG_LARGE_FRESH_EGG},
-    {gBattleAnimSpritePalette_176, ANIM_TAG_SHADOW_BALL},
-    {gBattleAnimSpritePalette_177, ANIM_TAG_LICK},
-    {gBattleAnimSpritePalette_178, ANIM_TAG_UNUSED_VOID_LINES},
-    {gBattleAnimSpritePalette_179, ANIM_TAG_STRING},
-    {gBattleAnimSpritePalette_179, ANIM_TAG_WEB_THREAD},
-    {gBattleAnimSpritePalette_179, ANIM_TAG_SPIDER_WEB},
-    {gBattleAnimSpritePalette_182, ANIM_TAG_UNUSED_LIGHTBULB},
-    {gBattleAnimSpritePalette_183, ANIM_TAG_SLASH},
-    {gBattleAnimSpritePalette_184, ANIM_TAG_FOCUS_ENERGY},
-    {gBattleAnimSpritePalette_185, ANIM_TAG_SPHERE_TO_CUBE},
-    {gBattleAnimSpritePalette_186, ANIM_TAG_TENDRILS},
-    {gBattleAnimSpritePalette_187, ANIM_TAG_EYE},
-    {gBattleAnimSpritePalette_188, ANIM_TAG_WHITE_SHADOW},
-    {gBattleAnimSpritePalette_189, ANIM_TAG_TEAL_ALERT},
-    {gBattleAnimSpritePalette_190, ANIM_TAG_OPENING_EYE},
-    {gBattleAnimSpritePalette_191, ANIM_TAG_ROUND_WHITE_HALO},
-    {gBattleAnimSpritePalette_192, ANIM_TAG_FANG_ATTACK},
-    {gBattleAnimSpritePalette_193, ANIM_TAG_PURPLE_HAND_OUTLINE},
-    {gBattleAnimSpritePalette_194, ANIM_TAG_MOON},
-    {gBattleAnimSpritePalette_195, ANIM_TAG_GREEN_SPARKLE},
-    {gBattleAnimSpritePalette_196, ANIM_TAG_SPIRAL},
-    {gBattleAnimSpritePalette_197, ANIM_TAG_SNORE_Z},
-    {gBattleAnimSpritePalette_198, ANIM_TAG_EXPLOSION},
-    {gBattleAnimSpritePalette_199, ANIM_TAG_NAIL},
-    {gBattleAnimSpritePalette_200, ANIM_TAG_GHOSTLY_SPIRIT},
-    {gBattleAnimSpritePalette_201, ANIM_TAG_WARM_ROCK},
-    {gBattleAnimSpritePalette_202, ANIM_TAG_BREAKING_EGG},
-    {gBattleAnimSpritePalette_203, ANIM_TAG_THIN_RING},
-    {gBattleAnimSpritePalette_204, ANIM_TAG_UNUSED_PUNCH_IMPACT},
-    {gBattleAnimSpritePalette_205, ANIM_TAG_BELL},
-    {gBattleAnimSpritePalette_206, ANIM_TAG_MUSIC_NOTES_2},
-    {gBattleAnimSpritePalette_207, ANIM_TAG_SPEED_DUST},
-    {gBattleAnimSpritePalette_167, ANIM_TAG_TORN_METAL},
-    {gBattleAnimSpritePalette_209, ANIM_TAG_THOUGHT_BUBBLE},
-    {gBattleAnimSpritePalette_210, ANIM_TAG_MAGENTA_HEART},
-    {gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRIC_ORBS},
-    {gBattleAnimSpritePalette_211, ANIM_TAG_CIRCLE_OF_LIGHT},
-    {gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRICITY},
-    {gBattleAnimSpritePalette_064, ANIM_TAG_FINGER_2},
-    {gBattleAnimSpritePalette_215, ANIM_TAG_MOVEMENT_WAVES},
-    {gBattleAnimSpritePalette_216, ANIM_TAG_RED_HEART},
-    {gBattleAnimSpritePalette_217, ANIM_TAG_RED_ORB},
-    {gBattleAnimSpritePalette_218, ANIM_TAG_EYE_SPARKLE},
-    {gBattleAnimSpritePalette_219, ANIM_TAG_PINK_HEART},
-    {gBattleAnimSpritePalette_220, ANIM_TAG_ANGEL},
-    {gBattleAnimSpritePalette_221, ANIM_TAG_DEVIL},
-    {gBattleAnimSpritePalette_222, ANIM_TAG_SWIPE},
-    {gBattleAnimSpritePalette_223, ANIM_TAG_ROOTS},
-    {gBattleAnimSpritePalette_224, ANIM_TAG_ITEM_BAG},
-    {gBattleAnimSpritePalette_225, ANIM_TAG_JAGGED_MUSIC_NOTE},
-    {gBattleAnimSpritePalette_226, ANIM_TAG_POKEBALL},
-    {gBattleAnimSpritePalette_226, ANIM_TAG_SPOTLIGHT},
-    {gBattleAnimSpritePalette_228, ANIM_TAG_LETTER_Z},
-    {gBattleAnimSpritePalette_229, ANIM_TAG_RAPID_SPIN},
-    {gBattleAnimSpritePalette_230, ANIM_TAG_TRI_FORCE_TRIANGLE},
-    {gBattleAnimSpritePalette_231, ANIM_TAG_WISP_ORB},
-    {gBattleAnimSpritePalette_231, ANIM_TAG_WISP_FIRE},
-    {gBattleAnimSpritePalette_233, ANIM_TAG_GOLD_STARS},
-    {gBattleAnimSpritePalette_234, ANIM_TAG_ECLIPSING_ORB},
-    {gBattleAnimSpritePalette_235, ANIM_TAG_GRAY_ORB},
-    {gBattleAnimSpritePalette_236, ANIM_TAG_BLUE_ORB},
-    {gBattleAnimSpritePalette_237, ANIM_TAG_RED_ORB_2},
-    {gBattleAnimSpritePalette_238, ANIM_TAG_PINK_PETAL},
-    {gBattleAnimSpritePalette_239, ANIM_TAG_PAIN_SPLIT},
-    {gBattleAnimSpritePalette_240, ANIM_TAG_CONFETTI},
-    {gBattleAnimSpritePalette_241, ANIM_TAG_GREEN_STAR},
-    {gBattleAnimSpritePalette_242, ANIM_TAG_PINK_CLOUD},
-    {gBattleAnimSpritePalette_243, ANIM_TAG_SWEAT_DROP},
-    {gBattleAnimSpritePalette_244, ANIM_TAG_GUARD_RING},
-    {gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SCRATCH},
-    {gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SWIPE},
-    {gBattleAnimSpritePalette_064, ANIM_TAG_TAG_HAND},
-    {gBattleAnimSpritePalette_248, ANIM_TAG_SMALL_RED_EYE},
-    {gBattleAnimSpritePalette_249, ANIM_TAG_HOLLOW_ORB},
-    {gBattleAnimSpritePalette_249, ANIM_TAG_X_SIGN},
-    {gBattleAnimSpritePalette_251, ANIM_TAG_BLUEGREEN_ORB},
-    {gBattleAnimSpritePalette_252, ANIM_TAG_PAW_PRINT},
-    {gBattleAnimSpritePalette_253, ANIM_TAG_PURPLE_FLAME},
-    {gBattleAnimSpritePalette_254, ANIM_TAG_RED_BALL},
-    {gBattleAnimSpritePalette_255, ANIM_TAG_SMELLINGSALT_EFFECT},
-    {gBattleAnimSpritePalette_256, ANIM_TAG_METEOR},
-    {gBattleAnimSpritePalette_257, ANIM_TAG_FLAT_ROCK},
-    {gBattleAnimSpritePalette_258, ANIM_TAG_MAGNIFYING_GLASS},
-    {gBattleAnimSpritePalette_259, ANIM_TAG_BROWN_ORB},
-    {gBattleAnimSpritePalette_260, ANIM_TAG_METAL_SOUND_WAVES},
-    {gBattleAnimSpritePalette_261, ANIM_TAG_FLYING_DIRT},
-    {gBattleAnimSpritePalette_262, ANIM_TAG_ICICLE_SPEAR},
-    {gBattleAnimSpritePalette_263, ANIM_TAG_HAIL},
-    {gBattleAnimSpritePalette_264, ANIM_TAG_GLOWY_RED_ORB},
-    {gBattleAnimSpritePalette_265, ANIM_TAG_GLOWY_GREEN_ORB},
-    {gBattleAnimSpritePalette_266, ANIM_TAG_GREEN_SPIKE},
-    {gBattleAnimSpritePalette_267, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
-    {gBattleAnimSpritePalette_268, ANIM_TAG_GLOWY_BLUE_ORB},
-    {gBattleAnimSpritePalette_269, ANIM_TAG_UNUSED_RED_BRICK},
-    {gBattleAnimSpritePalette_270, ANIM_TAG_WHITE_FEATHER},
-    {gBattleAnimSpritePalette_271, ANIM_TAG_SPARKLE_6},
-    {gBattleAnimSpritePalette_272, ANIM_TAG_SPLASH},
-    {gBattleAnimSpritePalette_272, ANIM_TAG_SWEAT_BEAD},
-    {gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_1},
-    {gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_2},
-    {gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_3},
-    {gBattleAnimSpritePalette_277, ANIM_TAG_SLAM_HIT_2},
-    {gBattleAnimSpritePalette_278, ANIM_TAG_RECYCLE},
-    {gBattleAnimSpritePalette_279, ANIM_TAG_UNUSED_RED_PARTICLES},
-    {gBattleAnimSpritePalette_280, ANIM_TAG_PROTECT},
-    {gBattleAnimSpritePalette_281, ANIM_TAG_DIRT_MOUND},
-    {gBattleAnimSpritePalette_282, ANIM_TAG_SHOCK_3},
-    {gBattleAnimSpritePalette_283, ANIM_TAG_WEATHER_BALL},
-    {gBattleAnimSpritePalette_284, ANIM_TAG_BIRD},
-    {gBattleAnimSpritePalette_285, ANIM_TAG_CROSS_IMPACT},
-    {gBattleAnimSpritePalette_286, ANIM_TAG_SLASH_2},
-    {gBattleAnimSpritePalette_287, ANIM_TAG_WHIP_HIT},
-    {gBattleAnimSpritePalette_288, ANIM_TAG_BLUE_RING_2},
+    {gBattleAnimSpritePal_Bone, ANIM_TAG_BONE},
+    {gBattleAnimSpritePal_Spark, ANIM_TAG_SPARK},
+    {gBattleAnimSpritePal_Pencil, ANIM_TAG_PENCIL},
+    {gBattleAnimSpritePal_AirWave, ANIM_TAG_AIR_WAVE},
+    {gBattleAnimSpritePal_Orb, ANIM_TAG_ORB},
+    {gBattleAnimSpritePal_Sword, ANIM_TAG_SWORD},
+    {gBattleAnimSpritePal_Seed, ANIM_TAG_SEED},
+    {gBattleAnimSpritePal_Explosion6, ANIM_TAG_EXPLOSION_6},
+    {gBattleAnimSpritePal_PinkOrb, ANIM_TAG_PINK_ORB},
+    {gBattleAnimSpritePal_Gust, ANIM_TAG_GUST},
+    {gBattleAnimSpritePal_IceCube, ANIM_TAG_ICE_CUBE},
+    {gBattleAnimSpritePal_Spark2, ANIM_TAG_SPARK_2},
+    {gBattleAnimSpritePal_Orange, ANIM_TAG_ORANGE},
+    {gBattleAnimSpritePal_YellowBall, ANIM_TAG_YELLOW_BALL},
+    {gBattleAnimSpritePal_LockOn, ANIM_TAG_LOCK_ON},
+    {gBattleAnimSpritePal_TiedBag, ANIM_TAG_TIED_BAG},
+    {gBattleAnimSpritePal_BlackSmoke, ANIM_TAG_BLACK_SMOKE},
+    {gBattleAnimSpritePal_BlackSmoke, ANIM_TAG_BLACK_BALL},
+    {gBattleAnimSpritePal_Conversion, ANIM_TAG_CONVERSION},
+    {gBattleAnimSpritePal_Glass, ANIM_TAG_GLASS},
+    {gBattleAnimSpritePal_HornHit, ANIM_TAG_HORN_HIT},
+    {gBattleAnimSpritePal_Hit, ANIM_TAG_HIT},
+    {gBattleAnimSpritePal_Hit2, ANIM_TAG_HIT_2},
+    {gBattleAnimSpritePal_BlueShards, ANIM_TAG_BLUE_SHARDS},
+    {gBattleAnimSpritePal_ClosingEye, ANIM_TAG_CLOSING_EYE},
+    {gBattleAnimSpritePal_WavingHand, ANIM_TAG_WAVING_HAND},
+    {gBattleAnimSpritePal_HitDuplicate, ANIM_TAG_HIT_DUPLICATE},
+    {gBattleAnimSpritePal_Leer, ANIM_TAG_LEER},
+    {gBattleAnimSpritePal_BlueBurst, ANIM_TAG_BLUE_BURST},
+    {gBattleAnimSpritePal_SmallEmber, ANIM_TAG_SMALL_EMBER},
+    {gBattleAnimSpritePal_GraySmoke, ANIM_TAG_GRAY_SMOKE},
+    {gBattleAnimSpritePal_BlueStar, ANIM_TAG_BLUE_STAR},
+    {gBattleAnimSpritePal_BubbleBurst, ANIM_TAG_BUBBLE_BURST},
+    {gBattleAnimSpritePal_Fire, ANIM_TAG_FIRE},
+    {gBattleAnimSpritePal_Fire, ANIM_TAG_SPINNING_FIRE},
+    {gBattleAnimSpritePal_Fire, ANIM_TAG_FIRE_PLUME},
+    {gBattleAnimSpritePal_Lightning2, ANIM_TAG_LIGHTNING_2},
+    {gBattleAnimSpritePal_Lightning2, ANIM_TAG_LIGHTNING},
+    {gBattleAnimSpritePal_ClawSlash2, ANIM_TAG_CLAW_SLASH_2},
+    {gBattleAnimSpritePal_ClawSlash, ANIM_TAG_CLAW_SLASH},
+    {gBattleAnimSpritePal_ClawSlash2, ANIM_TAG_SCRATCH_3},
+    {gBattleAnimSpritePal_ClawSlash2, ANIM_TAG_SCRATCH_2},
+    {gBattleAnimSpritePal_BubbleBurst2, ANIM_TAG_BUBBLE_BURST_2},
+    {gBattleAnimSpritePal_IceChunk, ANIM_TAG_ICE_CHUNK},
+    {gBattleAnimSpritePal_Glass2, ANIM_TAG_GLASS_2},
+    {gBattleAnimSpritePal_PinkHeart2, ANIM_TAG_PINK_HEART_2},
+    {gBattleAnimSpritePal_SapDrip, ANIM_TAG_SAP_DRIP},
+    {gBattleAnimSpritePal_SapDrip2, ANIM_TAG_SAP_DRIP},
+    {gBattleAnimSpritePal_Sparkle1, ANIM_TAG_SPARKLE_1},
+    {gBattleAnimSpritePal_Sparkle2, ANIM_TAG_SPARKLE_2},
+    {gBattleAnimSpritePal_HumanoidFoot, ANIM_TAG_HUMANOID_FOOT},
+    {gBattleAnimSpritePal_HumanoidFoot, ANIM_TAG_MONSTER_FOOT},
+    {gBattleAnimSpritePal_HumanoidFoot, ANIM_TAG_HUMANOID_HAND},
+    {gBattleAnimSpritePal_HitDuplicate, ANIM_TAG_NOISE_LINE},
+    {gBattleAnimSpritePal_YellowUnk, ANIM_TAG_YELLOW_UNK},
+    {gBattleAnimSpritePal_HumanoidFoot, ANIM_TAG_RED_FIST},
+    {gBattleAnimSpritePal_SlamHit, ANIM_TAG_SLAM_HIT},
+    {gBattleAnimSpritePal_Ring, ANIM_TAG_RING},
+    {gBattleAnimSpritePal_Rocks, ANIM_TAG_ROCKS},
+    {gBattleAnimSpritePal_Z, ANIM_TAG_Z},
+    {gBattleAnimSpritePal_YellowUnk2, ANIM_TAG_YELLOW_UNK_2},
+    {gBattleAnimSpritePal_AirSlash, ANIM_TAG_AIR_SLASH},
+    {gBattleAnimSpritePal_SpinningGreenOrbs, ANIM_TAG_SPINNING_GREEN_ORBS},
+    {gBattleAnimSpritePal_Leaf, ANIM_TAG_LEAF},
+    {gBattleAnimSpritePal_Finger, ANIM_TAG_FINGER},
+    {gBattleAnimSpritePal_PoisonPowder, ANIM_TAG_POISON_POWDER},
+    {gBattleAnimSpritePal_BrownTriangle, ANIM_TAG_BROWN_TRIANGLE},
+    {gBattleAnimSpritePal_SleepPowder, ANIM_TAG_SLEEP_POWDER},
+    {gBattleAnimSpritePal_StunSpore, ANIM_TAG_STUN_SPORE},
+    {gBattleAnimSpritePal_PoisonPowder, ANIM_TAG_POWDER},
+    {gBattleAnimSpritePal_Sparkle3, ANIM_TAG_SPARKLE_3},
+    {gBattleAnimSpritePal_Sparkle3, ANIM_TAG_SPARKLE_4},
+    {gBattleAnimSpritePal_MusicNotes, ANIM_TAG_MUSIC_NOTES},
+    {gBattleAnimSpritePal_Duck, ANIM_TAG_DUCK},
+    {gBattleAnimSpritePal_MudSand, ANIM_TAG_MUD_SAND},
+    {gBattleAnimSpritePal_Alert, ANIM_TAG_ALERT},
+    {gBattleAnimSpritePal_BlueFlames, ANIM_TAG_BLUE_FLAMES},
+    {gBattleAnimSpritePal_BlueFlames, ANIM_TAG_BLUE_FLAMES_2},
+    {gBattleAnimSpritePal_Shock4, ANIM_TAG_SHOCK_4},
+    {gBattleAnimSpritePal_Shock4, ANIM_TAG_SHOCK},
+    {gBattleAnimSpritePal_Bell2, ANIM_TAG_BELL_2},
+    {gBattleAnimSpritePal_PinkGlove, ANIM_TAG_PINK_GLOVE},
+    {gBattleAnimSpritePal_BlueLines, ANIM_TAG_BLUE_LINES},
+    {gBattleAnimSpritePal_Impact3, ANIM_TAG_IMPACT_3},
+    {gBattleAnimSpritePal_Impact2, ANIM_TAG_IMPACT_2},
+    {gBattleAnimSpritePal_Reticle, ANIM_TAG_RETICLE},
+    {gBattleAnimSpritePal_Breath, ANIM_TAG_BREATH},
+    {gBattleAnimSpritePal_Anger, ANIM_TAG_ANGER},
+    {gBattleAnimSpritePal_Snowball, ANIM_TAG_SNOWBALL},
+    {gBattleAnimSpritePal_Vine, ANIM_TAG_VINE},
+    {gBattleAnimSpritePal_Sword2, ANIM_TAG_SWORD_2},
+    {gBattleAnimSpritePal_Clapping, ANIM_TAG_CLAPPING},
+    {gBattleAnimSpritePal_RedTube, ANIM_TAG_RED_TUBE},
+    {gBattleAnimSpritePal_Amnesia, ANIM_TAG_AMNESIA},
+    {gBattleAnimSpritePal_String2, ANIM_TAG_STRING_2},
+    {gBattleAnimSpritePal_Pencil2, ANIM_TAG_PENCIL_2},
+    {gBattleAnimSpritePal_Petal, ANIM_TAG_PETAL},
+    {gBattleAnimSpritePal_BentSpoon, ANIM_TAG_BENT_SPOON},
+    {gBattleAnimSpritePal_String2, ANIM_TAG_WEB},
+    {gBattleAnimSpritePal_MilkBottle, ANIM_TAG_MILK_BOTTLE},
+    {gBattleAnimSpritePal_Coin, ANIM_TAG_COIN},
+    {gBattleAnimSpritePal_CrackedEgg, ANIM_TAG_CRACKED_EGG},
+    {gBattleAnimSpritePal_CrackedEgg, ANIM_TAG_HATCHED_EGG},
+    {gBattleAnimSpritePal_FreshEgg, ANIM_TAG_FRESH_EGG},
+    {gBattleAnimSpritePal_Fangs, ANIM_TAG_FANGS},
+    {gBattleAnimSpritePal_Explosion2, ANIM_TAG_EXPLOSION_2},
+    {gBattleAnimSpritePal_Explosion2, ANIM_TAG_EXPLOSION_3},
+    {gBattleAnimSpritePal_WaterDroplet, ANIM_TAG_WATER_DROPLET},
+    {gBattleAnimSpritePal_WaterDroplet, ANIM_TAG_WATER_DROPLET_2},
+    {gBattleAnimSpritePal_Seed2, ANIM_TAG_SEED_2},
+    {gBattleAnimSpritePal_Seed2, ANIM_TAG_SPROUT},
+    {gBattleAnimSpritePal_RedWand, ANIM_TAG_RED_WAND},
+    {gBattleAnimSpritePal_PurpleGreenUnk, ANIM_TAG_PURPLE_GREEN_UNK},
+    {gBattleAnimSpritePal_WaterColumn, ANIM_TAG_WATER_COLUMN},
+    {gBattleAnimSpritePal_MudUnk, ANIM_TAG_MUD_UNK},
+    {gBattleAnimSpritePal_RainDrops, ANIM_TAG_RAIN_DROPS},
+    {gBattleAnimSpritePal_FurySwipes, ANIM_TAG_FURY_SWIPES},
+    {gBattleAnimSpritePal_Vine2, ANIM_TAG_VINE_2},
+    {gBattleAnimSpritePal_Teeth, ANIM_TAG_TEETH},
+    {gBattleAnimSpritePal_Bone2, ANIM_TAG_BONE_2},
+    {gBattleAnimSpritePal_WhiteBag, ANIM_TAG_WHITE_BAG},
+    {gBattleAnimSpritePal_Unknown, ANIM_TAG_UNKNOWN},
+    {gBattleAnimSpritePal_PurpleCoral, ANIM_TAG_PURPLE_CORAL},
+    {gBattleAnimSpritePal_PurpleCoral, ANIM_TAG_PURPLE_DROPLET},
+    {gBattleAnimSpritePal_Shock2, ANIM_TAG_SHOCK_2},
+    {gBattleAnimSpritePal_ClosingEye2, ANIM_TAG_CLOSING_EYE_2},
+    {gBattleAnimSpritePal_MetalBall, ANIM_TAG_METAL_BALL},
+    {gBattleAnimSpritePal_MonsterDoll, ANIM_TAG_MONSTER_DOLL},
+    {gBattleAnimSpritePal_Whirlwind, ANIM_TAG_WHIRLWIND},
+    {gBattleAnimSpritePal_Whirlwind, ANIM_TAG_WHIRLWIND_2},
+    {gBattleAnimSpritePal_Explosion4, ANIM_TAG_EXPLOSION_4},
+    {gBattleAnimSpritePal_Explosion4, ANIM_TAG_EXPLOSION_5},
+    {gBattleAnimSpritePal_Tongue, ANIM_TAG_TONGUE},
+    {gBattleAnimSpritePal_Smoke, ANIM_TAG_SMOKE},
+    {gBattleAnimSpritePal_Smoke, ANIM_TAG_SMOKE_2},
+    {gBattleAnimSpritePal_Impact, ANIM_TAG_IMPACT},
+    {gBattleAnimSpritePal_CircleImpact, ANIM_TAG_CIRCLE_IMPACT},
+    {gBattleAnimSpritePal_Impact, ANIM_TAG_SCRATCH},
+    {gBattleAnimSpritePal_Impact, ANIM_TAG_CUT},
+    {gBattleAnimSpritePal_SharpTeeth, ANIM_TAG_SHARP_TEETH},
+    {gBattleAnimSpritePal_RainbowRings, ANIM_TAG_RAINBOW_RINGS},
+    {gBattleAnimSpritePal_IceCrystals, ANIM_TAG_ICE_CRYSTALS},
+    {gBattleAnimSpritePal_IceCrystals, ANIM_TAG_ICE_SPIKES},
+    {gBattleAnimSpritePal_HandsAndFeet, ANIM_TAG_HANDS_AND_FEET},
+    {gBattleAnimSpritePal_MistCloud, ANIM_TAG_MIST_CLOUD},
+    {gBattleAnimSpritePal_SharpTeeth, ANIM_TAG_CLAMP},
+    {gBattleAnimSpritePal_RainDrops, ANIM_TAG_BUBBLE},
+    {gBattleAnimSpritePal_Orbs, ANIM_TAG_ORBS},
+    {gBattleAnimSpritePal_WaterImpact, ANIM_TAG_WATER_IMPACT},
+    {gBattleAnimSpritePal_WaterImpact, ANIM_TAG_WATER_ORB},
+    {gBattleAnimSpritePal_PoisonBubble, ANIM_TAG_POISON_BUBBLE},
+    {gBattleAnimSpritePal_PoisonBubble, ANIM_TAG_TOXIC_BUBBLE},
+    {gBattleAnimSpritePal_Spikes, ANIM_TAG_SPIKES},
+    {gBattleAnimSpritePal_HornHit2, ANIM_TAG_HORN_HIT_2},
+    {gBattleAnimSpritePal_AirWave2, ANIM_TAG_AIR_WAVE_2},
+    {gBattleAnimSpritePal_SmallBubbles, ANIM_TAG_SMALL_BUBBLES},
+    {gBattleAnimSpritePal_RoundShadow, ANIM_TAG_ROUND_SHADOW},
+    {gBattleAnimSpritePal_Sunlight, ANIM_TAG_SUNLIGHT},
+    {gBattleAnimSpritePal_Spore, ANIM_TAG_SPORE},
+    {gBattleAnimSpritePal_Flower, ANIM_TAG_FLOWER},
+    {gBattleAnimSpritePal_RazorLeaf, ANIM_TAG_RAZOR_LEAF},
+    {gBattleAnimSpritePal_Needle, ANIM_TAG_NEEDLE},
+    {gBattleAnimSpritePal_WhirlwindLines, ANIM_TAG_WHIRLWIND_LINES},
+    {gBattleAnimSpritePal_GoldRing, ANIM_TAG_GOLD_RING},
+    {gBattleAnimSpritePal_PurpleRing, ANIM_TAG_PURPLE_RING},
+    {gBattleAnimSpritePal_BlueRing, ANIM_TAG_BLUE_RING},
+    {gBattleAnimSpritePal_GreenLightWall, ANIM_TAG_GREEN_LIGHT_WALL},
+    {gBattleAnimSpritePal_BlueLightWall, ANIM_TAG_BLUE_LIGHT_WALL},
+    {gBattleAnimSpritePal_RedLightWall, ANIM_TAG_RED_LIGHT_WALL},
+    {gBattleAnimSpritePal_GrayLightWall, ANIM_TAG_GRAY_LIGHT_WALL},
+    {gBattleAnimSpritePal_OrangeLightWall, ANIM_TAG_ORANGE_LIGHT_WALL},
+    {gBattleAnimSpritePal_BlackBall2, ANIM_TAG_BLACK_BALL_2},
+    {gBattleAnimSpritePal_PurpleGasCloud, ANIM_TAG_PURPLE_GAS_CLOUD},
+    {gBattleAnimSpritePal_Spark, ANIM_TAG_SPARK_H},
+    {gBattleAnimSpritePal_YellowStar, ANIM_TAG_YELLOW_STAR},
+    {gBattleAnimSpritePal_LargeFreshEgg, ANIM_TAG_LARGE_FRESH_EGG},
+    {gBattleAnimSpritePal_ShadowBall, ANIM_TAG_SHADOW_BALL},
+    {gBattleAnimSpritePal_Lick, ANIM_TAG_LICK},
+    {gBattleAnimSpritePal_VoidLines, ANIM_TAG_VOID_LINES},
+    {gBattleAnimSpritePal_String, ANIM_TAG_STRING},
+    {gBattleAnimSpritePal_String, ANIM_TAG_WEB_THREAD},
+    {gBattleAnimSpritePal_String, ANIM_TAG_SPIDER_WEB},
+    {gBattleAnimSpritePal_Lightbulb, ANIM_TAG_LIGHTBULB},
+    {gBattleAnimSpritePal_Slash, ANIM_TAG_SLASH},
+    {gBattleAnimSpritePal_FocusEnergy, ANIM_TAG_FOCUS_ENERGY},
+    {gBattleAnimSpritePal_SphereToCube, ANIM_TAG_SPHERE_TO_CUBE},
+    {gBattleAnimSpritePal_Tendrils, ANIM_TAG_TENDRILS},
+    {gBattleAnimSpritePal_Eye, ANIM_TAG_EYE},
+    {gBattleAnimSpritePal_WhiteShadow, ANIM_TAG_WHITE_SHADOW},
+    {gBattleAnimSpritePal_TealAlert, ANIM_TAG_TEAL_ALERT},
+    {gBattleAnimSpritePal_OpeningEye, ANIM_TAG_OPENING_EYE},
+    {gBattleAnimSpritePal_RoundWhiteHalo, ANIM_TAG_ROUND_WHITE_HALO},
+    {gBattleAnimSpritePal_FangAttack, ANIM_TAG_FANG_ATTACK},
+    {gBattleAnimSpritePal_PurpleHandOutline, ANIM_TAG_PURPLE_HAND_OUTLINE},
+    {gBattleAnimSpritePal_Moon, ANIM_TAG_MOON},
+    {gBattleAnimSpritePal_GreenSparkle, ANIM_TAG_GREEN_SPARKLE},
+    {gBattleAnimSpritePal_Spiral, ANIM_TAG_SPIRAL},
+    {gBattleAnimSpritePal_SnoreZ, ANIM_TAG_SNORE_Z},
+    {gBattleAnimSpritePal_Explosion, ANIM_TAG_EXPLOSION},
+    {gBattleAnimSpritePal_Nail, ANIM_TAG_NAIL},
+    {gBattleAnimSpritePal_GhostlySpirit, ANIM_TAG_GHOSTLY_SPIRIT},
+    {gBattleAnimSpritePal_WarmRock, ANIM_TAG_WARM_ROCK},
+    {gBattleAnimSpritePal_BreakingEgg, ANIM_TAG_BREAKING_EGG},
+    {gBattleAnimSpritePal_ThinRing, ANIM_TAG_THIN_RING},
+    {gBattleAnimSpritePal_PunchImpact, ANIM_TAG_PUNCH_IMPACT},
+    {gBattleAnimSpritePal_Bell, ANIM_TAG_BELL},
+    {gBattleAnimSpritePal_MusicNotes2, ANIM_TAG_MUSIC_NOTES_2},
+    {gBattleAnimSpritePal_SpeedDust, ANIM_TAG_SPEED_DUST},
+    {gBattleAnimSpritePal_BlueLightWall, ANIM_TAG_TORN_METAL},
+    {gBattleAnimSpritePal_ThoughtBubble, ANIM_TAG_THOUGHT_BUBBLE},
+    {gBattleAnimSpritePal_MagentaHeart, ANIM_TAG_MAGENTA_HEART},
+    {gBattleAnimSpritePal_ElectricOrbs, ANIM_TAG_ELECTRIC_ORBS},
+    {gBattleAnimSpritePal_ElectricOrbs, ANIM_TAG_CIRCLE_OF_LIGHT},
+    {gBattleAnimSpritePal_ElectricOrbs, ANIM_TAG_ELECTRICITY},
+    {gBattleAnimSpritePal_Finger, ANIM_TAG_FINGER_2},
+    {gBattleAnimSpritePal_MovementWaves, ANIM_TAG_MOVEMENT_WAVES},
+    {gBattleAnimSpritePal_RedHeart, ANIM_TAG_RED_HEART},
+    {gBattleAnimSpritePal_RedOrb, ANIM_TAG_RED_ORB},
+    {gBattleAnimSpritePal_EyeSparkle, ANIM_TAG_EYE_SPARKLE},
+    {gBattleAnimSpritePal_PinkHeart, ANIM_TAG_PINK_HEART},
+    {gBattleAnimSpritePal_Angel, ANIM_TAG_ANGEL},
+    {gBattleAnimSpritePal_Devil, ANIM_TAG_DEVIL},
+    {gBattleAnimSpritePal_Swipe, ANIM_TAG_SWIPE},
+    {gBattleAnimSpritePal_Roots, ANIM_TAG_ROOTS},
+    {gBattleAnimSpritePal_ItemBag, ANIM_TAG_ITEM_BAG},
+    {gBattleAnimSpritePal_JaggedMusicNote, ANIM_TAG_JAGGED_MUSIC_NOTE},
+    {gBattleAnimSpritePal_Pokeball, ANIM_TAG_POKEBALL},
+    {gBattleAnimSpritePal_Pokeball, ANIM_TAG_SPOTLIGHT},
+    {gBattleAnimSpritePal_LetterZ, ANIM_TAG_LETTER_Z},
+    {gBattleAnimSpritePal_RapidSpin, ANIM_TAG_RAPID_SPIN},
+    {gBattleAnimSpritePal_TriForceTriangle, ANIM_TAG_TRI_FORCE_TRIANGLE},
+    {gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_ORB},
+    {gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_FIRE},
+    {gBattleAnimSpritePal_GoldStars, ANIM_TAG_GOLD_STARS},
+    {gBattleAnimSpritePal_EclipsingOrb, ANIM_TAG_ECLIPSING_ORB},
+    {gBattleAnimSpritePal_GrayOrb, ANIM_TAG_GRAY_ORB},
+    {gBattleAnimSpritePal_BlueOrb, ANIM_TAG_BLUE_ORB},
+    {gBattleAnimSpritePal_RedOrb2, ANIM_TAG_RED_ORB_2},
+    {gBattleAnimSpritePal_PinkPetal, ANIM_TAG_PINK_PETAL},
+    {gBattleAnimSpritePal_PainSplit, ANIM_TAG_PAIN_SPLIT},
+    {gBattleAnimSpritePal_Confetti, ANIM_TAG_CONFETTI},
+    {gBattleAnimSpritePal_GreenStar, ANIM_TAG_GREEN_STAR},
+    {gBattleAnimSpritePal_PinkCloud, ANIM_TAG_PINK_CLOUD},
+    {gBattleAnimSpritePal_SweatDrop, ANIM_TAG_SWEAT_DROP},
+    {gBattleAnimSpritePal_GuardRing, ANIM_TAG_GUARD_RING},
+    {gBattleAnimSpritePal_PurpleScratch, ANIM_TAG_PURPLE_SCRATCH},
+    {gBattleAnimSpritePal_PurpleScratch, ANIM_TAG_PURPLE_SWIPE},
+    {gBattleAnimSpritePal_Finger, ANIM_TAG_TAG_HAND},
+    {gBattleAnimSpritePal_SmallRedEye, ANIM_TAG_SMALL_RED_EYE},
+    {gBattleAnimSpritePal_HollowOrb, ANIM_TAG_HOLLOW_ORB},
+    {gBattleAnimSpritePal_HollowOrb, ANIM_TAG_X_SIGN},
+    {gBattleAnimSpritePal_BluegreenOrb, ANIM_TAG_BLUEGREEN_ORB},
+    {gBattleAnimSpritePal_PawPrint, ANIM_TAG_PAW_PRINT},
+    {gBattleAnimSpritePal_PurpleFlame, ANIM_TAG_PURPLE_FLAME},
+    {gBattleAnimSpritePal_RedBall, ANIM_TAG_RED_BALL},
+    {gBattleAnimSpritePal_SmellingsaltEffect, ANIM_TAG_SMELLINGSALT_EFFECT},
+    {gBattleAnimSpritePal_Meteor, ANIM_TAG_METEOR},
+    {gBattleAnimSpritePal_FlatRock, ANIM_TAG_FLAT_ROCK},
+    {gBattleAnimSpritePal_MagnifyingGlass, ANIM_TAG_MAGNIFYING_GLASS},
+    {gBattleAnimSpritePal_BrownOrb, ANIM_TAG_BROWN_ORB},
+    {gBattleAnimSpritePal_MetalSoundWaves, ANIM_TAG_METAL_SOUND_WAVES},
+    {gBattleAnimSpritePal_FlyingDirt, ANIM_TAG_FLYING_DIRT},
+    {gBattleAnimSpritePal_IcicleSpear, ANIM_TAG_ICICLE_SPEAR},
+    {gBattleAnimSpritePal_Hail, ANIM_TAG_HAIL},
+    {gBattleAnimSpritePal_GlowyRedOrb, ANIM_TAG_GLOWY_RED_ORB},
+    {gBattleAnimSpritePal_GlowyGreenOrb, ANIM_TAG_GLOWY_GREEN_ORB},
+    {gBattleAnimSpritePal_GreenSpike, ANIM_TAG_GREEN_SPIKE},
+    {gBattleAnimSpritePal_WhiteCircleOfLight, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
+    {gBattleAnimSpritePal_GlowyBlueOrb, ANIM_TAG_GLOWY_BLUE_ORB},
+    {gBattleAnimSpritePal_RedBrick, ANIM_TAG_RED_BRICK},
+    {gBattleAnimSpritePal_WhiteFeather, ANIM_TAG_WHITE_FEATHER},
+    {gBattleAnimSpritePal_Sparkle6, ANIM_TAG_SPARKLE_6},
+    {gBattleAnimSpritePal_Splash, ANIM_TAG_SPLASH},
+    {gBattleAnimSpritePal_Splash, ANIM_TAG_SWEAT_BEAD},
+    {gBattleAnimSpritePal_Gem1, ANIM_TAG_GEM_1},
+    {gBattleAnimSpritePal_Gem1, ANIM_TAG_GEM_2},
+    {gBattleAnimSpritePal_Gem1, ANIM_TAG_GEM_3},
+    {gBattleAnimSpritePal_SlamHit2, ANIM_TAG_SLAM_HIT_2},
+    {gBattleAnimSpritePal_Recycle, ANIM_TAG_RECYCLE},
+    {gBattleAnimSpritePal_RedParticles, ANIM_TAG_RED_PARTICLES},
+    {gBattleAnimSpritePal_Protect, ANIM_TAG_PROTECT},
+    {gBattleAnimSpritePal_DirtMound, ANIM_TAG_DIRT_MOUND},
+    {gBattleAnimSpritePal_Shock3, ANIM_TAG_SHOCK_3},
+    {gBattleAnimSpritePal_WeatherBall, ANIM_TAG_WEATHER_BALL},
+    {gBattleAnimSpritePal_Bird, ANIM_TAG_BIRD},
+    {gBattleAnimSpritePal_CrossImpact, ANIM_TAG_CROSS_IMPACT},
+    {gBattleAnimSpritePal_Slash2, ANIM_TAG_SLASH_2},
+    {gBattleAnimSpritePal_WhipHit, ANIM_TAG_WHIP_HIT},
+    {gBattleAnimSpritePal_BlueRing2, ANIM_TAG_BLUE_RING_2},
 };
 
 const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
 {
-    {gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00},
-    {gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00},
-    {gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02},
-    {gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03},
-    {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04},
-    {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05},
-    {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06},
-    {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07},
-    {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08},
-    {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09},
-    {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10},
-    {gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11},
-    {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12},
-    {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13},
-    {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14},
-    {gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15},
-    {gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16},
-    {gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17},
-    {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07},
-    {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08},
-    {gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20},
-    {gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21},
-    {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09},
-    {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10},
-    {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04},
-    {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05},
-    {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06},
+    [BG_DARK_] = {gBattleAnimBgImage_Dark, gBattleAnimBgPalette_Dark, gBattleAnimBgTilemap_Dark},
+    [BG_DARK] = {gBattleAnimBgImage_Dark, gBattleAnimBgPalette_Dark, gBattleAnimBgTilemap_Dark},
+    [BG_GHOST] = {gBattleAnimBgImage_Ghost, gBattleAnimBgPalette_Ghost, gBattleAnimBgTilemap_Ghost},
+    [BG_PSYCHIC] = {gBattleAnimBgImage_Psychic, gBattleAnimBgPalette_Psychic, gBattleAnimBgTilemap_Psychic},
+    [BG_IMPACT_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Impact, gBattleAnimBgTilemap_ImpactOpponent},
+    [BG_IMPACT_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Impact, gBattleAnimBgTilemap_ImpactPlayer},
+    [BG_IMPACT_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Impact, gBattleAnimBgTilemap_ImpactContests},
+    [BG_DRILL] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Drill, gBattleAnimBgTilemap_Drill},
+    [BG_DRILL_CONTESTS] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Drill, gBattleAnimBgTilemap_DrillContests},
+    [BG_HIGHSPEED_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Highspeed, gBattleAnimBgTilemap_HighspeedOpponent},
+    [BG_HIGHSPEED_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Highspeed, gBattleAnimBgTilemap_HighspeedPlayer},
+    [BG_THUNDER] = {gBattleAnimBgImage_Thunder, gBattleAnimBgPalette_Thunder, gBattleAnimBgTilemap_Thunder},
+    [BG_GUILLOTINE_OPPONENT] = {gBattleAnimBgImage_Guillotine, gBattleAnimBgPalette_Guillotine, gBattleAnimBgTilemap_GuillotineOpponent},
+    [BG_GUILLOTINE_PLAYER] = {gBattleAnimBgImage_Guillotine, gBattleAnimBgPalette_Guillotine, gBattleAnimBgTilemap_GuillotinePlayer},
+    [BG_GUILLOTINE_CONTESTS] = {gBattleAnimBgImage_Guillotine, gBattleAnimBgPalette_Guillotine, gBattleAnimBgTilemap_GuillotineContests},
+    [BG_ICE] = {gBattleAnimBgImage_Ice, gBattleAnimBgPalette_Ice, gBattleAnimBgTilemap_Ice},
+    [BG_COSMIC] = {gBattleAnimBgImage_Cosmic, gBattleAnimBgPalette_Cosmic, gBattleAnimBgTilemap_Cosmic},
+    [BG_IN_AIR] = {gBattleAnimBgImage_InAir, gBattleAnimBgPalette_InAir, gBattleAnimBgTilemap_InAir},
+    [BG_SKY] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Sky, gBattleAnimBgTilemap_Drill},
+    [BG_SKY_CONTESTS] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Sky, gBattleAnimBgTilemap_DrillContests},
+    [BG_AURORA] = {gBattleAnimBgImage_Aurora, gBattleAnimBgPalette_Aurora, gBattleAnimBgTilemap_Aurora},
+    [BG_FISSURE] = {gBattleAnimBgImage_Fissure, gBattleAnimBgPalette_Fissure, gBattleAnimBgTilemap_Fissure},
+    [BG_BUG_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedOpponent},
+    [BG_BUG_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedPlayer},
+    [BG_SOLARBEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactOpponent},
+    [BG_SOLARBEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactPlayer},
+    [BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests},
 };
 
 static void (* const sScriptCmdTable[])(void) =
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index f14e502f3..49bb0216b 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -1093,7 +1093,7 @@ const struct SpriteTemplate gUnknown_085928D0 =
     .callback = sub_8100A50,
 };
 
-const struct SpriteTemplate gUnknown_085928E8 =
+const struct SpriteTemplate gVineWhipSpriteTemplate =
 {
     .tileTag = ANIM_TAG_WHIP_HIT,
     .paletteTag = ANIM_TAG_WHIP_HIT,
@@ -1121,8 +1121,8 @@ const union AnimCmd *const gUnknown_08592918[] =
 
 const struct SpriteTemplate gUnknown_0859291C =
 {
-    .tileTag = ANIM_TAG_UNUSED_HIT,
-    .paletteTag = ANIM_TAG_UNUSED_HIT,
+    .tileTag = ANIM_TAG_HIT,
+    .paletteTag = ANIM_TAG_HIT,
     .oam = &gUnknown_08524914,
     .anims = gUnknown_08592918,
     .images = NULL,
@@ -1132,8 +1132,8 @@ const struct SpriteTemplate gUnknown_0859291C =
 
 const struct SpriteTemplate gUnknown_08592934 =
 {
-    .tileTag = ANIM_TAG_UNUSED_HIT_2,
-    .paletteTag = ANIM_TAG_UNUSED_HIT_2,
+    .tileTag = ANIM_TAG_HIT_2,
+    .paletteTag = ANIM_TAG_HIT_2,
     .oam = &gUnknown_08524914,
     .anims = gUnknown_08592918,
     .images = NULL,
@@ -1442,8 +1442,8 @@ const union AnimCmd *const gUnknown_08592BF4[] =
 
 const struct SpriteTemplate gUnknown_08592BFC =
 {
-    .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST,
-    .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST,
+    .tileTag = ANIM_TAG_BUBBLE_BURST,
+    .paletteTag = ANIM_TAG_BUBBLE_BURST,
     .oam = &gUnknown_0852490C,
     .anims = gUnknown_08592BF4,
     .images = NULL,
@@ -2336,7 +2336,7 @@ void AnimHyperBeamOrb(struct Sprite* sprite)
 {
     u16 speed;
     u16 animNum = Random2();
-    
+
     StartSpriteAnim(sprite, animNum % 8);
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
@@ -2660,7 +2660,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite)
     s16 a = sprite->data[0];
     s16 b = sprite->data[7];
     s16 r0;
-    
+
     sprite->data[0] = 1;
     TranslateAnimHorizontalArc(sprite);
     r0 = sprite->data[7];
@@ -2675,7 +2675,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite)
         if (sprite->oam.affineParam == 30)
             destroy = TRUE;
     }
-    
+
     if (sprite->pos1.x + sprite->pos2.x > 256
      || sprite->pos1.x + sprite->pos2.x < -16
      || sprite->pos1.y + sprite->pos2.y > 160
@@ -3748,7 +3748,7 @@ void sub_81009F8(struct Sprite* sprite)
 
 void sub_8100A50(struct Sprite* sprite)
 {
-    if (GetBattlerSide(gBattleAnimAttacker) == 0)
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         StartSpriteAnim(sprite, 1);
 
     sprite->callback = sub_81009DC;
@@ -3770,7 +3770,7 @@ void sub_8100A94(struct Sprite* sprite)
 }
 
 // Moves the sprite in a diagonally slashing motion across the target mon.
-// Used by moves such as MOVE_CUT and MOVE_AERIAL_ACE. 
+// Used by moves such as MOVE_CUT and MOVE_AERIAL_ACE.
 // arg 0: initial x pixel offset
 // arg 1: initial y pixel offset
 // arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
@@ -5350,10 +5350,10 @@ static void sub_8102DE4(struct Sprite* sprite)
 
 void sub_8102EB0(struct Sprite* sprite)
 {
-    int a; 
+    int a;
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
     {
-        a = gBattleAnimArgs[1]; 
+        a = gBattleAnimArgs[1];
         (u16)gBattleAnimArgs[1] = -a;
     }
 
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 80b3258b4..580b13864 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -189,8 +189,8 @@ const union AffineAnimCmd *const gUnknown_08593300[] =
 
 const struct SpriteTemplate gUnknown_08593304 =
 {
-    .tileTag = ANIM_TAG_UNUSED_EXPLOSION,
-    .paletteTag = ANIM_TAG_UNUSED_EXPLOSION,
+    .tileTag = ANIM_TAG_EXPLOSION_6,
+    .paletteTag = ANIM_TAG_EXPLOSION_6,
     .oam = &gUnknown_08524974,
     .anims = gUnknown_085932E4,
     .images = NULL,
@@ -359,8 +359,8 @@ const struct SpriteTemplate gUnknown_08593488 =
 
 const struct SpriteTemplate gUnknown_085934A0 =
 {
-    .tileTag = ANIM_TAG_UNUSED_VOID_LINES,
-    .paletteTag = ANIM_TAG_UNUSED_VOID_LINES,
+    .tileTag = ANIM_TAG_VOID_LINES,
+    .paletteTag = ANIM_TAG_VOID_LINES,
     .oam = &gUnknown_08524A3C,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -889,7 +889,7 @@ const struct SpriteTemplate gUnknown_08593958 =
     .callback = sub_8105DE8,
 };
 
-const struct SpriteTemplate gUnknown_08593970 =
+const struct SpriteTemplate gMagentaHeartSpriteTemplate =
 {
     .tileTag = ANIM_TAG_MAGENTA_HEART,
     .paletteTag = ANIM_TAG_MAGENTA_HEART,
@@ -3067,7 +3067,7 @@ void sub_8105CB4(u8 taskId)
         paletteNums[i] = AllocSpritePalette(ANIM_SPRITES_START - i);
 
     gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
-    LZDecompressWram(gBattleAnimSpritePalette_206, gMonSpritesGfxPtr->field_17C);
+    LZDecompressWram(gBattleAnimSpritePal_MusicNotes2, gMonSpritesGfxPtr->field_17C);
     for (i = 0; i < 3; i++)
         LoadPalette(&gMonSpritesGfxPtr->field_17C[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32);
 
@@ -3286,7 +3286,7 @@ static void sub_810627C(struct Sprite *sprite)
     }
 }
 
-void sub_81062E8(u8 taskId)
+void AnimTask_HeartsBackground(u8 taskId)
 {
     struct BattleAnimBgData animBg;
 
@@ -3381,11 +3381,11 @@ void sub_81064F8(u8 taskId)
     SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
     sub_80A6B30(&animBg);
     if (IsContest())
-        sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0);
+        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceContest, 0);
     else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
-        sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0);
+        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFacePlayer, 0);
     else
-        sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0);
+        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, 0);
 
     AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset);
     LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32);
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index efa2620fd..ab765b8c1 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -4,7 +4,7 @@
 #include "battle_anim.h"
 #include "bg.h"
 #include "contest.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
@@ -25,8 +25,6 @@
 #include "constants/weather.h"
 
 extern const struct SpriteTemplate gUnknown_08593114;
-extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
-extern const union AffineAnimCmd *const gUnknown_082FF694[];
 
 void sub_815A0D4(struct Sprite *);
 void sub_815A1B0(struct Sprite *);
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index 372377a0c..c6058204d 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -3,7 +3,7 @@
 #include "battle_anim.h"
 #include "bg.h"
 #include "contest.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
@@ -27,11 +27,6 @@
 #define IS_DOUBLE_BATTLE() ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
 
 extern const struct OamData gUnknown_0852497C;
-extern const struct MonCoords gMonFrontPicCoords[];
-extern const struct MonCoords gMonBackPicCoords[];
-extern const u8 gEnemyMonElevation[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const union AffineAnimCmd *gUnknown_082FF6C0[];
 
 static void sub_80A6FB4(struct Sprite *sprite);
 static void sub_80A7144(struct Sprite *sprite);
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index 92874fe09..ee37d199f 100755
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -105,34 +105,34 @@ static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] =
 
 const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[] =
 {
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EC},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6ED},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EE},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EF},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F0},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F1},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F2},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F3},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F4},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F5},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F6},
-    {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F7},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6EC},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6ED},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6EE},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6EF},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F0},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F1},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F2},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F3},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F4},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F5},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F6},
+    {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F7},
 };
 
 const struct CompressedSpritePalette gBallOpenParticlePalettes[] =
 {
-    {gBattleAnimSpritePalette_136, 0xD6EC},
-    {gBattleAnimSpritePalette_136, 0xD6ED},
-    {gBattleAnimSpritePalette_136, 0xD6EE},
-    {gBattleAnimSpritePalette_136, 0xD6EF},
-    {gBattleAnimSpritePalette_136, 0xD6F0},
-    {gBattleAnimSpritePalette_136, 0xD6F1},
-    {gBattleAnimSpritePalette_136, 0xD6F2},
-    {gBattleAnimSpritePalette_136, 0xD6F3},
-    {gBattleAnimSpritePalette_136, 0xD6F4},
-    {gBattleAnimSpritePalette_136, 0xD6F5},
-    {gBattleAnimSpritePalette_136, 0xD6F6},
-    {gBattleAnimSpritePalette_136, 0xD6F7},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6EC},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6ED},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6EE},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6EF},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F0},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F1},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F2},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F3},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F4},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F5},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F6},
+    {gBattleAnimSpritePal_CircleImpact, 0xD6F7},
 };
 
 const union AnimCmd gUnknown_085E5154[] =
@@ -357,8 +357,8 @@ const u16 gUnknown_085E5310[] =
 
 const struct SpriteTemplate gBattleAnimSpriteTemplate_85E5338 =
 {
-    .tileTag = ANIM_TAG_UNUSED_RED_BRICK,
-    .paletteTag = ANIM_TAG_UNUSED_RED_BRICK,
+    .tileTag = ANIM_TAG_RED_BRICK,
+    .paletteTag = ANIM_TAG_RED_BRICK,
     .oam = &gUnknown_0852490C,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -1314,7 +1314,7 @@ static void sub_8171BAC(struct Sprite *sprite)
 
     if (sprite->animEnded)
         sprite->invisible = 1;
-    
+
     if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded)
     {
         StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 0);
@@ -1323,7 +1323,7 @@ static void sub_8171BAC(struct Sprite *sprite)
     else
     {
         gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] -= 288;
-        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8;   
+        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8;
     }
 
     if (sprite->animEnded && next)
@@ -1907,7 +1907,7 @@ void sub_8172BF0(u8 taskId)
     u8 spriteId;
     u32 x;
     u32 done;
-    
+
     done = FALSE;
     spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
     switch (gTasks[taskId].data[10])
@@ -2063,7 +2063,7 @@ static void sub_8172FEC(u8 taskId)
         gTasks[taskId].data[13]++;
         return;
     }
-    
+
     if (gBattleSpritesDataPtr->animationData->field_A)
         return;
 
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index 1271680e0..7ed78ea9a 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -44,8 +44,8 @@ static const union AnimCmd *const sSpriteAnimTable_853EDF8[] =
 
 const struct SpriteTemplate gUnknown_0853EDFC =
 {
-    .tileTag = ANIM_TAG_UNUSED_ORB,
-    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .tileTag = ANIM_TAG_ORB,
+    .paletteTag = ANIM_TAG_ORB,
     .oam = &gUnknown_0852490C,
     .anims = sSpriteAnimTable_853EDF8,
     .images = NULL,
@@ -55,8 +55,8 @@ const struct SpriteTemplate gUnknown_0853EDFC =
 
 const struct SpriteTemplate gUnknown_0853EE14 =
 {
-    .tileTag = ANIM_TAG_UNUSED_ORB,
-    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .tileTag = ANIM_TAG_ORB,
+    .paletteTag = ANIM_TAG_ORB,
     .oam = &gUnknown_0852490C,
     .anims = sSpriteAnimTable_853EDF8,
     .images = NULL,
@@ -125,8 +125,8 @@ const struct SpriteTemplate gUnknown_0853EE84 =
 
 const struct SpriteTemplate gUnknown_0853EE9C =
 {
-    .tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
-    .paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
+    .tileTag = ANIM_TAG_MONSTER_FOOT,
+    .paletteTag = ANIM_TAG_MONSTER_FOOT,
     .oam = &gUnknown_08524914,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -195,8 +195,8 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] =
 
 const struct SpriteTemplate gUnknown_0853EF18 =
 {
-    .tileTag = ANIM_TAG_UNUSED_ORB,
-    .paletteTag = ANIM_TAG_UNUSED_ORB,
+    .tileTag = ANIM_TAG_ORB,
+    .paletteTag = ANIM_TAG_ORB,
     .oam = &gUnknown_085249CC,
     .anims = sSpriteAnimTable_853EEF8,
     .images = NULL,
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 814e8dad9..a08873857 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -5,6 +5,7 @@
 #include "battle_message.h"
 #include "battle_setup.h"
 #include "bg.h"
+#include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "graphics.h"
@@ -597,6 +598,7 @@ const struct WindowTemplate * const gBattleWindowTemplates[] =
 
 static const struct BattleBackground gBattleTerrainTable[] =
 {
+    [BATTLE_TERRAIN_GRASS] =
     {
         .tileset = gBattleTerrainTiles_TallGrass,
         .tilemap = gBattleTerrainTilemap_TallGrass,
@@ -604,6 +606,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_TallGrass,
         .palette = gBattleTerrainPalette_TallGrass,
     },
+
+    [BATTLE_TERRAIN_LONG_GRASS] =
     {
         .tileset = gBattleTerrainTiles_LongGrass,
         .tilemap = gBattleTerrainTilemap_LongGrass,
@@ -611,6 +615,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_LongGrass,
         .palette = gBattleTerrainPalette_LongGrass,
     },
+
+    [BATTLE_TERRAIN_SAND] =
     {
         .tileset = gBattleTerrainTiles_Sand,
         .tilemap = gBattleTerrainTilemap_Sand,
@@ -618,6 +624,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Sand,
         .palette = gBattleTerrainPalette_Sand,
     },
+
+    [BATTLE_TERRAIN_UNDERWATER] =
     {
         .tileset = gBattleTerrainTiles_Underwater,
         .tilemap = gBattleTerrainTilemap_Underwater,
@@ -625,6 +633,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Underwater,
         .palette = gBattleTerrainPalette_Underwater,
     },
+
+    [BATTLE_TERRAIN_WATER] =
     {
         .tileset = gBattleTerrainTiles_Water,
         .tilemap = gBattleTerrainTilemap_Water,
@@ -632,6 +642,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Water,
         .palette = gBattleTerrainPalette_Water,
     },
+
+    [BATTLE_TERRAIN_POND] =
     {
         .tileset = gBattleTerrainTiles_PondWater,
         .tilemap = gBattleTerrainTilemap_PondWater,
@@ -639,6 +651,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_PondWater,
         .palette = gBattleTerrainPalette_PondWater,
     },
+
+    [BATTLE_TERRAIN_MOUNTAIN] =
     {
         .tileset = gBattleTerrainTiles_Rock,
         .tilemap = gBattleTerrainTilemap_Rock,
@@ -646,6 +660,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Rock,
         .palette = gBattleTerrainPalette_Rock,
     },
+
+    [BATTLE_TERRAIN_CAVE] =
     {
         .tileset = gBattleTerrainTiles_Cave,
         .tilemap = gBattleTerrainTilemap_Cave,
@@ -653,6 +669,8 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Cave,
         .palette = gBattleTerrainPalette_Cave,
     },
+
+    [BATTLE_TERRAIN_BUILDING] =
     {
         .tileset = gBattleTerrainTiles_Building,
         .tilemap = gBattleTerrainTilemap_Building,
@@ -660,7 +678,9 @@ static const struct BattleBackground gBattleTerrainTable[] =
         .entryTilemap = gBattleTerrainAnimTilemap_Building,
         .palette = gBattleTerrainPalette_Building,
     },
-    {// plain
+
+    [BATTLE_TERRAIN_PLAIN] =
+    {
         .tileset = gBattleTerrainTiles_Building,
         .tilemap = gBattleTerrainTilemap_Building,
         .entryTileset = gBattleTerrainAnimTiles_Building,
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 23d469c27..3fb5da9dc 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -9,7 +9,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "main.h"
 #include "m4a.h"
@@ -31,8 +31,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-
 // this file's functions
 static void LinkOpponentHandleGetMonData(void);
 static void LinkOpponentHandleGetRawMonData(void);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 22633c5bc..6fc73a604 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -9,7 +9,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "main.h"
 #include "m4a.h"
@@ -29,9 +29,6 @@
 #include "constants/trainers.h"
 #include "recorded_battle.h"
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void LinkPartnerHandleGetMonData(void);
 static void LinkPartnerHandleGetRawMonData(void);
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 7d940cb89..392811327 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -10,7 +10,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "frontier_util.h"
 #include "item.h"
 #include "link.h"
@@ -36,8 +36,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-
 // this file's functions
 static void OpponentHandleGetMonData(void);
 static void OpponentHandleGetRawMonData(void);
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index c4e2face2..e4b5b5c18 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -9,7 +9,7 @@
 #include "battle_setup.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
@@ -37,9 +37,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void PlayerHandleGetMonData(void);
 static void PlayerHandleSetMonData(void);
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 2c53938c1..0ec21fd22 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -8,7 +8,7 @@
 #include "battle_setup.h"
 #include "battle_tower.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -27,9 +27,6 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void PlayerPartnerHandleGetMonData(void);
 static void PlayerPartnerHandleGetRawMonData(void);
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index e43c5f8ae..69d840020 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -9,7 +9,7 @@
 #include "battle_tower.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -31,8 +31,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-
 // this file's functions
 static void RecordedOpponentHandleGetMonData(void);
 static void RecordedOpponentHandleGetRawMonData(void);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 412c49f17..95683225e 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -6,7 +6,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_use.h"
 #include "link.h"
 #include "main.h"
@@ -27,9 +27,6 @@
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void RecordedPlayerHandleGetMonData(void);
 static void RecordedPlayerHandleGetRawMonData(void);
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 2c6514daa..c39b904c9 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -5,7 +5,7 @@
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_menu.h"
 #include "link.h"
 #include "main.h"
@@ -24,8 +24,6 @@
 #include "constants/songs.h"
 #include "constants/rgb.h"
 
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void SafariHandleGetMonData(void);
 static void SafariHandleGetRawMonData(void);
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index c131df0ca..6a5b23e59 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -7,7 +7,7 @@
 #include "battle_setup.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
@@ -32,8 +32,6 @@
 #include "constants/trainers.h"
 #include "constants/rgb.h"
 
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void WallyHandleGetMonData(void);
 static void WallyHandleGetRawMonData(void);
diff --git a/src/battle_data.c b/src/battle_data.c
deleted file mode 100644
index 7f86385aa..000000000
--- a/src/battle_data.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "global.h"
-#include "battle.h"
-#include "data2.h"
-#include "constants/items.h"
-#include "constants/moves.h"
-#include "constants/species.h"
-#include "constants/trainers.h"
-#include "constants/battle_ai.h"
-
-#include "data/trainer_parties.h"
-#include "data/text/trainer_class_names.h"
-#include "data/trainers.h"
-#include "data/text/species_names.h"
-#include "data/text/move_names.h"
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 1b7953180..95fce49a3 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -24,7 +24,7 @@
 #include "menu.h"
 #include "sound.h"
 #include "pokemon_icon.h"
-#include "data2.h"
+#include "data.h"
 #include "international_string_util.h"
 #include "trainer_pokemon_sprites.h"
 #include "scanline_effect.h"
@@ -59,9 +59,6 @@ struct UnkStruct_860DD10
     u16 src;
 };
 
-// text
-extern const u8 gTrainerClassNames[][13];
-
 // This file's functions.
 static u8 GetDomeTrainerMonIvs(u16 trainerId);
 static void SwapDomeTrainers(int id1, int id2, u16 *statsArray);
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index 126e3d5e6..02804ba0b 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -17,7 +17,7 @@
 #include "string_util.h"
 #include "international_string_util.h"
 #include "window.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "pokemon_summary_screen.h"
 #include "sound.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 7c6b74304..d6b1b6dee 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -19,7 +19,7 @@
 #include "m4a.h"
 #include "constants/species.h"
 #include "decompress.h"
-#include "data2.h"
+#include "data.h"
 #include "palette.h"
 #include "contest.h"
 #include "constants/songs.h"
@@ -32,16 +32,8 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern const u8 gUnknown_0831C604[];
 extern const u8 * const gBattleAnims_General[];
 extern const u8 * const gBattleAnims_Special[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
-extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
-extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-extern const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[];
 extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
 extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
-extern const u8 gEnemyMonElevation[];
 
 // this file's functions
 static u8 sub_805D4A8(u16 move);
@@ -932,7 +924,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform
 
         if (targetSpecies == SPECIES_CASTFORM)
         {
-            gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies];
+            gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonFrontAnimsPtrTable[targetSpecies];
             LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
             LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[battlerDef] * 16, paletteOffset, 32);
         }
diff --git a/src/battle_interface.c b/src/battle_interface.c
index a8651f6cf..922437597 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -23,7 +23,8 @@
 #include "battle_anim.h"
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
-#include "data2.h"
+#include "data.h"
+#include "pokemon_summary_screen.h"
 
 struct TestingBar
 {
@@ -157,8 +158,6 @@ enum
     HEALTHBOX_GFX_117, //unknown_D1300C
 };
 
-extern const u8 *const gNatureNamePointers[];
-
 // strings
 extern const u8 gText_Slash[];
 extern const u8 gText_HighlightDarkGrey[];
diff --git a/src/battle_main.c b/src/battle_main.c
index 5bcbc6f59..76bd6d877 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -13,7 +13,7 @@
 #include "battle_tower.h"
 #include "berry.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "event_data.h"
@@ -293,35 +293,31 @@ static const u8 sText_ShedinjaJpnName[] = _("ヌケニン"); // Nukenin
 const struct OamData gOamData_831ACA8 =
 {
     .y = 0,
-    .affineMode = 1,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
-    .affineParam = 0
+    .affineParam = 0,
 };
 
 const struct OamData gOamData_831ACB0 =
 {
     .y = 0,
-    .affineMode = 1,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 2,
-    .affineParam = 0
+    .affineParam = 0,
 };
 
 // Unknown and unused data. Feel free to remove.
@@ -5891,3 +5887,5 @@ static void HandleAction_ActionFinished(void)
     gBattleScripting.multihitMoveEffect = 0;
     gBattleResources->battleScriptsStack->size = 0;
 }
+
+
diff --git a/src/battle_message.c b/src/battle_message.c
index f93765b89..3fec571f4 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -5,7 +5,7 @@
 #include "battle_message.h"
 #include "battle_setup.h"
 #include "battle_tower.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "frontier_util.h"
 #include "international_string_util.h"
@@ -38,7 +38,6 @@ struct BattleWindowText
     u8 shadowColor;
 };
 
-extern const u8 gTrainerClassNames[][13];
 extern const u16 gUnknown_08D85620[];
 
 // this file's functions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index e9db4a1ad..7e783bef5 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -51,6 +51,7 @@
 #include "pokenav.h"
 #include "menu_specialized.h"
 #include "constants/rgb.h"
+#include "data.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
@@ -67,8 +68,8 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8* BS_ptr);
 static bool32 IsMonGettingExpSentOut(void);
 static void sub_804F17C(void);
 static bool8 sub_804F1CC(void);
-static void sub_804F100(void);
-static void sub_804F144(void);
+static void DrawLevelUpWindow1(void);
+static void DrawLevelUpWindow2(void);
 static bool8 sub_804F344(void);
 static void PutMonIconOnLvlUpBox(void);
 static void PutLevelAndGenderOnLvlUpBox(void);
@@ -297,7 +298,7 @@ static void atkDA_tryswapabilities(void);
 static void atkDB_tryimprison(void);
 static void atkDC_trysetgrudge(void);
 static void atkDD_weightdamagecalculation(void);
-static void atkDE_asistattackselect(void);
+static void atkDE_assistattackselect(void);
 static void atkDF_trysetmagiccoat(void);
 static void atkE0_trysetsnatch(void);
 static void atkE1_trygetintimidatetarget(void);
@@ -549,7 +550,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkDB_tryimprison,
     atkDC_trysetgrudge,
     atkDD_weightdamagecalculation,
-    atkDE_asistattackselect,
+    atkDE_assistattackselect,
     atkDF_trysetmagiccoat,
     atkE0_trysetsnatch,
     atkE1_trygetintimidatetarget,
@@ -3239,9 +3240,8 @@ static void atk23_getexp(void)
     s32 i; // also used as stringId
     u8 holdEffect;
     s32 sentIn;
-
     s32 viaExpShare = 0;
-    u16* exp = &gBattleStruct->expValue;
+    u16 *exp = &gBattleStruct->expValue;
 
     gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1];
@@ -3392,14 +3392,14 @@ static void atk23_getexp(void)
                         }
                     }
                     else
+                    {
                         gBattleStruct->expGetterBattlerId = 0;
+                    }
 
-                    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId)
-
+                    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId);
                     // buffer 'gained' or 'gained a boosted'
-                    PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
-
-                    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
+                    PREPARE_STRING_BUFFER(gBattleTextBuff2, i);
+                    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage);
 
                     PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBattlerId);
                     MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species);
@@ -3415,12 +3415,12 @@ static void atk23_getexp(void)
             gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0;
             if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_LEVEL)
             {
-                gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
-                gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
-                gBattleResources->statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
-                gBattleResources->statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
-                gBattleResources->statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
-                gBattleResources->statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
+                gBattleResources->beforeLvlUp->stats[STAT_HP]    = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
+                gBattleResources->beforeLvlUp->stats[STAT_ATK]   = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
+                gBattleResources->beforeLvlUp->stats[STAT_DEF]   = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
+                gBattleResources->beforeLvlUp->stats[STAT_SPEED] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
+                gBattleResources->beforeLvlUp->stats[STAT_SPATK] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
+                gBattleResources->beforeLvlUp->stats[STAT_SPDEF] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
 
                 gActiveBattler = gBattleStruct->expGetterBattlerId;
                 BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage);
@@ -3438,9 +3438,8 @@ static void atk23_getexp(void)
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId)
                     HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 
-                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId)
-
-                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL))
+                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId);
+                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL));
 
                 BattleScriptPushCursor();
                 gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterMonId];
@@ -3488,7 +3487,9 @@ static void atk23_getexp(void)
         break;
     case 5: // looper increment
         if (gBattleMoveDamage) // there is exp to give, goto case 3 that gives exp
+        {
             gBattleScripting.atk23_state = 3;
+        }
         else
         {
             gBattleStruct->expGetterMonId++;
@@ -5912,8 +5913,7 @@ static void atk5D_getmoneyreward(void)
         moneyReward += GetTrainerMoneyToGive(gTrainerBattleOpponent_B);
 
     AddMoney(&gSaveBlock1Ptr->money, moneyReward);
-
-    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward)
+    PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward);
 
     gBattlescriptCurrInstr++;
 }
@@ -6234,7 +6234,7 @@ static void atk6C_drawlvlupbox(void)
         gBattleScripting.atk6C_state = 4;
         break;
     case 4:
-        sub_804F100();
+        DrawLevelUpWindow1();
         PutWindowTilemap(13);
         CopyWindowToVram(13, 3);
         gBattleScripting.atk6C_state++;
@@ -6251,7 +6251,7 @@ static void atk6C_drawlvlupbox(void)
         if (gMain.newKeys != 0)
         {
             PlaySE(SE_SELECT);
-            sub_804F144();
+            DrawLevelUpWindow2();
             CopyWindowToVram(13, 2);
             gBattleScripting.atk6C_state++;
         }
@@ -6292,20 +6292,20 @@ static void atk6C_drawlvlupbox(void)
     }
 }
 
-static void sub_804F100(void)
+static void DrawLevelUpWindow1(void)
 {
-    struct StatsArray currentStats;
+    u16 currStats[NUM_STATS];
 
-    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
-    DrawLevelUpWindowPg1(0xD, gBattleResources->statsBeforeLvlUp, &currentStats, 0xE, 0xD, 0xF);
+    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
+    DrawLevelUpWindowPg1(0xD, gBattleResources->beforeLvlUp->stats, currStats, 0xE, 0xD, 0xF);
 }
 
-static void sub_804F144(void)
+static void DrawLevelUpWindow2(void)
 {
-    struct StatsArray currentStats;
+    u16 currStats[NUM_STATS];
 
-    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
-    DrawLevelUpWindowPg2(0xD, &currentStats, 0xE, 0xD, 0xF);
+    GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
+    DrawLevelUpWindowPg2(0xD, currStats, 0xE, 0xD, 0xF);
 }
 
 static void sub_804F17C(void)
@@ -9661,7 +9661,7 @@ static void atkDD_weightdamagecalculation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkDE_asistattackselect(void)
+static void atkDE_assistattackselect(void)
 {
     s32 chooseableMovesNo = 0;
     struct Pokemon* party;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 347486a0b..712098773 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -45,6 +45,7 @@
 #include "constants/map_types.h"
 #include "constants/battle_frontier.h"
 #include "field_screen_effect.h"
+#include "data.h"
 
 enum
 {
@@ -232,84 +233,84 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[]
 
 const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] =
 {
-    {{TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5}, 0x0, 0x21},
-    {{TRAINER_ANDRES_1, TRAINER_ANDRES_2, TRAINER_ANDRES_3, TRAINER_ANDRES_4, TRAINER_ANDRES_5}, 0x0, 0x14},
-    {{TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5}, 0x0, 0x1a},
-    {{TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5}, 0x0, 0x18},
-    {{TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5}, 0x0, 0x18},
-    {{TRAINER_LILA_AND_ROY_1, TRAINER_LILA_AND_ROY_2, TRAINER_LILA_AND_ROY_3, TRAINER_LILA_AND_ROY_4, TRAINER_LILA_AND_ROY_5}, 0x0, 0x27},
-    {{TRAINER_CRISTIN_1, TRAINER_CRISTIN_2, TRAINER_CRISTIN_3, TRAINER_CRISTIN_4, TRAINER_CRISTIN_5}, 0x0, 0x24},
-    {{TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5}, 0x0, 0x1a},
-    {{TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5}, 0x0, 0x1a},
-    {{TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5}, 0x18, 0x14},
-    {{TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6}, 0x0, 0x13},
-    {{TRAINER_THALIA_1, TRAINER_THALIA_2, TRAINER_THALIA_3, TRAINER_THALIA_4, TRAINER_THALIA_5}, 0x18, 0x38},
-    {{TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5}, 0x0, 0x24},
-    {{TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5}, 0x0, 0x13},
-    {{TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5}, 0x0, 0x1d},
-    {{TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5}, 0x0, 0x16},
-    {{TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5}, 0x0, 0x1e},
-    {{TRAINER_KOJI_1, TRAINER_KOJI_2, TRAINER_KOJI_3, TRAINER_KOJI_4, TRAINER_KOJI_5}, 0x0, 0x2a},
-    {{TRAINER_FERNANDO_1, TRAINER_FERNANDO_2, TRAINER_FERNANDO_3, TRAINER_FERNANDO_4, TRAINER_FERNANDO_5}, 0x0, 0x26},
-    {{TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5}, 0x0, 0x21},
-    {{TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5}, 0x0, 0x1d},
-    {{TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5}, 0x18, 0xd},
-    {{TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5}, 0x18, 0x1},
-    {{TRAINER_JEFFREY_1, TRAINER_JEFFREY_2, TRAINER_JEFFREY_3, TRAINER_JEFFREY_4, TRAINER_JEFFREY_5}, 0x0, 0x23},
-    {{TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5}, 0x0, 0x26},
-    {{TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5}, 0x0, 0x26},
-    {{TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5}, 0x0, 0x24},
-    {{TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5}, 0x0, 0x1f},
-    {{TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5}, 0x0, 0x1f},
-    {{TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5}, 0x0, 0x20},
-    {{TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5}, 0x0, 0x19},
-    {{TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5}, 0x0, 0x12},
-    {{TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5}, 0x0, 0x1e},
-    {{TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5}, 0x18, 0xc},
-    {{TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5}, 0x0, 0x11},
-    {{TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5}, 0x0, 0x15},
-    {{TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5}, 0x0, 0x2b},
-    {{TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5}, 0x0, 0x20},
-    {{TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5}, 0x0, 0x19},
-    {{TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5}, 0x0, 0x20},
-    {{TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5}, 0x0, 0x2b},
-    {{TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5}, 0x0, 0x19},
-    {{TRAINER_PABLO_1, TRAINER_PABLO_2, TRAINER_PABLO_3, TRAINER_PABLO_4, TRAINER_PABLO_5}, 0x0, 0x29},
-    {{TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5}, 0x18, 0x1},
-    {{TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5}, 0x0, 0x23},
-    {{TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5}, 0x0, 0x1c},
-    {{TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5}, 0x0, 0x1e},
-    {{TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5}, 0x0, 0x1c},
-    {{TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5}, 0x0, 0x27},
-    {{TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5}, 0x18, 0xd},
-    {{TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6}, 0x0, 0x12},
-    {{TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5}, 0x0, 0x28},
-    {{TRAINER_CORY_1, TRAINER_CORY_2, TRAINER_CORY_3, TRAINER_CORY_4, TRAINER_CORY_5}, 0x0, 0x17},
-    {{TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5}, 0x0, 0x19},
-    {{TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5}, 0x0, 0x20},
-    {{TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5}, 0x0, 0x20},
-    {{TRAINER_GABRIELLE_1, TRAINER_GABRIELLE_2, TRAINER_GABRIELLE_3, TRAINER_GABRIELLE_4, TRAINER_GABRIELLE_5}, 0x18, 0x11},
-    {{TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5}, 0x0, 0x22},
-    {{TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5}, 0x0, 0x22},
-    {{TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5}, 0x0, 0x13},
-    {{TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5}, 0x18, 0xb},
-    {{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, 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},
-    {{TRAINER_FLANNERY_1, TRAINER_FLANNERY_2, TRAINER_FLANNERY_3, TRAINER_FLANNERY_4, TRAINER_FLANNERY_5}, 0x0, 0xc},
-    {{TRAINER_NORMAN_1, TRAINER_NORMAN_2, TRAINER_NORMAN_3, TRAINER_NORMAN_4, TRAINER_NORMAN_5}, 0x0, 0x0},
-    {{TRAINER_WINONA_1, TRAINER_WINONA_2, TRAINER_WINONA_3, TRAINER_WINONA_4, TRAINER_WINONA_5}, 0x0, 0x4},
-    {{TRAINER_TATE_AND_LIZA_1, TRAINER_TATE_AND_LIZA_2, TRAINER_TATE_AND_LIZA_3, TRAINER_TATE_AND_LIZA_4, TRAINER_TATE_AND_LIZA_5}, 0x0, 0x6},
-    {{TRAINER_JUAN_1, TRAINER_JUAN_2, TRAINER_JUAN_3, TRAINER_JUAN_4, TRAINER_JUAN_5}, 0x0, 0x7},
-    {{TRAINER_SIDNEY, TRAINER_SIDNEY, TRAINER_SIDNEY, TRAINER_SIDNEY, TRAINER_SIDNEY}, 0x0, 0x8},
-    {{TRAINER_PHOEBE, TRAINER_PHOEBE, TRAINER_PHOEBE, TRAINER_PHOEBE, TRAINER_PHOEBE}, 0x0, 0x8},
-    {{TRAINER_GLACIA, TRAINER_GLACIA, TRAINER_GLACIA, TRAINER_GLACIA, TRAINER_GLACIA}, 0x0, 0x8},
-    {{TRAINER_DRAKE, TRAINER_DRAKE, TRAINER_DRAKE, TRAINER_DRAKE, TRAINER_DRAKE}, 0x0, 0x8},
-    {{TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE}, 0x0, 0x8},
+    [REMATCH_ROSE] = {{TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5}, 0x0, 0x21},
+    [REMATCH_ANDRES] = {{TRAINER_ANDRES_1, TRAINER_ANDRES_2, TRAINER_ANDRES_3, TRAINER_ANDRES_4, TRAINER_ANDRES_5}, 0x0, 0x14},
+    [REMATCH_DUSTY] = {{TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5}, 0x0, 0x1a},
+    [REMATCH_LOLA] = {{TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5}, 0x0, 0x18},
+    [REMATCH_RICKY] = {{TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5}, 0x0, 0x18},
+    [REMATCH_LILA_AND_ROY] = {{TRAINER_LILA_AND_ROY_1, TRAINER_LILA_AND_ROY_2, TRAINER_LILA_AND_ROY_3, TRAINER_LILA_AND_ROY_4, TRAINER_LILA_AND_ROY_5}, 0x0, 0x27},
+    [REMATCH_CRISTIN] = {{TRAINER_CRISTIN_1, TRAINER_CRISTIN_2, TRAINER_CRISTIN_3, TRAINER_CRISTIN_4, TRAINER_CRISTIN_5}, 0x0, 0x24},
+    [REMATCH_BROOKE] = {{TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5}, 0x0, 0x1a},
+    [REMATCH_WILTON] = {{TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5}, 0x0, 0x1a},
+    [REMATCH_VALERIE] = {{TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5}, 0x18, 0x14},
+    [REMATCH_CINDY] = {{TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6}, 0x0, 0x13},
+    [REMATCH_THALIA] = {{TRAINER_THALIA_1, TRAINER_THALIA_2, TRAINER_THALIA_3, TRAINER_THALIA_4, TRAINER_THALIA_5}, 0x18, 0x38},
+    [REMATCH_JESSICA] = {{TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5}, 0x0, 0x24},
+    [REMATCH_WINSTON] = {{TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5}, 0x0, 0x13},
+    [REMATCH_STEVE] = {{TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5}, 0x0, 0x1d},
+    [REMATCH_TONY] = {{TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5}, 0x0, 0x16},
+    [REMATCH_NOB] = {{TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5}, 0x0, 0x1e},
+    [REMATCH_KOJI] = {{TRAINER_KOJI_1, TRAINER_KOJI_2, TRAINER_KOJI_3, TRAINER_KOJI_4, TRAINER_KOJI_5}, 0x0, 0x2a},
+    [REMATCH_FERNANDO] = {{TRAINER_FERNANDO_1, TRAINER_FERNANDO_2, TRAINER_FERNANDO_3, TRAINER_FERNANDO_4, TRAINER_FERNANDO_5}, 0x0, 0x26},
+    [REMATCH_DALTON] = {{TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5}, 0x0, 0x21},
+    [REMATCH_BERNIE] = {{TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5}, 0x0, 0x1d},
+    [REMATCH_ETHAN] = {{TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5}, 0x18, 0xd},
+    [REMATCH_JOHN_AND_JAY] = {{TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5}, 0x18, 0x1},
+    [REMATCH_JEFFREY] = {{TRAINER_JEFFREY_1, TRAINER_JEFFREY_2, TRAINER_JEFFREY_3, TRAINER_JEFFREY_4, TRAINER_JEFFREY_5}, 0x0, 0x23},
+    [REMATCH_CAMERON] = {{TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5}, 0x0, 0x26},
+    [REMATCH_JACKI] = {{TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5}, 0x0, 0x26},
+    [REMATCH_WALTER] = {{TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5}, 0x0, 0x24},
+    [REMATCH_KAREN] = {{TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5}, 0x0, 0x1f},
+    [REMATCH_JERRY] = {{TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5}, 0x0, 0x1f},
+    [REMATCH_ANNA_AND_MEG] = {{TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5}, 0x0, 0x20},
+    [REMATCH_ISABEL] = {{TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5}, 0x0, 0x19},
+    [REMATCH_MIGUEL] = {{TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5}, 0x0, 0x12},
+    [REMATCH_TIMOTHY] = {{TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5}, 0x0, 0x1e},
+    [REMATCH_SHELBY] = {{TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5}, 0x18, 0xc},
+    [REMATCH_CALVIN] = {{TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5}, 0x0, 0x11},
+    [REMATCH_ELLIOT] = {{TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5}, 0x0, 0x15},
+    [REMATCH_ISAIAH] = {{TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5}, 0x0, 0x2b},
+    [REMATCH_MARIA] = {{TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5}, 0x0, 0x20},
+    [REMATCH_ABIGAIL] = {{TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5}, 0x0, 0x19},
+    [REMATCH_DYLAN] = {{TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5}, 0x0, 0x20},
+    [REMATCH_KATELYN] = {{TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5}, 0x0, 0x2b},
+    [REMATCH_BENJAMIN] = {{TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5}, 0x0, 0x19},
+    [REMATCH_PABLO] = {{TRAINER_PABLO_1, TRAINER_PABLO_2, TRAINER_PABLO_3, TRAINER_PABLO_4, TRAINER_PABLO_5}, 0x0, 0x29},
+    [REMATCH_NICOLAS] = {{TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5}, 0x18, 0x1},
+    [REMATCH_ROBERT] = {{TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5}, 0x0, 0x23},
+    [REMATCH_LAO] = {{TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5}, 0x0, 0x1c},
+    [REMATCH_CYNDY] = {{TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5}, 0x0, 0x1e},
+    [REMATCH_MADELINE] = {{TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5}, 0x0, 0x1c},
+    [REMATCH_JENNY] = {{TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5}, 0x0, 0x27},
+    [REMATCH_DIANA] = {{TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5}, 0x18, 0xd},
+    [REMATCH_AMY_AND_LIV] = {{TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6}, 0x0, 0x12},
+    [REMATCH_ERNEST] = {{TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5}, 0x0, 0x28},
+    [REMATCH_CORY] = {{TRAINER_CORY_1, TRAINER_CORY_2, TRAINER_CORY_3, TRAINER_CORY_4, TRAINER_CORY_5}, 0x0, 0x17},
+    [REMATCH_EDWIN] = {{TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5}, 0x0, 0x19},
+    [REMATCH_LYDIA] = {{TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5}, 0x0, 0x20},
+    [REMATCH_ISAAC] = {{TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5}, 0x0, 0x20},
+    [REMATCH_GABRIELLE] = {{TRAINER_GABRIELLE_1, TRAINER_GABRIELLE_2, TRAINER_GABRIELLE_3, TRAINER_GABRIELLE_4, TRAINER_GABRIELLE_5}, 0x18, 0x11},
+    [REMATCH_CATHERINE] = {{TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5}, 0x0, 0x22},
+    [REMATCH_JACKSON] = {{TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5}, 0x0, 0x22},
+    [REMATCH_HALEY] = {{TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5}, 0x0, 0x13},
+    [REMATCH_JAMES] = {{TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5}, 0x18, 0xb},
+    [REMATCH_TRENT] = {{TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, 0x0, 0x1b},
+    [REMATCH_SAWYER] = {{TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5}, 0x18, 0xc},
+    [REMATCH_KIRA_AND_DAN] = {{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},
+    [REMATCH_WALLY_3] = {{TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_WALLY_6}, 0x18, 0x2b},
+    [REMATCH_ROXANNE] = {{TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5}, 0x0, 0x3},
+    [REMATCH_BRAWLY] = {{TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5}, 0x0, 0xb},
+    [REMATCH_WATTSON] = {{TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5}, 0x0, 0x2},
+    [REMATCH_FLANNERY] = {{TRAINER_FLANNERY_1, TRAINER_FLANNERY_2, TRAINER_FLANNERY_3, TRAINER_FLANNERY_4, TRAINER_FLANNERY_5}, 0x0, 0xc},
+    [REMATCH_NORMAN] = {{TRAINER_NORMAN_1, TRAINER_NORMAN_2, TRAINER_NORMAN_3, TRAINER_NORMAN_4, TRAINER_NORMAN_5}, 0x0, 0x0},
+    [REMATCH_WINONA] = {{TRAINER_WINONA_1, TRAINER_WINONA_2, TRAINER_WINONA_3, TRAINER_WINONA_4, TRAINER_WINONA_5}, 0x0, 0x4},
+    [REMATCH_TATE_AND_LIZA] = {{TRAINER_TATE_AND_LIZA_1, TRAINER_TATE_AND_LIZA_2, TRAINER_TATE_AND_LIZA_3, TRAINER_TATE_AND_LIZA_4, TRAINER_TATE_AND_LIZA_5}, 0x0, 0x6},
+    [REMATCH_JUAN] = {{TRAINER_JUAN_1, TRAINER_JUAN_2, TRAINER_JUAN_3, TRAINER_JUAN_4, TRAINER_JUAN_5}, 0x0, 0x7},
+    [REMATCH_SIDNEY] = {{TRAINER_SIDNEY, TRAINER_SIDNEY, TRAINER_SIDNEY, TRAINER_SIDNEY, TRAINER_SIDNEY}, 0x0, 0x8},
+    [REMATCH_PHOEBE] = {{TRAINER_PHOEBE, TRAINER_PHOEBE, TRAINER_PHOEBE, TRAINER_PHOEBE, TRAINER_PHOEBE}, 0x0, 0x8},
+    [REMATCH_GLACIA] = {{TRAINER_GLACIA, TRAINER_GLACIA, TRAINER_GLACIA, TRAINER_GLACIA, TRAINER_GLACIA}, 0x0, 0x8},
+    [REMATCH_DRAKE] = {{TRAINER_DRAKE, TRAINER_DRAKE, TRAINER_DRAKE, TRAINER_DRAKE, TRAINER_DRAKE}, 0x0, 0x8},
+    [REMATCH_WALLACE] = {{TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE, TRAINER_WALLACE}, 0x0, 0x8},
 };
 
 static const u16 sBadgeFlags[8] =
@@ -1545,7 +1546,7 @@ static bool32 sub_80B1D94(s32 rematchTableId)
 {
     if (rematchTableId >= REMATCH_ELITE_FOUR_ENTRIES)
         return TRUE;
-    else if (rematchTableId == REMATCH_WALLY_ENTRY)
+    else if (rematchTableId == REMATCH_WALLY_3)
         return (FlagGet(FLAG_DEFEATED_WALLY_VICTORY_ROAD) == FALSE);
     else
         return FALSE;
@@ -1573,7 +1574,7 @@ static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u
     s32 i;
     bool32 ret = FALSE;
 
-    for (i = 0; i <= REMATCH_WALLY_ENTRY; i++)
+    for (i = 0; i <= REMATCH_WALLY_3; i++)
     {
         if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && !sub_80B1D94(i))
         {
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 46aab4bac..6f8e3e25f 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -18,7 +18,7 @@
 #include "trainer_see.h"
 #include "new_game.h"
 #include "string_util.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "field_message_box.h"
 #include "tv.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index a7962b7f7..03f1482da 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2041,7 +2041,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 case ABILITY_FLASH_FIRE:
                     if (moveType == TYPE_FIRE && !(gBattleMons[battler].status1 & STATUS1_FREEZE))
                     {
-                        if (!(gBattleResources->flags->flags[battler] & UNKNOWN_FLAG_FLASH_FIRE))
+                        if (!(gBattleResources->flags->flags[battler] & RESOURCE_FLAG_FLASH_FIRE))
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                             if (gProtectStructs[gBattlerAttacker].notFirstStrike)
@@ -2049,7 +2049,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
 
-                            gBattleResources->flags->flags[battler] |= UNKNOWN_FLAG_FLASH_FIRE;
+                            gBattleResources->flags->flags[battler] |= RESOURCE_FLAG_FLASH_FIRE;
                             effect = 2;
                         }
                         else
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 5ef969fd5..f840cd58b 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -25,7 +25,7 @@ void AllocateBattleResources(void)
     gBattleResources->flags = AllocZeroed(sizeof(*gBattleResources->flags));
     gBattleResources->battleScriptsStack = AllocZeroed(sizeof(*gBattleResources->battleScriptsStack));
     gBattleResources->battleCallbackStack = AllocZeroed(sizeof(*gBattleResources->battleCallbackStack));
-    gBattleResources->statsBeforeLvlUp = AllocZeroed(sizeof(*gBattleResources->statsBeforeLvlUp));
+    gBattleResources->beforeLvlUp = AllocZeroed(sizeof(*gBattleResources->beforeLvlUp));
     gBattleResources->ai = AllocZeroed(sizeof(*gBattleResources->ai));
     gBattleResources->battleHistory = AllocZeroed(sizeof(*gBattleResources->battleHistory));
     gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack));
@@ -56,7 +56,7 @@ void FreeBattleResources(void)
         FREE_AND_SET_NULL(gBattleResources->flags);
         FREE_AND_SET_NULL(gBattleResources->battleScriptsStack);
         FREE_AND_SET_NULL(gBattleResources->battleCallbackStack);
-        FREE_AND_SET_NULL(gBattleResources->statsBeforeLvlUp);
+        FREE_AND_SET_NULL(gBattleResources->beforeLvlUp);
         FREE_AND_SET_NULL(gBattleResources->ai);
         FREE_AND_SET_NULL(gBattleResources->battleHistory);
         FREE_AND_SET_NULL(gBattleResources->AI_ScriptsStack);
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 8429e39cc..8efb5906b 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -139,7 +139,7 @@ void sub_8022960(struct BerryCrushGame *);
 void sub_8022524(struct BerryCrushGame_138 *, u16);
 void sub_8022B28(struct Sprite *);
 
-extern struct BerryCrushGame *gUnknown_02022C90;
+static EWRAM_DATA struct BerryCrushGame *gUnknown_02022C90 = NULL;
 
 extern const struct BgTemplate gUnknown_082F32C8[4];
 extern const u8 gBerryCrushGrinderTopTilemap[];
diff --git a/src/bike.c b/src/bike.c
index 530742bdf..7f84f350b 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -3,7 +3,7 @@
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "global.fieldmap.h"
+#include "field_specials.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "sound.h"
@@ -11,9 +11,6 @@
 #include "constants/map_types.h"
 #include "constants/songs.h"
 
-extern bool8 gBikeCyclingChallenge;
-extern u8 gBikeCollisions;
-
 // this file's functions
 static void MovePlayerOnMachBike(u8, u16, u16);
 static u8 GetMachBikeTransition(u8 *);
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 07b941f11..659f8682e 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -25,42 +25,42 @@ EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0;
 
 static const u8 gRegicePathCoords[][2] =
 {
-    {0x04, 0x15},
-    {0x05, 0x15},
-    {0x06, 0x15},
-    {0x07, 0x15},
-    {0x08, 0x15},
-    {0x09, 0x15},
-    {0x0a, 0x15},
-    {0x0b, 0x15},
-    {0x0c, 0x15},
-    {0x0c, 0x16},
-    {0x0c, 0x17},
-    {0x0d, 0x17},
-    {0x0d, 0x18},
-    {0x0d, 0x19},
-    {0x0d, 0x1a},
-    {0x0d, 0x1b},
-    {0x0c, 0x1b},
-    {0x0c, 0x1c},
-    {0x04, 0x1d},
-    {0x05, 0x1d},
-    {0x06, 0x1d},
-    {0x07, 0x1d},
-    {0x08, 0x1d},
-    {0x09, 0x1d},
-    {0x0a, 0x1d},
-    {0x0b, 0x1d},
-    {0x0c, 0x1d},
-    {0x04, 0x1c},
-    {0x04, 0x1b},
-    {0x03, 0x1b},
-    {0x03, 0x1a},
-    {0x03, 0x19},
-    {0x03, 0x18},
-    {0x03, 0x17},
-    {0x04, 0x17},
-    {0x04, 0x16},
+    {4,  21},
+    {5,  21},
+    {6,  21},
+    {7,  21},
+    {8,  21},
+    {9,  21},
+    {10, 21},
+    {11, 21},
+    {12, 21},
+    {12, 22},
+    {12, 23},
+    {13, 23},
+    {13, 24},
+    {13, 25},
+    {13, 26},
+    {13, 27},
+    {12, 27},
+    {12, 28},
+    {4,  29},
+    {5,  29},
+    {6,  29},
+    {7,  29},
+    {8,  29},
+    {9,  29},
+    {10, 29},
+    {11, 29},
+    {12, 29},
+    {4,  28},
+    {4,  27},
+    {3,  27},
+    {3,  26},
+    {3,  25},
+    {3,  24},
+    {3,  23},
+    {4,  23},
+    {4,  22},
 };
 
 void SealedChamberShakingEffect(u8);
diff --git a/src/bug.c b/src/bug.c
index 88f93a3d5..4fa6a5bb6 100644
--- a/src/bug.c
+++ b/src/bug.c
@@ -6,7 +6,7 @@
 
 void sub_8110368(struct Sprite *);
 void sub_8110438(struct Sprite *);
-void sub_81104E4(struct Sprite *);
+void AnimTranslateWebThread(struct Sprite *);
 void sub_81105B4(struct Sprite *);
 void sub_811067C(struct Sprite *);
 void AnimTranslateStinger(struct Sprite *);
@@ -90,7 +90,7 @@ const struct SpriteTemplate gUnknown_085969C8 =
     .callback = sub_8110438,
 };
 
-const struct SpriteTemplate gUnknown_085969E0 =
+const struct SpriteTemplate gWebThreadSpriteTemplate =
 {
     .tileTag = ANIM_TAG_WEB_THREAD,
     .paletteTag = ANIM_TAG_WEB_THREAD,
@@ -98,7 +98,7 @@ const struct SpriteTemplate gUnknown_085969E0 =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_81104E4,
+    .callback = AnimTranslateWebThread,
 };
 
 const struct SpriteTemplate gUnknown_085969F8 =
@@ -124,7 +124,7 @@ const union AffineAnimCmd *const gUnknown_08596A28[] =
     gUnknown_08596A10,
 };
 
-const struct SpriteTemplate gUnknown_08596A2C =
+const struct SpriteTemplate gSpiderWebSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SPIDER_WEB,
     .paletteTag = ANIM_TAG_SPIDER_WEB,
@@ -247,12 +247,19 @@ void sub_8110438(struct Sprite *sprite)
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
 
-void sub_81104E4(struct Sprite *sprite)
+// Creates a single web thread that travels from attacker to target.
+// Used by MOVE_STRING_SHOT and MOVE_SPIDER_WEB in their first move phase.
+// arg 0: x
+// arg 1: y
+// arg 2: controls the left-to-right movement
+// arg 3: amplitude
+// arg 4: if targets both opponents
+void AnimTranslateWebThread(struct Sprite *sprite)
 {
     if (IsContest())
         gBattleAnimArgs[2] /= 2;
 
-    InitSpritePosToAnimAttacker(sprite, 1);
+    InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
     sprite->data[3] = sprite->pos1.y;
diff --git a/src/cable_car.c b/src/cable_car.c
index ab7b5726a..d44c9a241 100755..100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -151,25 +151,46 @@ const struct SpritePalette gUnknown_085CDB74[] = {
     { }
 };
 
-const struct OamData gOamData_85CDB84 = {
+const struct OamData gOamData_85CDB84 =
+{
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
-    .priority = 2
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
 };
 
-const struct OamData gOamData_85CDB8C = {
+const struct OamData gOamData_85CDB8C =
+{
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
     .size = SPRITE_SIZE(16x8),
-    .priority = 2
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
 };
 
-const struct OamData gOamData_85CDB94 = {
+const struct OamData gOamData_85CDB94 =
+{
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
-    .priority = 2
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
 };
 
 const struct SpriteTemplate gSpriteTemplate_85CDB9C[] =
@@ -407,13 +428,12 @@ static void sub_81503E4(u8 taskId)
         case WEATHER_ASH:
             if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0)
             {
-                for (; i < 20; i++)
+                for (; i < NUM_ASH_SPRITES; i++)
                 {
-                    if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL)
-                    {
+                    if (gWeatherPtr->sprites.s2.ashSprites[i])
                         gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0;
-                    }
                 }
+
                 sCableCar->state = 2;
             }
             break;
@@ -424,12 +444,10 @@ static void sub_81503E4(u8 taskId)
             }
             else if (sCableCar->timer >= sCableCar->unk4 + 8)
             {
-                for (; i < 20; i++)
+                for (; i < NUM_ASH_SPRITES; i++)
                 {
-                    if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL)
-                    {
-                        gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= TRUE;
-                    }
+                    if (gWeatherPtr->sprites.s2.ashSprites[i])
+                        gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= 1;
                 }
             }
             break;
@@ -445,9 +463,7 @@ static void sub_81503E4(u8 taskId)
         break;
     case 3:
         if (!gPaletteFade.active)
-        {
             sCableCar->state = 0xFF;
-        }
         break;
     case 0xFF:
         SetVBlankCallback(NULL);
@@ -536,7 +552,7 @@ static void sub_8150664(u8 taskId)
     if (sCableCar->timer < sCableCar->unk4)
         gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248;
     else
-        gWeatherPtr->unknown_6FC = (gWeatherPtr->unknown_6FC + 247) % 248;
+        gWeatherPtr->ashBaseSpritesX = (gWeatherPtr->ashBaseSpritesX + 247) % 248;
 }
 
 static void CableCarVblankCallback(void)
@@ -1007,3 +1023,4 @@ static void sub_81514C8(u8 arg0)
 
     sCableCar->unk1C = 0;
 }
+
diff --git a/src/cable_club.c b/src/cable_club.c
index fab187b07..303cc76d1 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -4,7 +4,7 @@
 #include "battle_records.h"
 #include "battle_setup.h"
 #include "cable_club.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "field_message_box.h"
 #include "field_specials.h"
diff --git a/src/contest.c b/src/contest.c
index 2d13dd581..eb3252f72 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -11,7 +11,7 @@
 #include "battle.h"
 #include "battle_anim.h"
 #include "contest.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "link.h"
@@ -41,7 +41,7 @@
 #include "contest_link_80FC4F4.h"
 #include "script_pokemon_util_80F87D8.h"
 #include "international_string_util.h"
-#include "data2.h"
+#include "data.h"
 #include "constants/rgb.h"
 #include "contest_ai.h"
 
@@ -269,8 +269,6 @@ extern const u8 gText_Contest_Fear[];
 extern const u8 gText_BDot[];
 extern const u8 gText_CDot[];
 extern const u8 *const gUnknown_08587E10[];
-extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
-extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const struct SpriteTemplate gSpriteTemplate_8587AD0;
 extern const struct SpriteTemplate gSpriteTemplate_8587B18[];
 extern void (*const gContestEffectFuncs[])(void);
@@ -472,18 +470,15 @@ const struct CompressedSpriteSheet gUnknown_08587B88 =
 const struct OamData gOamData_8587B90 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0
 };
 
 const struct SpriteTemplate gSpriteTemplate_8587B98 =
@@ -513,18 +508,15 @@ static const struct SpritePalette sApplauseMeterPalette =
 static const struct OamData sApplauseMeterOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0
 };
 
 static const struct SpriteTemplate sApplauseMeterSpriteTemplate =
@@ -541,18 +533,15 @@ static const struct SpriteTemplate sApplauseMeterSpriteTemplate =
 const struct OamData gOamData_8587BE0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 2,
-    .affineParam = 0
 };
 
 const struct SpriteTemplate gSpriteTemplate_8587BE8 =
@@ -795,18 +784,16 @@ static const struct SpritePalette sUnknown_08589924[] =
 const struct OamData gOamData_8589944 =
 {
     .y = 0,
-    .affineMode = 3,
-    .objMode = 1,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0
+    .affineParam = 0,
 };
 
 const union AffineAnimCmd gSpriteAffineAnim_858994C[] =
@@ -5885,3 +5872,5 @@ void sub_80DFA08(struct ContestPokemon *mon, s32 language)
         name[PLAYER_NAME_LENGTH] = EOS;
     }
 }
+
+
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index 0c16d8c81..aa3c67050 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -6,6 +6,7 @@
 #include "contest.h"
 #include "contest_link_80F57C4.h"
 #include "contest_link_80FC4F4.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "event_data.h"
@@ -86,7 +87,6 @@ struct ContestLink80F57C4
 
 EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL;
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct BgTemplate gUnknown_0858D888[4];
 extern const struct WindowTemplate gUnknown_0858D898[];
 extern const struct CompressedSpriteSheet gUnknown_0858D878[];
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 29f3c871d..b43923c7b 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -1,11 +1,12 @@
 #include "global.h"
 #include "alloc.h"
 #include "battle.h"
+#include "battle_gfx_sfx_util.h"
 #include "bg.h"
 #include "contest.h"
 #include "contest_painting.h"
 #include "contest_painting_effects.h"
-#include "battle_gfx_sfx_util.h"
+#include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "international_string_util.h"
@@ -44,8 +45,6 @@ static void VBlankCB_ContestPainting(void);
 static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]);
 
 extern const u8 gUnknown_0827EA0C[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
 extern const u8 gContestCoolness[];
 extern const u8 gContestBeauty[];
 extern const u8 gContestCuteness[];
@@ -152,16 +151,14 @@ const struct OamData gUnknown_085B0830 =
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .mosaic = 1,
+    .mosaic = TRUE,
     .bpp = ST_OAM_8BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
 };
 
 const u16 gUnknown_085B0838[] = {RGB(0, 0, 0), RGB(0, 0, 0)};
@@ -705,3 +702,4 @@ static void sub_8130884(u8 arg0, u8 arg1)
     sub_8130688(arg0);
     sub_8130430(arg0, arg1);
 }
+
diff --git a/src/dark.c b/src/dark.c
index 80ce61800..482c09c04 100644
--- a/src/dark.c
+++ b/src/dark.c
@@ -803,17 +803,23 @@ void sub_81144BC(struct Sprite *sprite)
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
 
-void sub_81144F8(u8 taskId)
+// Makes the attacker metallic and shining.
+// Used by MOVE_HARDEN and MOVE_IRON_DEFENSE.
+// arg0: if true won't change battler's palette back
+// arg1: if true, use custom color
+// arg2: custom color
+// Custom color argument is used in MOVE_POISON_TAIL to make the mon turn purplish/pinkish as if became cloaked in poison.
+void AnimTask_MetallicShine(u8 taskId)
 {
     u16 species;
     u8 spriteId;
     u8 newSpriteId;
     u16 paletteNum;
     struct BattleAnimBgData animBg;
-    int var0 = 0;
+    bool32 priorityChanged = FALSE;
 
-    gBattle_WIN0H = var0;
-    gBattle_WIN0V = var0;
+    gBattle_WIN0H = 0;
+    gBattle_WIN0V = 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_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
     SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON);
@@ -832,7 +838,7 @@ void sub_81144F8(u8 taskId)
             {
                 gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimAttacker)]].oam.priority--;
                 SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
-                var0 = 1;
+                priorityChanged = TRUE;
             }
         }
     }
@@ -861,7 +867,7 @@ void sub_81144F8(u8 taskId)
     gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32;
     paletteNum = 16 + gSprites[spriteId].oam.paletteNum;
 
-    if (gBattleAnimArgs[1]  == 0)
+    if (gBattleAnimArgs[1] == 0)
         SetGreyscaleOrOriginalPalette(paletteNum, FALSE);
     else
         BlendPalette(paletteNum * 16, 16, 11, gBattleAnimArgs[2]);
@@ -870,7 +876,7 @@ void sub_81144F8(u8 taskId)
     gTasks[taskId].data[1] = gBattleAnimArgs[0];
     gTasks[taskId].data[2] = gBattleAnimArgs[1];
     gTasks[taskId].data[3] = gBattleAnimArgs[2];
-    gTasks[taskId].data[6] = var0;
+    gTasks[taskId].data[6] = priorityChanged;
     gTasks[taskId].func = sub_8114748;
 }
 
@@ -879,29 +885,28 @@ static void sub_8114748(u8 taskId)
     struct BattleAnimBgData animBg;
     u16 paletteNum;
     u8 spriteId;
-    u8 taskIdCopy = taskId;
 
-    gTasks[taskIdCopy].data[10] += 4;
+    gTasks[taskId].data[10] += 4;
     gBattle_BG1_X -= 4;
-    if (gTasks[taskIdCopy].data[10] == 128)
+    if (gTasks[taskId].data[10] == 128)
     {
-        gTasks[taskIdCopy].data[10] = 0;
+        gTasks[taskId].data[10] = 0;
         gBattle_BG1_X += 128;
-        gTasks[taskIdCopy].data[11]++;
-        if (gTasks[taskIdCopy].data[11] == 2)
+        gTasks[taskId].data[11]++;
+        if (gTasks[taskId].data[11] == 2)
         {
             spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
             paletteNum = 16 + gSprites[spriteId].oam.paletteNum;
-            if (gTasks[taskIdCopy].data[1] == 0)
+            if (gTasks[taskId].data[1] == 0)
                 SetGreyscaleOrOriginalPalette(paletteNum, 1);
 
-            DestroySprite(&gSprites[gTasks[taskIdCopy].data[0]]);
+            DestroySprite(&gSprites[gTasks[taskId].data[0]]);
             sub_80A6B30(&animBg);
             sub_80A6C68(animBg.bgId);
-            if (gTasks[taskIdCopy].data[6] == 1)
+            if (gTasks[taskId].data[6] == 1)
                 gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimAttacker)]].oam.priority++;
         }
-        else if (gTasks[taskIdCopy].data[11] == 3)
+        else if (gTasks[taskId].data[11] == 3)
         {
             gBattle_WIN0H = 0;
             gBattle_WIN0V = 0;
@@ -918,7 +923,10 @@ static void sub_8114748(u8 taskId)
     }
 }
 
-void sub_811489C(u8 taskId)
+// Changes battler's palette to either greyscale or original.
+// arg0: which battler
+// arg1: 0 grayscale, 1 original
+void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId)
 {
     u8 spriteId;
     u8 battler;
diff --git a/src/data2b.c b/src/data.c
index af76390a4..7aebd63ed 100644
--- a/src/data2b.c
+++ b/src/data.c
@@ -1,11 +1,17 @@
 #include "global.h"
-#include "data2.h"
-#include "graphics.h"
 #include "alloc.h"
+#include "battle.h"
+#include "data.h"
+#include "graphics.h"
+#include "constants/items.h"
+#include "constants/moves.h"
 #include "constants/species.h"
+#include "constants/trainers.h"
+#include "constants/battle_ai.h"
 
 const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal");
 const u32 gUnknown_082FF1F8[] = INCBIN_U32("graphics/link/minigame_digits.4bpp.lz");
+// unused
 const u32 gUnknown_082FF2B8[] = INCBIN_U32("graphics/link/minigame_digits2.4bpp.lz");
 
 const struct SpriteFrameImage gUnknown_082FF3A8[] =
@@ -106,45 +112,45 @@ const struct SpriteFrameImage gTrainerBackPicTable_Steven[] =
     gTrainerBackPic_Steven + 0x1800, 0x0800,
 };
 
-const union AnimCmd gAnimCmd_General_Frame0[] =
+static const union AnimCmd sAnim_GeneralFrame0[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_General_Frame3[] =
+static const union AnimCmd sAnim_GeneralFrame3[] =
 {
     ANIMCMD_FRAME(3, 0),
     ANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF548[] =
+static const union AffineAnimCmd gUnknown_082FF548[] =
 {
     AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0x00),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF558[] =
+static const union AffineAnimCmd gUnknown_082FF558[] =
 {
     AFFINEANIMCMD_FRAME(0xff00, 0x0100, 0x00, 0x00),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF568[] =
+static const union AffineAnimCmd gUnknown_082FF568[] =
 {
     AFFINEANIMCMD_FRAME(0x0028, 0x0028, 0x00, 0x00),
     AFFINEANIMCMD_FRAME(0x0012, 0x0012, 0x00, 0x0c),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF580[] =
+static const union AffineAnimCmd gUnknown_082FF580[] =
 {
     AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x12),
     AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x0f),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF598[] =
+static const union AffineAnimCmd gUnknown_082FF598[] =
 {
     AFFINEANIMCMD_FRAME(0x00a0, 0x0100, 0x00, 0x00),
     AFFINEANIMCMD_FRAME(0x0004, 0x0000, 0x00, 0x08),
@@ -152,39 +158,39 @@ const union AffineAnimCmd gUnknown_082FF598[] =
     AFFINEANIMCMD_JUMP(1),
 };
 
-const union AffineAnimCmd gUnknown_082FF5B8[] =
+static const union AffineAnimCmd gUnknown_082FF5B8[] =
 {
     AFFINEANIMCMD_FRAME(0x0002, 0x0002, 0x00, 0x14),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF5C8[] =
+static const union AffineAnimCmd gUnknown_082FF5C8[] =
 {
     AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x14),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF5D8[] =
+static const union AffineAnimCmd gUnknown_082FF5D8[] =
 {
     AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0000),
     AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x09),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF5F0[] =
+static const union AffineAnimCmd gUnknown_082FF5F0[] =
 {
     AFFINEANIMCMD_FRAME(0x0004, 0x0004, 0x00, 0x3f),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF600[] =
+static const union AffineAnimCmd gUnknown_082FF600[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd * const gUnknown_082FF618[] =
+const union AffineAnimCmd *const gUnknown_082FF618[] =
 {
     gUnknown_082FF548,
     gUnknown_082FF568,
@@ -197,20 +203,20 @@ const union AffineAnimCmd * const gUnknown_082FF618[] =
     gUnknown_082FF5D8,
 };
 
-const union AffineAnimCmd gUnknown_082FF63C[] =
+static const union AffineAnimCmd gUnknown_082FF63C[] =
 {
     AFFINEANIMCMD_FRAME(0xfffc, 0xfffc, 0x04, 0x3f),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF64C[] =
+static const union AffineAnimCmd gUnknown_082FF64C[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF664[] =
+static const union AffineAnimCmd gUnknown_082FF664[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfb, 0x14),
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x00, 0x14),
@@ -218,13 +224,13 @@ const union AffineAnimCmd gUnknown_082FF664[] =
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd gUnknown_082FF684[] =
+static const union AffineAnimCmd gUnknown_082FF684[] =
 {
     AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x09, 0x6e),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd * const gUnknown_082FF694[] =
+const union AffineAnimCmd *const gUnknown_082FF694[] =
 {
     gUnknown_082FF548,
     gUnknown_082FF568,
@@ -239,7 +245,7 @@ const union AffineAnimCmd * const gUnknown_082FF694[] =
     gUnknown_082FF684,
 };
 
-const union AffineAnimCmd * const gUnknown_082FF6C0[] =
+const union AffineAnimCmd *const gUnknown_082FF6C0[] =
 {
     gUnknown_082FF558,
     gUnknown_082FF568,
@@ -254,6 +260,47 @@ const union AffineAnimCmd * const gUnknown_082FF6C0[] =
     gUnknown_082FF684,
 };
 
+static const union AnimCmd gUnknown_082FF6EC[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gUnknown_082FF6F4[] =
+{
+    ANIMCMD_FRAME(1, 0),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gUnknown_082FF6FC[] =
+{
+    ANIMCMD_FRAME(2, 0),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gUnknown_082FF704[] =
+{
+    ANIMCMD_FRAME(3, 0),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gUnknown_082FF70C[] =
+{
+    gUnknown_082FF6EC,
+    gUnknown_082FF6F4,
+    gUnknown_082FF6FC,
+    gUnknown_082FF704,
+};
+
+#define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, SPECIES_##species}
+#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
+#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
+
+#define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic}
+#define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic}
+
+#define TRAINER_BACK_PAL(trainerPic, pal) [TRAINER_BACK_PIC_##trainerPic] = {pal, TRAINER_BACK_PIC_##trainerPic}
+
 #include "data/pokemon_graphics/unknown_anims.h"
 #include "data/pokemon_graphics/front_pic_coordinates.h"
 #include "data/pokemon_graphics/still_front_pic_table.h"
@@ -269,10 +316,11 @@ const union AffineAnimCmd * const gUnknown_082FF6C0[] =
 #include "data/trainer_graphics/back_pic_tables.h"
 
 #include "data/pokemon_graphics/enemy_mon_elevation.h"
-#include "data/pokemon_graphics/front_anims.h"
+#include "data/pokemon_graphics/front_pic_anims.h"
 #include "data/pokemon_graphics/front_pic_table.h"
 
-const u32 gUnknown830AF4C[] = // Potentially part of battle_data.c
+// unused
+const u32 gUnknown830AF4C[] =
 {
     0x00000888, 0x00000888, 0x00000888, 0x00000888,
     0x00000088, 0x00000888, 0x00000888, 0x00000886,
@@ -385,3 +433,9 @@ const u32 gUnknown830AF4C[] = // Potentially part of battle_data.c
     0x00000888, 0x00000888, 0x00000888, 0x00000888,
     0x00000888, 0x00000888, 0x00000888, 0x00000888,
 };
+
+#include "data/trainer_parties.h"
+#include "data/text/trainer_class_names.h"
+#include "data/trainers.h"
+#include "data/text/species_names.h"
+#include "data/text/move_names.h"
diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
index 693005360..112a5870b 100644
--- a/src/data/bard_music/pokemon.h
+++ b/src/data/bard_music/pokemon.h
@@ -2,7 +2,7 @@
 #define GUARD_DATA_BARD_MUSIC_POKEMON_H
 #include "constants/species.h"
 
-const u16 gUnknown_085F5490 = NUM_SPECIES;
+const u16 gNumSpeciesNames = NUM_SPECIES;
 
 const struct BardSound gBardSounds_Pokemon[][6] = {
     {
diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h
index a909bd9fd..55458c7a3 100644
--- a/src/data/decoration/header.h
+++ b/src/data/decoration/header.h
@@ -686,7 +686,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_PICHU_DOLL,
         _("PICHU DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -695,7 +695,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_PIKACHU_DOLL,
         _("PIKACHU DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -704,7 +704,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_MARILL_DOLL,
         _("MARILL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -713,7 +713,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TOGEPI_DOLL,
         _("TOGEPI DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -722,7 +722,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CYNDAQUIL_DOLL,
         _("CYNDAQUIL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -731,7 +731,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CHIKORITA_DOLL,
         _("CHIKORITA DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -740,7 +740,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TOTODILE_DOLL,
         _("TOTODILE DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -749,7 +749,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_JIGGLYPUFF_DOLL,
         _("JIGGLYPUFF DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -758,7 +758,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_MEOWTH_DOLL,
         _("MEOWTH DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -767,7 +767,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CLEFAIRY_DOLL,
         _("CLEFAIRY DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -776,7 +776,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_DITTO_DOLL,
         _("DITTO DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -785,7 +785,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SMOOCHUM_DOLL,
         _("SMOOCHUM DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -794,7 +794,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TREECKO_DOLL,
         _("TREECKO DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -803,7 +803,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_TORCHIC_DOLL,
         _("TORCHIC DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -812,7 +812,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_MUDKIP_DOLL,
         _("MUDKIP DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -821,7 +821,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_DUSKULL_DOLL,
         _("DUSKULL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -830,7 +830,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_WYNAUT_DOLL,
         _("WYNAUT DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -839,7 +839,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_BALTOY_DOLL,
         _("BALTOY DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -848,7 +848,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_KECLEON_DOLL,
         _("KECLEON DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -857,7 +857,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_AZURILL_DOLL,
         _("AZURILL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -866,7 +866,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SKITTY_DOLL,
         _("SKITTY DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -875,7 +875,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SWABLU_DOLL,
         _("SWABLU DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -884,7 +884,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_GULPIN_DOLL,
         _("GULPIN DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -893,7 +893,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_LOTAD_DOLL,
         _("LOTAD DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -902,7 +902,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SEEDOT_DOLL,
         _("SEEDOT DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_DOLL,
         3000,
@@ -911,7 +911,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_PIKA_CUSHION,
         _("PIKA CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -920,7 +920,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_ROUND_CUSHION,
         _("ROUND CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -929,7 +929,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_KISS_CUSHION,
         _("KISS CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -938,7 +938,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_ZIGZAG_CUSHION,
         _("ZIGZAG CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -947,7 +947,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SPIN_CUSHION,
         _("SPIN CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -956,7 +956,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_DIAMOND_CUSHION,
         _("DIAMOND CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -965,7 +965,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_BALL_CUSHION,
         _("BALL CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -974,7 +974,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_GRASS_CUSHION,
         _("GRASS CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -983,7 +983,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_FIRE_CUSHION,
         _("FIRE CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -992,7 +992,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_WATER_CUSHION,
         _("WATER CUSHION"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x1,
         DECORCAT_CUSHION,
         2000,
@@ -1001,7 +1001,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_SNORLAX_DOLL,
         _("SNORLAX DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1010,7 +1010,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_RHYDON_DOLL,
         _("RHYDON DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1019,7 +1019,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_LAPRAS_DOLL,
         _("LAPRAS DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1028,7 +1028,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_VENUSAUR_DOLL,
         _("VENUSAUR DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1037,7 +1037,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_CHARIZARD_DOLL,
         _("CHARIZARD DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1046,7 +1046,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_BLASTOISE_DOLL,
         _("BLASTOISE DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1055,7 +1055,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_WAILMER_DOLL,
         _("WAILMER DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1064,7 +1064,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_REGIROCK_DOLL,
         _("REGIROCK DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1073,7 +1073,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_REGICE_DOLL,
         _("REGICE DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
@@ -1082,7 +1082,7 @@ const struct Decoration gDecorations[] = {
     }, {
         DECOR_REGISTEEL_DOLL,
         _("REGISTEEL DOLL"),
-        DECORPERM_SOLID_MAT,
+        DECORPERM_SPRITE,
         DECORSHAPE_1x2,
         DECORCAT_DOLL,
         10000,
diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h
index 0de0bfb52..0a89f20c8 100644
--- a/src/data/pokemon_graphics/back_pic_coordinates.h
+++ b/src/data/pokemon_graphics/back_pic_coordinates.h
@@ -1,5 +1,3 @@
-#include "constants/species.h"
-
 const struct MonCoords gMonBackPicCoords[] =
 {
     [SPECIES_NONE] =
diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h
index c6fd1300b..9a98927aa 100644
--- a/src/data/pokemon_graphics/back_pic_table.h
+++ b/src/data/pokemon_graphics/back_pic_table.h
@@ -1,444 +1,443 @@
 const struct CompressedSpriteSheet gMonBackPicTable[] =
 {
-    [SPECIES_NONE] = {gMonBackPic_CircledQuestionMark, 0x800, SPECIES_NONE},
-    [SPECIES_BULBASAUR] = {gMonBackPic_Bulbasaur, 0x800, SPECIES_BULBASAUR},
-    [SPECIES_IVYSAUR] = {gMonBackPic_Ivysaur, 0x800, SPECIES_IVYSAUR},
-    [SPECIES_VENUSAUR] = {gMonBackPic_Venusaur, 0x800, SPECIES_VENUSAUR},
-    [SPECIES_CHARMANDER] = {gMonBackPic_Charmander, 0x800, SPECIES_CHARMANDER},
-    [SPECIES_CHARMELEON] = {gMonBackPic_Charmeleon, 0x800, SPECIES_CHARMELEON},
-    [SPECIES_CHARIZARD] = {gMonBackPic_Charizard, 0x800, SPECIES_CHARIZARD},
-    [SPECIES_SQUIRTLE] = {gMonBackPic_Squirtle, 0x800, SPECIES_SQUIRTLE},
-    [SPECIES_WARTORTLE] = {gMonBackPic_Wartortle, 0x800, SPECIES_WARTORTLE},
-    [SPECIES_BLASTOISE] = {gMonBackPic_Blastoise, 0x800, SPECIES_BLASTOISE},
-    [SPECIES_CATERPIE] = {gMonBackPic_Caterpie, 0x800, SPECIES_CATERPIE},
-    [SPECIES_METAPOD] = {gMonBackPic_Metapod, 0x800, SPECIES_METAPOD},
-    [SPECIES_BUTTERFREE] = {gMonBackPic_Butterfree, 0x800, SPECIES_BUTTERFREE},
-    [SPECIES_WEEDLE] = {gMonBackPic_Weedle, 0x800, SPECIES_WEEDLE},
-    [SPECIES_KAKUNA] = {gMonBackPic_Kakuna, 0x800, SPECIES_KAKUNA},
-    [SPECIES_BEEDRILL] = {gMonBackPic_Beedrill, 0x800, SPECIES_BEEDRILL},
-    [SPECIES_PIDGEY] = {gMonBackPic_Pidgey, 0x800, SPECIES_PIDGEY},
-    [SPECIES_PIDGEOTTO] = {gMonBackPic_Pidgeotto, 0x800, SPECIES_PIDGEOTTO},
-    [SPECIES_PIDGEOT] = {gMonBackPic_Pidgeot, 0x800, SPECIES_PIDGEOT},
-    [SPECIES_RATTATA] = {gMonBackPic_Rattata, 0x800, SPECIES_RATTATA},
-    [SPECIES_RATICATE] = {gMonBackPic_Raticate, 0x800, SPECIES_RATICATE},
-    [SPECIES_SPEAROW] = {gMonBackPic_Spearow, 0x800, SPECIES_SPEAROW},
-    [SPECIES_FEAROW] = {gMonBackPic_Fearow, 0x800, SPECIES_FEAROW},
-    [SPECIES_EKANS] = {gMonBackPic_Ekans, 0x800, SPECIES_EKANS},
-    [SPECIES_ARBOK] = {gMonBackPic_Arbok, 0x800, SPECIES_ARBOK},
-    [SPECIES_PIKACHU] = {gMonBackPic_Pikachu, 0x800, SPECIES_PIKACHU},
-    [SPECIES_RAICHU] = {gMonBackPic_Raichu, 0x800, SPECIES_RAICHU},
-    [SPECIES_SANDSHREW] = {gMonBackPic_Sandshrew, 0x800, SPECIES_SANDSHREW},
-    [SPECIES_SANDSLASH] = {gMonBackPic_Sandslash, 0x800, SPECIES_SANDSLASH},
-    [SPECIES_NIDORAN_F] = {gMonBackPic_NidoranF, 0x800, SPECIES_NIDORAN_F},
-    [SPECIES_NIDORINA] = {gMonBackPic_Nidorina, 0x800, SPECIES_NIDORINA},
-    [SPECIES_NIDOQUEEN] = {gMonBackPic_Nidoqueen, 0x800, SPECIES_NIDOQUEEN},
-    [SPECIES_NIDORAN_M] = {gMonBackPic_NidoranM, 0x800, SPECIES_NIDORAN_M},
-    [SPECIES_NIDORINO] = {gMonBackPic_Nidorino, 0x800, SPECIES_NIDORINO},
-    [SPECIES_NIDOKING] = {gMonBackPic_Nidoking, 0x800, SPECIES_NIDOKING},
-    [SPECIES_CLEFAIRY] = {gMonBackPic_Clefairy, 0x800, SPECIES_CLEFAIRY},
-    [SPECIES_CLEFABLE] = {gMonBackPic_Clefable, 0x800, SPECIES_CLEFABLE},
-    [SPECIES_VULPIX] = {gMonBackPic_Vulpix, 0x800, SPECIES_VULPIX},
-    [SPECIES_NINETALES] = {gMonBackPic_Ninetales, 0x800, SPECIES_NINETALES},
-    [SPECIES_JIGGLYPUFF] = {gMonBackPic_Jigglypuff, 0x800, SPECIES_JIGGLYPUFF},
-    [SPECIES_WIGGLYTUFF] = {gMonBackPic_Wigglytuff, 0x800, SPECIES_WIGGLYTUFF},
-    [SPECIES_ZUBAT] = {gMonBackPic_Zubat, 0x800, SPECIES_ZUBAT},
-    [SPECIES_GOLBAT] = {gMonBackPic_Golbat, 0x800, SPECIES_GOLBAT},
-    [SPECIES_ODDISH] = {gMonBackPic_Oddish, 0x800, SPECIES_ODDISH},
-    [SPECIES_GLOOM] = {gMonBackPic_Gloom, 0x800, SPECIES_GLOOM},
-    [SPECIES_VILEPLUME] = {gMonBackPic_Vileplume, 0x800, SPECIES_VILEPLUME},
-    [SPECIES_PARAS] = {gMonBackPic_Paras, 0x800, SPECIES_PARAS},
-    [SPECIES_PARASECT] = {gMonBackPic_Parasect, 0x800, SPECIES_PARASECT},
-    [SPECIES_VENONAT] = {gMonBackPic_Venonat, 0x800, SPECIES_VENONAT},
-    [SPECIES_VENOMOTH] = {gMonBackPic_Venomoth, 0x800, SPECIES_VENOMOTH},
-    [SPECIES_DIGLETT] = {gMonBackPic_Diglett, 0x800, SPECIES_DIGLETT},
-    [SPECIES_DUGTRIO] = {gMonBackPic_Dugtrio, 0x800, SPECIES_DUGTRIO},
-    [SPECIES_MEOWTH] = {gMonBackPic_Meowth, 0x800, SPECIES_MEOWTH},
-    [SPECIES_PERSIAN] = {gMonBackPic_Persian, 0x800, SPECIES_PERSIAN},
-    [SPECIES_PSYDUCK] = {gMonBackPic_Psyduck, 0x800, SPECIES_PSYDUCK},
-    [SPECIES_GOLDUCK] = {gMonBackPic_Golduck, 0x800, SPECIES_GOLDUCK},
-    [SPECIES_MANKEY] = {gMonBackPic_Mankey, 0x800, SPECIES_MANKEY},
-    [SPECIES_PRIMEAPE] = {gMonBackPic_Primeape, 0x800, SPECIES_PRIMEAPE},
-    [SPECIES_GROWLITHE] = {gMonBackPic_Growlithe, 0x800, SPECIES_GROWLITHE},
-    [SPECIES_ARCANINE] = {gMonBackPic_Arcanine, 0x800, SPECIES_ARCANINE},
-    [SPECIES_POLIWAG] = {gMonBackPic_Poliwag, 0x800, SPECIES_POLIWAG},
-    [SPECIES_POLIWHIRL] = {gMonBackPic_Poliwhirl, 0x800, SPECIES_POLIWHIRL},
-    [SPECIES_POLIWRATH] = {gMonBackPic_Poliwrath, 0x800, SPECIES_POLIWRATH},
-    [SPECIES_ABRA] = {gMonBackPic_Abra, 0x800, SPECIES_ABRA},
-    [SPECIES_KADABRA] = {gMonBackPic_Kadabra, 0x800, SPECIES_KADABRA},
-    [SPECIES_ALAKAZAM] = {gMonBackPic_Alakazam, 0x800, SPECIES_ALAKAZAM},
-    [SPECIES_MACHOP] = {gMonBackPic_Machop, 0x800, SPECIES_MACHOP},
-    [SPECIES_MACHOKE] = {gMonBackPic_Machoke, 0x800, SPECIES_MACHOKE},
-    [SPECIES_MACHAMP] = {gMonBackPic_Machamp, 0x800, SPECIES_MACHAMP},
-    [SPECIES_BELLSPROUT] = {gMonBackPic_Bellsprout, 0x800, SPECIES_BELLSPROUT},
-    [SPECIES_WEEPINBELL] = {gMonBackPic_Weepinbell, 0x800, SPECIES_WEEPINBELL},
-    [SPECIES_VICTREEBEL] = {gMonBackPic_Victreebel, 0x800, SPECIES_VICTREEBEL},
-    [SPECIES_TENTACOOL] = {gMonBackPic_Tentacool, 0x800, SPECIES_TENTACOOL},
-    [SPECIES_TENTACRUEL] = {gMonBackPic_Tentacruel, 0x800, SPECIES_TENTACRUEL},
-    [SPECIES_GEODUDE] = {gMonBackPic_Geodude, 0x800, SPECIES_GEODUDE},
-    [SPECIES_GRAVELER] = {gMonBackPic_Graveler, 0x800, SPECIES_GRAVELER},
-    [SPECIES_GOLEM] = {gMonBackPic_Golem, 0x800, SPECIES_GOLEM},
-    [SPECIES_PONYTA] = {gMonBackPic_Ponyta, 0x800, SPECIES_PONYTA},
-    [SPECIES_RAPIDASH] = {gMonBackPic_Rapidash, 0x800, SPECIES_RAPIDASH},
-    [SPECIES_SLOWPOKE] = {gMonBackPic_Slowpoke, 0x800, SPECIES_SLOWPOKE},
-    [SPECIES_SLOWBRO] = {gMonBackPic_Slowbro, 0x800, SPECIES_SLOWBRO},
-    [SPECIES_MAGNEMITE] = {gMonBackPic_Magnemite, 0x800, SPECIES_MAGNEMITE},
-    [SPECIES_MAGNETON] = {gMonBackPic_Magneton, 0x800, SPECIES_MAGNETON},
-    [SPECIES_FARFETCHD] = {gMonBackPic_Farfetchd, 0x800, SPECIES_FARFETCHD},
-    [SPECIES_DODUO] = {gMonBackPic_Doduo, 0x800, SPECIES_DODUO},
-    [SPECIES_DODRIO] = {gMonBackPic_Dodrio, 0x800, SPECIES_DODRIO},
-    [SPECIES_SEEL] = {gMonBackPic_Seel, 0x800, SPECIES_SEEL},
-    [SPECIES_DEWGONG] = {gMonBackPic_Dewgong, 0x800, SPECIES_DEWGONG},
-    [SPECIES_GRIMER] = {gMonBackPic_Grimer, 0x800, SPECIES_GRIMER},
-    [SPECIES_MUK] = {gMonBackPic_Muk, 0x800, SPECIES_MUK},
-    [SPECIES_SHELLDER] = {gMonBackPic_Shellder, 0x800, SPECIES_SHELLDER},
-    [SPECIES_CLOYSTER] = {gMonBackPic_Cloyster, 0x800, SPECIES_CLOYSTER},
-    [SPECIES_GASTLY] = {gMonBackPic_Gastly, 0x800, SPECIES_GASTLY},
-    [SPECIES_HAUNTER] = {gMonBackPic_Haunter, 0x800, SPECIES_HAUNTER},
-    [SPECIES_GENGAR] = {gMonBackPic_Gengar, 0x800, SPECIES_GENGAR},
-    [SPECIES_ONIX] = {gMonBackPic_Onix, 0x800, SPECIES_ONIX},
-    [SPECIES_DROWZEE] = {gMonBackPic_Drowzee, 0x800, SPECIES_DROWZEE},
-    [SPECIES_HYPNO] = {gMonBackPic_Hypno, 0x800, SPECIES_HYPNO},
-    [SPECIES_KRABBY] = {gMonBackPic_Krabby, 0x800, SPECIES_KRABBY},
-    [SPECIES_KINGLER] = {gMonBackPic_Kingler, 0x800, SPECIES_KINGLER},
-    [SPECIES_VOLTORB] = {gMonBackPic_Voltorb, 0x800, SPECIES_VOLTORB},
-    [SPECIES_ELECTRODE] = {gMonBackPic_Electrode, 0x800, SPECIES_ELECTRODE},
-    [SPECIES_EXEGGCUTE] = {gMonBackPic_Exeggcute, 0x800, SPECIES_EXEGGCUTE},
-    [SPECIES_EXEGGUTOR] = {gMonBackPic_Exeggutor, 0x800, SPECIES_EXEGGUTOR},
-    [SPECIES_CUBONE] = {gMonBackPic_Cubone, 0x800, SPECIES_CUBONE},
-    [SPECIES_MAROWAK] = {gMonBackPic_Marowak, 0x800, SPECIES_MAROWAK},
-    [SPECIES_HITMONLEE] = {gMonBackPic_Hitmonlee, 0x800, SPECIES_HITMONLEE},
-    [SPECIES_HITMONCHAN] = {gMonBackPic_Hitmonchan, 0x800, SPECIES_HITMONCHAN},
-    [SPECIES_LICKITUNG] = {gMonBackPic_Lickitung, 0x800, SPECIES_LICKITUNG},
-    [SPECIES_KOFFING] = {gMonBackPic_Koffing, 0x800, SPECIES_KOFFING},
-    [SPECIES_WEEZING] = {gMonBackPic_Weezing, 0x800, SPECIES_WEEZING},
-    [SPECIES_RHYHORN] = {gMonBackPic_Rhyhorn, 0x800, SPECIES_RHYHORN},
-    [SPECIES_RHYDON] = {gMonBackPic_Rhydon, 0x800, SPECIES_RHYDON},
-    [SPECIES_CHANSEY] = {gMonBackPic_Chansey, 0x800, SPECIES_CHANSEY},
-    [SPECIES_TANGELA] = {gMonBackPic_Tangela, 0x800, SPECIES_TANGELA},
-    [SPECIES_KANGASKHAN] = {gMonBackPic_Kangaskhan, 0x800, SPECIES_KANGASKHAN},
-    [SPECIES_HORSEA] = {gMonBackPic_Horsea, 0x800, SPECIES_HORSEA},
-    [SPECIES_SEADRA] = {gMonBackPic_Seadra, 0x800, SPECIES_SEADRA},
-    [SPECIES_GOLDEEN] = {gMonBackPic_Goldeen, 0x800, SPECIES_GOLDEEN},
-    [SPECIES_SEAKING] = {gMonBackPic_Seaking, 0x800, SPECIES_SEAKING},
-    [SPECIES_STARYU] = {gMonBackPic_Staryu, 0x800, SPECIES_STARYU},
-    [SPECIES_STARMIE] = {gMonBackPic_Starmie, 0x800, SPECIES_STARMIE},
-    [SPECIES_MR_MIME] = {gMonBackPic_Mrmime, 0x800, SPECIES_MR_MIME},
-    [SPECIES_SCYTHER] = {gMonBackPic_Scyther, 0x800, SPECIES_SCYTHER},
-    [SPECIES_JYNX] = {gMonBackPic_Jynx, 0x800, SPECIES_JYNX},
-    [SPECIES_ELECTABUZZ] = {gMonBackPic_Electabuzz, 0x800, SPECIES_ELECTABUZZ},
-    [SPECIES_MAGMAR] = {gMonBackPic_Magmar, 0x800, SPECIES_MAGMAR},
-    [SPECIES_PINSIR] = {gMonBackPic_Pinsir, 0x800, SPECIES_PINSIR},
-    [SPECIES_TAUROS] = {gMonBackPic_Tauros, 0x800, SPECIES_TAUROS},
-    [SPECIES_MAGIKARP] = {gMonBackPic_Magikarp, 0x800, SPECIES_MAGIKARP},
-    [SPECIES_GYARADOS] = {gMonBackPic_Gyarados, 0x800, SPECIES_GYARADOS},
-    [SPECIES_LAPRAS] = {gMonBackPic_Lapras, 0x800, SPECIES_LAPRAS},
-    [SPECIES_DITTO] = {gMonBackPic_Ditto, 0x800, SPECIES_DITTO},
-    [SPECIES_EEVEE] = {gMonBackPic_Eevee, 0x800, SPECIES_EEVEE},
-    [SPECIES_VAPOREON] = {gMonBackPic_Vaporeon, 0x800, SPECIES_VAPOREON},
-    [SPECIES_JOLTEON] = {gMonBackPic_Jolteon, 0x800, SPECIES_JOLTEON},
-    [SPECIES_FLAREON] = {gMonBackPic_Flareon, 0x800, SPECIES_FLAREON},
-    [SPECIES_PORYGON] = {gMonBackPic_Porygon, 0x800, SPECIES_PORYGON},
-    [SPECIES_OMANYTE] = {gMonBackPic_Omanyte, 0x800, SPECIES_OMANYTE},
-    [SPECIES_OMASTAR] = {gMonBackPic_Omastar, 0x800, SPECIES_OMASTAR},
-    [SPECIES_KABUTO] = {gMonBackPic_Kabuto, 0x800, SPECIES_KABUTO},
-    [SPECIES_KABUTOPS] = {gMonBackPic_Kabutops, 0x800, SPECIES_KABUTOPS},
-    [SPECIES_AERODACTYL] = {gMonBackPic_Aerodactyl, 0x800, SPECIES_AERODACTYL},
-    [SPECIES_SNORLAX] = {gMonBackPic_Snorlax, 0x800, SPECIES_SNORLAX},
-    [SPECIES_ARTICUNO] = {gMonBackPic_Articuno, 0x800, SPECIES_ARTICUNO},
-    [SPECIES_ZAPDOS] = {gMonBackPic_Zapdos, 0x800, SPECIES_ZAPDOS},
-    [SPECIES_MOLTRES] = {gMonBackPic_Moltres, 0x800, SPECIES_MOLTRES},
-    [SPECIES_DRATINI] = {gMonBackPic_Dratini, 0x800, SPECIES_DRATINI},
-    [SPECIES_DRAGONAIR] = {gMonBackPic_Dragonair, 0x800, SPECIES_DRAGONAIR},
-    [SPECIES_DRAGONITE] = {gMonBackPic_Dragonite, 0x800, SPECIES_DRAGONITE},
-    [SPECIES_MEWTWO] = {gMonBackPic_Mewtwo, 0x800, SPECIES_MEWTWO},
-    [SPECIES_MEW] = {gMonBackPic_Mew, 0x800, SPECIES_MEW},
-    [SPECIES_CHIKORITA] = {gMonBackPic_Chikorita, 0x800, SPECIES_CHIKORITA},
-    [SPECIES_BAYLEEF] = {gMonBackPic_Bayleef, 0x800, SPECIES_BAYLEEF},
-    [SPECIES_MEGANIUM] = {gMonBackPic_Meganium, 0x800, SPECIES_MEGANIUM},
-    [SPECIES_CYNDAQUIL] = {gMonBackPic_Cyndaquil, 0x800, SPECIES_CYNDAQUIL},
-    [SPECIES_QUILAVA] = {gMonBackPic_Quilava, 0x800, SPECIES_QUILAVA},
-    [SPECIES_TYPHLOSION] = {gMonBackPic_Typhlosion, 0x800, SPECIES_TYPHLOSION},
-    [SPECIES_TOTODILE] = {gMonBackPic_Totodile, 0x800, SPECIES_TOTODILE},
-    [SPECIES_CROCONAW] = {gMonBackPic_Croconaw, 0x800, SPECIES_CROCONAW},
-    [SPECIES_FERALIGATR] = {gMonBackPic_Feraligatr, 0x800, SPECIES_FERALIGATR},
-    [SPECIES_SENTRET] = {gMonBackPic_Sentret, 0x800, SPECIES_SENTRET},
-    [SPECIES_FURRET] = {gMonBackPic_Furret, 0x800, SPECIES_FURRET},
-    [SPECIES_HOOTHOOT] = {gMonBackPic_Hoothoot, 0x800, SPECIES_HOOTHOOT},
-    [SPECIES_NOCTOWL] = {gMonBackPic_Noctowl, 0x800, SPECIES_NOCTOWL},
-    [SPECIES_LEDYBA] = {gMonBackPic_Ledyba, 0x800, SPECIES_LEDYBA},
-    [SPECIES_LEDIAN] = {gMonBackPic_Ledian, 0x800, SPECIES_LEDIAN},
-    [SPECIES_SPINARAK] = {gMonBackPic_Spinarak, 0x800, SPECIES_SPINARAK},
-    [SPECIES_ARIADOS] = {gMonBackPic_Ariados, 0x800, SPECIES_ARIADOS},
-    [SPECIES_CROBAT] = {gMonBackPic_Crobat, 0x800, SPECIES_CROBAT},
-    [SPECIES_CHINCHOU] = {gMonBackPic_Chinchou, 0x800, SPECIES_CHINCHOU},
-    [SPECIES_LANTURN] = {gMonBackPic_Lanturn, 0x800, SPECIES_LANTURN},
-    [SPECIES_PICHU] = {gMonBackPic_Pichu, 0x800, SPECIES_PICHU},
-    [SPECIES_CLEFFA] = {gMonBackPic_Cleffa, 0x800, SPECIES_CLEFFA},
-    [SPECIES_IGGLYBUFF] = {gMonBackPic_Igglybuff, 0x800, SPECIES_IGGLYBUFF},
-    [SPECIES_TOGEPI] = {gMonBackPic_Togepi, 0x800, SPECIES_TOGEPI},
-    [SPECIES_TOGETIC] = {gMonBackPic_Togetic, 0x800, SPECIES_TOGETIC},
-    [SPECIES_NATU] = {gMonBackPic_Natu, 0x800, SPECIES_NATU},
-    [SPECIES_XATU] = {gMonBackPic_Xatu, 0x800, SPECIES_XATU},
-    [SPECIES_MAREEP] = {gMonBackPic_Mareep, 0x800, SPECIES_MAREEP},
-    [SPECIES_FLAAFFY] = {gMonBackPic_Flaaffy, 0x800, SPECIES_FLAAFFY},
-    [SPECIES_AMPHAROS] = {gMonBackPic_Ampharos, 0x800, SPECIES_AMPHAROS},
-    [SPECIES_BELLOSSOM] = {gMonBackPic_Bellossom, 0x800, SPECIES_BELLOSSOM},
-    [SPECIES_MARILL] = {gMonBackPic_Marill, 0x800, SPECIES_MARILL},
-    [SPECIES_AZUMARILL] = {gMonBackPic_Azumarill, 0x800, SPECIES_AZUMARILL},
-    [SPECIES_SUDOWOODO] = {gMonBackPic_Sudowoodo, 0x800, SPECIES_SUDOWOODO},
-    [SPECIES_POLITOED] = {gMonBackPic_Politoed, 0x800, SPECIES_POLITOED},
-    [SPECIES_HOPPIP] = {gMonBackPic_Hoppip, 0x800, SPECIES_HOPPIP},
-    [SPECIES_SKIPLOOM] = {gMonBackPic_Skiploom, 0x800, SPECIES_SKIPLOOM},
-    [SPECIES_JUMPLUFF] = {gMonBackPic_Jumpluff, 0x800, SPECIES_JUMPLUFF},
-    [SPECIES_AIPOM] = {gMonBackPic_Aipom, 0x800, SPECIES_AIPOM},
-    [SPECIES_SUNKERN] = {gMonBackPic_Sunkern, 0x800, SPECIES_SUNKERN},
-    [SPECIES_SUNFLORA] = {gMonBackPic_Sunflora, 0x800, SPECIES_SUNFLORA},
-    [SPECIES_YANMA] = {gMonBackPic_Yanma, 0x800, SPECIES_YANMA},
-    [SPECIES_WOOPER] = {gMonBackPic_Wooper, 0x800, SPECIES_WOOPER},
-    [SPECIES_QUAGSIRE] = {gMonBackPic_Quagsire, 0x800, SPECIES_QUAGSIRE},
-    [SPECIES_ESPEON] = {gMonBackPic_Espeon, 0x800, SPECIES_ESPEON},
-    [SPECIES_UMBREON] = {gMonBackPic_Umbreon, 0x800, SPECIES_UMBREON},
-    [SPECIES_MURKROW] = {gMonBackPic_Murkrow, 0x800, SPECIES_MURKROW},
-    [SPECIES_SLOWKING] = {gMonBackPic_Slowking, 0x800, SPECIES_SLOWKING},
-    [SPECIES_MISDREAVUS] = {gMonBackPic_Misdreavus, 0x800, SPECIES_MISDREAVUS},
-    [SPECIES_UNOWN] = {gMonBackPic_UnownA, 0x800, SPECIES_UNOWN},
-    [SPECIES_WOBBUFFET] = {gMonBackPic_Wobbuffet, 0x800, SPECIES_WOBBUFFET},
-    [SPECIES_GIRAFARIG] = {gMonBackPic_Girafarig, 0x800, SPECIES_GIRAFARIG},
-    [SPECIES_PINECO] = {gMonBackPic_Pineco, 0x800, SPECIES_PINECO},
-    [SPECIES_FORRETRESS] = {gMonBackPic_Forretress, 0x800, SPECIES_FORRETRESS},
-    [SPECIES_DUNSPARCE] = {gMonBackPic_Dunsparce, 0x800, SPECIES_DUNSPARCE},
-    [SPECIES_GLIGAR] = {gMonBackPic_Gligar, 0x800, SPECIES_GLIGAR},
-    [SPECIES_STEELIX] = {gMonBackPic_Steelix, 0x800, SPECIES_STEELIX},
-    [SPECIES_SNUBBULL] = {gMonBackPic_Snubbull, 0x800, SPECIES_SNUBBULL},
-    [SPECIES_GRANBULL] = {gMonBackPic_Granbull, 0x800, SPECIES_GRANBULL},
-    [SPECIES_QWILFISH] = {gMonBackPic_Qwilfish, 0x800, SPECIES_QWILFISH},
-    [SPECIES_SCIZOR] = {gMonBackPic_Scizor, 0x800, SPECIES_SCIZOR},
-    [SPECIES_SHUCKLE] = {gMonBackPic_Shuckle, 0x800, SPECIES_SHUCKLE},
-    [SPECIES_HERACROSS] = {gMonBackPic_Heracross, 0x800, SPECIES_HERACROSS},
-    [SPECIES_SNEASEL] = {gMonBackPic_Sneasel, 0x800, SPECIES_SNEASEL},
-    [SPECIES_TEDDIURSA] = {gMonBackPic_Teddiursa, 0x800, SPECIES_TEDDIURSA},
-    [SPECIES_URSARING] = {gMonBackPic_Ursaring, 0x800, SPECIES_URSARING},
-    [SPECIES_SLUGMA] = {gMonBackPic_Slugma, 0x800, SPECIES_SLUGMA},
-    [SPECIES_MAGCARGO] = {gMonBackPic_Magcargo, 0x800, SPECIES_MAGCARGO},
-    [SPECIES_SWINUB] = {gMonBackPic_Swinub, 0x800, SPECIES_SWINUB},
-    [SPECIES_PILOSWINE] = {gMonBackPic_Piloswine, 0x800, SPECIES_PILOSWINE},
-    [SPECIES_CORSOLA] = {gMonBackPic_Corsola, 0x800, SPECIES_CORSOLA},
-    [SPECIES_REMORAID] = {gMonBackPic_Remoraid, 0x800, SPECIES_REMORAID},
-    [SPECIES_OCTILLERY] = {gMonBackPic_Octillery, 0x800, SPECIES_OCTILLERY},
-    [SPECIES_DELIBIRD] = {gMonBackPic_Delibird, 0x800, SPECIES_DELIBIRD},
-    [SPECIES_MANTINE] = {gMonBackPic_Mantine, 0x800, SPECIES_MANTINE},
-    [SPECIES_SKARMORY] = {gMonBackPic_Skarmory, 0x800, SPECIES_SKARMORY},
-    [SPECIES_HOUNDOUR] = {gMonBackPic_Houndour, 0x800, SPECIES_HOUNDOUR},
-    [SPECIES_HOUNDOOM] = {gMonBackPic_Houndoom, 0x800, SPECIES_HOUNDOOM},
-    [SPECIES_KINGDRA] = {gMonBackPic_Kingdra, 0x800, SPECIES_KINGDRA},
-    [SPECIES_PHANPY] = {gMonBackPic_Phanpy, 0x800, SPECIES_PHANPY},
-    [SPECIES_DONPHAN] = {gMonBackPic_Donphan, 0x800, SPECIES_DONPHAN},
-    [SPECIES_PORYGON2] = {gMonBackPic_Porygon2, 0x800, SPECIES_PORYGON2},
-    [SPECIES_STANTLER] = {gMonBackPic_Stantler, 0x800, SPECIES_STANTLER},
-    [SPECIES_SMEARGLE] = {gMonBackPic_Smeargle, 0x800, SPECIES_SMEARGLE},
-    [SPECIES_TYROGUE] = {gMonBackPic_Tyrogue, 0x800, SPECIES_TYROGUE},
-    [SPECIES_HITMONTOP] = {gMonBackPic_Hitmontop, 0x800, SPECIES_HITMONTOP},
-    [SPECIES_SMOOCHUM] = {gMonBackPic_Smoochum, 0x800, SPECIES_SMOOCHUM},
-    [SPECIES_ELEKID] = {gMonBackPic_Elekid, 0x800, SPECIES_ELEKID},
-    [SPECIES_MAGBY] = {gMonBackPic_Magby, 0x800, SPECIES_MAGBY},
-    [SPECIES_MILTANK] = {gMonBackPic_Miltank, 0x800, SPECIES_MILTANK},
-    [SPECIES_BLISSEY] = {gMonBackPic_Blissey, 0x800, SPECIES_BLISSEY},
-    [SPECIES_RAIKOU] = {gMonBackPic_Raikou, 0x800, SPECIES_RAIKOU},
-    [SPECIES_ENTEI] = {gMonBackPic_Entei, 0x800, SPECIES_ENTEI},
-    [SPECIES_SUICUNE] = {gMonBackPic_Suicune, 0x800, SPECIES_SUICUNE},
-    [SPECIES_LARVITAR] = {gMonBackPic_Larvitar, 0x800, SPECIES_LARVITAR},
-    [SPECIES_PUPITAR] = {gMonBackPic_Pupitar, 0x800, SPECIES_PUPITAR},
-    [SPECIES_TYRANITAR] = {gMonBackPic_Tyranitar, 0x800, SPECIES_TYRANITAR},
-    [SPECIES_LUGIA] = {gMonBackPic_Lugia, 0x800, SPECIES_LUGIA},
-    [SPECIES_HO_OH] = {gMonBackPic_HoOh, 0x800, SPECIES_HO_OH},
-    [SPECIES_CELEBI] = {gMonBackPic_Celebi, 0x800, SPECIES_CELEBI},
-    [SPECIES_OLD_UNOWN_B] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_B},
-    [SPECIES_OLD_UNOWN_C] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_C},
-    [SPECIES_OLD_UNOWN_D] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_D},
-    [SPECIES_OLD_UNOWN_E] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_E},
-    [SPECIES_OLD_UNOWN_F] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_F},
-    [SPECIES_OLD_UNOWN_G] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_G},
-    [SPECIES_OLD_UNOWN_H] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_H},
-    [SPECIES_OLD_UNOWN_I] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_I},
-    [SPECIES_OLD_UNOWN_J] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_J},
-    [SPECIES_OLD_UNOWN_K] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_K},
-    [SPECIES_OLD_UNOWN_L] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_L},
-    [SPECIES_OLD_UNOWN_M] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_M},
-    [SPECIES_OLD_UNOWN_N] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_N},
-    [SPECIES_OLD_UNOWN_O] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_O},
-    [SPECIES_OLD_UNOWN_P] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_P},
-    [SPECIES_OLD_UNOWN_Q] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Q},
-    [SPECIES_OLD_UNOWN_R] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_R},
-    [SPECIES_OLD_UNOWN_S] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_S},
-    [SPECIES_OLD_UNOWN_T] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_T},
-    [SPECIES_OLD_UNOWN_U] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_U},
-    [SPECIES_OLD_UNOWN_V] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_V},
-    [SPECIES_OLD_UNOWN_W] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_W},
-    [SPECIES_OLD_UNOWN_X] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_X},
-    [SPECIES_OLD_UNOWN_Y] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Y},
-    [SPECIES_OLD_UNOWN_Z] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Z},
-    [SPECIES_TREECKO] = {gMonBackPic_Treecko, 0x800, SPECIES_TREECKO},
-    [SPECIES_GROVYLE] = {gMonBackPic_Grovyle, 0x800, SPECIES_GROVYLE},
-    [SPECIES_SCEPTILE] = {gMonBackPic_Sceptile, 0x800, SPECIES_SCEPTILE},
-    [SPECIES_TORCHIC] = {gMonBackPic_Torchic, 0x800, SPECIES_TORCHIC},
-    [SPECIES_COMBUSKEN] = {gMonBackPic_Combusken, 0x800, SPECIES_COMBUSKEN},
-    [SPECIES_BLAZIKEN] = {gMonBackPic_Blaziken, 0x800, SPECIES_BLAZIKEN},
-    [SPECIES_MUDKIP] = {gMonBackPic_Mudkip, 0x800, SPECIES_MUDKIP},
-    [SPECIES_MARSHTOMP] = {gMonBackPic_Marshtomp, 0x800, SPECIES_MARSHTOMP},
-    [SPECIES_SWAMPERT] = {gMonBackPic_Swampert, 0x800, SPECIES_SWAMPERT},
-    [SPECIES_POOCHYENA] = {gMonBackPic_Poochyena, 0x800, SPECIES_POOCHYENA},
-    [SPECIES_MIGHTYENA] = {gMonBackPic_Mightyena, 0x800, SPECIES_MIGHTYENA},
-    [SPECIES_ZIGZAGOON] = {gMonBackPic_Zigzagoon, 0x800, SPECIES_ZIGZAGOON},
-    [SPECIES_LINOONE] = {gMonBackPic_Linoone, 0x800, SPECIES_LINOONE},
-    [SPECIES_WURMPLE] = {gMonBackPic_Wurmple, 0x800, SPECIES_WURMPLE},
-    [SPECIES_SILCOON] = {gMonBackPic_Silcoon, 0x800, SPECIES_SILCOON},
-    [SPECIES_BEAUTIFLY] = {gMonBackPic_Beautifly, 0x800, SPECIES_BEAUTIFLY},
-    [SPECIES_CASCOON] = {gMonBackPic_Cascoon, 0x800, SPECIES_CASCOON},
-    [SPECIES_DUSTOX] = {gMonBackPic_Dustox, 0x800, SPECIES_DUSTOX},
-    [SPECIES_LOTAD] = {gMonBackPic_Lotad, 0x800, SPECIES_LOTAD},
-    [SPECIES_LOMBRE] = {gMonBackPic_Lombre, 0x800, SPECIES_LOMBRE},
-    [SPECIES_LUDICOLO] = {gMonBackPic_Ludicolo, 0x800, SPECIES_LUDICOLO},
-    [SPECIES_SEEDOT] = {gMonBackPic_Seedot, 0x800, SPECIES_SEEDOT},
-    [SPECIES_NUZLEAF] = {gMonBackPic_Nuzleaf, 0x800, SPECIES_NUZLEAF},
-    [SPECIES_SHIFTRY] = {gMonBackPic_Shiftry, 0x800, SPECIES_SHIFTRY},
-    [SPECIES_NINCADA] = {gMonBackPic_Nincada, 0x800, SPECIES_NINCADA},
-    [SPECIES_NINJASK] = {gMonBackPic_Ninjask, 0x800, SPECIES_NINJASK},
-    [SPECIES_SHEDINJA] = {gMonBackPic_Shedinja, 0x800, SPECIES_SHEDINJA},
-    [SPECIES_TAILLOW] = {gMonBackPic_Taillow, 0x800, SPECIES_TAILLOW},
-    [SPECIES_SWELLOW] = {gMonBackPic_Swellow, 0x800, SPECIES_SWELLOW},
-    [SPECIES_SHROOMISH] = {gMonBackPic_Shroomish, 0x800, SPECIES_SHROOMISH},
-    [SPECIES_BRELOOM] = {gMonBackPic_Breloom, 0x800, SPECIES_BRELOOM},
-    [SPECIES_SPINDA] = {gMonBackPic_Spinda, 0x800, SPECIES_SPINDA},
-    [SPECIES_WINGULL] = {gMonBackPic_Wingull, 0x800, SPECIES_WINGULL},
-    [SPECIES_PELIPPER] = {gMonBackPic_Pelipper, 0x800, SPECIES_PELIPPER},
-    [SPECIES_SURSKIT] = {gMonBackPic_Surskit, 0x800, SPECIES_SURSKIT},
-    [SPECIES_MASQUERAIN] = {gMonBackPic_Masquerain, 0x800, SPECIES_MASQUERAIN},
-    [SPECIES_WAILMER] = {gMonBackPic_Wailmer, 0x800, SPECIES_WAILMER},
-    [SPECIES_WAILORD] = {gMonBackPic_Wailord, 0x800, SPECIES_WAILORD},
-    [SPECIES_SKITTY] = {gMonBackPic_Skitty, 0x800, SPECIES_SKITTY},
-    [SPECIES_DELCATTY] = {gMonBackPic_Delcatty, 0x800, SPECIES_DELCATTY},
-    [SPECIES_KECLEON] = {gMonBackPic_Kecleon, 0x800, SPECIES_KECLEON},
-    [SPECIES_BALTOY] = {gMonBackPic_Baltoy, 0x800, SPECIES_BALTOY},
-    [SPECIES_CLAYDOL] = {gMonBackPic_Claydol, 0x800, SPECIES_CLAYDOL},
-    [SPECIES_NOSEPASS] = {gMonBackPic_Nosepass, 0x800, SPECIES_NOSEPASS},
-    [SPECIES_TORKOAL] = {gMonBackPic_Torkoal, 0x800, SPECIES_TORKOAL},
-    [SPECIES_SABLEYE] = {gMonBackPic_Sableye, 0x800, SPECIES_SABLEYE},
-    [SPECIES_BARBOACH] = {gMonBackPic_Barboach, 0x800, SPECIES_BARBOACH},
-    [SPECIES_WHISCASH] = {gMonBackPic_Whiscash, 0x800, SPECIES_WHISCASH},
-    [SPECIES_LUVDISC] = {gMonBackPic_Luvdisc, 0x800, SPECIES_LUVDISC},
-    [SPECIES_CORPHISH] = {gMonBackPic_Corphish, 0x800, SPECIES_CORPHISH},
-    [SPECIES_CRAWDAUNT] = {gMonBackPic_Crawdaunt, 0x800, SPECIES_CRAWDAUNT},
-    [SPECIES_FEEBAS] = {gMonBackPic_Feebas, 0x800, SPECIES_FEEBAS},
-    [SPECIES_MILOTIC] = {gMonBackPic_Milotic, 0x800, SPECIES_MILOTIC},
-    [SPECIES_CARVANHA] = {gMonBackPic_Carvanha, 0x800, SPECIES_CARVANHA},
-    [SPECIES_SHARPEDO] = {gMonBackPic_Sharpedo, 0x800, SPECIES_SHARPEDO},
-    [SPECIES_TRAPINCH] = {gMonBackPic_Trapinch, 0x800, SPECIES_TRAPINCH},
-    [SPECIES_VIBRAVA] = {gMonBackPic_Vibrava, 0x800, SPECIES_VIBRAVA},
-    [SPECIES_FLYGON] = {gMonBackPic_Flygon, 0x800, SPECIES_FLYGON},
-    [SPECIES_MAKUHITA] = {gMonBackPic_Makuhita, 0x800, SPECIES_MAKUHITA},
-    [SPECIES_HARIYAMA] = {gMonBackPic_Hariyama, 0x800, SPECIES_HARIYAMA},
-    [SPECIES_ELECTRIKE] = {gMonBackPic_Electrike, 0x800, SPECIES_ELECTRIKE},
-    [SPECIES_MANECTRIC] = {gMonBackPic_Manectric, 0x800, SPECIES_MANECTRIC},
-    [SPECIES_NUMEL] = {gMonBackPic_Numel, 0x800, SPECIES_NUMEL},
-    [SPECIES_CAMERUPT] = {gMonBackPic_Camerupt, 0x800, SPECIES_CAMERUPT},
-    [SPECIES_SPHEAL] = {gMonBackPic_Spheal, 0x800, SPECIES_SPHEAL},
-    [SPECIES_SEALEO] = {gMonBackPic_Sealeo, 0x800, SPECIES_SEALEO},
-    [SPECIES_WALREIN] = {gMonBackPic_Walrein, 0x800, SPECIES_WALREIN},
-    [SPECIES_CACNEA] = {gMonBackPic_Cacnea, 0x800, SPECIES_CACNEA},
-    [SPECIES_CACTURNE] = {gMonBackPic_Cacturne, 0x800, SPECIES_CACTURNE},
-    [SPECIES_SNORUNT] = {gMonBackPic_Snorunt, 0x800, SPECIES_SNORUNT},
-    [SPECIES_GLALIE] = {gMonBackPic_Glalie, 0x800, SPECIES_GLALIE},
-    [SPECIES_LUNATONE] = {gMonBackPic_Lunatone, 0x800, SPECIES_LUNATONE},
-    [SPECIES_SOLROCK] = {gMonBackPic_Solrock, 0x800, SPECIES_SOLROCK},
-    [SPECIES_AZURILL] = {gMonBackPic_Azurill, 0x800, SPECIES_AZURILL},
-    [SPECIES_SPOINK] = {gMonBackPic_Spoink, 0x800, SPECIES_SPOINK},
-    [SPECIES_GRUMPIG] = {gMonBackPic_Grumpig, 0x800, SPECIES_GRUMPIG},
-    [SPECIES_PLUSLE] = {gMonBackPic_Plusle, 0x800, SPECIES_PLUSLE},
-    [SPECIES_MINUN] = {gMonBackPic_Minun, 0x800, SPECIES_MINUN},
-    [SPECIES_MAWILE] = {gMonBackPic_Mawile, 0x800, SPECIES_MAWILE},
-    [SPECIES_MEDITITE] = {gMonBackPic_Meditite, 0x800, SPECIES_MEDITITE},
-    [SPECIES_MEDICHAM] = {gMonBackPic_Medicham, 0x800, SPECIES_MEDICHAM},
-    [SPECIES_SWABLU] = {gMonBackPic_Swablu, 0x800, SPECIES_SWABLU},
-    [SPECIES_ALTARIA] = {gMonBackPic_Altaria, 0x800, SPECIES_ALTARIA},
-    [SPECIES_WYNAUT] = {gMonBackPic_Wynaut, 0x800, SPECIES_WYNAUT},
-    [SPECIES_DUSKULL] = {gMonBackPic_Duskull, 0x800, SPECIES_DUSKULL},
-    [SPECIES_DUSCLOPS] = {gMonBackPic_Dusclops, 0x800, SPECIES_DUSCLOPS},
-    [SPECIES_ROSELIA] = {gMonBackPic_Roselia, 0x800, SPECIES_ROSELIA},
-    [SPECIES_SLAKOTH] = {gMonBackPic_Slakoth, 0x800, SPECIES_SLAKOTH},
-    [SPECIES_VIGOROTH] = {gMonBackPic_Vigoroth, 0x800, SPECIES_VIGOROTH},
-    [SPECIES_SLAKING] = {gMonBackPic_Slaking, 0x800, SPECIES_SLAKING},
-    [SPECIES_GULPIN] = {gMonBackPic_Gulpin, 0x800, SPECIES_GULPIN},
-    [SPECIES_SWALOT] = {gMonBackPic_Swalot, 0x800, SPECIES_SWALOT},
-    [SPECIES_TROPIUS] = {gMonBackPic_Tropius, 0x800, SPECIES_TROPIUS},
-    [SPECIES_WHISMUR] = {gMonBackPic_Whismur, 0x800, SPECIES_WHISMUR},
-    [SPECIES_LOUDRED] = {gMonBackPic_Loudred, 0x800, SPECIES_LOUDRED},
-    [SPECIES_EXPLOUD] = {gMonBackPic_Exploud, 0x800, SPECIES_EXPLOUD},
-    [SPECIES_CLAMPERL] = {gMonBackPic_Clamperl, 0x800, SPECIES_CLAMPERL},
-    [SPECIES_HUNTAIL] = {gMonBackPic_Huntail, 0x800, SPECIES_HUNTAIL},
-    [SPECIES_GOREBYSS] = {gMonBackPic_Gorebyss, 0x800, SPECIES_GOREBYSS},
-    [SPECIES_ABSOL] = {gMonBackPic_Absol, 0x800, SPECIES_ABSOL},
-    [SPECIES_SHUPPET] = {gMonBackPic_Shuppet, 0x800, SPECIES_SHUPPET},
-    [SPECIES_BANETTE] = {gMonBackPic_Banette, 0x800, SPECIES_BANETTE},
-    [SPECIES_SEVIPER] = {gMonBackPic_Seviper, 0x800, SPECIES_SEVIPER},
-    [SPECIES_ZANGOOSE] = {gMonBackPic_Zangoose, 0x800, SPECIES_ZANGOOSE},
-    [SPECIES_RELICANTH] = {gMonBackPic_Relicanth, 0x800, SPECIES_RELICANTH},
-    [SPECIES_ARON] = {gMonBackPic_Aron, 0x800, SPECIES_ARON},
-    [SPECIES_LAIRON] = {gMonBackPic_Lairon, 0x800, SPECIES_LAIRON},
-    [SPECIES_AGGRON] = {gMonBackPic_Aggron, 0x800, SPECIES_AGGRON},
-    [SPECIES_CASTFORM] = {gMonBackPic_Castform, 0x800, SPECIES_CASTFORM},
-    [SPECIES_VOLBEAT] = {gMonBackPic_Volbeat, 0x800, SPECIES_VOLBEAT},
-    [SPECIES_ILLUMISE] = {gMonBackPic_Illumise, 0x800, SPECIES_ILLUMISE},
-    [SPECIES_LILEEP] = {gMonBackPic_Lileep, 0x800, SPECIES_LILEEP},
-    [SPECIES_CRADILY] = {gMonBackPic_Cradily, 0x800, SPECIES_CRADILY},
-    [SPECIES_ANORITH] = {gMonBackPic_Anorith, 0x800, SPECIES_ANORITH},
-    [SPECIES_ARMALDO] = {gMonBackPic_Armaldo, 0x800, SPECIES_ARMALDO},
-    [SPECIES_RALTS] = {gMonBackPic_Ralts, 0x800, SPECIES_RALTS},
-    [SPECIES_KIRLIA] = {gMonBackPic_Kirlia, 0x800, SPECIES_KIRLIA},
-    [SPECIES_GARDEVOIR] = {gMonBackPic_Gardevoir, 0x800, SPECIES_GARDEVOIR},
-    [SPECIES_BAGON] = {gMonBackPic_Bagon, 0x800, SPECIES_BAGON},
-    [SPECIES_SHELGON] = {gMonBackPic_Shelgon, 0x800, SPECIES_SHELGON},
-    [SPECIES_SALAMENCE] = {gMonBackPic_Salamence, 0x800, SPECIES_SALAMENCE},
-    [SPECIES_BELDUM] = {gMonBackPic_Beldum, 0x800, SPECIES_BELDUM},
-    [SPECIES_METANG] = {gMonBackPic_Metang, 0x800, SPECIES_METANG},
-    [SPECIES_METAGROSS] = {gMonBackPic_Metagross, 0x800, SPECIES_METAGROSS},
-    [SPECIES_REGIROCK] = {gMonBackPic_Regirock, 0x800, SPECIES_REGIROCK},
-    [SPECIES_REGICE] = {gMonBackPic_Regice, 0x800, SPECIES_REGICE},
-    [SPECIES_REGISTEEL] = {gMonBackPic_Registeel, 0x800, SPECIES_REGISTEEL},
-    [SPECIES_KYOGRE] = {gMonBackPic_Kyogre, 0x800, SPECIES_KYOGRE},
-    [SPECIES_GROUDON] = {gMonBackPic_Groudon, 0x800, SPECIES_GROUDON},
-    [SPECIES_RAYQUAZA] = {gMonBackPic_Rayquaza, 0x800, SPECIES_RAYQUAZA},
-    [SPECIES_LATIAS] = {gMonBackPic_Latias, 0x800, SPECIES_LATIAS},
-    [SPECIES_LATIOS] = {gMonBackPic_Latios, 0x800, SPECIES_LATIOS},
-    [SPECIES_JIRACHI] = {gMonBackPic_Jirachi, 0x800, SPECIES_JIRACHI},
-    [SPECIES_DEOXYS] = {gMonBackPic_Deoxys, 0x800, SPECIES_DEOXYS},
-    [SPECIES_CHIMECHO] = {gMonBackPic_Chimecho, 0x800, SPECIES_CHIMECHO},
-    [SPECIES_EGG] = {gMonStillFrontPic_Egg, 0x800, SPECIES_EGG},
-    [SPECIES_UNOWN_B] = {gMonBackPic_UnownB, 0x800, SPECIES_UNOWN_B},
-    [SPECIES_UNOWN_C] = {gMonBackPic_UnownC, 0x800, SPECIES_UNOWN_C},
-    [SPECIES_UNOWN_D] = {gMonBackPic_UnownD, 0x800, SPECIES_UNOWN_D},
-    [SPECIES_UNOWN_E] = {gMonBackPic_UnownE, 0x800, SPECIES_UNOWN_E},
-    [SPECIES_UNOWN_F] = {gMonBackPic_UnownF, 0x800, SPECIES_UNOWN_F},
-    [SPECIES_UNOWN_G] = {gMonBackPic_UnownG, 0x800, SPECIES_UNOWN_G},
-    [SPECIES_UNOWN_H] = {gMonBackPic_UnownH, 0x800, SPECIES_UNOWN_H},
-    [SPECIES_UNOWN_I] = {gMonBackPic_UnownI, 0x800, SPECIES_UNOWN_I},
-    [SPECIES_UNOWN_J] = {gMonBackPic_UnownJ, 0x800, SPECIES_UNOWN_J},
-    [SPECIES_UNOWN_K] = {gMonBackPic_UnownK, 0x800, SPECIES_UNOWN_K},
-    [SPECIES_UNOWN_L] = {gMonBackPic_UnownL, 0x800, SPECIES_UNOWN_L},
-    [SPECIES_UNOWN_M] = {gMonBackPic_UnownM, 0x800, SPECIES_UNOWN_M},
-    [SPECIES_UNOWN_N] = {gMonBackPic_UnownN, 0x800, SPECIES_UNOWN_N},
-    [SPECIES_UNOWN_O] = {gMonBackPic_UnownO, 0x800, SPECIES_UNOWN_O},
-    [SPECIES_UNOWN_P] = {gMonBackPic_UnownP, 0x800, SPECIES_UNOWN_P},
-    [SPECIES_UNOWN_Q] = {gMonBackPic_UnownQ, 0x800, SPECIES_UNOWN_Q},
-    [SPECIES_UNOWN_R] = {gMonBackPic_UnownR, 0x800, SPECIES_UNOWN_R},
-    [SPECIES_UNOWN_S] = {gMonBackPic_UnownS, 0x800, SPECIES_UNOWN_S},
-    [SPECIES_UNOWN_T] = {gMonBackPic_UnownT, 0x800, SPECIES_UNOWN_T},
-    [SPECIES_UNOWN_U] = {gMonBackPic_UnownU, 0x800, SPECIES_UNOWN_U},
-    [SPECIES_UNOWN_V] = {gMonBackPic_UnownV, 0x800, SPECIES_UNOWN_V},
-    [SPECIES_UNOWN_W] = {gMonBackPic_UnownW, 0x800, SPECIES_UNOWN_W},
-    [SPECIES_UNOWN_X] = {gMonBackPic_UnownX, 0x800, SPECIES_UNOWN_X},
-    [SPECIES_UNOWN_Y] = {gMonBackPic_UnownY, 0x800, SPECIES_UNOWN_Y},
-    [SPECIES_UNOWN_Z] = {gMonBackPic_UnownZ, 0x800, SPECIES_UNOWN_Z},
-    [SPECIES_UNOWN_EMARK] = {gMonBackPic_UnownExclamationMark, 0x800, SPECIES_UNOWN_EMARK},
-    [SPECIES_UNOWN_QMARK] = {gMonBackPic_UnownQuestionMark, 0x800, SPECIES_UNOWN_QMARK},
+    SPECIES_SPRITE(NONE, gMonBackPic_CircledQuestionMark),
+    SPECIES_SPRITE(BULBASAUR, gMonBackPic_Bulbasaur),
+    SPECIES_SPRITE(IVYSAUR, gMonBackPic_Ivysaur),
+    SPECIES_SPRITE(VENUSAUR, gMonBackPic_Venusaur),
+    SPECIES_SPRITE(CHARMANDER, gMonBackPic_Charmander),
+    SPECIES_SPRITE(CHARMELEON, gMonBackPic_Charmeleon),
+    SPECIES_SPRITE(CHARIZARD, gMonBackPic_Charizard),
+    SPECIES_SPRITE(SQUIRTLE, gMonBackPic_Squirtle),
+    SPECIES_SPRITE(WARTORTLE, gMonBackPic_Wartortle),
+    SPECIES_SPRITE(BLASTOISE, gMonBackPic_Blastoise),
+    SPECIES_SPRITE(CATERPIE, gMonBackPic_Caterpie),
+    SPECIES_SPRITE(METAPOD, gMonBackPic_Metapod),
+    SPECIES_SPRITE(BUTTERFREE, gMonBackPic_Butterfree),
+    SPECIES_SPRITE(WEEDLE, gMonBackPic_Weedle),
+    SPECIES_SPRITE(KAKUNA, gMonBackPic_Kakuna),
+    SPECIES_SPRITE(BEEDRILL, gMonBackPic_Beedrill),
+    SPECIES_SPRITE(PIDGEY, gMonBackPic_Pidgey),
+    SPECIES_SPRITE(PIDGEOTTO, gMonBackPic_Pidgeotto),
+    SPECIES_SPRITE(PIDGEOT, gMonBackPic_Pidgeot),
+    SPECIES_SPRITE(RATTATA, gMonBackPic_Rattata),
+    SPECIES_SPRITE(RATICATE, gMonBackPic_Raticate),
+    SPECIES_SPRITE(SPEAROW, gMonBackPic_Spearow),
+    SPECIES_SPRITE(FEAROW, gMonBackPic_Fearow),
+    SPECIES_SPRITE(EKANS, gMonBackPic_Ekans),
+    SPECIES_SPRITE(ARBOK, gMonBackPic_Arbok),
+    SPECIES_SPRITE(PIKACHU, gMonBackPic_Pikachu),
+    SPECIES_SPRITE(RAICHU, gMonBackPic_Raichu),
+    SPECIES_SPRITE(SANDSHREW, gMonBackPic_Sandshrew),
+    SPECIES_SPRITE(SANDSLASH, gMonBackPic_Sandslash),
+    SPECIES_SPRITE(NIDORAN_F, gMonBackPic_NidoranF),
+    SPECIES_SPRITE(NIDORINA, gMonBackPic_Nidorina),
+    SPECIES_SPRITE(NIDOQUEEN, gMonBackPic_Nidoqueen),
+    SPECIES_SPRITE(NIDORAN_M, gMonBackPic_NidoranM),
+    SPECIES_SPRITE(NIDORINO, gMonBackPic_Nidorino),
+    SPECIES_SPRITE(NIDOKING, gMonBackPic_Nidoking),
+    SPECIES_SPRITE(CLEFAIRY, gMonBackPic_Clefairy),
+    SPECIES_SPRITE(CLEFABLE, gMonBackPic_Clefable),
+    SPECIES_SPRITE(VULPIX, gMonBackPic_Vulpix),
+    SPECIES_SPRITE(NINETALES, gMonBackPic_Ninetales),
+    SPECIES_SPRITE(JIGGLYPUFF, gMonBackPic_Jigglypuff),
+    SPECIES_SPRITE(WIGGLYTUFF, gMonBackPic_Wigglytuff),
+    SPECIES_SPRITE(ZUBAT, gMonBackPic_Zubat),
+    SPECIES_SPRITE(GOLBAT, gMonBackPic_Golbat),
+    SPECIES_SPRITE(ODDISH, gMonBackPic_Oddish),
+    SPECIES_SPRITE(GLOOM, gMonBackPic_Gloom),
+    SPECIES_SPRITE(VILEPLUME, gMonBackPic_Vileplume),
+    SPECIES_SPRITE(PARAS, gMonBackPic_Paras),
+    SPECIES_SPRITE(PARASECT, gMonBackPic_Parasect),
+    SPECIES_SPRITE(VENONAT, gMonBackPic_Venonat),
+    SPECIES_SPRITE(VENOMOTH, gMonBackPic_Venomoth),
+    SPECIES_SPRITE(DIGLETT, gMonBackPic_Diglett),
+    SPECIES_SPRITE(DUGTRIO, gMonBackPic_Dugtrio),
+    SPECIES_SPRITE(MEOWTH, gMonBackPic_Meowth),
+    SPECIES_SPRITE(PERSIAN, gMonBackPic_Persian),
+    SPECIES_SPRITE(PSYDUCK, gMonBackPic_Psyduck),
+    SPECIES_SPRITE(GOLDUCK, gMonBackPic_Golduck),
+    SPECIES_SPRITE(MANKEY, gMonBackPic_Mankey),
+    SPECIES_SPRITE(PRIMEAPE, gMonBackPic_Primeape),
+    SPECIES_SPRITE(GROWLITHE, gMonBackPic_Growlithe),
+    SPECIES_SPRITE(ARCANINE, gMonBackPic_Arcanine),
+    SPECIES_SPRITE(POLIWAG, gMonBackPic_Poliwag),
+    SPECIES_SPRITE(POLIWHIRL, gMonBackPic_Poliwhirl),
+    SPECIES_SPRITE(POLIWRATH, gMonBackPic_Poliwrath),
+    SPECIES_SPRITE(ABRA, gMonBackPic_Abra),
+    SPECIES_SPRITE(KADABRA, gMonBackPic_Kadabra),
+    SPECIES_SPRITE(ALAKAZAM, gMonBackPic_Alakazam),
+    SPECIES_SPRITE(MACHOP, gMonBackPic_Machop),
+    SPECIES_SPRITE(MACHOKE, gMonBackPic_Machoke),
+    SPECIES_SPRITE(MACHAMP, gMonBackPic_Machamp),
+    SPECIES_SPRITE(BELLSPROUT, gMonBackPic_Bellsprout),
+    SPECIES_SPRITE(WEEPINBELL, gMonBackPic_Weepinbell),
+    SPECIES_SPRITE(VICTREEBEL, gMonBackPic_Victreebel),
+    SPECIES_SPRITE(TENTACOOL, gMonBackPic_Tentacool),
+    SPECIES_SPRITE(TENTACRUEL, gMonBackPic_Tentacruel),
+    SPECIES_SPRITE(GEODUDE, gMonBackPic_Geodude),
+    SPECIES_SPRITE(GRAVELER, gMonBackPic_Graveler),
+    SPECIES_SPRITE(GOLEM, gMonBackPic_Golem),
+    SPECIES_SPRITE(PONYTA, gMonBackPic_Ponyta),
+    SPECIES_SPRITE(RAPIDASH, gMonBackPic_Rapidash),
+    SPECIES_SPRITE(SLOWPOKE, gMonBackPic_Slowpoke),
+    SPECIES_SPRITE(SLOWBRO, gMonBackPic_Slowbro),
+    SPECIES_SPRITE(MAGNEMITE, gMonBackPic_Magnemite),
+    SPECIES_SPRITE(MAGNETON, gMonBackPic_Magneton),
+    SPECIES_SPRITE(FARFETCHD, gMonBackPic_Farfetchd),
+    SPECIES_SPRITE(DODUO, gMonBackPic_Doduo),
+    SPECIES_SPRITE(DODRIO, gMonBackPic_Dodrio),
+    SPECIES_SPRITE(SEEL, gMonBackPic_Seel),
+    SPECIES_SPRITE(DEWGONG, gMonBackPic_Dewgong),
+    SPECIES_SPRITE(GRIMER, gMonBackPic_Grimer),
+    SPECIES_SPRITE(MUK, gMonBackPic_Muk),
+    SPECIES_SPRITE(SHELLDER, gMonBackPic_Shellder),
+    SPECIES_SPRITE(CLOYSTER, gMonBackPic_Cloyster),
+    SPECIES_SPRITE(GASTLY, gMonBackPic_Gastly),
+    SPECIES_SPRITE(HAUNTER, gMonBackPic_Haunter),
+    SPECIES_SPRITE(GENGAR, gMonBackPic_Gengar),
+    SPECIES_SPRITE(ONIX, gMonBackPic_Onix),
+    SPECIES_SPRITE(DROWZEE, gMonBackPic_Drowzee),
+    SPECIES_SPRITE(HYPNO, gMonBackPic_Hypno),
+    SPECIES_SPRITE(KRABBY, gMonBackPic_Krabby),
+    SPECIES_SPRITE(KINGLER, gMonBackPic_Kingler),
+    SPECIES_SPRITE(VOLTORB, gMonBackPic_Voltorb),
+    SPECIES_SPRITE(ELECTRODE, gMonBackPic_Electrode),
+    SPECIES_SPRITE(EXEGGCUTE, gMonBackPic_Exeggcute),
+    SPECIES_SPRITE(EXEGGUTOR, gMonBackPic_Exeggutor),
+    SPECIES_SPRITE(CUBONE, gMonBackPic_Cubone),
+    SPECIES_SPRITE(MAROWAK, gMonBackPic_Marowak),
+    SPECIES_SPRITE(HITMONLEE, gMonBackPic_Hitmonlee),
+    SPECIES_SPRITE(HITMONCHAN, gMonBackPic_Hitmonchan),
+    SPECIES_SPRITE(LICKITUNG, gMonBackPic_Lickitung),
+    SPECIES_SPRITE(KOFFING, gMonBackPic_Koffing),
+    SPECIES_SPRITE(WEEZING, gMonBackPic_Weezing),
+    SPECIES_SPRITE(RHYHORN, gMonBackPic_Rhyhorn),
+    SPECIES_SPRITE(RHYDON, gMonBackPic_Rhydon),
+    SPECIES_SPRITE(CHANSEY, gMonBackPic_Chansey),
+    SPECIES_SPRITE(TANGELA, gMonBackPic_Tangela),
+    SPECIES_SPRITE(KANGASKHAN, gMonBackPic_Kangaskhan),
+    SPECIES_SPRITE(HORSEA, gMonBackPic_Horsea),
+    SPECIES_SPRITE(SEADRA, gMonBackPic_Seadra),
+    SPECIES_SPRITE(GOLDEEN, gMonBackPic_Goldeen),
+    SPECIES_SPRITE(SEAKING, gMonBackPic_Seaking),
+    SPECIES_SPRITE(STARYU, gMonBackPic_Staryu),
+    SPECIES_SPRITE(STARMIE, gMonBackPic_Starmie),
+    SPECIES_SPRITE(MR_MIME, gMonBackPic_Mrmime),
+    SPECIES_SPRITE(SCYTHER, gMonBackPic_Scyther),
+    SPECIES_SPRITE(JYNX, gMonBackPic_Jynx),
+    SPECIES_SPRITE(ELECTABUZZ, gMonBackPic_Electabuzz),
+    SPECIES_SPRITE(MAGMAR, gMonBackPic_Magmar),
+    SPECIES_SPRITE(PINSIR, gMonBackPic_Pinsir),
+    SPECIES_SPRITE(TAUROS, gMonBackPic_Tauros),
+    SPECIES_SPRITE(MAGIKARP, gMonBackPic_Magikarp),
+    SPECIES_SPRITE(GYARADOS, gMonBackPic_Gyarados),
+    SPECIES_SPRITE(LAPRAS, gMonBackPic_Lapras),
+    SPECIES_SPRITE(DITTO, gMonBackPic_Ditto),
+    SPECIES_SPRITE(EEVEE, gMonBackPic_Eevee),
+    SPECIES_SPRITE(VAPOREON, gMonBackPic_Vaporeon),
+    SPECIES_SPRITE(JOLTEON, gMonBackPic_Jolteon),
+    SPECIES_SPRITE(FLAREON, gMonBackPic_Flareon),
+    SPECIES_SPRITE(PORYGON, gMonBackPic_Porygon),
+    SPECIES_SPRITE(OMANYTE, gMonBackPic_Omanyte),
+    SPECIES_SPRITE(OMASTAR, gMonBackPic_Omastar),
+    SPECIES_SPRITE(KABUTO, gMonBackPic_Kabuto),
+    SPECIES_SPRITE(KABUTOPS, gMonBackPic_Kabutops),
+    SPECIES_SPRITE(AERODACTYL, gMonBackPic_Aerodactyl),
+    SPECIES_SPRITE(SNORLAX, gMonBackPic_Snorlax),
+    SPECIES_SPRITE(ARTICUNO, gMonBackPic_Articuno),
+    SPECIES_SPRITE(ZAPDOS, gMonBackPic_Zapdos),
+    SPECIES_SPRITE(MOLTRES, gMonBackPic_Moltres),
+    SPECIES_SPRITE(DRATINI, gMonBackPic_Dratini),
+    SPECIES_SPRITE(DRAGONAIR, gMonBackPic_Dragonair),
+    SPECIES_SPRITE(DRAGONITE, gMonBackPic_Dragonite),
+    SPECIES_SPRITE(MEWTWO, gMonBackPic_Mewtwo),
+    SPECIES_SPRITE(MEW, gMonBackPic_Mew),
+    SPECIES_SPRITE(CHIKORITA, gMonBackPic_Chikorita),
+    SPECIES_SPRITE(BAYLEEF, gMonBackPic_Bayleef),
+    SPECIES_SPRITE(MEGANIUM, gMonBackPic_Meganium),
+    SPECIES_SPRITE(CYNDAQUIL, gMonBackPic_Cyndaquil),
+    SPECIES_SPRITE(QUILAVA, gMonBackPic_Quilava),
+    SPECIES_SPRITE(TYPHLOSION, gMonBackPic_Typhlosion),
+    SPECIES_SPRITE(TOTODILE, gMonBackPic_Totodile),
+    SPECIES_SPRITE(CROCONAW, gMonBackPic_Croconaw),
+    SPECIES_SPRITE(FERALIGATR, gMonBackPic_Feraligatr),
+    SPECIES_SPRITE(SENTRET, gMonBackPic_Sentret),
+    SPECIES_SPRITE(FURRET, gMonBackPic_Furret),
+    SPECIES_SPRITE(HOOTHOOT, gMonBackPic_Hoothoot),
+    SPECIES_SPRITE(NOCTOWL, gMonBackPic_Noctowl),
+    SPECIES_SPRITE(LEDYBA, gMonBackPic_Ledyba),
+    SPECIES_SPRITE(LEDIAN, gMonBackPic_Ledian),
+    SPECIES_SPRITE(SPINARAK, gMonBackPic_Spinarak),
+    SPECIES_SPRITE(ARIADOS, gMonBackPic_Ariados),
+    SPECIES_SPRITE(CROBAT, gMonBackPic_Crobat),
+    SPECIES_SPRITE(CHINCHOU, gMonBackPic_Chinchou),
+    SPECIES_SPRITE(LANTURN, gMonBackPic_Lanturn),
+    SPECIES_SPRITE(PICHU, gMonBackPic_Pichu),
+    SPECIES_SPRITE(CLEFFA, gMonBackPic_Cleffa),
+    SPECIES_SPRITE(IGGLYBUFF, gMonBackPic_Igglybuff),
+    SPECIES_SPRITE(TOGEPI, gMonBackPic_Togepi),
+    SPECIES_SPRITE(TOGETIC, gMonBackPic_Togetic),
+    SPECIES_SPRITE(NATU, gMonBackPic_Natu),
+    SPECIES_SPRITE(XATU, gMonBackPic_Xatu),
+    SPECIES_SPRITE(MAREEP, gMonBackPic_Mareep),
+    SPECIES_SPRITE(FLAAFFY, gMonBackPic_Flaaffy),
+    SPECIES_SPRITE(AMPHAROS, gMonBackPic_Ampharos),
+    SPECIES_SPRITE(BELLOSSOM, gMonBackPic_Bellossom),
+    SPECIES_SPRITE(MARILL, gMonBackPic_Marill),
+    SPECIES_SPRITE(AZUMARILL, gMonBackPic_Azumarill),
+    SPECIES_SPRITE(SUDOWOODO, gMonBackPic_Sudowoodo),
+    SPECIES_SPRITE(POLITOED, gMonBackPic_Politoed),
+    SPECIES_SPRITE(HOPPIP, gMonBackPic_Hoppip),
+    SPECIES_SPRITE(SKIPLOOM, gMonBackPic_Skiploom),
+    SPECIES_SPRITE(JUMPLUFF, gMonBackPic_Jumpluff),
+    SPECIES_SPRITE(AIPOM, gMonBackPic_Aipom),
+    SPECIES_SPRITE(SUNKERN, gMonBackPic_Sunkern),
+    SPECIES_SPRITE(SUNFLORA, gMonBackPic_Sunflora),
+    SPECIES_SPRITE(YANMA, gMonBackPic_Yanma),
+    SPECIES_SPRITE(WOOPER, gMonBackPic_Wooper),
+    SPECIES_SPRITE(QUAGSIRE, gMonBackPic_Quagsire),
+    SPECIES_SPRITE(ESPEON, gMonBackPic_Espeon),
+    SPECIES_SPRITE(UMBREON, gMonBackPic_Umbreon),
+    SPECIES_SPRITE(MURKROW, gMonBackPic_Murkrow),
+    SPECIES_SPRITE(SLOWKING, gMonBackPic_Slowking),
+    SPECIES_SPRITE(MISDREAVUS, gMonBackPic_Misdreavus),
+    SPECIES_SPRITE(UNOWN, gMonBackPic_UnownA),
+    SPECIES_SPRITE(WOBBUFFET, gMonBackPic_Wobbuffet),
+    SPECIES_SPRITE(GIRAFARIG, gMonBackPic_Girafarig),
+    SPECIES_SPRITE(PINECO, gMonBackPic_Pineco),
+    SPECIES_SPRITE(FORRETRESS, gMonBackPic_Forretress),
+    SPECIES_SPRITE(DUNSPARCE, gMonBackPic_Dunsparce),
+    SPECIES_SPRITE(GLIGAR, gMonBackPic_Gligar),
+    SPECIES_SPRITE(STEELIX, gMonBackPic_Steelix),
+    SPECIES_SPRITE(SNUBBULL, gMonBackPic_Snubbull),
+    SPECIES_SPRITE(GRANBULL, gMonBackPic_Granbull),
+    SPECIES_SPRITE(QWILFISH, gMonBackPic_Qwilfish),
+    SPECIES_SPRITE(SCIZOR, gMonBackPic_Scizor),
+    SPECIES_SPRITE(SHUCKLE, gMonBackPic_Shuckle),
+    SPECIES_SPRITE(HERACROSS, gMonBackPic_Heracross),
+    SPECIES_SPRITE(SNEASEL, gMonBackPic_Sneasel),
+    SPECIES_SPRITE(TEDDIURSA, gMonBackPic_Teddiursa),
+    SPECIES_SPRITE(URSARING, gMonBackPic_Ursaring),
+    SPECIES_SPRITE(SLUGMA, gMonBackPic_Slugma),
+    SPECIES_SPRITE(MAGCARGO, gMonBackPic_Magcargo),
+    SPECIES_SPRITE(SWINUB, gMonBackPic_Swinub),
+    SPECIES_SPRITE(PILOSWINE, gMonBackPic_Piloswine),
+    SPECIES_SPRITE(CORSOLA, gMonBackPic_Corsola),
+    SPECIES_SPRITE(REMORAID, gMonBackPic_Remoraid),
+    SPECIES_SPRITE(OCTILLERY, gMonBackPic_Octillery),
+    SPECIES_SPRITE(DELIBIRD, gMonBackPic_Delibird),
+    SPECIES_SPRITE(MANTINE, gMonBackPic_Mantine),
+    SPECIES_SPRITE(SKARMORY, gMonBackPic_Skarmory),
+    SPECIES_SPRITE(HOUNDOUR, gMonBackPic_Houndour),
+    SPECIES_SPRITE(HOUNDOOM, gMonBackPic_Houndoom),
+    SPECIES_SPRITE(KINGDRA, gMonBackPic_Kingdra),
+    SPECIES_SPRITE(PHANPY, gMonBackPic_Phanpy),
+    SPECIES_SPRITE(DONPHAN, gMonBackPic_Donphan),
+    SPECIES_SPRITE(PORYGON2, gMonBackPic_Porygon2),
+    SPECIES_SPRITE(STANTLER, gMonBackPic_Stantler),
+    SPECIES_SPRITE(SMEARGLE, gMonBackPic_Smeargle),
+    SPECIES_SPRITE(TYROGUE, gMonBackPic_Tyrogue),
+    SPECIES_SPRITE(HITMONTOP, gMonBackPic_Hitmontop),
+    SPECIES_SPRITE(SMOOCHUM, gMonBackPic_Smoochum),
+    SPECIES_SPRITE(ELEKID, gMonBackPic_Elekid),
+    SPECIES_SPRITE(MAGBY, gMonBackPic_Magby),
+    SPECIES_SPRITE(MILTANK, gMonBackPic_Miltank),
+    SPECIES_SPRITE(BLISSEY, gMonBackPic_Blissey),
+    SPECIES_SPRITE(RAIKOU, gMonBackPic_Raikou),
+    SPECIES_SPRITE(ENTEI, gMonBackPic_Entei),
+    SPECIES_SPRITE(SUICUNE, gMonBackPic_Suicune),
+    SPECIES_SPRITE(LARVITAR, gMonBackPic_Larvitar),
+    SPECIES_SPRITE(PUPITAR, gMonBackPic_Pupitar),
+    SPECIES_SPRITE(TYRANITAR, gMonBackPic_Tyranitar),
+    SPECIES_SPRITE(LUGIA, gMonBackPic_Lugia),
+    SPECIES_SPRITE(HO_OH, gMonBackPic_HoOh),
+    SPECIES_SPRITE(CELEBI, gMonBackPic_Celebi),
+    SPECIES_SPRITE(OLD_UNOWN_B, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_C, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_D, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_E, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_F, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_G, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_H, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_I, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_J, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_K, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_L, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_M, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_N, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_O, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_P, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Q, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_R, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_S, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_T, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_U, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_V, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_W, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_X, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Y, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Z, gMonBackPic_DoubleQuestionMark),
+    SPECIES_SPRITE(TREECKO, gMonBackPic_Treecko),
+    SPECIES_SPRITE(GROVYLE, gMonBackPic_Grovyle),
+    SPECIES_SPRITE(SCEPTILE, gMonBackPic_Sceptile),
+    SPECIES_SPRITE(TORCHIC, gMonBackPic_Torchic),
+    SPECIES_SPRITE(COMBUSKEN, gMonBackPic_Combusken),
+    SPECIES_SPRITE(BLAZIKEN, gMonBackPic_Blaziken),
+    SPECIES_SPRITE(MUDKIP, gMonBackPic_Mudkip),
+    SPECIES_SPRITE(MARSHTOMP, gMonBackPic_Marshtomp),
+    SPECIES_SPRITE(SWAMPERT, gMonBackPic_Swampert),
+    SPECIES_SPRITE(POOCHYENA, gMonBackPic_Poochyena),
+    SPECIES_SPRITE(MIGHTYENA, gMonBackPic_Mightyena),
+    SPECIES_SPRITE(ZIGZAGOON, gMonBackPic_Zigzagoon),
+    SPECIES_SPRITE(LINOONE, gMonBackPic_Linoone),
+    SPECIES_SPRITE(WURMPLE, gMonBackPic_Wurmple),
+    SPECIES_SPRITE(SILCOON, gMonBackPic_Silcoon),
+    SPECIES_SPRITE(BEAUTIFLY, gMonBackPic_Beautifly),
+    SPECIES_SPRITE(CASCOON, gMonBackPic_Cascoon),
+    SPECIES_SPRITE(DUSTOX, gMonBackPic_Dustox),
+    SPECIES_SPRITE(LOTAD, gMonBackPic_Lotad),
+    SPECIES_SPRITE(LOMBRE, gMonBackPic_Lombre),
+    SPECIES_SPRITE(LUDICOLO, gMonBackPic_Ludicolo),
+    SPECIES_SPRITE(SEEDOT, gMonBackPic_Seedot),
+    SPECIES_SPRITE(NUZLEAF, gMonBackPic_Nuzleaf),
+    SPECIES_SPRITE(SHIFTRY, gMonBackPic_Shiftry),
+    SPECIES_SPRITE(NINCADA, gMonBackPic_Nincada),
+    SPECIES_SPRITE(NINJASK, gMonBackPic_Ninjask),
+    SPECIES_SPRITE(SHEDINJA, gMonBackPic_Shedinja),
+    SPECIES_SPRITE(TAILLOW, gMonBackPic_Taillow),
+    SPECIES_SPRITE(SWELLOW, gMonBackPic_Swellow),
+    SPECIES_SPRITE(SHROOMISH, gMonBackPic_Shroomish),
+    SPECIES_SPRITE(BRELOOM, gMonBackPic_Breloom),
+    SPECIES_SPRITE(SPINDA, gMonBackPic_Spinda),
+    SPECIES_SPRITE(WINGULL, gMonBackPic_Wingull),
+    SPECIES_SPRITE(PELIPPER, gMonBackPic_Pelipper),
+    SPECIES_SPRITE(SURSKIT, gMonBackPic_Surskit),
+    SPECIES_SPRITE(MASQUERAIN, gMonBackPic_Masquerain),
+    SPECIES_SPRITE(WAILMER, gMonBackPic_Wailmer),
+    SPECIES_SPRITE(WAILORD, gMonBackPic_Wailord),
+    SPECIES_SPRITE(SKITTY, gMonBackPic_Skitty),
+    SPECIES_SPRITE(DELCATTY, gMonBackPic_Delcatty),
+    SPECIES_SPRITE(KECLEON, gMonBackPic_Kecleon),
+    SPECIES_SPRITE(BALTOY, gMonBackPic_Baltoy),
+    SPECIES_SPRITE(CLAYDOL, gMonBackPic_Claydol),
+    SPECIES_SPRITE(NOSEPASS, gMonBackPic_Nosepass),
+    SPECIES_SPRITE(TORKOAL, gMonBackPic_Torkoal),
+    SPECIES_SPRITE(SABLEYE, gMonBackPic_Sableye),
+    SPECIES_SPRITE(BARBOACH, gMonBackPic_Barboach),
+    SPECIES_SPRITE(WHISCASH, gMonBackPic_Whiscash),
+    SPECIES_SPRITE(LUVDISC, gMonBackPic_Luvdisc),
+    SPECIES_SPRITE(CORPHISH, gMonBackPic_Corphish),
+    SPECIES_SPRITE(CRAWDAUNT, gMonBackPic_Crawdaunt),
+    SPECIES_SPRITE(FEEBAS, gMonBackPic_Feebas),
+    SPECIES_SPRITE(MILOTIC, gMonBackPic_Milotic),
+    SPECIES_SPRITE(CARVANHA, gMonBackPic_Carvanha),
+    SPECIES_SPRITE(SHARPEDO, gMonBackPic_Sharpedo),
+    SPECIES_SPRITE(TRAPINCH, gMonBackPic_Trapinch),
+    SPECIES_SPRITE(VIBRAVA, gMonBackPic_Vibrava),
+    SPECIES_SPRITE(FLYGON, gMonBackPic_Flygon),
+    SPECIES_SPRITE(MAKUHITA, gMonBackPic_Makuhita),
+    SPECIES_SPRITE(HARIYAMA, gMonBackPic_Hariyama),
+    SPECIES_SPRITE(ELECTRIKE, gMonBackPic_Electrike),
+    SPECIES_SPRITE(MANECTRIC, gMonBackPic_Manectric),
+    SPECIES_SPRITE(NUMEL, gMonBackPic_Numel),
+    SPECIES_SPRITE(CAMERUPT, gMonBackPic_Camerupt),
+    SPECIES_SPRITE(SPHEAL, gMonBackPic_Spheal),
+    SPECIES_SPRITE(SEALEO, gMonBackPic_Sealeo),
+    SPECIES_SPRITE(WALREIN, gMonBackPic_Walrein),
+    SPECIES_SPRITE(CACNEA, gMonBackPic_Cacnea),
+    SPECIES_SPRITE(CACTURNE, gMonBackPic_Cacturne),
+    SPECIES_SPRITE(SNORUNT, gMonBackPic_Snorunt),
+    SPECIES_SPRITE(GLALIE, gMonBackPic_Glalie),
+    SPECIES_SPRITE(LUNATONE, gMonBackPic_Lunatone),
+    SPECIES_SPRITE(SOLROCK, gMonBackPic_Solrock),
+    SPECIES_SPRITE(AZURILL, gMonBackPic_Azurill),
+    SPECIES_SPRITE(SPOINK, gMonBackPic_Spoink),
+    SPECIES_SPRITE(GRUMPIG, gMonBackPic_Grumpig),
+    SPECIES_SPRITE(PLUSLE, gMonBackPic_Plusle),
+    SPECIES_SPRITE(MINUN, gMonBackPic_Minun),
+    SPECIES_SPRITE(MAWILE, gMonBackPic_Mawile),
+    SPECIES_SPRITE(MEDITITE, gMonBackPic_Meditite),
+    SPECIES_SPRITE(MEDICHAM, gMonBackPic_Medicham),
+    SPECIES_SPRITE(SWABLU, gMonBackPic_Swablu),
+    SPECIES_SPRITE(ALTARIA, gMonBackPic_Altaria),
+    SPECIES_SPRITE(WYNAUT, gMonBackPic_Wynaut),
+    SPECIES_SPRITE(DUSKULL, gMonBackPic_Duskull),
+    SPECIES_SPRITE(DUSCLOPS, gMonBackPic_Dusclops),
+    SPECIES_SPRITE(ROSELIA, gMonBackPic_Roselia),
+    SPECIES_SPRITE(SLAKOTH, gMonBackPic_Slakoth),
+    SPECIES_SPRITE(VIGOROTH, gMonBackPic_Vigoroth),
+    SPECIES_SPRITE(SLAKING, gMonBackPic_Slaking),
+    SPECIES_SPRITE(GULPIN, gMonBackPic_Gulpin),
+    SPECIES_SPRITE(SWALOT, gMonBackPic_Swalot),
+    SPECIES_SPRITE(TROPIUS, gMonBackPic_Tropius),
+    SPECIES_SPRITE(WHISMUR, gMonBackPic_Whismur),
+    SPECIES_SPRITE(LOUDRED, gMonBackPic_Loudred),
+    SPECIES_SPRITE(EXPLOUD, gMonBackPic_Exploud),
+    SPECIES_SPRITE(CLAMPERL, gMonBackPic_Clamperl),
+    SPECIES_SPRITE(HUNTAIL, gMonBackPic_Huntail),
+    SPECIES_SPRITE(GOREBYSS, gMonBackPic_Gorebyss),
+    SPECIES_SPRITE(ABSOL, gMonBackPic_Absol),
+    SPECIES_SPRITE(SHUPPET, gMonBackPic_Shuppet),
+    SPECIES_SPRITE(BANETTE, gMonBackPic_Banette),
+    SPECIES_SPRITE(SEVIPER, gMonBackPic_Seviper),
+    SPECIES_SPRITE(ZANGOOSE, gMonBackPic_Zangoose),
+    SPECIES_SPRITE(RELICANTH, gMonBackPic_Relicanth),
+    SPECIES_SPRITE(ARON, gMonBackPic_Aron),
+    SPECIES_SPRITE(LAIRON, gMonBackPic_Lairon),
+    SPECIES_SPRITE(AGGRON, gMonBackPic_Aggron),
+    SPECIES_SPRITE(CASTFORM, gMonBackPic_Castform),
+    SPECIES_SPRITE(VOLBEAT, gMonBackPic_Volbeat),
+    SPECIES_SPRITE(ILLUMISE, gMonBackPic_Illumise),
+    SPECIES_SPRITE(LILEEP, gMonBackPic_Lileep),
+    SPECIES_SPRITE(CRADILY, gMonBackPic_Cradily),
+    SPECIES_SPRITE(ANORITH, gMonBackPic_Anorith),
+    SPECIES_SPRITE(ARMALDO, gMonBackPic_Armaldo),
+    SPECIES_SPRITE(RALTS, gMonBackPic_Ralts),
+    SPECIES_SPRITE(KIRLIA, gMonBackPic_Kirlia),
+    SPECIES_SPRITE(GARDEVOIR, gMonBackPic_Gardevoir),
+    SPECIES_SPRITE(BAGON, gMonBackPic_Bagon),
+    SPECIES_SPRITE(SHELGON, gMonBackPic_Shelgon),
+    SPECIES_SPRITE(SALAMENCE, gMonBackPic_Salamence),
+    SPECIES_SPRITE(BELDUM, gMonBackPic_Beldum),
+    SPECIES_SPRITE(METANG, gMonBackPic_Metang),
+    SPECIES_SPRITE(METAGROSS, gMonBackPic_Metagross),
+    SPECIES_SPRITE(REGIROCK, gMonBackPic_Regirock),
+    SPECIES_SPRITE(REGICE, gMonBackPic_Regice),
+    SPECIES_SPRITE(REGISTEEL, gMonBackPic_Registeel),
+    SPECIES_SPRITE(KYOGRE, gMonBackPic_Kyogre),
+    SPECIES_SPRITE(GROUDON, gMonBackPic_Groudon),
+    SPECIES_SPRITE(RAYQUAZA, gMonBackPic_Rayquaza),
+    SPECIES_SPRITE(LATIAS, gMonBackPic_Latias),
+    SPECIES_SPRITE(LATIOS, gMonBackPic_Latios),
+    SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi),
+    SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys),
+    SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho),
+    SPECIES_SPRITE(EGG, gMonStillFrontPic_Egg),
+    SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB),
+    SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC),
+    SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD),
+    SPECIES_SPRITE(UNOWN_E, gMonBackPic_UnownE),
+    SPECIES_SPRITE(UNOWN_F, gMonBackPic_UnownF),
+    SPECIES_SPRITE(UNOWN_G, gMonBackPic_UnownG),
+    SPECIES_SPRITE(UNOWN_H, gMonBackPic_UnownH),
+    SPECIES_SPRITE(UNOWN_I, gMonBackPic_UnownI),
+    SPECIES_SPRITE(UNOWN_J, gMonBackPic_UnownJ),
+    SPECIES_SPRITE(UNOWN_K, gMonBackPic_UnownK),
+    SPECIES_SPRITE(UNOWN_L, gMonBackPic_UnownL),
+    SPECIES_SPRITE(UNOWN_M, gMonBackPic_UnownM),
+    SPECIES_SPRITE(UNOWN_N, gMonBackPic_UnownN),
+    SPECIES_SPRITE(UNOWN_O, gMonBackPic_UnownO),
+    SPECIES_SPRITE(UNOWN_P, gMonBackPic_UnownP),
+    SPECIES_SPRITE(UNOWN_Q, gMonBackPic_UnownQ),
+    SPECIES_SPRITE(UNOWN_R, gMonBackPic_UnownR),
+    SPECIES_SPRITE(UNOWN_S, gMonBackPic_UnownS),
+    SPECIES_SPRITE(UNOWN_T, gMonBackPic_UnownT),
+    SPECIES_SPRITE(UNOWN_U, gMonBackPic_UnownU),
+    SPECIES_SPRITE(UNOWN_V, gMonBackPic_UnownV),
+    SPECIES_SPRITE(UNOWN_W, gMonBackPic_UnownW),
+    SPECIES_SPRITE(UNOWN_X, gMonBackPic_UnownX),
+    SPECIES_SPRITE(UNOWN_Y, gMonBackPic_UnownY),
+    SPECIES_SPRITE(UNOWN_Z, gMonBackPic_UnownZ),
+    SPECIES_SPRITE(UNOWN_EMARK, gMonBackPic_UnownExclamationMark),
+    SPECIES_SPRITE(UNOWN_QMARK, gMonBackPic_UnownQuestionMark),
 };
-
diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index c8f079a5c..f3d81d27e 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -1,415 +1,62 @@
-#include "constants/species.h"
-
 // This determines how much higher above the usual position the enemy Pokémon
 // is during battle. Species that float or fly have nonzero values.
-const u8 gEnemyMonElevation[] =
+const u8 gEnemyMonElevation[NUM_SPECIES] =
 {
-    [SPECIES_NONE] = 0,
-    [SPECIES_BULBASAUR] = 0,
-    [SPECIES_IVYSAUR] = 0,
-    [SPECIES_VENUSAUR] = 0,
-    [SPECIES_CHARMANDER] = 0,
-    [SPECIES_CHARMELEON] = 0,
-    [SPECIES_CHARIZARD] = 0,
-    [SPECIES_SQUIRTLE] = 0,
-    [SPECIES_WARTORTLE] = 0,
-    [SPECIES_BLASTOISE] = 0,
-    [SPECIES_CATERPIE] = 0,
-    [SPECIES_METAPOD] = 0,
     [SPECIES_BUTTERFREE] = 8,
-    [SPECIES_WEEDLE] = 0,
-    [SPECIES_KAKUNA] = 0,
     [SPECIES_BEEDRILL] = 8,
     [SPECIES_PIDGEY] = 16,
-    [SPECIES_PIDGEOTTO] = 0,
     [SPECIES_PIDGEOT] = 4,
-    [SPECIES_RATTATA] = 0,
-    [SPECIES_RATICATE] = 0,
-    [SPECIES_SPEAROW] = 0,
     [SPECIES_FEAROW] = 6,
-    [SPECIES_EKANS] = 0,
-    [SPECIES_ARBOK] = 0,
-    [SPECIES_PIKACHU] = 0,
-    [SPECIES_RAICHU] = 0,
-    [SPECIES_SANDSHREW] = 0,
-    [SPECIES_SANDSLASH] = 0,
-    [SPECIES_NIDORAN_F] = 0,
-    [SPECIES_NIDORINA] = 0,
-    [SPECIES_NIDOQUEEN] = 0,
-    [SPECIES_NIDORAN_M] = 0,
-    [SPECIES_NIDORINO] = 0,
-    [SPECIES_NIDOKING] = 0,
-    [SPECIES_CLEFAIRY] = 0,
-    [SPECIES_CLEFABLE] = 0,
-    [SPECIES_VULPIX] = 0,
-    [SPECIES_NINETALES] = 0,
-    [SPECIES_JIGGLYPUFF] = 0,
-    [SPECIES_WIGGLYTUFF] = 0,
     [SPECIES_ZUBAT] = 8,
     [SPECIES_GOLBAT] = 8,
-    [SPECIES_ODDISH] = 0,
-    [SPECIES_GLOOM] = 0,
-    [SPECIES_VILEPLUME] = 0,
-    [SPECIES_PARAS] = 0,
-    [SPECIES_PARASECT] = 0,
-    [SPECIES_VENONAT] = 0,
     [SPECIES_VENOMOTH] = 8,
-    [SPECIES_DIGLETT] = 0,
-    [SPECIES_DUGTRIO] = 0,
-    [SPECIES_MEOWTH] = 0,
-    [SPECIES_PERSIAN] = 0,
-    [SPECIES_PSYDUCK] = 0,
-    [SPECIES_GOLDUCK] = 0,
-    [SPECIES_MANKEY] = 0,
-    [SPECIES_PRIMEAPE] = 0,
-    [SPECIES_GROWLITHE] = 0,
-    [SPECIES_ARCANINE] = 0,
-    [SPECIES_POLIWAG] = 0,
-    [SPECIES_POLIWHIRL] = 0,
-    [SPECIES_POLIWRATH] = 0,
-    [SPECIES_ABRA] = 0,
-    [SPECIES_KADABRA] = 0,
-    [SPECIES_ALAKAZAM] = 0,
-    [SPECIES_MACHOP] = 0,
-    [SPECIES_MACHOKE] = 0,
-    [SPECIES_MACHAMP] = 0,
-    [SPECIES_BELLSPROUT] = 0,
-    [SPECIES_WEEPINBELL] = 0,
-    [SPECIES_VICTREEBEL] = 0,
-    [SPECIES_TENTACOOL] = 0,
-    [SPECIES_TENTACRUEL] = 0,
     [SPECIES_GEODUDE] = 16,
-    [SPECIES_GRAVELER] = 0,
-    [SPECIES_GOLEM] = 0,
-    [SPECIES_PONYTA] = 0,
-    [SPECIES_RAPIDASH] = 0,
-    [SPECIES_SLOWPOKE] = 0,
-    [SPECIES_SLOWBRO] = 0,
     [SPECIES_MAGNEMITE] = 16,
     [SPECIES_MAGNETON] = 8,
-    [SPECIES_FARFETCHD] = 0,
-    [SPECIES_DODUO] = 0,
-    [SPECIES_DODRIO] = 0,
-    [SPECIES_SEEL] = 0,
-    [SPECIES_DEWGONG] = 0,
-    [SPECIES_GRIMER] = 0,
-    [SPECIES_MUK] = 0,
-    [SPECIES_SHELLDER] = 0,
-    [SPECIES_CLOYSTER] = 0,
     [SPECIES_GASTLY] = 4,
     [SPECIES_HAUNTER] = 4,
-    [SPECIES_GENGAR] = 0,
-    [SPECIES_ONIX] = 0,
-    [SPECIES_DROWZEE] = 0,
-    [SPECIES_HYPNO] = 0,
-    [SPECIES_KRABBY] = 0,
-    [SPECIES_KINGLER] = 0,
     [SPECIES_VOLTORB] = 10,
     [SPECIES_ELECTRODE] = 12,
-    [SPECIES_EXEGGCUTE] = 0,
-    [SPECIES_EXEGGUTOR] = 0,
-    [SPECIES_CUBONE] = 0,
-    [SPECIES_MAROWAK] = 0,
-    [SPECIES_HITMONLEE] = 0,
-    [SPECIES_HITMONCHAN] = 0,
-    [SPECIES_LICKITUNG] = 0,
     [SPECIES_KOFFING] = 8,
     [SPECIES_WEEZING] = 6,
-    [SPECIES_RHYHORN] = 0,
-    [SPECIES_RHYDON] = 0,
-    [SPECIES_CHANSEY] = 0,
-    [SPECIES_TANGELA] = 0,
-    [SPECIES_KANGASKHAN] = 0,
-    [SPECIES_HORSEA] = 0,
-    [SPECIES_SEADRA] = 0,
-    [SPECIES_GOLDEEN] = 0,
-    [SPECIES_SEAKING] = 0,
-    [SPECIES_STARYU] = 0,
-    [SPECIES_STARMIE] = 0,
-    [SPECIES_MR_MIME] = 0,
-    [SPECIES_SCYTHER] = 0,
-    [SPECIES_JYNX] = 0,
-    [SPECIES_ELECTABUZZ] = 0,
-    [SPECIES_MAGMAR] = 0,
-    [SPECIES_PINSIR] = 0,
-    [SPECIES_TAUROS] = 0,
-    [SPECIES_MAGIKARP] = 0,
-    [SPECIES_GYARADOS] = 0,
-    [SPECIES_LAPRAS] = 0,
-    [SPECIES_DITTO] = 0,
-    [SPECIES_EEVEE] = 0,
-    [SPECIES_VAPOREON] = 0,
-    [SPECIES_JOLTEON] = 0,
-    [SPECIES_FLAREON] = 0,
-    [SPECIES_PORYGON] = 0,
-    [SPECIES_OMANYTE] = 0,
-    [SPECIES_OMASTAR] = 0,
-    [SPECIES_KABUTO] = 0,
-    [SPECIES_KABUTOPS] = 0,
     [SPECIES_AERODACTYL] = 7,
-    [SPECIES_SNORLAX] = 0,
     [SPECIES_ARTICUNO] = 6,
     [SPECIES_ZAPDOS] = 8,
     [SPECIES_MOLTRES] = 5,
-    [SPECIES_DRATINI] = 0,
-    [SPECIES_DRAGONAIR] = 0,
     [SPECIES_DRAGONITE] = 6,
-    [SPECIES_MEWTWO] = 0,
     [SPECIES_MEW] = 8,
-    [SPECIES_CHIKORITA] = 0,
-    [SPECIES_BAYLEEF] = 0,
-    [SPECIES_MEGANIUM] = 0,
-    [SPECIES_CYNDAQUIL] = 0,
-    [SPECIES_QUILAVA] = 0,
-    [SPECIES_TYPHLOSION] = 0,
-    [SPECIES_TOTODILE] = 0,
-    [SPECIES_CROCONAW] = 0,
-    [SPECIES_FERALIGATR] = 0,
-    [SPECIES_SENTRET] = 0,
-    [SPECIES_FURRET] = 0,
-    [SPECIES_HOOTHOOT] = 0,
-    [SPECIES_NOCTOWL] = 0,
-    [SPECIES_LEDYBA] = 0,
     [SPECIES_LEDIAN] = 8,
-    [SPECIES_SPINARAK] = 0,
-    [SPECIES_ARIADOS] = 0,
     [SPECIES_CROBAT] = 6,
-    [SPECIES_CHINCHOU] = 0,
-    [SPECIES_LANTURN] = 0,
-    [SPECIES_PICHU] = 0,
-    [SPECIES_CLEFFA] = 0,
-    [SPECIES_IGGLYBUFF] = 0,
-    [SPECIES_TOGEPI] = 0,
-    [SPECIES_TOGETIC] = 0,
-    [SPECIES_NATU] = 0,
-    [SPECIES_XATU] = 0,
-    [SPECIES_MAREEP] = 0,
-    [SPECIES_FLAAFFY] = 0,
-    [SPECIES_AMPHAROS] = 0,
-    [SPECIES_BELLOSSOM] = 0,
-    [SPECIES_MARILL] = 0,
-    [SPECIES_AZUMARILL] = 0,
-    [SPECIES_SUDOWOODO] = 0,
-    [SPECIES_POLITOED] = 0,
     [SPECIES_HOPPIP] = 11,
     [SPECIES_SKIPLOOM] = 12,
     [SPECIES_JUMPLUFF] = 9,
-    [SPECIES_AIPOM] = 0,
-    [SPECIES_SUNKERN] = 0,
-    [SPECIES_SUNFLORA] = 0,
     [SPECIES_YANMA] = 8,
-    [SPECIES_WOOPER] = 0,
-    [SPECIES_QUAGSIRE] = 0,
-    [SPECIES_ESPEON] = 0,
-    [SPECIES_UMBREON] = 0,
-    [SPECIES_MURKROW] = 0,
-    [SPECIES_SLOWKING] = 0,
     [SPECIES_MISDREAVUS] = 8,
     [SPECIES_UNOWN] = 8,
-    [SPECIES_WOBBUFFET] = 0,
-    [SPECIES_GIRAFARIG] = 0,
-    [SPECIES_PINECO] = 0,
-    [SPECIES_FORRETRESS] = 0,
-    [SPECIES_DUNSPARCE] = 0,
     [SPECIES_GLIGAR] = 6,
-    [SPECIES_STEELIX] = 0,
-    [SPECIES_SNUBBULL] = 0,
-    [SPECIES_GRANBULL] = 0,
-    [SPECIES_QWILFISH] = 0,
-    [SPECIES_SCIZOR] = 0,
-    [SPECIES_SHUCKLE] = 0,
-    [SPECIES_HERACROSS] = 0,
-    [SPECIES_SNEASEL] = 0,
-    [SPECIES_TEDDIURSA] = 0,
-    [SPECIES_URSARING] = 0,
-    [SPECIES_SLUGMA] = 0,
-    [SPECIES_MAGCARGO] = 0,
-    [SPECIES_SWINUB] = 0,
-    [SPECIES_PILOSWINE] = 0,
-    [SPECIES_CORSOLA] = 0,
-    [SPECIES_REMORAID] = 0,
-    [SPECIES_OCTILLERY] = 0,
-    [SPECIES_DELIBIRD] = 0,
-    [SPECIES_MANTINE] = 0,
-    [SPECIES_SKARMORY] = 0,
-    [SPECIES_HOUNDOUR] = 0,
-    [SPECIES_HOUNDOOM] = 0,
-    [SPECIES_KINGDRA] = 0,
-    [SPECIES_PHANPY] = 0,
-    [SPECIES_DONPHAN] = 0,
-    [SPECIES_PORYGON2] = 0,
-    [SPECIES_STANTLER] = 0,
-    [SPECIES_SMEARGLE] = 0,
-    [SPECIES_TYROGUE] = 0,
-    [SPECIES_HITMONTOP] = 0,
-    [SPECIES_SMOOCHUM] = 0,
-    [SPECIES_ELEKID] = 0,
-    [SPECIES_MAGBY] = 0,
-    [SPECIES_MILTANK] = 0,
-    [SPECIES_BLISSEY] = 0,
-    [SPECIES_RAIKOU] = 0,
-    [SPECIES_ENTEI] = 0,
-    [SPECIES_SUICUNE] = 0,
-    [SPECIES_LARVITAR] = 0,
-    [SPECIES_PUPITAR] = 0,
-    [SPECIES_TYRANITAR] = 0,
     [SPECIES_LUGIA] = 6,
     [SPECIES_HO_OH] = 6,
     [SPECIES_CELEBI] = 15,
-    [SPECIES_OLD_UNOWN_B] = 0,
-    [SPECIES_OLD_UNOWN_C] = 0,
-    [SPECIES_OLD_UNOWN_D] = 0,
-    [SPECIES_OLD_UNOWN_E] = 0,
-    [SPECIES_OLD_UNOWN_F] = 0,
-    [SPECIES_OLD_UNOWN_G] = 0,
-    [SPECIES_OLD_UNOWN_H] = 0,
-    [SPECIES_OLD_UNOWN_I] = 0,
-    [SPECIES_OLD_UNOWN_J] = 0,
-    [SPECIES_OLD_UNOWN_K] = 0,
-    [SPECIES_OLD_UNOWN_L] = 0,
-    [SPECIES_OLD_UNOWN_M] = 0,
-    [SPECIES_OLD_UNOWN_N] = 0,
-    [SPECIES_OLD_UNOWN_O] = 0,
-    [SPECIES_OLD_UNOWN_P] = 0,
-    [SPECIES_OLD_UNOWN_Q] = 0,
-    [SPECIES_OLD_UNOWN_R] = 0,
-    [SPECIES_OLD_UNOWN_S] = 0,
-    [SPECIES_OLD_UNOWN_T] = 0,
-    [SPECIES_OLD_UNOWN_U] = 0,
-    [SPECIES_OLD_UNOWN_V] = 0,
-    [SPECIES_OLD_UNOWN_W] = 0,
-    [SPECIES_OLD_UNOWN_X] = 0,
-    [SPECIES_OLD_UNOWN_Y] = 0,
-    [SPECIES_OLD_UNOWN_Z] = 0,
-    [SPECIES_TREECKO] = 0,
-    [SPECIES_GROVYLE] = 0,
-    [SPECIES_SCEPTILE] = 0,
-    [SPECIES_TORCHIC] = 0,
-    [SPECIES_COMBUSKEN] = 0,
-    [SPECIES_BLAZIKEN] = 0,
-    [SPECIES_MUDKIP] = 0,
-    [SPECIES_MARSHTOMP] = 0,
-    [SPECIES_SWAMPERT] = 0,
-    [SPECIES_POOCHYENA] = 0,
-    [SPECIES_MIGHTYENA] = 0,
-    [SPECIES_ZIGZAGOON] = 0,
-    [SPECIES_LINOONE] = 0,
-    [SPECIES_WURMPLE] = 0,
-    [SPECIES_SILCOON] = 0,
     [SPECIES_BEAUTIFLY] = 8,
-    [SPECIES_CASCOON] = 0,
     [SPECIES_DUSTOX] = 10,
-    [SPECIES_LOTAD] = 0,
-    [SPECIES_LOMBRE] = 0,
-    [SPECIES_LUDICOLO] = 0,
-    [SPECIES_SEEDOT] = 0,
-    [SPECIES_NUZLEAF] = 0,
-    [SPECIES_SHIFTRY] = 0,
-    [SPECIES_NINCADA] = 0,
     [SPECIES_NINJASK] = 10,
     [SPECIES_SHEDINJA] = 8,
-    [SPECIES_TAILLOW] = 0,
-    [SPECIES_SWELLOW] = 0,
-    [SPECIES_SHROOMISH] = 0,
-    [SPECIES_BRELOOM] = 0,
-    [SPECIES_SPINDA] = 0,
     [SPECIES_WINGULL] = 16,
     [SPECIES_PELIPPER] = 8,
-    [SPECIES_SURSKIT] = 0,
     [SPECIES_MASQUERAIN] = 10,
-    [SPECIES_WAILMER] = 0,
-    [SPECIES_WAILORD] = 0,
-    [SPECIES_SKITTY] = 0,
-    [SPECIES_DELCATTY] = 0,
-    [SPECIES_KECLEON] = 0,
     [SPECIES_BALTOY] = 4,
     [SPECIES_CLAYDOL] = 10,
-    [SPECIES_NOSEPASS] = 0,
-    [SPECIES_TORKOAL] = 0,
-    [SPECIES_SABLEYE] = 0,
-    [SPECIES_BARBOACH] = 0,
-    [SPECIES_WHISCASH] = 0,
-    [SPECIES_LUVDISC] = 0,
-    [SPECIES_CORPHISH] = 0,
-    [SPECIES_CRAWDAUNT] = 0,
-    [SPECIES_FEEBAS] = 0,
-    [SPECIES_MILOTIC] = 0,
-    [SPECIES_CARVANHA] = 0,
-    [SPECIES_SHARPEDO] = 0,
-    [SPECIES_TRAPINCH] = 0,
-    [SPECIES_VIBRAVA] = 0,
     [SPECIES_FLYGON] = 7,
-    [SPECIES_MAKUHITA] = 0,
-    [SPECIES_HARIYAMA] = 0,
-    [SPECIES_ELECTRIKE] = 0,
-    [SPECIES_MANECTRIC] = 0,
-    [SPECIES_NUMEL] = 0,
-    [SPECIES_CAMERUPT] = 0,
-    [SPECIES_SPHEAL] = 0,
-    [SPECIES_SEALEO] = 0,
-    [SPECIES_WALREIN] = 0,
-    [SPECIES_CACNEA] = 0,
-    [SPECIES_CACTURNE] = 0,
-    [SPECIES_SNORUNT] = 0,
     [SPECIES_GLALIE] = 12,
     [SPECIES_LUNATONE] = 13,
     [SPECIES_SOLROCK] = 4,
-    [SPECIES_AZURILL] = 0,
-    [SPECIES_SPOINK] = 0,
-    [SPECIES_GRUMPIG] = 0,
-    [SPECIES_PLUSLE] = 0,
-    [SPECIES_MINUN] = 0,
-    [SPECIES_MAWILE] = 0,
-    [SPECIES_MEDITITE] = 0,
-    [SPECIES_MEDICHAM] = 0,
     [SPECIES_SWABLU] = 12,
     [SPECIES_ALTARIA] = 8,
-    [SPECIES_WYNAUT] = 0,
     [SPECIES_DUSKULL] = 9,
-    [SPECIES_DUSCLOPS] = 0,
-    [SPECIES_ROSELIA] = 0,
-    [SPECIES_SLAKOTH] = 0,
-    [SPECIES_VIGOROTH] = 0,
-    [SPECIES_SLAKING] = 0,
-    [SPECIES_GULPIN] = 0,
-    [SPECIES_SWALOT] = 0,
-    [SPECIES_TROPIUS] = 0,
-    [SPECIES_WHISMUR] = 0,
-    [SPECIES_LOUDRED] = 0,
-    [SPECIES_EXPLOUD] = 0,
-    [SPECIES_CLAMPERL] = 0,
-    [SPECIES_HUNTAIL] = 0,
-    [SPECIES_GOREBYSS] = 0,
-    [SPECIES_ABSOL] = 0,
     [SPECIES_SHUPPET] = 12,
     [SPECIES_BANETTE] = 8,
-    [SPECIES_SEVIPER] = 0,
-    [SPECIES_ZANGOOSE] = 0,
-    [SPECIES_RELICANTH] = 0,
-    [SPECIES_ARON] = 0,
-    [SPECIES_LAIRON] = 0,
-    [SPECIES_AGGRON] = 0,
     [SPECIES_CASTFORM] = 16,
-    [SPECIES_VOLBEAT] = 0,
-    [SPECIES_ILLUMISE] = 0,
-    [SPECIES_LILEEP] = 0,
-    [SPECIES_CRADILY] = 0,
-    [SPECIES_ANORITH] = 0,
-    [SPECIES_ARMALDO] = 0,
-    [SPECIES_RALTS] = 0,
-    [SPECIES_KIRLIA] = 0,
-    [SPECIES_GARDEVOIR] = 0,
-    [SPECIES_BAGON] = 0,
-    [SPECIES_SHELGON] = 0,
-    [SPECIES_SALAMENCE] = 0,
     [SPECIES_BELDUM] = 8,
-    [SPECIES_METANG] = 0,
-    [SPECIES_METAGROSS] = 0,
-    [SPECIES_REGIROCK] = 0,
-    [SPECIES_REGICE] = 0,
-    [SPECIES_REGISTEEL] = 0,
-    [SPECIES_KYOGRE] = 0,
-    [SPECIES_GROUDON] = 0,
     [SPECIES_RAYQUAZA] = 6,
     [SPECIES_LATIAS] = 6,
     [SPECIES_LATIOS] = 6,
diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h
index 779ce3dcd..86ca06790 100644
--- a/src/data/pokemon_graphics/footprint_table.h
+++ b/src/data/pokemon_graphics/footprint_table.h
@@ -1,416 +1,416 @@
 const u8 *const gMonFootprintTable[] =
 {
-    gMonFootprint_Bulbasaur,
-    gMonFootprint_Bulbasaur,
-    gMonFootprint_Ivysaur,
-    gMonFootprint_Venusaur,
-    gMonFootprint_Charmander,
-    gMonFootprint_Charmeleon,
-    gMonFootprint_Charizard,
-    gMonFootprint_Squirtle,
-    gMonFootprint_Wartortle,
-    gMonFootprint_Blastoise,
-    gMonFootprint_Caterpie,
-    gMonFootprint_Metapod,
-    gMonFootprint_Butterfree,
-    gMonFootprint_Weedle,
-    gMonFootprint_Kakuna,
-    gMonFootprint_Beedrill,
-    gMonFootprint_Pidgey,
-    gMonFootprint_Pidgeotto,
-    gMonFootprint_Pidgeot,
-    gMonFootprint_Rattata,
-    gMonFootprint_Raticate,
-    gMonFootprint_Spearow,
-    gMonFootprint_Fearow,
-    gMonFootprint_Ekans,
-    gMonFootprint_Arbok,
-    gMonFootprint_Pikachu,
-    gMonFootprint_Raichu,
-    gMonFootprint_Sandshrew,
-    gMonFootprint_Sandslash,
-    gMonFootprint_NidoranF,
-    gMonFootprint_Nidorina,
-    gMonFootprint_Nidoqueen,
-    gMonFootprint_NidoranM,
-    gMonFootprint_Nidorino,
-    gMonFootprint_Nidoking,
-    gMonFootprint_Clefairy,
-    gMonFootprint_Clefable,
-    gMonFootprint_Vulpix,
-    gMonFootprint_Ninetales,
-    gMonFootprint_Jigglypuff,
-    gMonFootprint_Wigglytuff,
-    gMonFootprint_Zubat,
-    gMonFootprint_Golbat,
-    gMonFootprint_Oddish,
-    gMonFootprint_Gloom,
-    gMonFootprint_Vileplume,
-    gMonFootprint_Paras,
-    gMonFootprint_Parasect,
-    gMonFootprint_Venonat,
-    gMonFootprint_Venomoth,
-    gMonFootprint_Diglett,
-    gMonFootprint_Dugtrio,
-    gMonFootprint_Meowth,
-    gMonFootprint_Persian,
-    gMonFootprint_Psyduck,
-    gMonFootprint_Golduck,
-    gMonFootprint_Mankey,
-    gMonFootprint_Primeape,
-    gMonFootprint_Growlithe,
-    gMonFootprint_Arcanine,
-    gMonFootprint_Poliwag,
-    gMonFootprint_Poliwhirl,
-    gMonFootprint_Poliwrath,
-    gMonFootprint_Abra,
-    gMonFootprint_Kadabra,
-    gMonFootprint_Alakazam,
-    gMonFootprint_Machop,
-    gMonFootprint_Machoke,
-    gMonFootprint_Machamp,
-    gMonFootprint_Bellsprout,
-    gMonFootprint_Weepinbell,
-    gMonFootprint_Victreebel,
-    gMonFootprint_Tentacool,
-    gMonFootprint_Tentacruel,
-    gMonFootprint_Geodude,
-    gMonFootprint_Graveler,
-    gMonFootprint_Golem,
-    gMonFootprint_Ponyta,
-    gMonFootprint_Rapidash,
-    gMonFootprint_Slowpoke,
-    gMonFootprint_Slowbro,
-    gMonFootprint_Magnemite,
-    gMonFootprint_Magneton,
-    gMonFootprint_Farfetchd,
-    gMonFootprint_Doduo,
-    gMonFootprint_Dodrio,
-    gMonFootprint_Seel,
-    gMonFootprint_Dewgong,
-    gMonFootprint_Grimer,
-    gMonFootprint_Muk,
-    gMonFootprint_Shellder,
-    gMonFootprint_Cloyster,
-    gMonFootprint_Gastly,
-    gMonFootprint_Haunter,
-    gMonFootprint_Gengar,
-    gMonFootprint_Onix,
-    gMonFootprint_Drowzee,
-    gMonFootprint_Hypno,
-    gMonFootprint_Krabby,
-    gMonFootprint_Kingler,
-    gMonFootprint_Voltorb,
-    gMonFootprint_Electrode,
-    gMonFootprint_Exeggcute,
-    gMonFootprint_Exeggutor,
-    gMonFootprint_Cubone,
-    gMonFootprint_Marowak,
-    gMonFootprint_Hitmonlee,
-    gMonFootprint_Hitmonchan,
-    gMonFootprint_Lickitung,
-    gMonFootprint_Koffing,
-    gMonFootprint_Weezing,
-    gMonFootprint_Rhyhorn,
-    gMonFootprint_Rhydon,
-    gMonFootprint_Chansey,
-    gMonFootprint_Tangela,
-    gMonFootprint_Kangaskhan,
-    gMonFootprint_Horsea,
-    gMonFootprint_Seadra,
-    gMonFootprint_Goldeen,
-    gMonFootprint_Seaking,
-    gMonFootprint_Staryu,
-    gMonFootprint_Starmie,
-    gMonFootprint_Mrmime,
-    gMonFootprint_Scyther,
-    gMonFootprint_Jynx,
-    gMonFootprint_Electabuzz,
-    gMonFootprint_Magmar,
-    gMonFootprint_Pinsir,
-    gMonFootprint_Tauros,
-    gMonFootprint_Magikarp,
-    gMonFootprint_Gyarados,
-    gMonFootprint_Lapras,
-    gMonFootprint_Ditto,
-    gMonFootprint_Eevee,
-    gMonFootprint_Vaporeon,
-    gMonFootprint_Jolteon,
-    gMonFootprint_Flareon,
-    gMonFootprint_Porygon,
-    gMonFootprint_Omanyte,
-    gMonFootprint_Omastar,
-    gMonFootprint_Kabuto,
-    gMonFootprint_Kabutops,
-    gMonFootprint_Aerodactyl,
-    gMonFootprint_Snorlax,
-    gMonFootprint_Articuno,
-    gMonFootprint_Zapdos,
-    gMonFootprint_Moltres,
-    gMonFootprint_Dratini,
-    gMonFootprint_Dragonair,
-    gMonFootprint_Dragonite,
-    gMonFootprint_Mewtwo,
-    gMonFootprint_Mew,
-    gMonFootprint_Chikorita,
-    gMonFootprint_Bayleef,
-    gMonFootprint_Meganium,
-    gMonFootprint_Cyndaquil,
-    gMonFootprint_Quilava,
-    gMonFootprint_Typhlosion,
-    gMonFootprint_Totodile,
-    gMonFootprint_Croconaw,
-    gMonFootprint_Feraligatr,
-    gMonFootprint_Sentret,
-    gMonFootprint_Furret,
-    gMonFootprint_Hoothoot,
-    gMonFootprint_Noctowl,
-    gMonFootprint_Ledyba,
-    gMonFootprint_Ledian,
-    gMonFootprint_Spinarak,
-    gMonFootprint_Ariados,
-    gMonFootprint_Crobat,
-    gMonFootprint_Chinchou,
-    gMonFootprint_Lanturn,
-    gMonFootprint_Pichu,
-    gMonFootprint_Cleffa,
-    gMonFootprint_Igglybuff,
-    gMonFootprint_Togepi,
-    gMonFootprint_Togetic,
-    gMonFootprint_Natu,
-    gMonFootprint_Xatu,
-    gMonFootprint_Mareep,
-    gMonFootprint_Flaaffy,
-    gMonFootprint_Ampharos,
-    gMonFootprint_Bellossom,
-    gMonFootprint_Marill,
-    gMonFootprint_Azumarill,
-    gMonFootprint_Sudowoodo,
-    gMonFootprint_Politoed,
-    gMonFootprint_Hoppip,
-    gMonFootprint_Skiploom,
-    gMonFootprint_Jumpluff,
-    gMonFootprint_Aipom,
-    gMonFootprint_Sunkern,
-    gMonFootprint_Sunflora,
-    gMonFootprint_Yanma,
-    gMonFootprint_Wooper,
-    gMonFootprint_Quagsire,
-    gMonFootprint_Espeon,
-    gMonFootprint_Umbreon,
-    gMonFootprint_Murkrow,
-    gMonFootprint_Slowking,
-    gMonFootprint_Misdreavus,
-    gMonFootprint_Unown,
-    gMonFootprint_Wobbuffet,
-    gMonFootprint_Girafarig,
-    gMonFootprint_Pineco,
-    gMonFootprint_Forretress,
-    gMonFootprint_Dunsparce,
-    gMonFootprint_Gligar,
-    gMonFootprint_Steelix,
-    gMonFootprint_Snubbull,
-    gMonFootprint_Granbull,
-    gMonFootprint_Qwilfish,
-    gMonFootprint_Scizor,
-    gMonFootprint_Shuckle,
-    gMonFootprint_Heracross,
-    gMonFootprint_Sneasel,
-    gMonFootprint_Teddiursa,
-    gMonFootprint_Ursaring,
-    gMonFootprint_Slugma,
-    gMonFootprint_Magcargo,
-    gMonFootprint_Swinub,
-    gMonFootprint_Piloswine,
-    gMonFootprint_Corsola,
-    gMonFootprint_Remoraid,
-    gMonFootprint_Octillery,
-    gMonFootprint_Delibird,
-    gMonFootprint_Mantine,
-    gMonFootprint_Skarmory,
-    gMonFootprint_Houndour,
-    gMonFootprint_Houndoom,
-    gMonFootprint_Kingdra,
-    gMonFootprint_Phanpy,
-    gMonFootprint_Donphan,
-    gMonFootprint_Porygon2,
-    gMonFootprint_Stantler,
-    gMonFootprint_Smeargle,
-    gMonFootprint_Tyrogue,
-    gMonFootprint_Hitmontop,
-    gMonFootprint_Smoochum,
-    gMonFootprint_Elekid,
-    gMonFootprint_Magby,
-    gMonFootprint_Miltank,
-    gMonFootprint_Blissey,
-    gMonFootprint_Raikou,
-    gMonFootprint_Entei,
-    gMonFootprint_Suicune,
-    gMonFootprint_Larvitar,
-    gMonFootprint_Pupitar,
-    gMonFootprint_Tyranitar,
-    gMonFootprint_Lugia,
-    gMonFootprint_HoOh,
-    gMonFootprint_Celebi,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_QuestionMark,
-    gMonFootprint_Treecko,
-    gMonFootprint_Grovyle,
-    gMonFootprint_Sceptile,
-    gMonFootprint_Torchic,
-    gMonFootprint_Combusken,
-    gMonFootprint_Blaziken,
-    gMonFootprint_Mudkip,
-    gMonFootprint_Marshtomp,
-    gMonFootprint_Swampert,
-    gMonFootprint_Poochyena,
-    gMonFootprint_Mightyena,
-    gMonFootprint_Zigzagoon,
-    gMonFootprint_Linoone,
-    gMonFootprint_Wurmple,
-    gMonFootprint_Silcoon,
-    gMonFootprint_Beautifly,
-    gMonFootprint_Cascoon,
-    gMonFootprint_Dustox,
-    gMonFootprint_Lotad,
-    gMonFootprint_Lombre,
-    gMonFootprint_Ludicolo,
-    gMonFootprint_Seedot,
-    gMonFootprint_Nuzleaf,
-    gMonFootprint_Shiftry,
-    gMonFootprint_Nincada,
-    gMonFootprint_Ninjask,
-    gMonFootprint_Shedinja,
-    gMonFootprint_Taillow,
-    gMonFootprint_Swellow,
-    gMonFootprint_Shroomish,
-    gMonFootprint_Breloom,
-    gMonFootprint_Spinda,
-    gMonFootprint_Wingull,
-    gMonFootprint_Pelipper,
-    gMonFootprint_Surskit,
-    gMonFootprint_Masquerain,
-    gMonFootprint_Wailmer,
-    gMonFootprint_Wailord,
-    gMonFootprint_Skitty,
-    gMonFootprint_Delcatty,
-    gMonFootprint_Kecleon,
-    gMonFootprint_Baltoy,
-    gMonFootprint_Claydol,
-    gMonFootprint_Nosepass,
-    gMonFootprint_Torkoal,
-    gMonFootprint_Sableye,
-    gMonFootprint_Barboach,
-    gMonFootprint_Whiscash,
-    gMonFootprint_Luvdisc,
-    gMonFootprint_Corphish,
-    gMonFootprint_Crawdaunt,
-    gMonFootprint_Feebas,
-    gMonFootprint_Milotic,
-    gMonFootprint_Carvanha,
-    gMonFootprint_Sharpedo,
-    gMonFootprint_Trapinch,
-    gMonFootprint_Vibrava,
-    gMonFootprint_Flygon,
-    gMonFootprint_Makuhita,
-    gMonFootprint_Hariyama,
-    gMonFootprint_Electrike,
-    gMonFootprint_Manectric,
-    gMonFootprint_Numel,
-    gMonFootprint_Camerupt,
-    gMonFootprint_Spheal,
-    gMonFootprint_Sealeo,
-    gMonFootprint_Walrein,
-    gMonFootprint_Cacnea,
-    gMonFootprint_Cacturne,
-    gMonFootprint_Snorunt,
-    gMonFootprint_Glalie,
-    gMonFootprint_Lunatone,
-    gMonFootprint_Solrock,
-    gMonFootprint_Azurill,
-    gMonFootprint_Spoink,
-    gMonFootprint_Grumpig,
-    gMonFootprint_Plusle,
-    gMonFootprint_Minun,
-    gMonFootprint_Mawile,
-    gMonFootprint_Meditite,
-    gMonFootprint_Medicham,
-    gMonFootprint_Swablu,
-    gMonFootprint_Altaria,
-    gMonFootprint_Wynaut,
-    gMonFootprint_Duskull,
-    gMonFootprint_Dusclops,
-    gMonFootprint_Roselia,
-    gMonFootprint_Slakoth,
-    gMonFootprint_Vigoroth,
-    gMonFootprint_Slaking,
-    gMonFootprint_Gulpin,
-    gMonFootprint_Swalot,
-    gMonFootprint_Tropius,
-    gMonFootprint_Whismur,
-    gMonFootprint_Loudred,
-    gMonFootprint_Exploud,
-    gMonFootprint_Clamperl,
-    gMonFootprint_Huntail,
-    gMonFootprint_Gorebyss,
-    gMonFootprint_Absol,
-    gMonFootprint_Shuppet,
-    gMonFootprint_Banette,
-    gMonFootprint_Seviper,
-    gMonFootprint_Zangoose,
-    gMonFootprint_Relicanth,
-    gMonFootprint_Aron,
-    gMonFootprint_Lairon,
-    gMonFootprint_Aggron,
-    gMonFootprint_Castform,
-    gMonFootprint_Volbeat,
-    gMonFootprint_Illumise,
-    gMonFootprint_Lileep,
-    gMonFootprint_Cradily,
-    gMonFootprint_Anorith,
-    gMonFootprint_Armaldo,
-    gMonFootprint_Ralts,
-    gMonFootprint_Kirlia,
-    gMonFootprint_Gardevoir,
-    gMonFootprint_Bagon,
-    gMonFootprint_Shelgon,
-    gMonFootprint_Salamence,
-    gMonFootprint_Beldum,
-    gMonFootprint_Metang,
-    gMonFootprint_Metagross,
-    gMonFootprint_Regirock,
-    gMonFootprint_Regice,
-    gMonFootprint_Registeel,
-    gMonFootprint_Kyogre,
-    gMonFootprint_Groudon,
-    gMonFootprint_Rayquaza,
-    gMonFootprint_Latias,
-    gMonFootprint_Latios,
-    gMonFootprint_Jirachi,
-    gMonFootprint_Deoxys,
-    gMonFootprint_Chimecho,
-    gMonFootprint_Bulbasaur,
+    [SPECIES_NONE] = gMonFootprint_Bulbasaur,
+    [SPECIES_BULBASAUR] = gMonFootprint_Bulbasaur,
+    [SPECIES_IVYSAUR] = gMonFootprint_Ivysaur,
+    [SPECIES_VENUSAUR] = gMonFootprint_Venusaur,
+    [SPECIES_CHARMANDER] = gMonFootprint_Charmander,
+    [SPECIES_CHARMELEON] = gMonFootprint_Charmeleon,
+    [SPECIES_CHARIZARD] = gMonFootprint_Charizard,
+    [SPECIES_SQUIRTLE] = gMonFootprint_Squirtle,
+    [SPECIES_WARTORTLE] = gMonFootprint_Wartortle,
+    [SPECIES_BLASTOISE] = gMonFootprint_Blastoise,
+    [SPECIES_CATERPIE] = gMonFootprint_Caterpie,
+    [SPECIES_METAPOD] = gMonFootprint_Metapod,
+    [SPECIES_BUTTERFREE] = gMonFootprint_Butterfree,
+    [SPECIES_WEEDLE] = gMonFootprint_Weedle,
+    [SPECIES_KAKUNA] = gMonFootprint_Kakuna,
+    [SPECIES_BEEDRILL] = gMonFootprint_Beedrill,
+    [SPECIES_PIDGEY] = gMonFootprint_Pidgey,
+    [SPECIES_PIDGEOTTO] = gMonFootprint_Pidgeotto,
+    [SPECIES_PIDGEOT] = gMonFootprint_Pidgeot,
+    [SPECIES_RATTATA] = gMonFootprint_Rattata,
+    [SPECIES_RATICATE] = gMonFootprint_Raticate,
+    [SPECIES_SPEAROW] = gMonFootprint_Spearow,
+    [SPECIES_FEAROW] = gMonFootprint_Fearow,
+    [SPECIES_EKANS] = gMonFootprint_Ekans,
+    [SPECIES_ARBOK] = gMonFootprint_Arbok,
+    [SPECIES_PIKACHU] = gMonFootprint_Pikachu,
+    [SPECIES_RAICHU] = gMonFootprint_Raichu,
+    [SPECIES_SANDSHREW] = gMonFootprint_Sandshrew,
+    [SPECIES_SANDSLASH] = gMonFootprint_Sandslash,
+    [SPECIES_NIDORAN_F] = gMonFootprint_NidoranF,
+    [SPECIES_NIDORINA] = gMonFootprint_Nidorina,
+    [SPECIES_NIDOQUEEN] = gMonFootprint_Nidoqueen,
+    [SPECIES_NIDORAN_M] = gMonFootprint_NidoranM,
+    [SPECIES_NIDORINO] = gMonFootprint_Nidorino,
+    [SPECIES_NIDOKING] = gMonFootprint_Nidoking,
+    [SPECIES_CLEFAIRY] = gMonFootprint_Clefairy,
+    [SPECIES_CLEFABLE] = gMonFootprint_Clefable,
+    [SPECIES_VULPIX] = gMonFootprint_Vulpix,
+    [SPECIES_NINETALES] = gMonFootprint_Ninetales,
+    [SPECIES_JIGGLYPUFF] = gMonFootprint_Jigglypuff,
+    [SPECIES_WIGGLYTUFF] = gMonFootprint_Wigglytuff,
+    [SPECIES_ZUBAT] = gMonFootprint_Zubat,
+    [SPECIES_GOLBAT] = gMonFootprint_Golbat,
+    [SPECIES_ODDISH] = gMonFootprint_Oddish,
+    [SPECIES_GLOOM] = gMonFootprint_Gloom,
+    [SPECIES_VILEPLUME] = gMonFootprint_Vileplume,
+    [SPECIES_PARAS] = gMonFootprint_Paras,
+    [SPECIES_PARASECT] = gMonFootprint_Parasect,
+    [SPECIES_VENONAT] = gMonFootprint_Venonat,
+    [SPECIES_VENOMOTH] = gMonFootprint_Venomoth,
+    [SPECIES_DIGLETT] = gMonFootprint_Diglett,
+    [SPECIES_DUGTRIO] = gMonFootprint_Dugtrio,
+    [SPECIES_MEOWTH] = gMonFootprint_Meowth,
+    [SPECIES_PERSIAN] = gMonFootprint_Persian,
+    [SPECIES_PSYDUCK] = gMonFootprint_Psyduck,
+    [SPECIES_GOLDUCK] = gMonFootprint_Golduck,
+    [SPECIES_MANKEY] = gMonFootprint_Mankey,
+    [SPECIES_PRIMEAPE] = gMonFootprint_Primeape,
+    [SPECIES_GROWLITHE] = gMonFootprint_Growlithe,
+    [SPECIES_ARCANINE] = gMonFootprint_Arcanine,
+    [SPECIES_POLIWAG] = gMonFootprint_Poliwag,
+    [SPECIES_POLIWHIRL] = gMonFootprint_Poliwhirl,
+    [SPECIES_POLIWRATH] = gMonFootprint_Poliwrath,
+    [SPECIES_ABRA] = gMonFootprint_Abra,
+    [SPECIES_KADABRA] = gMonFootprint_Kadabra,
+    [SPECIES_ALAKAZAM] = gMonFootprint_Alakazam,
+    [SPECIES_MACHOP] = gMonFootprint_Machop,
+    [SPECIES_MACHOKE] = gMonFootprint_Machoke,
+    [SPECIES_MACHAMP] = gMonFootprint_Machamp,
+    [SPECIES_BELLSPROUT] = gMonFootprint_Bellsprout,
+    [SPECIES_WEEPINBELL] = gMonFootprint_Weepinbell,
+    [SPECIES_VICTREEBEL] = gMonFootprint_Victreebel,
+    [SPECIES_TENTACOOL] = gMonFootprint_Tentacool,
+    [SPECIES_TENTACRUEL] = gMonFootprint_Tentacruel,
+    [SPECIES_GEODUDE] = gMonFootprint_Geodude,
+    [SPECIES_GRAVELER] = gMonFootprint_Graveler,
+    [SPECIES_GOLEM] = gMonFootprint_Golem,
+    [SPECIES_PONYTA] = gMonFootprint_Ponyta,
+    [SPECIES_RAPIDASH] = gMonFootprint_Rapidash,
+    [SPECIES_SLOWPOKE] = gMonFootprint_Slowpoke,
+    [SPECIES_SLOWBRO] = gMonFootprint_Slowbro,
+    [SPECIES_MAGNEMITE] = gMonFootprint_Magnemite,
+    [SPECIES_MAGNETON] = gMonFootprint_Magneton,
+    [SPECIES_FARFETCHD] = gMonFootprint_Farfetchd,
+    [SPECIES_DODUO] = gMonFootprint_Doduo,
+    [SPECIES_DODRIO] = gMonFootprint_Dodrio,
+    [SPECIES_SEEL] = gMonFootprint_Seel,
+    [SPECIES_DEWGONG] = gMonFootprint_Dewgong,
+    [SPECIES_GRIMER] = gMonFootprint_Grimer,
+    [SPECIES_MUK] = gMonFootprint_Muk,
+    [SPECIES_SHELLDER] = gMonFootprint_Shellder,
+    [SPECIES_CLOYSTER] = gMonFootprint_Cloyster,
+    [SPECIES_GASTLY] = gMonFootprint_Gastly,
+    [SPECIES_HAUNTER] = gMonFootprint_Haunter,
+    [SPECIES_GENGAR] = gMonFootprint_Gengar,
+    [SPECIES_ONIX] = gMonFootprint_Onix,
+    [SPECIES_DROWZEE] = gMonFootprint_Drowzee,
+    [SPECIES_HYPNO] = gMonFootprint_Hypno,
+    [SPECIES_KRABBY] = gMonFootprint_Krabby,
+    [SPECIES_KINGLER] = gMonFootprint_Kingler,
+    [SPECIES_VOLTORB] = gMonFootprint_Voltorb,
+    [SPECIES_ELECTRODE] = gMonFootprint_Electrode,
+    [SPECIES_EXEGGCUTE] = gMonFootprint_Exeggcute,
+    [SPECIES_EXEGGUTOR] = gMonFootprint_Exeggutor,
+    [SPECIES_CUBONE] = gMonFootprint_Cubone,
+    [SPECIES_MAROWAK] = gMonFootprint_Marowak,
+    [SPECIES_HITMONLEE] = gMonFootprint_Hitmonlee,
+    [SPECIES_HITMONCHAN] = gMonFootprint_Hitmonchan,
+    [SPECIES_LICKITUNG] = gMonFootprint_Lickitung,
+    [SPECIES_KOFFING] = gMonFootprint_Koffing,
+    [SPECIES_WEEZING] = gMonFootprint_Weezing,
+    [SPECIES_RHYHORN] = gMonFootprint_Rhyhorn,
+    [SPECIES_RHYDON] = gMonFootprint_Rhydon,
+    [SPECIES_CHANSEY] = gMonFootprint_Chansey,
+    [SPECIES_TANGELA] = gMonFootprint_Tangela,
+    [SPECIES_KANGASKHAN] = gMonFootprint_Kangaskhan,
+    [SPECIES_HORSEA] = gMonFootprint_Horsea,
+    [SPECIES_SEADRA] = gMonFootprint_Seadra,
+    [SPECIES_GOLDEEN] = gMonFootprint_Goldeen,
+    [SPECIES_SEAKING] = gMonFootprint_Seaking,
+    [SPECIES_STARYU] = gMonFootprint_Staryu,
+    [SPECIES_STARMIE] = gMonFootprint_Starmie,
+    [SPECIES_MR_MIME] = gMonFootprint_Mrmime,
+    [SPECIES_SCYTHER] = gMonFootprint_Scyther,
+    [SPECIES_JYNX] = gMonFootprint_Jynx,
+    [SPECIES_ELECTABUZZ] = gMonFootprint_Electabuzz,
+    [SPECIES_MAGMAR] = gMonFootprint_Magmar,
+    [SPECIES_PINSIR] = gMonFootprint_Pinsir,
+    [SPECIES_TAUROS] = gMonFootprint_Tauros,
+    [SPECIES_MAGIKARP] = gMonFootprint_Magikarp,
+    [SPECIES_GYARADOS] = gMonFootprint_Gyarados,
+    [SPECIES_LAPRAS] = gMonFootprint_Lapras,
+    [SPECIES_DITTO] = gMonFootprint_Ditto,
+    [SPECIES_EEVEE] = gMonFootprint_Eevee,
+    [SPECIES_VAPOREON] = gMonFootprint_Vaporeon,
+    [SPECIES_JOLTEON] = gMonFootprint_Jolteon,
+    [SPECIES_FLAREON] = gMonFootprint_Flareon,
+    [SPECIES_PORYGON] = gMonFootprint_Porygon,
+    [SPECIES_OMANYTE] = gMonFootprint_Omanyte,
+    [SPECIES_OMASTAR] = gMonFootprint_Omastar,
+    [SPECIES_KABUTO] = gMonFootprint_Kabuto,
+    [SPECIES_KABUTOPS] = gMonFootprint_Kabutops,
+    [SPECIES_AERODACTYL] = gMonFootprint_Aerodactyl,
+    [SPECIES_SNORLAX] = gMonFootprint_Snorlax,
+    [SPECIES_ARTICUNO] = gMonFootprint_Articuno,
+    [SPECIES_ZAPDOS] = gMonFootprint_Zapdos,
+    [SPECIES_MOLTRES] = gMonFootprint_Moltres,
+    [SPECIES_DRATINI] = gMonFootprint_Dratini,
+    [SPECIES_DRAGONAIR] = gMonFootprint_Dragonair,
+    [SPECIES_DRAGONITE] = gMonFootprint_Dragonite,
+    [SPECIES_MEWTWO] = gMonFootprint_Mewtwo,
+    [SPECIES_MEW] = gMonFootprint_Mew,
+    [SPECIES_CHIKORITA] = gMonFootprint_Chikorita,
+    [SPECIES_BAYLEEF] = gMonFootprint_Bayleef,
+    [SPECIES_MEGANIUM] = gMonFootprint_Meganium,
+    [SPECIES_CYNDAQUIL] = gMonFootprint_Cyndaquil,
+    [SPECIES_QUILAVA] = gMonFootprint_Quilava,
+    [SPECIES_TYPHLOSION] = gMonFootprint_Typhlosion,
+    [SPECIES_TOTODILE] = gMonFootprint_Totodile,
+    [SPECIES_CROCONAW] = gMonFootprint_Croconaw,
+    [SPECIES_FERALIGATR] = gMonFootprint_Feraligatr,
+    [SPECIES_SENTRET] = gMonFootprint_Sentret,
+    [SPECIES_FURRET] = gMonFootprint_Furret,
+    [SPECIES_HOOTHOOT] = gMonFootprint_Hoothoot,
+    [SPECIES_NOCTOWL] = gMonFootprint_Noctowl,
+    [SPECIES_LEDYBA] = gMonFootprint_Ledyba,
+    [SPECIES_LEDIAN] = gMonFootprint_Ledian,
+    [SPECIES_SPINARAK] = gMonFootprint_Spinarak,
+    [SPECIES_ARIADOS] = gMonFootprint_Ariados,
+    [SPECIES_CROBAT] = gMonFootprint_Crobat,
+    [SPECIES_CHINCHOU] = gMonFootprint_Chinchou,
+    [SPECIES_LANTURN] = gMonFootprint_Lanturn,
+    [SPECIES_PICHU] = gMonFootprint_Pichu,
+    [SPECIES_CLEFFA] = gMonFootprint_Cleffa,
+    [SPECIES_IGGLYBUFF] = gMonFootprint_Igglybuff,
+    [SPECIES_TOGEPI] = gMonFootprint_Togepi,
+    [SPECIES_TOGETIC] = gMonFootprint_Togetic,
+    [SPECIES_NATU] = gMonFootprint_Natu,
+    [SPECIES_XATU] = gMonFootprint_Xatu,
+    [SPECIES_MAREEP] = gMonFootprint_Mareep,
+    [SPECIES_FLAAFFY] = gMonFootprint_Flaaffy,
+    [SPECIES_AMPHAROS] = gMonFootprint_Ampharos,
+    [SPECIES_BELLOSSOM] = gMonFootprint_Bellossom,
+    [SPECIES_MARILL] = gMonFootprint_Marill,
+    [SPECIES_AZUMARILL] = gMonFootprint_Azumarill,
+    [SPECIES_SUDOWOODO] = gMonFootprint_Sudowoodo,
+    [SPECIES_POLITOED] = gMonFootprint_Politoed,
+    [SPECIES_HOPPIP] = gMonFootprint_Hoppip,
+    [SPECIES_SKIPLOOM] = gMonFootprint_Skiploom,
+    [SPECIES_JUMPLUFF] = gMonFootprint_Jumpluff,
+    [SPECIES_AIPOM] = gMonFootprint_Aipom,
+    [SPECIES_SUNKERN] = gMonFootprint_Sunkern,
+    [SPECIES_SUNFLORA] = gMonFootprint_Sunflora,
+    [SPECIES_YANMA] = gMonFootprint_Yanma,
+    [SPECIES_WOOPER] = gMonFootprint_Wooper,
+    [SPECIES_QUAGSIRE] = gMonFootprint_Quagsire,
+    [SPECIES_ESPEON] = gMonFootprint_Espeon,
+    [SPECIES_UMBREON] = gMonFootprint_Umbreon,
+    [SPECIES_MURKROW] = gMonFootprint_Murkrow,
+    [SPECIES_SLOWKING] = gMonFootprint_Slowking,
+    [SPECIES_MISDREAVUS] = gMonFootprint_Misdreavus,
+    [SPECIES_UNOWN] = gMonFootprint_Unown,
+    [SPECIES_WOBBUFFET] = gMonFootprint_Wobbuffet,
+    [SPECIES_GIRAFARIG] = gMonFootprint_Girafarig,
+    [SPECIES_PINECO] = gMonFootprint_Pineco,
+    [SPECIES_FORRETRESS] = gMonFootprint_Forretress,
+    [SPECIES_DUNSPARCE] = gMonFootprint_Dunsparce,
+    [SPECIES_GLIGAR] = gMonFootprint_Gligar,
+    [SPECIES_STEELIX] = gMonFootprint_Steelix,
+    [SPECIES_SNUBBULL] = gMonFootprint_Snubbull,
+    [SPECIES_GRANBULL] = gMonFootprint_Granbull,
+    [SPECIES_QWILFISH] = gMonFootprint_Qwilfish,
+    [SPECIES_SCIZOR] = gMonFootprint_Scizor,
+    [SPECIES_SHUCKLE] = gMonFootprint_Shuckle,
+    [SPECIES_HERACROSS] = gMonFootprint_Heracross,
+    [SPECIES_SNEASEL] = gMonFootprint_Sneasel,
+    [SPECIES_TEDDIURSA] = gMonFootprint_Teddiursa,
+    [SPECIES_URSARING] = gMonFootprint_Ursaring,
+    [SPECIES_SLUGMA] = gMonFootprint_Slugma,
+    [SPECIES_MAGCARGO] = gMonFootprint_Magcargo,
+    [SPECIES_SWINUB] = gMonFootprint_Swinub,
+    [SPECIES_PILOSWINE] = gMonFootprint_Piloswine,
+    [SPECIES_CORSOLA] = gMonFootprint_Corsola,
+    [SPECIES_REMORAID] = gMonFootprint_Remoraid,
+    [SPECIES_OCTILLERY] = gMonFootprint_Octillery,
+    [SPECIES_DELIBIRD] = gMonFootprint_Delibird,
+    [SPECIES_MANTINE] = gMonFootprint_Mantine,
+    [SPECIES_SKARMORY] = gMonFootprint_Skarmory,
+    [SPECIES_HOUNDOUR] = gMonFootprint_Houndour,
+    [SPECIES_HOUNDOOM] = gMonFootprint_Houndoom,
+    [SPECIES_KINGDRA] = gMonFootprint_Kingdra,
+    [SPECIES_PHANPY] = gMonFootprint_Phanpy,
+    [SPECIES_DONPHAN] = gMonFootprint_Donphan,
+    [SPECIES_PORYGON2] = gMonFootprint_Porygon2,
+    [SPECIES_STANTLER] = gMonFootprint_Stantler,
+    [SPECIES_SMEARGLE] = gMonFootprint_Smeargle,
+    [SPECIES_TYROGUE] = gMonFootprint_Tyrogue,
+    [SPECIES_HITMONTOP] = gMonFootprint_Hitmontop,
+    [SPECIES_SMOOCHUM] = gMonFootprint_Smoochum,
+    [SPECIES_ELEKID] = gMonFootprint_Elekid,
+    [SPECIES_MAGBY] = gMonFootprint_Magby,
+    [SPECIES_MILTANK] = gMonFootprint_Miltank,
+    [SPECIES_BLISSEY] = gMonFootprint_Blissey,
+    [SPECIES_RAIKOU] = gMonFootprint_Raikou,
+    [SPECIES_ENTEI] = gMonFootprint_Entei,
+    [SPECIES_SUICUNE] = gMonFootprint_Suicune,
+    [SPECIES_LARVITAR] = gMonFootprint_Larvitar,
+    [SPECIES_PUPITAR] = gMonFootprint_Pupitar,
+    [SPECIES_TYRANITAR] = gMonFootprint_Tyranitar,
+    [SPECIES_LUGIA] = gMonFootprint_Lugia,
+    [SPECIES_HO_OH] = gMonFootprint_HoOh,
+    [SPECIES_CELEBI] = gMonFootprint_Celebi,
+    [SPECIES_OLD_UNOWN_B] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_C] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_D] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_E] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_F] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_G] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_H] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_I] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_J] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_K] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_L] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_M] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_N] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_O] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_P] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_Q] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_R] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_S] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_T] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_U] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_V] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_W] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_X] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_Y] = gMonFootprint_QuestionMark,
+    [SPECIES_OLD_UNOWN_Z] = gMonFootprint_QuestionMark,
+    [SPECIES_TREECKO] = gMonFootprint_Treecko,
+    [SPECIES_GROVYLE] = gMonFootprint_Grovyle,
+    [SPECIES_SCEPTILE] = gMonFootprint_Sceptile,
+    [SPECIES_TORCHIC] = gMonFootprint_Torchic,
+    [SPECIES_COMBUSKEN] = gMonFootprint_Combusken,
+    [SPECIES_BLAZIKEN] = gMonFootprint_Blaziken,
+    [SPECIES_MUDKIP] = gMonFootprint_Mudkip,
+    [SPECIES_MARSHTOMP] = gMonFootprint_Marshtomp,
+    [SPECIES_SWAMPERT] = gMonFootprint_Swampert,
+    [SPECIES_POOCHYENA] = gMonFootprint_Poochyena,
+    [SPECIES_MIGHTYENA] = gMonFootprint_Mightyena,
+    [SPECIES_ZIGZAGOON] = gMonFootprint_Zigzagoon,
+    [SPECIES_LINOONE] = gMonFootprint_Linoone,
+    [SPECIES_WURMPLE] = gMonFootprint_Wurmple,
+    [SPECIES_SILCOON] = gMonFootprint_Silcoon,
+    [SPECIES_BEAUTIFLY] = gMonFootprint_Beautifly,
+    [SPECIES_CASCOON] = gMonFootprint_Cascoon,
+    [SPECIES_DUSTOX] = gMonFootprint_Dustox,
+    [SPECIES_LOTAD] = gMonFootprint_Lotad,
+    [SPECIES_LOMBRE] = gMonFootprint_Lombre,
+    [SPECIES_LUDICOLO] = gMonFootprint_Ludicolo,
+    [SPECIES_SEEDOT] = gMonFootprint_Seedot,
+    [SPECIES_NUZLEAF] = gMonFootprint_Nuzleaf,
+    [SPECIES_SHIFTRY] = gMonFootprint_Shiftry,
+    [SPECIES_NINCADA] = gMonFootprint_Nincada,
+    [SPECIES_NINJASK] = gMonFootprint_Ninjask,
+    [SPECIES_SHEDINJA] = gMonFootprint_Shedinja,
+    [SPECIES_TAILLOW] = gMonFootprint_Taillow,
+    [SPECIES_SWELLOW] = gMonFootprint_Swellow,
+    [SPECIES_SHROOMISH] = gMonFootprint_Shroomish,
+    [SPECIES_BRELOOM] = gMonFootprint_Breloom,
+    [SPECIES_SPINDA] = gMonFootprint_Spinda,
+    [SPECIES_WINGULL] = gMonFootprint_Wingull,
+    [SPECIES_PELIPPER] = gMonFootprint_Pelipper,
+    [SPECIES_SURSKIT] = gMonFootprint_Surskit,
+    [SPECIES_MASQUERAIN] = gMonFootprint_Masquerain,
+    [SPECIES_WAILMER] = gMonFootprint_Wailmer,
+    [SPECIES_WAILORD] = gMonFootprint_Wailord,
+    [SPECIES_SKITTY] = gMonFootprint_Skitty,
+    [SPECIES_DELCATTY] = gMonFootprint_Delcatty,
+    [SPECIES_KECLEON] = gMonFootprint_Kecleon,
+    [SPECIES_BALTOY] = gMonFootprint_Baltoy,
+    [SPECIES_CLAYDOL] = gMonFootprint_Claydol,
+    [SPECIES_NOSEPASS] = gMonFootprint_Nosepass,
+    [SPECIES_TORKOAL] = gMonFootprint_Torkoal,
+    [SPECIES_SABLEYE] = gMonFootprint_Sableye,
+    [SPECIES_BARBOACH] = gMonFootprint_Barboach,
+    [SPECIES_WHISCASH] = gMonFootprint_Whiscash,
+    [SPECIES_LUVDISC] = gMonFootprint_Luvdisc,
+    [SPECIES_CORPHISH] = gMonFootprint_Corphish,
+    [SPECIES_CRAWDAUNT] = gMonFootprint_Crawdaunt,
+    [SPECIES_FEEBAS] = gMonFootprint_Feebas,
+    [SPECIES_MILOTIC] = gMonFootprint_Milotic,
+    [SPECIES_CARVANHA] = gMonFootprint_Carvanha,
+    [SPECIES_SHARPEDO] = gMonFootprint_Sharpedo,
+    [SPECIES_TRAPINCH] = gMonFootprint_Trapinch,
+    [SPECIES_VIBRAVA] = gMonFootprint_Vibrava,
+    [SPECIES_FLYGON] = gMonFootprint_Flygon,
+    [SPECIES_MAKUHITA] = gMonFootprint_Makuhita,
+    [SPECIES_HARIYAMA] = gMonFootprint_Hariyama,
+    [SPECIES_ELECTRIKE] = gMonFootprint_Electrike,
+    [SPECIES_MANECTRIC] = gMonFootprint_Manectric,
+    [SPECIES_NUMEL] = gMonFootprint_Numel,
+    [SPECIES_CAMERUPT] = gMonFootprint_Camerupt,
+    [SPECIES_SPHEAL] = gMonFootprint_Spheal,
+    [SPECIES_SEALEO] = gMonFootprint_Sealeo,
+    [SPECIES_WALREIN] = gMonFootprint_Walrein,
+    [SPECIES_CACNEA] = gMonFootprint_Cacnea,
+    [SPECIES_CACTURNE] = gMonFootprint_Cacturne,
+    [SPECIES_SNORUNT] = gMonFootprint_Snorunt,
+    [SPECIES_GLALIE] = gMonFootprint_Glalie,
+    [SPECIES_LUNATONE] = gMonFootprint_Lunatone,
+    [SPECIES_SOLROCK] = gMonFootprint_Solrock,
+    [SPECIES_AZURILL] = gMonFootprint_Azurill,
+    [SPECIES_SPOINK] = gMonFootprint_Spoink,
+    [SPECIES_GRUMPIG] = gMonFootprint_Grumpig,
+    [SPECIES_PLUSLE] = gMonFootprint_Plusle,
+    [SPECIES_MINUN] = gMonFootprint_Minun,
+    [SPECIES_MAWILE] = gMonFootprint_Mawile,
+    [SPECIES_MEDITITE] = gMonFootprint_Meditite,
+    [SPECIES_MEDICHAM] = gMonFootprint_Medicham,
+    [SPECIES_SWABLU] = gMonFootprint_Swablu,
+    [SPECIES_ALTARIA] = gMonFootprint_Altaria,
+    [SPECIES_WYNAUT] = gMonFootprint_Wynaut,
+    [SPECIES_DUSKULL] = gMonFootprint_Duskull,
+    [SPECIES_DUSCLOPS] = gMonFootprint_Dusclops,
+    [SPECIES_ROSELIA] = gMonFootprint_Roselia,
+    [SPECIES_SLAKOTH] = gMonFootprint_Slakoth,
+    [SPECIES_VIGOROTH] = gMonFootprint_Vigoroth,
+    [SPECIES_SLAKING] = gMonFootprint_Slaking,
+    [SPECIES_GULPIN] = gMonFootprint_Gulpin,
+    [SPECIES_SWALOT] = gMonFootprint_Swalot,
+    [SPECIES_TROPIUS] = gMonFootprint_Tropius,
+    [SPECIES_WHISMUR] = gMonFootprint_Whismur,
+    [SPECIES_LOUDRED] = gMonFootprint_Loudred,
+    [SPECIES_EXPLOUD] = gMonFootprint_Exploud,
+    [SPECIES_CLAMPERL] = gMonFootprint_Clamperl,
+    [SPECIES_HUNTAIL] = gMonFootprint_Huntail,
+    [SPECIES_GOREBYSS] = gMonFootprint_Gorebyss,
+    [SPECIES_ABSOL] = gMonFootprint_Absol,
+    [SPECIES_SHUPPET] = gMonFootprint_Shuppet,
+    [SPECIES_BANETTE] = gMonFootprint_Banette,
+    [SPECIES_SEVIPER] = gMonFootprint_Seviper,
+    [SPECIES_ZANGOOSE] = gMonFootprint_Zangoose,
+    [SPECIES_RELICANTH] = gMonFootprint_Relicanth,
+    [SPECIES_ARON] = gMonFootprint_Aron,
+    [SPECIES_LAIRON] = gMonFootprint_Lairon,
+    [SPECIES_AGGRON] = gMonFootprint_Aggron,
+    [SPECIES_CASTFORM] = gMonFootprint_Castform,
+    [SPECIES_VOLBEAT] = gMonFootprint_Volbeat,
+    [SPECIES_ILLUMISE] = gMonFootprint_Illumise,
+    [SPECIES_LILEEP] = gMonFootprint_Lileep,
+    [SPECIES_CRADILY] = gMonFootprint_Cradily,
+    [SPECIES_ANORITH] = gMonFootprint_Anorith,
+    [SPECIES_ARMALDO] = gMonFootprint_Armaldo,
+    [SPECIES_RALTS] = gMonFootprint_Ralts,
+    [SPECIES_KIRLIA] = gMonFootprint_Kirlia,
+    [SPECIES_GARDEVOIR] = gMonFootprint_Gardevoir,
+    [SPECIES_BAGON] = gMonFootprint_Bagon,
+    [SPECIES_SHELGON] = gMonFootprint_Shelgon,
+    [SPECIES_SALAMENCE] = gMonFootprint_Salamence,
+    [SPECIES_BELDUM] = gMonFootprint_Beldum,
+    [SPECIES_METANG] = gMonFootprint_Metang,
+    [SPECIES_METAGROSS] = gMonFootprint_Metagross,
+    [SPECIES_REGIROCK] = gMonFootprint_Regirock,
+    [SPECIES_REGICE] = gMonFootprint_Regice,
+    [SPECIES_REGISTEEL] = gMonFootprint_Registeel,
+    [SPECIES_KYOGRE] = gMonFootprint_Kyogre,
+    [SPECIES_GROUDON] = gMonFootprint_Groudon,
+    [SPECIES_RAYQUAZA] = gMonFootprint_Rayquaza,
+    [SPECIES_LATIAS] = gMonFootprint_Latias,
+    [SPECIES_LATIOS] = gMonFootprint_Latios,
+    [SPECIES_JIRACHI] = gMonFootprint_Jirachi,
+    [SPECIES_DEOXYS] = gMonFootprint_Deoxys,
+    [SPECIES_CHIMECHO] = gMonFootprint_Chimecho,
+    [SPECIES_EGG] = gMonFootprint_Bulbasaur,
 };
diff --git a/src/data/pokemon_graphics/front_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 8a42eb5c9..4c97af1a7 100644
--- a/src/data/pokemon_graphics/front_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -1,5 +1,4 @@
-
-const union AnimCmd gAnimCmd_NONE_1[] =
+static const union AnimCmd sAnim_NONE_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -7,7 +6,7 @@ const union AnimCmd gAnimCmd_NONE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BULBASAUR_1[] =
+static const union AnimCmd sAnim_BULBASAUR_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -15,7 +14,7 @@ const union AnimCmd gAnimCmd_BULBASAUR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_IVYSAUR_1[] =
+static const union AnimCmd sAnim_IVYSAUR_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 36),
@@ -23,7 +22,7 @@ const union AnimCmd gAnimCmd_IVYSAUR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VENUSAUR_1[] =
+static const union AnimCmd sAnim_VENUSAUR_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 25),
@@ -31,7 +30,7 @@ const union AnimCmd gAnimCmd_VENUSAUR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHARMANDER_1[] =
+static const union AnimCmd sAnim_CHARMANDER_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 46),
@@ -39,7 +38,7 @@ const union AnimCmd gAnimCmd_CHARMANDER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHARMELEON_1[] =
+static const union AnimCmd sAnim_CHARMELEON_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 25),
@@ -47,14 +46,14 @@ const union AnimCmd gAnimCmd_CHARMELEON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHARIZARD_1[] =
+static const union AnimCmd sAnim_CHARIZARD_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SQUIRTLE_1[] =
+static const union AnimCmd sAnim_SQUIRTLE_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -62,7 +61,7 @@ const union AnimCmd gAnimCmd_SQUIRTLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WARTORTLE_1[] =
+static const union AnimCmd sAnim_WARTORTLE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 20),
@@ -70,7 +69,7 @@ const union AnimCmd gAnimCmd_WARTORTLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BLASTOISE_1[] =
+static const union AnimCmd sAnim_BLASTOISE_1[] =
 {
     ANIMCMD_FRAME(0, 50),
     ANIMCMD_FRAME(1, 25),
@@ -80,7 +79,7 @@ const union AnimCmd gAnimCmd_BLASTOISE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CATERPIE_1[] =
+static const union AnimCmd sAnim_CATERPIE_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -93,14 +92,14 @@ const union AnimCmd gAnimCmd_CATERPIE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_METAPOD_1[] =
+static const union AnimCmd sAnim_METAPOD_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BUTTERFREE_1[] =
+static const union AnimCmd sAnim_BUTTERFREE_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -118,7 +117,7 @@ const union AnimCmd gAnimCmd_BUTTERFREE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WEEDLE_1[] =
+static const union AnimCmd sAnim_WEEDLE_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 15),
@@ -130,7 +129,7 @@ const union AnimCmd gAnimCmd_WEEDLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KAKUNA_1[] =
+static const union AnimCmd sAnim_KAKUNA_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -146,7 +145,7 @@ const union AnimCmd gAnimCmd_KAKUNA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BEEDRILL_1[] =
+static const union AnimCmd sAnim_BEEDRILL_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 35),
@@ -156,7 +155,7 @@ const union AnimCmd gAnimCmd_BEEDRILL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PIDGEY_1[] =
+static const union AnimCmd sAnim_PIDGEY_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -173,7 +172,7 @@ const union AnimCmd gAnimCmd_PIDGEY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PIDGEOTTO_1[] =
+static const union AnimCmd sAnim_PIDGEOTTO_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 10),
@@ -183,7 +182,7 @@ const union AnimCmd gAnimCmd_PIDGEOTTO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PIDGEOT_1[] =
+static const union AnimCmd sAnim_PIDGEOT_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 10),
@@ -193,7 +192,7 @@ const union AnimCmd gAnimCmd_PIDGEOT_1[] =
 };
 
 
-const union AnimCmd gAnimCmd_RATTATA_1[] =
+static const union AnimCmd sAnim_RATTATA_1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 50),
@@ -202,7 +201,7 @@ const union AnimCmd gAnimCmd_RATTATA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RATICATE_1[] =
+static const union AnimCmd sAnim_RATICATE_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -219,7 +218,7 @@ const union AnimCmd gAnimCmd_RATICATE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SPEAROW_1[] =
+static const union AnimCmd sAnim_SPEAROW_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -240,7 +239,7 @@ const union AnimCmd gAnimCmd_SPEAROW_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FEAROW_1[] =
+static const union AnimCmd sAnim_FEAROW_1[] =
 {
     ANIMCMD_FRAME(1, 7),
     ANIMCMD_FRAME(0, 7),
@@ -253,7 +252,7 @@ const union AnimCmd gAnimCmd_FEAROW_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_EKANS_1[] =
+static const union AnimCmd sAnim_EKANS_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -264,7 +263,7 @@ const union AnimCmd gAnimCmd_EKANS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ARBOK_1[] =
+static const union AnimCmd sAnim_ARBOK_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 35),
@@ -272,7 +271,7 @@ const union AnimCmd gAnimCmd_ARBOK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PIKACHU_1[] =
+static const union AnimCmd sAnim_PIKACHU_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -282,7 +281,7 @@ const union AnimCmd gAnimCmd_PIKACHU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PIKACHU_2[] =
+static const union AnimCmd sAnim_PIKACHU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -291,7 +290,7 @@ const union AnimCmd gAnimCmd_PIKACHU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RAICHU_1[] =
+static const union AnimCmd sAnim_RAICHU_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -301,7 +300,7 @@ const union AnimCmd gAnimCmd_RAICHU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RAICHU_2[] =
+static const union AnimCmd sAnim_RAICHU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -310,7 +309,7 @@ const union AnimCmd gAnimCmd_RAICHU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SANDSHREW_1[] =
+static const union AnimCmd sAnim_SANDSHREW_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -320,7 +319,7 @@ const union AnimCmd gAnimCmd_SANDSHREW_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SANDSHREW_2[] =
+static const union AnimCmd sAnim_SANDSHREW_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -329,7 +328,7 @@ const union AnimCmd gAnimCmd_SANDSHREW_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SANDSLASH_1[] =
+static const union AnimCmd sAnim_SANDSLASH_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -339,7 +338,7 @@ const union AnimCmd gAnimCmd_SANDSLASH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SANDSLASH_2[] =
+static const union AnimCmd sAnim_SANDSLASH_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -348,7 +347,7 @@ const union AnimCmd gAnimCmd_SANDSLASH_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NIDORAN_F_1[] =
+static const union AnimCmd sAnim_NIDORAN_F_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -362,21 +361,21 @@ const union AnimCmd gAnimCmd_NIDORAN_F_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NIDORINA_1[] =
+static const union AnimCmd sAnim_NIDORINA_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NIDOQUEEN_1[] =
+static const union AnimCmd sAnim_NIDOQUEEN_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NIDORAN_M_1[] =
+static const union AnimCmd sAnim_NIDORAN_M_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -384,7 +383,7 @@ const union AnimCmd gAnimCmd_NIDORAN_M_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NIDORINO_1[] =
+static const union AnimCmd sAnim_NIDORINO_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -392,7 +391,7 @@ const union AnimCmd gAnimCmd_NIDORINO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NIDOKING_1[] =
+static const union AnimCmd sAnim_NIDOKING_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 15),
@@ -401,7 +400,7 @@ const union AnimCmd gAnimCmd_NIDOKING_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CLEFAIRY_1[] =
+static const union AnimCmd sAnim_CLEFAIRY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -409,7 +408,7 @@ const union AnimCmd gAnimCmd_CLEFAIRY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CLEFABLE_1[] =
+static const union AnimCmd sAnim_CLEFABLE_1[] =
 {
     ANIMCMD_FRAME(1, 27),
     ANIMCMD_FRAME(0, 27),
@@ -420,7 +419,7 @@ const union AnimCmd gAnimCmd_CLEFABLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VULPIX_1[] =
+static const union AnimCmd sAnim_VULPIX_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -430,7 +429,7 @@ const union AnimCmd gAnimCmd_VULPIX_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VULPIX_2[] =
+static const union AnimCmd sAnim_VULPIX_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -439,7 +438,7 @@ const union AnimCmd gAnimCmd_VULPIX_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NINETALES_1[] =
+static const union AnimCmd sAnim_NINETALES_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -449,7 +448,7 @@ const union AnimCmd gAnimCmd_NINETALES_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NINETALES_2[] =
+static const union AnimCmd sAnim_NINETALES_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -458,7 +457,7 @@ const union AnimCmd gAnimCmd_NINETALES_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JIGGLYPUFF_1[] =
+static const union AnimCmd sAnim_JIGGLYPUFF_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -468,7 +467,7 @@ const union AnimCmd gAnimCmd_JIGGLYPUFF_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JIGGLYPUFF_2[] =
+static const union AnimCmd sAnim_JIGGLYPUFF_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -477,7 +476,7 @@ const union AnimCmd gAnimCmd_JIGGLYPUFF_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WIGGLYTUFF_1[] =
+static const union AnimCmd sAnim_WIGGLYTUFF_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -487,7 +486,7 @@ const union AnimCmd gAnimCmd_WIGGLYTUFF_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WIGGLYTUFF_2[] =
+static const union AnimCmd sAnim_WIGGLYTUFF_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -496,7 +495,7 @@ const union AnimCmd gAnimCmd_WIGGLYTUFF_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ZUBAT_1[] =
+static const union AnimCmd sAnim_ZUBAT_1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 3),
@@ -514,7 +513,7 @@ const union AnimCmd gAnimCmd_ZUBAT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GOLBAT_1[] =
+static const union AnimCmd sAnim_GOLBAT_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -538,7 +537,7 @@ const union AnimCmd gAnimCmd_GOLBAT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ODDISH_1[] =
+static const union AnimCmd sAnim_ODDISH_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -550,7 +549,7 @@ const union AnimCmd gAnimCmd_ODDISH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GLOOM_1[] =
+static const union AnimCmd sAnim_GLOOM_1[] =
 {
     ANIMCMD_FRAME(0, 21),
     ANIMCMD_FRAME(1, 45),
@@ -559,7 +558,7 @@ const union AnimCmd gAnimCmd_GLOOM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VILEPLUME_1[] =
+static const union AnimCmd sAnim_VILEPLUME_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 21),
@@ -569,7 +568,7 @@ const union AnimCmd gAnimCmd_VILEPLUME_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PARAS_1[] =
+static const union AnimCmd sAnim_PARAS_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -590,7 +589,7 @@ const union AnimCmd gAnimCmd_PARAS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PARASECT_1[] =
+static const union AnimCmd sAnim_PARASECT_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -601,7 +600,7 @@ const union AnimCmd gAnimCmd_PARASECT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VENONAT_1[] =
+static const union AnimCmd sAnim_VENONAT_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -612,7 +611,7 @@ const union AnimCmd gAnimCmd_VENONAT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VENOMOTH_1[] =
+static const union AnimCmd sAnim_VENOMOTH_1[] =
 {
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_FRAME(0, 4),
@@ -639,7 +638,7 @@ const union AnimCmd gAnimCmd_VENOMOTH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DIGLETT_1[] =
+static const union AnimCmd sAnim_DIGLETT_1[] =
 {
     ANIMCMD_FRAME(0, 25),
     ANIMCMD_FRAME(1, 35),
@@ -647,7 +646,7 @@ const union AnimCmd gAnimCmd_DIGLETT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DUGTRIO_1[] =
+static const union AnimCmd sAnim_DUGTRIO_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 10),
@@ -662,7 +661,7 @@ const union AnimCmd gAnimCmd_DUGTRIO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MEOWTH_1[] =
+static const union AnimCmd sAnim_MEOWTH_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -673,14 +672,14 @@ const union AnimCmd gAnimCmd_MEOWTH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PERSIAN_1[] =
+static const union AnimCmd sAnim_PERSIAN_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PSYDUCK_1[] =
+static const union AnimCmd sAnim_PSYDUCK_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -690,7 +689,7 @@ const union AnimCmd gAnimCmd_PSYDUCK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PSYDUCK_2[] =
+static const union AnimCmd sAnim_PSYDUCK_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -699,7 +698,7 @@ const union AnimCmd gAnimCmd_PSYDUCK_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GOLDUCK_1[] =
+static const union AnimCmd sAnim_GOLDUCK_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -709,7 +708,7 @@ const union AnimCmd gAnimCmd_GOLDUCK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GOLDUCK_2[] =
+static const union AnimCmd sAnim_GOLDUCK_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -718,7 +717,7 @@ const union AnimCmd gAnimCmd_GOLDUCK_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MANKEY_1[] =
+static const union AnimCmd sAnim_MANKEY_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -729,7 +728,7 @@ const union AnimCmd gAnimCmd_MANKEY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PRIMEAPE_1[] =
+static const union AnimCmd sAnim_PRIMEAPE_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -740,7 +739,7 @@ const union AnimCmd gAnimCmd_PRIMEAPE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GROWLITHE_1[] =
+static const union AnimCmd sAnim_GROWLITHE_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -751,7 +750,7 @@ const union AnimCmd gAnimCmd_GROWLITHE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ARCANINE_1[] =
+static const union AnimCmd sAnim_ARCANINE_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -761,7 +760,7 @@ const union AnimCmd gAnimCmd_ARCANINE_1[] =
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,};
 
-const union AnimCmd gAnimCmd_POLIWAG_1[] =
+static const union AnimCmd sAnim_POLIWAG_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 10),
@@ -769,7 +768,7 @@ const union AnimCmd gAnimCmd_POLIWAG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_POLIWHIRL_1[] =
+static const union AnimCmd sAnim_POLIWHIRL_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 25),
@@ -779,14 +778,14 @@ const union AnimCmd gAnimCmd_POLIWHIRL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_POLIWRATH_1[] =
+static const union AnimCmd sAnim_POLIWRATH_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ABRA_1[] =
+static const union AnimCmd sAnim_ABRA_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 21),
@@ -796,7 +795,7 @@ const union AnimCmd gAnimCmd_ABRA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KADABRA_1[] =
+static const union AnimCmd sAnim_KADABRA_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 45),
@@ -804,7 +803,7 @@ const union AnimCmd gAnimCmd_KADABRA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ALAKAZAM_1[] =
+static const union AnimCmd sAnim_ALAKAZAM_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 54),
@@ -812,7 +811,7 @@ const union AnimCmd gAnimCmd_ALAKAZAM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MACHOP_1[] =
+static const union AnimCmd sAnim_MACHOP_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -824,7 +823,7 @@ const union AnimCmd gAnimCmd_MACHOP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MACHOKE_1[] =
+static const union AnimCmd sAnim_MACHOKE_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 44),
@@ -832,7 +831,7 @@ const union AnimCmd gAnimCmd_MACHOKE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MACHAMP_1[] =
+static const union AnimCmd sAnim_MACHAMP_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -844,7 +843,7 @@ const union AnimCmd gAnimCmd_MACHAMP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BELLSPROUT_1[] =
+static const union AnimCmd sAnim_BELLSPROUT_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 25),
@@ -852,7 +851,7 @@ const union AnimCmd gAnimCmd_BELLSPROUT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WEEPINBELL_1[] =
+static const union AnimCmd sAnim_WEEPINBELL_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 25),
@@ -864,7 +863,7 @@ const union AnimCmd gAnimCmd_WEEPINBELL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VICTREEBEL_1[] =
+static const union AnimCmd sAnim_VICTREEBEL_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -876,7 +875,7 @@ const union AnimCmd gAnimCmd_VICTREEBEL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TENTACOOL_1[] =
+static const union AnimCmd sAnim_TENTACOOL_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 15),
@@ -886,7 +885,7 @@ const union AnimCmd gAnimCmd_TENTACOOL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TENTACRUEL_1[] =
+static const union AnimCmd sAnim_TENTACRUEL_1[] =
 {
     ANIMCMD_FRAME(0, 19),
     ANIMCMD_FRAME(1, 35),
@@ -896,7 +895,7 @@ const union AnimCmd gAnimCmd_TENTACRUEL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GEODUDE_1[] =
+static const union AnimCmd sAnim_GEODUDE_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 36),
@@ -904,7 +903,7 @@ const union AnimCmd gAnimCmd_GEODUDE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GRAVELER_1[] =
+static const union AnimCmd sAnim_GRAVELER_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -914,7 +913,7 @@ const union AnimCmd gAnimCmd_GRAVELER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GOLEM_1[] =
+static const union AnimCmd sAnim_GOLEM_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 31),
@@ -924,14 +923,14 @@ const union AnimCmd gAnimCmd_GOLEM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PONYTA_1[] =
+static const union AnimCmd sAnim_PONYTA_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RAPIDASH_1[] =
+static const union AnimCmd sAnim_RAPIDASH_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 40),
@@ -939,7 +938,7 @@ const union AnimCmd gAnimCmd_RAPIDASH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLOWPOKE_1[] =
+static const union AnimCmd sAnim_SLOWPOKE_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 50),
@@ -947,7 +946,7 @@ const union AnimCmd gAnimCmd_SLOWPOKE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLOWBRO_1[] =
+static const union AnimCmd sAnim_SLOWBRO_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 45),
@@ -955,7 +954,7 @@ const union AnimCmd gAnimCmd_SLOWBRO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGNEMITE_1[] =
+static const union AnimCmd sAnim_MAGNEMITE_1[] =
 {
     ANIMCMD_FRAME(0, 28),
     ANIMCMD_FRAME(1, 28),
@@ -965,7 +964,7 @@ const union AnimCmd gAnimCmd_MAGNEMITE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGNETON_1[] =
+static const union AnimCmd sAnim_MAGNETON_1[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(1, 14),
@@ -977,7 +976,7 @@ const union AnimCmd gAnimCmd_MAGNETON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FARFETCHD_1[] =
+static const union AnimCmd sAnim_FARFETCHD_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -994,7 +993,7 @@ const union AnimCmd gAnimCmd_FARFETCHD_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DODUO_1[] =
+static const union AnimCmd sAnim_DODUO_1[] =
 {
     ANIMCMD_FRAME(0, 18),
     ANIMCMD_FRAME(1, 18),
@@ -1004,7 +1003,7 @@ const union AnimCmd gAnimCmd_DODUO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DODRIO_1[] =
+static const union AnimCmd sAnim_DODRIO_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 12),
@@ -1018,7 +1017,7 @@ const union AnimCmd gAnimCmd_DODRIO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEEL_1[] =
+static const union AnimCmd sAnim_SEEL_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -1031,7 +1030,7 @@ const union AnimCmd gAnimCmd_SEEL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DEWGONG_1[] =
+static const union AnimCmd sAnim_DEWGONG_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -1039,7 +1038,7 @@ const union AnimCmd gAnimCmd_DEWGONG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GRIMER_1[] =
+static const union AnimCmd sAnim_GRIMER_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1049,7 +1048,7 @@ const union AnimCmd gAnimCmd_GRIMER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GRIMER_2[] =
+static const union AnimCmd sAnim_GRIMER_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1058,7 +1057,7 @@ const union AnimCmd gAnimCmd_GRIMER_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MUK_1[] =
+static const union AnimCmd sAnim_MUK_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1068,7 +1067,7 @@ const union AnimCmd gAnimCmd_MUK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MUK_2[] =
+static const union AnimCmd sAnim_MUK_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1077,7 +1076,7 @@ const union AnimCmd gAnimCmd_MUK_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHELLDER_1[] =
+static const union AnimCmd sAnim_SHELLDER_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1086,7 +1085,7 @@ const union AnimCmd gAnimCmd_SHELLDER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CLOYSTER_1[] =
+static const union AnimCmd sAnim_CLOYSTER_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1107,7 +1106,7 @@ const union AnimCmd gAnimCmd_CLOYSTER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GASTLY_1[] =
+static const union AnimCmd sAnim_GASTLY_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 30),
@@ -1115,7 +1114,7 @@ const union AnimCmd gAnimCmd_GASTLY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HAUNTER_1[] =
+static const union AnimCmd sAnim_HAUNTER_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 15),
@@ -1125,7 +1124,7 @@ const union AnimCmd gAnimCmd_HAUNTER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GENGAR_1[] =
+static const union AnimCmd sAnim_GENGAR_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 40),
@@ -1133,7 +1132,7 @@ const union AnimCmd gAnimCmd_GENGAR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ONIX_1[] =
+static const union AnimCmd sAnim_ONIX_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 30),
@@ -1141,7 +1140,7 @@ const union AnimCmd gAnimCmd_ONIX_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DROWZEE_1[] =
+static const union AnimCmd sAnim_DROWZEE_1[] =
 {
     ANIMCMD_FRAME(1, 12),
     ANIMCMD_FRAME(0, 12),
@@ -1152,7 +1151,7 @@ const union AnimCmd gAnimCmd_DROWZEE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HYPNO_1[] =
+static const union AnimCmd sAnim_HYPNO_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -1164,7 +1163,7 @@ const union AnimCmd gAnimCmd_HYPNO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KRABBY_1[] =
+static const union AnimCmd sAnim_KRABBY_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -1175,7 +1174,7 @@ const union AnimCmd gAnimCmd_KRABBY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KINGLER_1[] =
+static const union AnimCmd sAnim_KINGLER_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 15),
@@ -1189,7 +1188,7 @@ const union AnimCmd gAnimCmd_KINGLER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VOLTORB_1[] =
+static const union AnimCmd sAnim_VOLTORB_1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 25),
@@ -1199,7 +1198,7 @@ const union AnimCmd gAnimCmd_VOLTORB_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ELECTRODE_1[] =
+static const union AnimCmd sAnim_ELECTRODE_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 30),
@@ -1209,7 +1208,7 @@ const union AnimCmd gAnimCmd_ELECTRODE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_EXEGGCUTE_1[] =
+static const union AnimCmd sAnim_EXEGGCUTE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1223,14 +1222,14 @@ const union AnimCmd gAnimCmd_EXEGGCUTE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_EXEGGUTOR_1[] =
+static const union AnimCmd sAnim_EXEGGUTOR_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,};
 
 
-const union AnimCmd gAnimCmd_CUBONE_1[] =
+static const union AnimCmd sAnim_CUBONE_1[] =
 {
     ANIMCMD_FRAME(1, 14),
     ANIMCMD_FRAME(0, 14),
@@ -1241,7 +1240,7 @@ const union AnimCmd gAnimCmd_CUBONE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAROWAK_1[] =
+static const union AnimCmd sAnim_MAROWAK_1[] =
 {
     ANIMCMD_FRAME(1, 14),
     ANIMCMD_FRAME(0, 14),
@@ -1252,14 +1251,14 @@ const union AnimCmd gAnimCmd_MAROWAK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HITMONLEE_1[] =
+static const union AnimCmd sAnim_HITMONLEE_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HITMONCHAN_1[] =
+static const union AnimCmd sAnim_HITMONCHAN_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1272,7 +1271,7 @@ const union AnimCmd gAnimCmd_HITMONCHAN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LICKITUNG_1[] =
+static const union AnimCmd sAnim_LICKITUNG_1[] =
 {
     ANIMCMD_FRAME(0, 28),
     ANIMCMD_FRAME(1, 32),
@@ -1280,7 +1279,7 @@ const union AnimCmd gAnimCmd_LICKITUNG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KOFFING_1[] =
+static const union AnimCmd sAnim_KOFFING_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1290,7 +1289,7 @@ const union AnimCmd gAnimCmd_KOFFING_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KOFFING_2[] =
+static const union AnimCmd sAnim_KOFFING_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1299,7 +1298,7 @@ const union AnimCmd gAnimCmd_KOFFING_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WEEZING_1[] =
+static const union AnimCmd sAnim_WEEZING_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1309,7 +1308,7 @@ const union AnimCmd gAnimCmd_WEEZING_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WEEZING_2[] =
+static const union AnimCmd sAnim_WEEZING_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1318,7 +1317,7 @@ const union AnimCmd gAnimCmd_WEEZING_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RHYHORN_1[] =
+static const union AnimCmd sAnim_RHYHORN_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1328,7 +1327,7 @@ const union AnimCmd gAnimCmd_RHYHORN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RHYHORN_2[] =
+static const union AnimCmd sAnim_RHYHORN_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1337,7 +1336,7 @@ const union AnimCmd gAnimCmd_RHYHORN_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RHYDON_1[] =
+static const union AnimCmd sAnim_RHYDON_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1347,7 +1346,7 @@ const union AnimCmd gAnimCmd_RHYDON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RHYDON_2[] =
+static const union AnimCmd sAnim_RHYDON_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1356,7 +1355,7 @@ const union AnimCmd gAnimCmd_RHYDON_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHANSEY_1[] =
+static const union AnimCmd sAnim_CHANSEY_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -1364,7 +1363,7 @@ const union AnimCmd gAnimCmd_CHANSEY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TANGELA_1[] =
+static const union AnimCmd sAnim_TANGELA_1[] =
 {
     ANIMCMD_FRAME(1, 9),
     ANIMCMD_FRAME(0, 9),
@@ -1379,7 +1378,7 @@ const union AnimCmd gAnimCmd_TANGELA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KANGASKHAN_1[] =
+static const union AnimCmd sAnim_KANGASKHAN_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1388,7 +1387,7 @@ const union AnimCmd gAnimCmd_KANGASKHAN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HORSEA_1[] =
+static const union AnimCmd sAnim_HORSEA_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1398,7 +1397,7 @@ const union AnimCmd gAnimCmd_HORSEA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HORSEA_2[] =
+static const union AnimCmd sAnim_HORSEA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1407,7 +1406,7 @@ const union AnimCmd gAnimCmd_HORSEA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEADRA_1[] =
+static const union AnimCmd sAnim_SEADRA_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1417,7 +1416,7 @@ const union AnimCmd gAnimCmd_SEADRA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEADRA_2[] =
+static const union AnimCmd sAnim_SEADRA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1426,7 +1425,7 @@ const union AnimCmd gAnimCmd_SEADRA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GOLDEEN_1[] =
+static const union AnimCmd sAnim_GOLDEEN_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -1440,7 +1439,7 @@ const union AnimCmd gAnimCmd_GOLDEEN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEAKING_1[] =
+static const union AnimCmd sAnim_SEAKING_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 20),
@@ -1450,7 +1449,7 @@ const union AnimCmd gAnimCmd_SEAKING_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_STARYU_1[] =
+static const union AnimCmd sAnim_STARYU_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1460,7 +1459,7 @@ const union AnimCmd gAnimCmd_STARYU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_STARYU_2[] =
+static const union AnimCmd sAnim_STARYU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1469,7 +1468,7 @@ const union AnimCmd gAnimCmd_STARYU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_STARMIE_1[] =
+static const union AnimCmd sAnim_STARMIE_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1479,7 +1478,7 @@ const union AnimCmd gAnimCmd_STARMIE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_STARMIE_2[] =
+static const union AnimCmd sAnim_STARMIE_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1488,7 +1487,7 @@ const union AnimCmd gAnimCmd_STARMIE_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MR_MIME_1[] =
+static const union AnimCmd sAnim_MR_MIME_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -1499,7 +1498,7 @@ const union AnimCmd gAnimCmd_MR_MIME_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SCYTHER_1[] =
+static const union AnimCmd sAnim_SCYTHER_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1512,7 +1511,7 @@ const union AnimCmd gAnimCmd_SCYTHER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JYNX_1[] =
+static const union AnimCmd sAnim_JYNX_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
@@ -1522,7 +1521,7 @@ const union AnimCmd gAnimCmd_JYNX_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ELECTABUZZ_1[] =
+static const union AnimCmd sAnim_ELECTABUZZ_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1531,14 +1530,14 @@ const union AnimCmd gAnimCmd_ELECTABUZZ_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGMAR_1[] =
+static const union AnimCmd sAnim_MAGMAR_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PINSIR_1[] =
+static const union AnimCmd sAnim_PINSIR_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1548,7 +1547,7 @@ const union AnimCmd gAnimCmd_PINSIR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PINSIR_2[] =
+static const union AnimCmd sAnim_PINSIR_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1557,7 +1556,7 @@ const union AnimCmd gAnimCmd_PINSIR_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TAUROS_1[] =
+static const union AnimCmd sAnim_TAUROS_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 20),
@@ -1566,7 +1565,7 @@ const union AnimCmd gAnimCmd_TAUROS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGIKARP_1[] =
+static const union AnimCmd sAnim_MAGIKARP_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -1580,7 +1579,7 @@ const union AnimCmd gAnimCmd_MAGIKARP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GYARADOS_1[] =
+static const union AnimCmd sAnim_GYARADOS_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 32),
@@ -1588,14 +1587,14 @@ const union AnimCmd gAnimCmd_GYARADOS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LAPRAS_1[] =
+static const union AnimCmd sAnim_LAPRAS_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DITTO_1[] =
+static const union AnimCmd sAnim_DITTO_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1604,35 +1603,35 @@ const union AnimCmd gAnimCmd_DITTO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_EEVEE_1[] =
+static const union AnimCmd sAnim_EEVEE_1[] =
 {
     ANIMCMD_FRAME(1, 33),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VAPOREON_1[] =
+static const union AnimCmd sAnim_VAPOREON_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JOLTEON_1[] =
+static const union AnimCmd sAnim_JOLTEON_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FLAREON_1[] =
+static const union AnimCmd sAnim_FLAREON_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PORYGON_1[] =
+static const union AnimCmd sAnim_PORYGON_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1641,7 +1640,7 @@ const union AnimCmd gAnimCmd_PORYGON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_OMANYTE_1[] =
+static const union AnimCmd sAnim_OMANYTE_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1654,7 +1653,7 @@ const union AnimCmd gAnimCmd_OMANYTE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_OMASTAR_1[] =
+static const union AnimCmd sAnim_OMASTAR_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1663,7 +1662,7 @@ const union AnimCmd gAnimCmd_OMASTAR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KABUTO_1[] =
+static const union AnimCmd sAnim_KABUTO_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -1676,7 +1675,7 @@ const union AnimCmd gAnimCmd_KABUTO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KABUTOPS_1[] =
+static const union AnimCmd sAnim_KABUTOPS_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1685,7 +1684,7 @@ const union AnimCmd gAnimCmd_KABUTOPS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_AERODACTYL_1[] =
+static const union AnimCmd sAnim_AERODACTYL_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 25),
@@ -1694,7 +1693,7 @@ const union AnimCmd gAnimCmd_AERODACTYL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SNORLAX_1[] =
+static const union AnimCmd sAnim_SNORLAX_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -1702,7 +1701,7 @@ const union AnimCmd gAnimCmd_SNORLAX_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ARTICUNO_1[] =
+static const union AnimCmd sAnim_ARTICUNO_1[] =
 {
     ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 15),
@@ -1711,7 +1710,7 @@ const union AnimCmd gAnimCmd_ARTICUNO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ZAPDOS_1[] =
+static const union AnimCmd sAnim_ZAPDOS_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1720,7 +1719,7 @@ const union AnimCmd gAnimCmd_ZAPDOS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MOLTRES_1[] =
+static const union AnimCmd sAnim_MOLTRES_1[] =
 {
     ANIMCMD_FRAME(1, 3),
     ANIMCMD_FRAME(0, 3),
@@ -1757,7 +1756,7 @@ const union AnimCmd gAnimCmd_MOLTRES_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DRATINI_1[] =
+static const union AnimCmd sAnim_DRATINI_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -1765,7 +1764,7 @@ const union AnimCmd gAnimCmd_DRATINI_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DRAGONAIR_1[] =
+static const union AnimCmd sAnim_DRAGONAIR_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1774,7 +1773,7 @@ const union AnimCmd gAnimCmd_DRAGONAIR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DRAGONITE_1[] =
+static const union AnimCmd sAnim_DRAGONITE_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 30),
@@ -1782,14 +1781,14 @@ const union AnimCmd gAnimCmd_DRAGONITE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MEWTWO_1[] =
+static const union AnimCmd sAnim_MEWTWO_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MEW_1[] =
+static const union AnimCmd sAnim_MEW_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 40),
@@ -1797,7 +1796,7 @@ const union AnimCmd gAnimCmd_MEW_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHIKORITA_1[] =
+static const union AnimCmd sAnim_CHIKORITA_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -1805,21 +1804,21 @@ const union AnimCmd gAnimCmd_CHIKORITA_1[] =
     ANIMCMD_END,};
 
 
-const union AnimCmd gAnimCmd_BAYLEEF_1[] =
+static const union AnimCmd sAnim_BAYLEEF_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MEGANIUM_1[] =
+static const union AnimCmd sAnim_MEGANIUM_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CYNDAQUIL_1[] =
+static const union AnimCmd sAnim_CYNDAQUIL_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1828,21 +1827,21 @@ const union AnimCmd gAnimCmd_CYNDAQUIL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_QUILAVA_1[] =
+static const union AnimCmd sAnim_QUILAVA_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TYPHLOSION_1[] =
+static const union AnimCmd sAnim_TYPHLOSION_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TOTODILE_1[] =
+static const union AnimCmd sAnim_TOTODILE_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -1853,14 +1852,14 @@ const union AnimCmd gAnimCmd_TOTODILE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CROCONAW_1[] =
+static const union AnimCmd sAnim_CROCONAW_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FERALIGATR_1[] =
+static const union AnimCmd sAnim_FERALIGATR_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1869,7 +1868,7 @@ const union AnimCmd gAnimCmd_FERALIGATR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SENTRET_1[] =
+static const union AnimCmd sAnim_SENTRET_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -1878,14 +1877,14 @@ const union AnimCmd gAnimCmd_SENTRET_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FURRET_1[] =
+static const union AnimCmd sAnim_FURRET_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HOOTHOOT_1[] =
+static const union AnimCmd sAnim_HOOTHOOT_1[] =
 {
     ANIMCMD_FRAME(1, 7),
     ANIMCMD_FRAME(0, 7),
@@ -1902,14 +1901,14 @@ const union AnimCmd gAnimCmd_HOOTHOOT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NOCTOWL_1[] =
+static const union AnimCmd sAnim_NOCTOWL_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LEDYBA_1[] =
+static const union AnimCmd sAnim_LEDYBA_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1918,7 +1917,7 @@ const union AnimCmd gAnimCmd_LEDYBA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LEDIAN_1[] =
+static const union AnimCmd sAnim_LEDIAN_1[] =
 {
     ANIMCMD_FRAME(1, 3),
     ANIMCMD_FRAME(0, 3),
@@ -1949,7 +1948,7 @@ const union AnimCmd gAnimCmd_LEDIAN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SPINARAK_1[] =
+static const union AnimCmd sAnim_SPINARAK_1[] =
 {
     ANIMCMD_FRAME(1, 6),
     ANIMCMD_FRAME(0, 6),
@@ -1962,7 +1961,7 @@ const union AnimCmd gAnimCmd_SPINARAK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ARIADOS_1[] =
+static const union AnimCmd sAnim_ARIADOS_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1971,7 +1970,7 @@ const union AnimCmd gAnimCmd_ARIADOS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CROBAT_1[] =
+static const union AnimCmd sAnim_CROBAT_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 2),
@@ -1993,7 +1992,7 @@ const union AnimCmd gAnimCmd_CROBAT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHINCHOU_1[] =
+static const union AnimCmd sAnim_CHINCHOU_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2003,7 +2002,7 @@ const union AnimCmd gAnimCmd_CHINCHOU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHINCHOU_2[] =
+static const union AnimCmd sAnim_CHINCHOU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2012,7 +2011,7 @@ const union AnimCmd gAnimCmd_CHINCHOU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LANTURN_1[] =
+static const union AnimCmd sAnim_LANTURN_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2022,7 +2021,7 @@ const union AnimCmd gAnimCmd_LANTURN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LANTURN_2[] =
+static const union AnimCmd sAnim_LANTURN_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2031,7 +2030,7 @@ const union AnimCmd gAnimCmd_LANTURN_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PICHU_1[] =
+static const union AnimCmd sAnim_PICHU_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2041,7 +2040,7 @@ const union AnimCmd gAnimCmd_PICHU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PICHU_2[] =
+static const union AnimCmd sAnim_PICHU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2050,7 +2049,7 @@ const union AnimCmd gAnimCmd_PICHU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CLEFFA_1[] =
+static const union AnimCmd sAnim_CLEFFA_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2059,7 +2058,7 @@ const union AnimCmd gAnimCmd_CLEFFA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_IGGLYBUFF_1[] =
+static const union AnimCmd sAnim_IGGLYBUFF_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2069,7 +2068,7 @@ const union AnimCmd gAnimCmd_IGGLYBUFF_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_IGGLYBUFF_2[] =
+static const union AnimCmd sAnim_IGGLYBUFF_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2078,7 +2077,7 @@ const union AnimCmd gAnimCmd_IGGLYBUFF_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TOGEPI_1[] =
+static const union AnimCmd sAnim_TOGEPI_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -2086,7 +2085,7 @@ const union AnimCmd gAnimCmd_TOGEPI_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TOGETIC_1[] =
+static const union AnimCmd sAnim_TOGETIC_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2094,7 +2093,7 @@ const union AnimCmd gAnimCmd_TOGETIC_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NATU_1[] =
+static const union AnimCmd sAnim_NATU_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2104,7 +2103,7 @@ const union AnimCmd gAnimCmd_NATU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NATU_2[] =
+static const union AnimCmd sAnim_NATU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2113,7 +2112,7 @@ const union AnimCmd gAnimCmd_NATU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_XATU_1[] =
+static const union AnimCmd sAnim_XATU_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 45),
@@ -2125,7 +2124,7 @@ const union AnimCmd gAnimCmd_XATU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_XATU_2[] =
+static const union AnimCmd sAnim_XATU_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2134,7 +2133,7 @@ const union AnimCmd gAnimCmd_XATU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAREEP_1[] =
+static const union AnimCmd sAnim_MAREEP_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2145,7 +2144,7 @@ const union AnimCmd gAnimCmd_MAREEP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FLAAFFY_1[] =
+static const union AnimCmd sAnim_FLAAFFY_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2154,7 +2153,7 @@ const union AnimCmd gAnimCmd_FLAAFFY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_AMPHAROS_1[] =
+static const union AnimCmd sAnim_AMPHAROS_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 15),
@@ -2162,7 +2161,7 @@ const union AnimCmd gAnimCmd_AMPHAROS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BELLOSSOM_1[] =
+static const union AnimCmd sAnim_BELLOSSOM_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -2174,7 +2173,7 @@ const union AnimCmd gAnimCmd_BELLOSSOM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MARILL_1[] =
+static const union AnimCmd sAnim_MARILL_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 44),
@@ -2184,7 +2183,7 @@ const union AnimCmd gAnimCmd_MARILL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_AZUMARILL_1[] =
+static const union AnimCmd sAnim_AZUMARILL_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -2194,7 +2193,7 @@ const union AnimCmd gAnimCmd_AZUMARILL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SUDOWOODO_1[] =
+static const union AnimCmd sAnim_SUDOWOODO_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -2205,7 +2204,7 @@ const union AnimCmd gAnimCmd_SUDOWOODO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_POLITOED_1[] =
+static const union AnimCmd sAnim_POLITOED_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2216,7 +2215,7 @@ const union AnimCmd gAnimCmd_POLITOED_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HOPPIP_1[] =
+static const union AnimCmd sAnim_HOPPIP_1[] =
 {
     ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 25),
@@ -2225,7 +2224,7 @@ const union AnimCmd gAnimCmd_HOPPIP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SKIPLOOM_1[] =
+static const union AnimCmd sAnim_SKIPLOOM_1[] =
 {
     ANIMCMD_FRAME(1, 12),
     ANIMCMD_FRAME(0, 12),
@@ -2238,7 +2237,7 @@ const union AnimCmd gAnimCmd_SKIPLOOM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JUMPLUFF_1[] =
+static const union AnimCmd sAnim_JUMPLUFF_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 25),
@@ -2249,14 +2248,14 @@ const union AnimCmd gAnimCmd_JUMPLUFF_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_AIPOM_1[] =
+static const union AnimCmd sAnim_AIPOM_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SUNKERN_1[] =
+static const union AnimCmd sAnim_SUNKERN_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2265,7 +2264,7 @@ const union AnimCmd gAnimCmd_SUNKERN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SUNFLORA_1[] =
+static const union AnimCmd sAnim_SUNFLORA_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2273,7 +2272,7 @@ const union AnimCmd gAnimCmd_SUNFLORA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_YANMA_1[] =
+static const union AnimCmd sAnim_YANMA_1[] =
 {
     ANIMCMD_FRAME(1, 2),
     ANIMCMD_FRAME(0, 2),
@@ -2300,7 +2299,7 @@ const union AnimCmd gAnimCmd_YANMA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WOOPER_1[] =
+static const union AnimCmd sAnim_WOOPER_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2308,14 +2307,14 @@ const union AnimCmd gAnimCmd_WOOPER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_QUAGSIRE_1[] =
+static const union AnimCmd sAnim_QUAGSIRE_1[] =
 {
     ANIMCMD_FRAME(1, 32),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ESPEON_1[] =
+static const union AnimCmd sAnim_ESPEON_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 25),
@@ -2323,21 +2322,21 @@ const union AnimCmd gAnimCmd_ESPEON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UMBREON_1[] =
+static const union AnimCmd sAnim_UMBREON_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MURKROW_1[] =
+static const union AnimCmd sAnim_MURKROW_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLOWKING_1[] =
+static const union AnimCmd sAnim_SLOWKING_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2345,7 +2344,7 @@ const union AnimCmd gAnimCmd_SLOWKING_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MISDREAVUS_1[] =
+static const union AnimCmd sAnim_MISDREAVUS_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2360,7 +2359,7 @@ const union AnimCmd gAnimCmd_MISDREAVUS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_1[] =
+static const union AnimCmd sAnim_UNOWN_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -2368,7 +2367,7 @@ const union AnimCmd gAnimCmd_UNOWN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WOBBUFFET_1[] =
+static const union AnimCmd sAnim_WOBBUFFET_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2378,7 +2377,7 @@ const union AnimCmd gAnimCmd_WOBBUFFET_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WOBBUFFET_2[] =
+static const union AnimCmd sAnim_WOBBUFFET_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2387,7 +2386,7 @@ const union AnimCmd gAnimCmd_WOBBUFFET_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GIRAFARIG_1[] =
+static const union AnimCmd sAnim_GIRAFARIG_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2399,7 +2398,7 @@ const union AnimCmd gAnimCmd_GIRAFARIG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GIRAFARIG_2[] =
+static const union AnimCmd sAnim_GIRAFARIG_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2408,7 +2407,7 @@ const union AnimCmd gAnimCmd_GIRAFARIG_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PINECO_1[] =
+static const union AnimCmd sAnim_PINECO_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2421,7 +2420,7 @@ const union AnimCmd gAnimCmd_PINECO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FORRETRESS_1[] =
+static const union AnimCmd sAnim_FORRETRESS_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2430,7 +2429,7 @@ const union AnimCmd gAnimCmd_FORRETRESS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DUNSPARCE_1[] =
+static const union AnimCmd sAnim_DUNSPARCE_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 15),
@@ -2439,14 +2438,14 @@ const union AnimCmd gAnimCmd_DUNSPARCE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GLIGAR_1[] =
+static const union AnimCmd sAnim_GLIGAR_1[] =
 {
     ANIMCMD_FRAME(1, 17),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_STEELIX_1[] =
+static const union AnimCmd sAnim_STEELIX_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 8),
@@ -2457,21 +2456,21 @@ const union AnimCmd gAnimCmd_STEELIX_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SNUBBULL_1[] =
+static const union AnimCmd sAnim_SNUBBULL_1[] =
 {
     ANIMCMD_FRAME(1, 32),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GRANBULL_1[] =
+static const union AnimCmd sAnim_GRANBULL_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_QWILFISH_1[] =
+static const union AnimCmd sAnim_QWILFISH_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -2483,14 +2482,14 @@ const union AnimCmd gAnimCmd_QWILFISH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SCIZOR_1[] =
+static const union AnimCmd sAnim_SCIZOR_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHUCKLE_1[] =
+static const union AnimCmd sAnim_SHUCKLE_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -2498,7 +2497,7 @@ const union AnimCmd gAnimCmd_SHUCKLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HERACROSS_1[] =
+static const union AnimCmd sAnim_HERACROSS_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2508,7 +2507,7 @@ const union AnimCmd gAnimCmd_HERACROSS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HERACROSS_2[] =
+static const union AnimCmd sAnim_HERACROSS_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2517,28 +2516,28 @@ const union AnimCmd gAnimCmd_HERACROSS_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SNEASEL_1[] =
+static const union AnimCmd sAnim_SNEASEL_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TEDDIURSA_1[] =
+static const union AnimCmd sAnim_TEDDIURSA_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_URSARING_1[] =
+static const union AnimCmd sAnim_URSARING_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLUGMA_1[] =
+static const union AnimCmd sAnim_SLUGMA_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -2548,7 +2547,7 @@ const union AnimCmd gAnimCmd_SLUGMA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLUGMA_2[] =
+static const union AnimCmd sAnim_SLUGMA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2557,7 +2556,7 @@ const union AnimCmd gAnimCmd_SLUGMA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGCARGO_1[] =
+static const union AnimCmd sAnim_MAGCARGO_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -2567,7 +2566,7 @@ const union AnimCmd gAnimCmd_MAGCARGO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGCARGO_2[] =
+static const union AnimCmd sAnim_MAGCARGO_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2576,7 +2575,7 @@ const union AnimCmd gAnimCmd_MAGCARGO_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SWINUB_1[] =
+static const union AnimCmd sAnim_SWINUB_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2585,7 +2584,7 @@ const union AnimCmd gAnimCmd_SWINUB_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PILOSWINE_1[] =
+static const union AnimCmd sAnim_PILOSWINE_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2594,7 +2593,7 @@ const union AnimCmd gAnimCmd_PILOSWINE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CORSOLA_1[] =
+static const union AnimCmd sAnim_CORSOLA_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2604,7 +2603,7 @@ const union AnimCmd gAnimCmd_CORSOLA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CORSOLA_2[] =
+static const union AnimCmd sAnim_CORSOLA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2613,7 +2612,7 @@ const union AnimCmd gAnimCmd_CORSOLA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_REMORAID_1[] =
+static const union AnimCmd sAnim_REMORAID_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -2622,7 +2621,7 @@ const union AnimCmd gAnimCmd_REMORAID_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_OCTILLERY_1[] =
+static const union AnimCmd sAnim_OCTILLERY_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2631,7 +2630,7 @@ const union AnimCmd gAnimCmd_OCTILLERY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DELIBIRD_1[] =
+static const union AnimCmd sAnim_DELIBIRD_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2640,7 +2639,7 @@ const union AnimCmd gAnimCmd_DELIBIRD_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MANTINE_1[] =
+static const union AnimCmd sAnim_MANTINE_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
@@ -2649,7 +2648,7 @@ const union AnimCmd gAnimCmd_MANTINE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SKARMORY_1[] =
+static const union AnimCmd sAnim_SKARMORY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2659,7 +2658,7 @@ const union AnimCmd gAnimCmd_SKARMORY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SKARMORY_2[] =
+static const union AnimCmd sAnim_SKARMORY_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2668,7 +2667,7 @@ const union AnimCmd gAnimCmd_SKARMORY_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HOUNDOUR_1[] =
+static const union AnimCmd sAnim_HOUNDOUR_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2677,14 +2676,14 @@ const union AnimCmd gAnimCmd_HOUNDOUR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HOUNDOOM_1[] =
+static const union AnimCmd sAnim_HOUNDOOM_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KINGDRA_1[] =
+static const union AnimCmd sAnim_KINGDRA_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2694,7 +2693,7 @@ const union AnimCmd gAnimCmd_KINGDRA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KINGDRA_2[] =
+static const union AnimCmd sAnim_KINGDRA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2703,7 +2702,7 @@ const union AnimCmd gAnimCmd_KINGDRA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PHANPY_1[] =
+static const union AnimCmd sAnim_PHANPY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2715,7 +2714,7 @@ const union AnimCmd gAnimCmd_PHANPY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PHANPY_2[] =
+static const union AnimCmd sAnim_PHANPY_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2724,7 +2723,7 @@ const union AnimCmd gAnimCmd_PHANPY_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DONPHAN_1[] =
+static const union AnimCmd sAnim_DONPHAN_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2736,7 +2735,7 @@ const union AnimCmd gAnimCmd_DONPHAN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DONPHAN_2[] =
+static const union AnimCmd sAnim_DONPHAN_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2745,7 +2744,7 @@ const union AnimCmd gAnimCmd_DONPHAN_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PORYGON2_1[] =
+static const union AnimCmd sAnim_PORYGON2_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2755,14 +2754,14 @@ const union AnimCmd gAnimCmd_PORYGON2_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_STANTLER_1[] =
+static const union AnimCmd sAnim_STANTLER_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SMEARGLE_1[] =
+static const union AnimCmd sAnim_SMEARGLE_1[] =
 {
     ANIMCMD_FRAME(1, 12),
     ANIMCMD_FRAME(0, 12),
@@ -2771,14 +2770,14 @@ const union AnimCmd gAnimCmd_SMEARGLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TYROGUE_1[] =
+static const union AnimCmd sAnim_TYROGUE_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HITMONTOP_1[] =
+static const union AnimCmd sAnim_HITMONTOP_1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -2794,7 +2793,7 @@ const union AnimCmd gAnimCmd_HITMONTOP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SMOOCHUM_1[] =
+static const union AnimCmd sAnim_SMOOCHUM_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2805,7 +2804,7 @@ const union AnimCmd gAnimCmd_SMOOCHUM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ELEKID_1[] =
+static const union AnimCmd sAnim_ELEKID_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 5),
@@ -2813,7 +2812,7 @@ const union AnimCmd gAnimCmd_ELEKID_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAGBY_1[] =
+static const union AnimCmd sAnim_MAGBY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2825,21 +2824,21 @@ const union AnimCmd gAnimCmd_MAGBY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MILTANK_1[] =
+static const union AnimCmd sAnim_MILTANK_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BLISSEY_1[] =
+static const union AnimCmd sAnim_BLISSEY_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RAIKOU_1[] =
+static const union AnimCmd sAnim_RAIKOU_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2848,21 +2847,21 @@ const union AnimCmd gAnimCmd_RAIKOU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ENTEI_1[] =
+static const union AnimCmd sAnim_ENTEI_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SUICUNE_1[] =
+static const union AnimCmd sAnim_SUICUNE_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LARVITAR_1[] =
+static const union AnimCmd sAnim_LARVITAR_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2871,14 +2870,14 @@ const union AnimCmd gAnimCmd_LARVITAR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PUPITAR_1[] =
+static const union AnimCmd sAnim_PUPITAR_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TYRANITAR_1[] =
+static const union AnimCmd sAnim_TYRANITAR_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 20),
@@ -2887,21 +2886,21 @@ const union AnimCmd gAnimCmd_TYRANITAR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LUGIA_1[] =
+static const union AnimCmd sAnim_LUGIA_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HO_OH_1[] =
+static const union AnimCmd sAnim_HO_OH_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CELEBI_1[] =
+static const union AnimCmd sAnim_CELEBI_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
@@ -2910,7 +2909,7 @@ const union AnimCmd gAnimCmd_CELEBI_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_OLD_UNOWN_B_1[] =
+static const union AnimCmd sAnim_OLD_UNOWN_B_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -2918,7 +2917,7 @@ const union AnimCmd gAnimCmd_OLD_UNOWN_B_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TREECKO_1[] =
+static const union AnimCmd sAnim_TREECKO_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 15),
@@ -2927,7 +2926,7 @@ const union AnimCmd gAnimCmd_TREECKO_1[] =
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_END,};
 
-const union AnimCmd gAnimCmd_GROVYLE_1[] =
+static const union AnimCmd sAnim_GROVYLE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 18),
@@ -2937,7 +2936,7 @@ const union AnimCmd gAnimCmd_GROVYLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SCEPTILE_1[] =
+static const union AnimCmd sAnim_SCEPTILE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 26),
@@ -2945,7 +2944,7 @@ const union AnimCmd gAnimCmd_SCEPTILE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TORCHIC_1[] =
+static const union AnimCmd sAnim_TORCHIC_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 4),
@@ -2957,14 +2956,14 @@ const union AnimCmd gAnimCmd_TORCHIC_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_COMBUSKEN_1[] =
+static const union AnimCmd sAnim_COMBUSKEN_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_END,};
 
-const union AnimCmd gAnimCmd_BLAZIKEN_1[] =
+static const union AnimCmd sAnim_BLAZIKEN_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 25),
@@ -2974,7 +2973,7 @@ const union AnimCmd gAnimCmd_BLAZIKEN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BLAZIKEN_2[] =
+static const union AnimCmd sAnim_BLAZIKEN_2[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 8),
@@ -2982,20 +2981,20 @@ const union AnimCmd gAnimCmd_BLAZIKEN_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BLAZIKEN_3[] =
+static const union AnimCmd sAnim_BLAZIKEN_3[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(2, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BLAZIKEN_4[] =
+static const union AnimCmd sAnim_BLAZIKEN_4[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MUDKIP_1[] =
+static const union AnimCmd sAnim_MUDKIP_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 8),
@@ -3005,7 +3004,7 @@ const union AnimCmd gAnimCmd_MUDKIP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MARSHTOMP_1[] =
+static const union AnimCmd sAnim_MARSHTOMP_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -3019,7 +3018,7 @@ const union AnimCmd gAnimCmd_MARSHTOMP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SWAMPERT_1[] =
+static const union AnimCmd sAnim_SWAMPERT_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 44),
@@ -3029,7 +3028,7 @@ const union AnimCmd gAnimCmd_SWAMPERT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_POOCHYENA_1[] =
+static const union AnimCmd sAnim_POOCHYENA_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 44),
@@ -3037,7 +3036,7 @@ const union AnimCmd gAnimCmd_POOCHYENA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MIGHTYENA_1[] =
+static const union AnimCmd sAnim_MIGHTYENA_1[] =
 {
     ANIMCMD_FRAME(0, 27),
     ANIMCMD_FRAME(1, 6),
@@ -3047,7 +3046,7 @@ const union AnimCmd gAnimCmd_MIGHTYENA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ZIGZAGOON_1[] =
+static const union AnimCmd sAnim_ZIGZAGOON_1[] =
 {
     ANIMCMD_FRAME(0, 27),
     ANIMCMD_FRAME(1, 6),
@@ -3057,7 +3056,7 @@ const union AnimCmd gAnimCmd_ZIGZAGOON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LINOONE_1[] =
+static const union AnimCmd sAnim_LINOONE_1[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(1, 14),
@@ -3067,7 +3066,7 @@ const union AnimCmd gAnimCmd_LINOONE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WURMPLE_1[] =
+static const union AnimCmd sAnim_WURMPLE_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 35),
@@ -3075,7 +3074,7 @@ const union AnimCmd gAnimCmd_WURMPLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SILCOON_1[] =
+static const union AnimCmd sAnim_SILCOON_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 25),
@@ -3083,13 +3082,13 @@ const union AnimCmd gAnimCmd_SILCOON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SILCOON_2[] =
+static const union AnimCmd sAnim_SILCOON_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BEAUTIFLY_1[] =
+static const union AnimCmd sAnim_BEAUTIFLY_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 2),
@@ -3103,13 +3102,13 @@ const union AnimCmd gAnimCmd_BEAUTIFLY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BEAUTIFLY_2[] =
+static const union AnimCmd sAnim_BEAUTIFLY_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CASCOON_1[] =
+static const union AnimCmd sAnim_CASCOON_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3119,13 +3118,13 @@ const union AnimCmd gAnimCmd_CASCOON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CASCOON_2[] =
+static const union AnimCmd sAnim_CASCOON_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DUSTOX_1[] =
+static const union AnimCmd sAnim_DUSTOX_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -3145,13 +3144,13 @@ const union AnimCmd gAnimCmd_DUSTOX_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DUSTOX_2[] =
+static const union AnimCmd sAnim_DUSTOX_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LOTAD_1[] =
+static const union AnimCmd sAnim_LOTAD_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 55),
@@ -3159,7 +3158,7 @@ const union AnimCmd gAnimCmd_LOTAD_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LOMBRE_1[] =
+static const union AnimCmd sAnim_LOMBRE_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 30),
@@ -3169,7 +3168,7 @@ const union AnimCmd gAnimCmd_LOMBRE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LUDICOLO_1[] =
+static const union AnimCmd sAnim_LUDICOLO_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -3181,7 +3180,7 @@ const union AnimCmd gAnimCmd_LUDICOLO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEEDOT_1[] =
+static const union AnimCmd sAnim_SEEDOT_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3195,7 +3194,7 @@ const union AnimCmd gAnimCmd_SEEDOT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NUZLEAF_1[] =
+static const union AnimCmd sAnim_NUZLEAF_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 15),
@@ -3209,7 +3208,7 @@ const union AnimCmd gAnimCmd_NUZLEAF_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHIFTRY_1[] =
+static const union AnimCmd sAnim_SHIFTRY_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 35),
@@ -3217,7 +3216,7 @@ const union AnimCmd gAnimCmd_SHIFTRY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NINCADA_1[] =
+static const union AnimCmd sAnim_NINCADA_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 22),
@@ -3227,7 +3226,7 @@ const union AnimCmd gAnimCmd_NINCADA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NINJASK_1[] =
+static const union AnimCmd sAnim_NINJASK_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -3250,7 +3249,7 @@ const union AnimCmd gAnimCmd_NINJASK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHEDINJA_1[] =
+static const union AnimCmd sAnim_SHEDINJA_1[] =
 {
     ANIMCMD_FRAME(0, 33),
     ANIMCMD_FRAME(1, 33),
@@ -3260,7 +3259,7 @@ const union AnimCmd gAnimCmd_SHEDINJA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TAILLOW_1[] =
+static const union AnimCmd sAnim_TAILLOW_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 15),
@@ -3274,7 +3273,7 @@ const union AnimCmd gAnimCmd_TAILLOW_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SWELLOW_1[] =
+static const union AnimCmd sAnim_SWELLOW_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 18),
@@ -3282,7 +3281,7 @@ const union AnimCmd gAnimCmd_SWELLOW_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHROOMISH_1[] =
+static const union AnimCmd sAnim_SHROOMISH_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -3298,7 +3297,7 @@ const union AnimCmd gAnimCmd_SHROOMISH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BRELOOM_1[] =
+static const union AnimCmd sAnim_BRELOOM_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 30),
@@ -3308,7 +3307,7 @@ const union AnimCmd gAnimCmd_BRELOOM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WINGULL_1[] =
+static const union AnimCmd sAnim_WINGULL_1[] =
 {
     ANIMCMD_FRAME(0, 17),
     ANIMCMD_FRAME(1, 23),
@@ -3316,7 +3315,7 @@ const union AnimCmd gAnimCmd_WINGULL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PELIPPER_1[] =
+static const union AnimCmd sAnim_PELIPPER_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -3330,7 +3329,7 @@ const union AnimCmd gAnimCmd_PELIPPER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SURSKIT_1[] =
+static const union AnimCmd sAnim_SURSKIT_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 18),
@@ -3340,13 +3339,13 @@ const union AnimCmd gAnimCmd_SURSKIT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SURSKIT_2[] =
+static const union AnimCmd sAnim_SURSKIT_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MASQUERAIN_1[] =
+static const union AnimCmd sAnim_MASQUERAIN_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -3360,13 +3359,13 @@ const union AnimCmd gAnimCmd_MASQUERAIN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MASQUERAIN_2[] =
+static const union AnimCmd sAnim_MASQUERAIN_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WAILMER_1[] =
+static const union AnimCmd sAnim_WAILMER_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -3378,7 +3377,7 @@ const union AnimCmd gAnimCmd_WAILMER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WAILORD_1[] =
+static const union AnimCmd sAnim_WAILORD_1[] =
 {
     ANIMCMD_FRAME(0, 26),
     ANIMCMD_FRAME(1, 48),
@@ -3386,7 +3385,7 @@ const union AnimCmd gAnimCmd_WAILORD_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SKITTY_1[] =
+static const union AnimCmd sAnim_SKITTY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 35),
@@ -3394,7 +3393,7 @@ const union AnimCmd gAnimCmd_SKITTY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DELCATTY_1[] =
+static const union AnimCmd sAnim_DELCATTY_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 46),
@@ -3402,7 +3401,7 @@ const union AnimCmd gAnimCmd_DELCATTY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KECLEON_1[] =
+static const union AnimCmd sAnim_KECLEON_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 18),
@@ -3412,7 +3411,7 @@ const union AnimCmd gAnimCmd_KECLEON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BALTOY_1[] =
+static const union AnimCmd sAnim_BALTOY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3424,7 +3423,7 @@ const union AnimCmd gAnimCmd_BALTOY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CLAYDOL_1[] =
+static const union AnimCmd sAnim_CLAYDOL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3436,7 +3435,7 @@ const union AnimCmd gAnimCmd_CLAYDOL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NOSEPASS_1[] =
+static const union AnimCmd sAnim_NOSEPASS_1[] =
 {
     ANIMCMD_FRAME(0, 27),
     ANIMCMD_FRAME(1, 27),
@@ -3448,7 +3447,7 @@ const union AnimCmd gAnimCmd_NOSEPASS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TORKOAL_1[] =
+static const union AnimCmd sAnim_TORKOAL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3458,7 +3457,7 @@ const union AnimCmd gAnimCmd_TORKOAL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SABLEYE_1[] =
+static const union AnimCmd sAnim_SABLEYE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3468,7 +3467,7 @@ const union AnimCmd gAnimCmd_SABLEYE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BARBOACH_1[] =
+static const union AnimCmd sAnim_BARBOACH_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3486,7 +3485,7 @@ const union AnimCmd gAnimCmd_BARBOACH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WHISCASH_1[] =
+static const union AnimCmd sAnim_WHISCASH_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3504,7 +3503,7 @@ const union AnimCmd gAnimCmd_WHISCASH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LUVDISC_1[] =
+static const union AnimCmd sAnim_LUVDISC_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3514,7 +3513,7 @@ const union AnimCmd gAnimCmd_LUVDISC_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CORPHISH_1[] =
+static const union AnimCmd sAnim_CORPHISH_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3526,7 +3525,7 @@ const union AnimCmd gAnimCmd_CORPHISH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CRAWDAUNT_1[] =
+static const union AnimCmd sAnim_CRAWDAUNT_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3536,7 +3535,7 @@ const union AnimCmd gAnimCmd_CRAWDAUNT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FEEBAS_1[] =
+static const union AnimCmd sAnim_FEEBAS_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3548,7 +3547,7 @@ const union AnimCmd gAnimCmd_FEEBAS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MILOTIC_1[] =
+static const union AnimCmd sAnim_MILOTIC_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3560,7 +3559,7 @@ const union AnimCmd gAnimCmd_MILOTIC_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CARVANHA_1[] =
+static const union AnimCmd sAnim_CARVANHA_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -3574,7 +3573,7 @@ const union AnimCmd gAnimCmd_CARVANHA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHARPEDO_1[] =
+static const union AnimCmd sAnim_SHARPEDO_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -3588,7 +3587,7 @@ const union AnimCmd gAnimCmd_SHARPEDO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TRAPINCH_1[] =
+static const union AnimCmd sAnim_TRAPINCH_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3598,7 +3597,7 @@ const union AnimCmd gAnimCmd_TRAPINCH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VIBRAVA_1[] =
+static const union AnimCmd sAnim_VIBRAVA_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3610,7 +3609,7 @@ const union AnimCmd gAnimCmd_VIBRAVA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_FLYGON_1[] =
+static const union AnimCmd sAnim_FLYGON_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3622,7 +3621,7 @@ const union AnimCmd gAnimCmd_FLYGON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAKUHITA_1[] =
+static const union AnimCmd sAnim_MAKUHITA_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 10),
@@ -3636,7 +3635,7 @@ const union AnimCmd gAnimCmd_MAKUHITA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HARIYAMA_1[] =
+static const union AnimCmd sAnim_HARIYAMA_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -3645,7 +3644,7 @@ const union AnimCmd gAnimCmd_HARIYAMA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ELECTRIKE_1[] =
+static const union AnimCmd sAnim_ELECTRIKE_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 25),
@@ -3655,7 +3654,7 @@ const union AnimCmd gAnimCmd_ELECTRIKE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MANECTRIC_1[] =
+static const union AnimCmd sAnim_MANECTRIC_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 33),
@@ -3665,7 +3664,7 @@ const union AnimCmd gAnimCmd_MANECTRIC_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_NUMEL_1[] =
+static const union AnimCmd sAnim_NUMEL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3675,7 +3674,7 @@ const union AnimCmd gAnimCmd_NUMEL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CAMERUPT_1[] =
+static const union AnimCmd sAnim_CAMERUPT_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3687,7 +3686,7 @@ const union AnimCmd gAnimCmd_CAMERUPT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SPHEAL_1[] =
+static const union AnimCmd sAnim_SPHEAL_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 43),
@@ -3700,7 +3699,7 @@ const union AnimCmd gAnimCmd_SPHEAL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEALEO_1[] =
+static const union AnimCmd sAnim_SEALEO_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3710,7 +3709,7 @@ const union AnimCmd gAnimCmd_SEALEO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WALREIN_1[] =
+static const union AnimCmd sAnim_WALREIN_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 10),
@@ -3720,7 +3719,7 @@ const union AnimCmd gAnimCmd_WALREIN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CACNEA_1[] =
+static const union AnimCmd sAnim_CACNEA_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3736,7 +3735,7 @@ const union AnimCmd gAnimCmd_CACNEA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CACTURNE_1[] =
+static const union AnimCmd sAnim_CACTURNE_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3746,7 +3745,7 @@ const union AnimCmd gAnimCmd_CACTURNE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SNORUNT_1[] =
+static const union AnimCmd sAnim_SNORUNT_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3756,7 +3755,7 @@ const union AnimCmd gAnimCmd_SNORUNT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GLALIE_1[] =
+static const union AnimCmd sAnim_GLALIE_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3766,7 +3765,7 @@ const union AnimCmd gAnimCmd_GLALIE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LUNATONE_1[] =
+static const union AnimCmd sAnim_LUNATONE_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -3776,7 +3775,7 @@ const union AnimCmd gAnimCmd_LUNATONE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LUNATONE_2[] =
+static const union AnimCmd sAnim_LUNATONE_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -3785,7 +3784,7 @@ const union AnimCmd gAnimCmd_LUNATONE_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SOLROCK_1[] =
+static const union AnimCmd sAnim_SOLROCK_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -3795,7 +3794,7 @@ const union AnimCmd gAnimCmd_SOLROCK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SOLROCK_2[] =
+static const union AnimCmd sAnim_SOLROCK_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -3804,7 +3803,7 @@ const union AnimCmd gAnimCmd_SOLROCK_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_AZURILL_1[] =
+static const union AnimCmd sAnim_AZURILL_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 12),
@@ -3816,7 +3815,7 @@ const union AnimCmd gAnimCmd_AZURILL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SPOINK_1[] =
+static const union AnimCmd sAnim_SPOINK_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 10),
@@ -3832,7 +3831,7 @@ const union AnimCmd gAnimCmd_SPOINK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GRUMPIG_1[] =
+static const union AnimCmd sAnim_GRUMPIG_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3842,7 +3841,7 @@ const union AnimCmd gAnimCmd_GRUMPIG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_PLUSLE_1[] =
+static const union AnimCmd sAnim_PLUSLE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3852,7 +3851,7 @@ const union AnimCmd gAnimCmd_PLUSLE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MINUN_1[] =
+static const union AnimCmd sAnim_MINUN_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3862,7 +3861,7 @@ const union AnimCmd gAnimCmd_MINUN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MAWILE_1[] =
+static const union AnimCmd sAnim_MAWILE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3874,7 +3873,7 @@ const union AnimCmd gAnimCmd_MAWILE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MEDITITE_1[] =
+static const union AnimCmd sAnim_MEDITITE_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 2),
@@ -3882,7 +3881,7 @@ const union AnimCmd gAnimCmd_MEDITITE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_MEDICHAM_1[] =
+static const union AnimCmd sAnim_MEDICHAM_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -3894,7 +3893,7 @@ const union AnimCmd gAnimCmd_MEDICHAM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SWABLU_1[] =
+static const union AnimCmd sAnim_SWABLU_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 10),
@@ -3906,7 +3905,7 @@ const union AnimCmd gAnimCmd_SWABLU_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SWABLU_2[] =
+static const union AnimCmd sAnim_SWABLU_2[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 8),
@@ -3917,7 +3916,7 @@ const union AnimCmd gAnimCmd_SWABLU_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ALTARIA_1[] =
+static const union AnimCmd sAnim_ALTARIA_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -3927,7 +3926,7 @@ const union AnimCmd gAnimCmd_ALTARIA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ALTARIA_2[] =
+static const union AnimCmd sAnim_ALTARIA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -3936,7 +3935,7 @@ const union AnimCmd gAnimCmd_ALTARIA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WYNAUT_1[] =
+static const union AnimCmd sAnim_WYNAUT_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3946,7 +3945,7 @@ const union AnimCmd gAnimCmd_WYNAUT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DUSKULL_1[] =
+static const union AnimCmd sAnim_DUSKULL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3956,7 +3955,7 @@ const union AnimCmd gAnimCmd_DUSKULL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DUSCLOPS_1[] =
+static const union AnimCmd sAnim_DUSCLOPS_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3966,7 +3965,7 @@ const union AnimCmd gAnimCmd_DUSCLOPS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ROSELIA_1[] =
+static const union AnimCmd sAnim_ROSELIA_1[] =
 {
     ANIMCMD_FRAME(0, 18),
     ANIMCMD_FRAME(1, 44),
@@ -3974,7 +3973,7 @@ const union AnimCmd gAnimCmd_ROSELIA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLAKOTH_1[] =
+static const union AnimCmd sAnim_SLAKOTH_1[] =
 {
     ANIMCMD_FRAME(0, 13),
     ANIMCMD_FRAME(1, 22),
@@ -3985,7 +3984,7 @@ const union AnimCmd gAnimCmd_SLAKOTH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VIGOROTH_1[] =
+static const union AnimCmd sAnim_VIGOROTH_1[] =
 {
     ANIMCMD_FRAME(0, 13),
     ANIMCMD_FRAME(1, 7),
@@ -3997,7 +3996,7 @@ const union AnimCmd gAnimCmd_VIGOROTH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SLAKING_1[] =
+static const union AnimCmd sAnim_SLAKING_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -4009,7 +4008,7 @@ const union AnimCmd gAnimCmd_SLAKING_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GULPIN_1[] =
+static const union AnimCmd sAnim_GULPIN_1[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(1, 14),
@@ -4019,7 +4018,7 @@ const union AnimCmd gAnimCmd_GULPIN_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SWALOT_1[] =
+static const union AnimCmd sAnim_SWALOT_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 30),
@@ -4028,7 +4027,7 @@ const union AnimCmd gAnimCmd_SWALOT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_TROPIUS_1[] =
+static const union AnimCmd sAnim_TROPIUS_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4038,7 +4037,7 @@ const union AnimCmd gAnimCmd_TROPIUS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_WHISMUR_1[] =
+static const union AnimCmd sAnim_WHISMUR_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 9),
@@ -4053,7 +4052,7 @@ const union AnimCmd gAnimCmd_WHISMUR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LOUDRED_1[] =
+static const union AnimCmd sAnim_LOUDRED_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 9),
@@ -4063,7 +4062,7 @@ const union AnimCmd gAnimCmd_LOUDRED_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_EXPLOUD_1[] =
+static const union AnimCmd sAnim_EXPLOUD_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 44),
@@ -4071,7 +4070,7 @@ const union AnimCmd gAnimCmd_EXPLOUD_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CLAMPERL_1[] =
+static const union AnimCmd sAnim_CLAMPERL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4081,7 +4080,7 @@ const union AnimCmd gAnimCmd_CLAMPERL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_HUNTAIL_1[] =
+static const union AnimCmd sAnim_HUNTAIL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4091,7 +4090,7 @@ const union AnimCmd gAnimCmd_HUNTAIL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GOREBYSS_1[] =
+static const union AnimCmd sAnim_GOREBYSS_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4101,7 +4100,7 @@ const union AnimCmd gAnimCmd_GOREBYSS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ABSOL_1[] =
+static const union AnimCmd sAnim_ABSOL_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4111,7 +4110,7 @@ const union AnimCmd gAnimCmd_ABSOL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHUPPET_1[] =
+static const union AnimCmd sAnim_SHUPPET_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4123,7 +4122,7 @@ const union AnimCmd gAnimCmd_SHUPPET_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BANETTE_1[] =
+static const union AnimCmd sAnim_BANETTE_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4135,7 +4134,7 @@ const union AnimCmd gAnimCmd_BANETTE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SEVIPER_1[] =
+static const union AnimCmd sAnim_SEVIPER_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4147,7 +4146,7 @@ const union AnimCmd gAnimCmd_SEVIPER_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ZANGOOSE_1[] =
+static const union AnimCmd sAnim_ZANGOOSE_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4159,7 +4158,7 @@ const union AnimCmd gAnimCmd_ZANGOOSE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RELICANTH_1[] =
+static const union AnimCmd sAnim_RELICANTH_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4169,7 +4168,7 @@ const union AnimCmd gAnimCmd_RELICANTH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ARON_1[] =
+static const union AnimCmd sAnim_ARON_1[] =
 {
     ANIMCMD_FRAME(0, 33),
     ANIMCMD_FRAME(1, 44),
@@ -4179,7 +4178,7 @@ const union AnimCmd gAnimCmd_ARON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LAIRON_1[] =
+static const union AnimCmd sAnim_LAIRON_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 29),
@@ -4189,7 +4188,7 @@ const union AnimCmd gAnimCmd_LAIRON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_AGGRON_1[] =
+static const union AnimCmd sAnim_AGGRON_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 44),
@@ -4197,31 +4196,31 @@ const union AnimCmd gAnimCmd_AGGRON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CASTFORM_0[] =
+static const union AnimCmd sAnim_CASTFORM_0[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CASTFORM_1[] =
+static const union AnimCmd sAnim_CASTFORM_1[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CASTFORM_2[] =
+static const union AnimCmd sAnim_CASTFORM_2[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CASTFORM_3[] =
+static const union AnimCmd sAnim_CASTFORM_3[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_VOLBEAT_1[] =
+static const union AnimCmd sAnim_VOLBEAT_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -4233,7 +4232,7 @@ const union AnimCmd gAnimCmd_VOLBEAT_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ILLUMISE_1[] =
+static const union AnimCmd sAnim_ILLUMISE_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -4243,7 +4242,7 @@ const union AnimCmd gAnimCmd_ILLUMISE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LILEEP_1[] =
+static const union AnimCmd sAnim_LILEEP_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4253,7 +4252,7 @@ const union AnimCmd gAnimCmd_LILEEP_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CRADILY_1[] =
+static const union AnimCmd sAnim_CRADILY_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4265,7 +4264,7 @@ const union AnimCmd gAnimCmd_CRADILY_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ANORITH_1[] =
+static const union AnimCmd sAnim_ANORITH_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4277,7 +4276,7 @@ const union AnimCmd gAnimCmd_ANORITH_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_ARMALDO_1[] =
+static const union AnimCmd sAnim_ARMALDO_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4287,7 +4286,7 @@ const union AnimCmd gAnimCmd_ARMALDO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RALTS_1[] =
+static const union AnimCmd sAnim_RALTS_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 25),
@@ -4295,7 +4294,7 @@ const union AnimCmd gAnimCmd_RALTS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KIRLIA_1[] =
+static const union AnimCmd sAnim_KIRLIA_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 39),
@@ -4303,7 +4302,7 @@ const union AnimCmd gAnimCmd_KIRLIA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GARDEVOIR_1[] =
+static const union AnimCmd sAnim_GARDEVOIR_1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 3),
@@ -4321,7 +4320,7 @@ const union AnimCmd gAnimCmd_GARDEVOIR_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BAGON_1[] =
+static const union AnimCmd sAnim_BAGON_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4331,7 +4330,7 @@ const union AnimCmd gAnimCmd_BAGON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SHELGON_1[] =
+static const union AnimCmd sAnim_SHELGON_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4341,7 +4340,7 @@ const union AnimCmd gAnimCmd_SHELGON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_SALAMENCE_1[] =
+static const union AnimCmd sAnim_SALAMENCE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4351,7 +4350,7 @@ const union AnimCmd gAnimCmd_SALAMENCE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_BELDUM_1[] =
+static const union AnimCmd sAnim_BELDUM_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4361,7 +4360,7 @@ const union AnimCmd gAnimCmd_BELDUM_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_METANG_1[] =
+static const union AnimCmd sAnim_METANG_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -4371,7 +4370,7 @@ const union AnimCmd gAnimCmd_METANG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_METAGROSS_1[] =
+static const union AnimCmd sAnim_METAGROSS_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -4381,7 +4380,7 @@ const union AnimCmd gAnimCmd_METAGROSS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_REGIROCK_1[] =
+static const union AnimCmd sAnim_REGIROCK_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4391,7 +4390,7 @@ const union AnimCmd gAnimCmd_REGIROCK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_REGIROCK_2[] =
+static const union AnimCmd sAnim_REGIROCK_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4400,7 +4399,7 @@ const union AnimCmd gAnimCmd_REGIROCK_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_REGICE_1[] =
+static const union AnimCmd sAnim_REGICE_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 15),
@@ -4410,7 +4409,7 @@ const union AnimCmd gAnimCmd_REGICE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_REGISTEEL_1[] =
+static const union AnimCmd sAnim_REGISTEEL_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4420,7 +4419,7 @@ const union AnimCmd gAnimCmd_REGISTEEL_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_REGISTEEL_2[] =
+static const union AnimCmd sAnim_REGISTEEL_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4429,7 +4428,7 @@ const union AnimCmd gAnimCmd_REGISTEEL_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KYOGRE_1[] =
+static const union AnimCmd sAnim_KYOGRE_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4439,7 +4438,7 @@ const union AnimCmd gAnimCmd_KYOGRE_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_KYOGRE_2[] =
+static const union AnimCmd sAnim_KYOGRE_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4448,7 +4447,7 @@ const union AnimCmd gAnimCmd_KYOGRE_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GROUDON_1[] =
+static const union AnimCmd sAnim_GROUDON_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -4458,7 +4457,7 @@ const union AnimCmd gAnimCmd_GROUDON_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_GROUDON_2[] =
+static const union AnimCmd sAnim_GROUDON_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4467,7 +4466,7 @@ const union AnimCmd gAnimCmd_GROUDON_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RAYQUAZA_1[] =
+static const union AnimCmd sAnim_RAYQUAZA_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 8),
@@ -4477,7 +4476,7 @@ const union AnimCmd gAnimCmd_RAYQUAZA_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RAYQUAZA_2[] =
+static const union AnimCmd sAnim_RAYQUAZA_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4486,7 +4485,7 @@ const union AnimCmd gAnimCmd_RAYQUAZA_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LATIAS_1[] =
+static const union AnimCmd sAnim_LATIAS_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4496,7 +4495,7 @@ const union AnimCmd gAnimCmd_LATIAS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LATIAS_2[] =
+static const union AnimCmd sAnim_LATIAS_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4505,7 +4504,7 @@ const union AnimCmd gAnimCmd_LATIAS_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LATIOS_1[] =
+static const union AnimCmd sAnim_LATIOS_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4515,7 +4514,7 @@ const union AnimCmd gAnimCmd_LATIOS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_LATIOS_2[] =
+static const union AnimCmd sAnim_LATIOS_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4524,7 +4523,7 @@ const union AnimCmd gAnimCmd_LATIOS_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JIRACHI_1[] =
+static const union AnimCmd sAnim_JIRACHI_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4539,7 +4538,7 @@ const union AnimCmd gAnimCmd_JIRACHI_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_JIRACHI_2[] =
+static const union AnimCmd sAnim_JIRACHI_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4548,7 +4547,7 @@ const union AnimCmd gAnimCmd_JIRACHI_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DEOXYS_1[] =
+static const union AnimCmd sAnim_DEOXYS_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -4558,7 +4557,7 @@ const union AnimCmd gAnimCmd_DEOXYS_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_DEOXYS_2[] =
+static const union AnimCmd sAnim_DEOXYS_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4567,7 +4566,7 @@ const union AnimCmd gAnimCmd_DEOXYS_2[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_CHIMECHO_1[] =
+static const union AnimCmd sAnim_CHIMECHO_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4581,7 +4580,7 @@ const union AnimCmd gAnimCmd_CHIMECHO_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_EGG_1[] =
+static const union AnimCmd sAnim_EGG_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -4590,7 +4589,7 @@ const union AnimCmd gAnimCmd_EGG_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_B_1[] =
+static const union AnimCmd sAnim_UNOWN_B_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4598,7 +4597,7 @@ const union AnimCmd gAnimCmd_UNOWN_B_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_C_1[] =
+static const union AnimCmd sAnim_UNOWN_C_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4606,7 +4605,7 @@ const union AnimCmd gAnimCmd_UNOWN_C_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_D_1[] =
+static const union AnimCmd sAnim_UNOWN_D_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4614,7 +4613,7 @@ const union AnimCmd gAnimCmd_UNOWN_D_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_E_1[] =
+static const union AnimCmd sAnim_UNOWN_E_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4622,7 +4621,7 @@ const union AnimCmd gAnimCmd_UNOWN_E_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_F_1[] =
+static const union AnimCmd sAnim_UNOWN_F_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4630,7 +4629,7 @@ const union AnimCmd gAnimCmd_UNOWN_F_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_G_1[] =
+static const union AnimCmd sAnim_UNOWN_G_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4638,7 +4637,7 @@ const union AnimCmd gAnimCmd_UNOWN_G_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_H_1[] =
+static const union AnimCmd sAnim_UNOWN_H_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4646,7 +4645,7 @@ const union AnimCmd gAnimCmd_UNOWN_H_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_I_1[] =
+static const union AnimCmd sAnim_UNOWN_I_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4654,7 +4653,7 @@ const union AnimCmd gAnimCmd_UNOWN_I_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_J_1[] =
+static const union AnimCmd sAnim_UNOWN_J_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4662,7 +4661,7 @@ const union AnimCmd gAnimCmd_UNOWN_J_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_K_1[] =
+static const union AnimCmd sAnim_UNOWN_K_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4670,7 +4669,7 @@ const union AnimCmd gAnimCmd_UNOWN_K_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_L_1[] =
+static const union AnimCmd sAnim_UNOWN_L_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4678,7 +4677,7 @@ const union AnimCmd gAnimCmd_UNOWN_L_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_M_1[] =
+static const union AnimCmd sAnim_UNOWN_M_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4686,7 +4685,7 @@ const union AnimCmd gAnimCmd_UNOWN_M_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_N_1[] =
+static const union AnimCmd sAnim_UNOWN_N_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4694,7 +4693,7 @@ const union AnimCmd gAnimCmd_UNOWN_N_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_O_1[] =
+static const union AnimCmd sAnim_UNOWN_O_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4702,7 +4701,7 @@ const union AnimCmd gAnimCmd_UNOWN_O_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_P_1[] =
+static const union AnimCmd sAnim_UNOWN_P_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4710,7 +4709,7 @@ const union AnimCmd gAnimCmd_UNOWN_P_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_Q_1[] =
+static const union AnimCmd sAnim_UNOWN_Q_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4718,7 +4717,7 @@ const union AnimCmd gAnimCmd_UNOWN_Q_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_R_1[] =
+static const union AnimCmd sAnim_UNOWN_R_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4726,7 +4725,7 @@ const union AnimCmd gAnimCmd_UNOWN_R_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_S_1[] =
+static const union AnimCmd sAnim_UNOWN_S_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4734,7 +4733,7 @@ const union AnimCmd gAnimCmd_UNOWN_S_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_T_1[] =
+static const union AnimCmd sAnim_UNOWN_T_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4742,7 +4741,7 @@ const union AnimCmd gAnimCmd_UNOWN_T_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_U_1[] =
+static const union AnimCmd sAnim_UNOWN_U_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4750,7 +4749,7 @@ const union AnimCmd gAnimCmd_UNOWN_U_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_V_1[] =
+static const union AnimCmd sAnim_UNOWN_V_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4758,7 +4757,7 @@ const union AnimCmd gAnimCmd_UNOWN_V_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_W_1[] =
+static const union AnimCmd sAnim_UNOWN_W_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4766,7 +4765,7 @@ const union AnimCmd gAnimCmd_UNOWN_W_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_X_1[] =
+static const union AnimCmd sAnim_UNOWN_X_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4774,7 +4773,7 @@ const union AnimCmd gAnimCmd_UNOWN_X_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_Y_1[] =
+static const union AnimCmd sAnim_UNOWN_Y_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4782,7 +4781,7 @@ const union AnimCmd gAnimCmd_UNOWN_Y_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_Z_1[] =
+static const union AnimCmd sAnim_UNOWN_Z_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4790,7 +4789,7 @@ const union AnimCmd gAnimCmd_UNOWN_Z_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_EMARK_1[] =
+static const union AnimCmd sAnim_UNOWN_EMARK_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4798,2158 +4797,2158 @@ const union AnimCmd gAnimCmd_UNOWN_EMARK_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_UNOWN_QMARK_1[] =
+static const union AnimCmd sAnim_UNOWN_QMARK_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
- 
-const union AnimCmd *const gAnims_NONE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NONE_1,
+
+static const union AnimCmd *const sAnims_NONE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NONE_1,
 };
 
-const union AnimCmd *const gAnims_BULBASAUR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BULBASAUR_1,
+static const union AnimCmd *const sAnims_BULBASAUR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BULBASAUR_1,
 };
 
-const union AnimCmd *const gAnims_IVYSAUR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_IVYSAUR_1,
+static const union AnimCmd *const sAnims_IVYSAUR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_IVYSAUR_1,
 };
 
-const union AnimCmd *const gAnims_VENUSAUR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VENUSAUR_1,
+static const union AnimCmd *const sAnims_VENUSAUR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VENUSAUR_1,
 };
 
-const union AnimCmd *const gAnims_CHARMANDER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHARMANDER_1,
+static const union AnimCmd *const sAnims_CHARMANDER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHARMANDER_1,
 };
 
-const union AnimCmd *const gAnims_CHARMELEON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHARMELEON_1,
+static const union AnimCmd *const sAnims_CHARMELEON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHARMELEON_1,
 };
 
-const union AnimCmd *const gAnims_CHARIZARD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHARIZARD_1,
+static const union AnimCmd *const sAnims_CHARIZARD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHARIZARD_1,
 };
 
-const union AnimCmd *const gAnims_SQUIRTLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SQUIRTLE_1,
+static const union AnimCmd *const sAnims_SQUIRTLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SQUIRTLE_1,
 };
 
-const union AnimCmd *const gAnims_WARTORTLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WARTORTLE_1,
+static const union AnimCmd *const sAnims_WARTORTLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WARTORTLE_1,
 };
 
-const union AnimCmd *const gAnims_BLASTOISE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BLASTOISE_1,
+static const union AnimCmd *const sAnims_BLASTOISE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BLASTOISE_1,
 };
 
-const union AnimCmd *const gAnims_CATERPIE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CATERPIE_1,
+static const union AnimCmd *const sAnims_CATERPIE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CATERPIE_1,
 };
 
-const union AnimCmd *const gAnims_METAPOD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_METAPOD_1,
+static const union AnimCmd *const sAnims_METAPOD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_METAPOD_1,
 };
 
-const union AnimCmd *const gAnims_BUTTERFREE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BUTTERFREE_1,
+static const union AnimCmd *const sAnims_BUTTERFREE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BUTTERFREE_1,
 };
 
-const union AnimCmd *const gAnims_WEEDLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WEEDLE_1,
+static const union AnimCmd *const sAnims_WEEDLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WEEDLE_1,
 };
 
-const union AnimCmd *const gAnims_KAKUNA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KAKUNA_1,
+static const union AnimCmd *const sAnims_KAKUNA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KAKUNA_1,
 };
 
-const union AnimCmd *const gAnims_BEEDRILL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BEEDRILL_1,
+static const union AnimCmd *const sAnims_BEEDRILL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BEEDRILL_1,
 };
 
-const union AnimCmd *const gAnims_PIDGEY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PIDGEY_1,
+static const union AnimCmd *const sAnims_PIDGEY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PIDGEY_1,
 };
 
-const union AnimCmd *const gAnims_PIDGEOTTO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PIDGEOTTO_1,
+static const union AnimCmd *const sAnims_PIDGEOTTO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PIDGEOTTO_1,
 };
 
-const union AnimCmd *const gAnims_PIDGEOT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PIDGEOT_1,
+static const union AnimCmd *const sAnims_PIDGEOT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PIDGEOT_1,
 };
 
-const union AnimCmd *const gAnims_RATTATA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RATTATA_1,
+static const union AnimCmd *const sAnims_RATTATA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RATTATA_1,
 };
 
-const union AnimCmd *const gAnims_RATICATE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RATICATE_1,
+static const union AnimCmd *const sAnims_RATICATE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RATICATE_1,
 };
 
-const union AnimCmd *const gAnims_SPEAROW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SPEAROW_1,
+static const union AnimCmd *const sAnims_SPEAROW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SPEAROW_1,
 };
 
-const union AnimCmd *const gAnims_FEAROW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FEAROW_1,
+static const union AnimCmd *const sAnims_FEAROW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FEAROW_1,
 };
 
-const union AnimCmd *const gAnims_EKANS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_EKANS_1,
+static const union AnimCmd *const sAnims_EKANS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_EKANS_1,
 };
 
-const union AnimCmd *const gAnims_ARBOK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ARBOK_1,
+static const union AnimCmd *const sAnims_ARBOK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ARBOK_1,
 };
 
-const union AnimCmd *const gAnims_PIKACHU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PIKACHU_1,
-    gAnimCmd_PIKACHU_2,
+static const union AnimCmd *const sAnims_PIKACHU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PIKACHU_1,
+    sAnim_PIKACHU_2,
 };
 
-const union AnimCmd *const gAnims_RAICHU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RAICHU_1,
-    gAnimCmd_RAICHU_2,
+static const union AnimCmd *const sAnims_RAICHU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RAICHU_1,
+    sAnim_RAICHU_2,
 };
 
-const union AnimCmd *const gAnims_SANDSHREW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SANDSHREW_1,
-    gAnimCmd_SANDSHREW_2,
+static const union AnimCmd *const sAnims_SANDSHREW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SANDSHREW_1,
+    sAnim_SANDSHREW_2,
 };
 
-const union AnimCmd *const gAnims_SANDSLASH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SANDSLASH_1,
-    gAnimCmd_SANDSLASH_2,
+static const union AnimCmd *const sAnims_SANDSLASH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SANDSLASH_1,
+    sAnim_SANDSLASH_2,
 };
 
-const union AnimCmd *const gAnims_NIDORAN_F[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NIDORAN_F_1,
+static const union AnimCmd *const sAnims_NIDORAN_F[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NIDORAN_F_1,
 };
 
-const union AnimCmd *const gAnims_NIDORINA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NIDORINA_1,
+static const union AnimCmd *const sAnims_NIDORINA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NIDORINA_1,
 };
 
-const union AnimCmd *const gAnims_NIDOQUEEN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NIDOQUEEN_1,
+static const union AnimCmd *const sAnims_NIDOQUEEN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NIDOQUEEN_1,
 };
 
-const union AnimCmd *const gAnims_NIDORAN_M[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NIDORAN_M_1,
+static const union AnimCmd *const sAnims_NIDORAN_M[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NIDORAN_M_1,
 };
 
-const union AnimCmd *const gAnims_NIDORINO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NIDORINO_1,
+static const union AnimCmd *const sAnims_NIDORINO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NIDORINO_1,
 };
 
-const union AnimCmd *const gAnims_NIDOKING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NIDOKING_1,
+static const union AnimCmd *const sAnims_NIDOKING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NIDOKING_1,
 };
 
-const union AnimCmd *const gAnims_CLEFAIRY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CLEFAIRY_1,
+static const union AnimCmd *const sAnims_CLEFAIRY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CLEFAIRY_1,
 };
 
-const union AnimCmd *const gAnims_CLEFABLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CLEFABLE_1,
+static const union AnimCmd *const sAnims_CLEFABLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CLEFABLE_1,
 };
 
-const union AnimCmd *const gAnims_VULPIX[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VULPIX_1,
-    gAnimCmd_VULPIX_2,
+static const union AnimCmd *const sAnims_VULPIX[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VULPIX_1,
+    sAnim_VULPIX_2,
 };
 
-const union AnimCmd *const gAnims_NINETALES[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NINETALES_1,
-    gAnimCmd_NINETALES_2,
+static const union AnimCmd *const sAnims_NINETALES[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NINETALES_1,
+    sAnim_NINETALES_2,
 };
 
-const union AnimCmd *const gAnims_JIGGLYPUFF[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_JIGGLYPUFF_1,
-    gAnimCmd_JIGGLYPUFF_2,
+static const union AnimCmd *const sAnims_JIGGLYPUFF[] ={
+    sAnim_GeneralFrame0,
+    sAnim_JIGGLYPUFF_1,
+    sAnim_JIGGLYPUFF_2,
 };
 
-const union AnimCmd *const gAnims_WIGGLYTUFF[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WIGGLYTUFF_1,
-    gAnimCmd_WIGGLYTUFF_2,
+static const union AnimCmd *const sAnims_WIGGLYTUFF[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WIGGLYTUFF_1,
+    sAnim_WIGGLYTUFF_2,
 };
 
-const union AnimCmd *const gAnims_ZUBAT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ZUBAT_1,
+static const union AnimCmd *const sAnims_ZUBAT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ZUBAT_1,
 };
 
-const union AnimCmd *const gAnims_GOLBAT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GOLBAT_1,
+static const union AnimCmd *const sAnims_GOLBAT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GOLBAT_1,
 };
 
-const union AnimCmd *const gAnims_ODDISH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ODDISH_1,
+static const union AnimCmd *const sAnims_ODDISH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ODDISH_1,
 };
 
-const union AnimCmd *const gAnims_GLOOM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GLOOM_1,
+static const union AnimCmd *const sAnims_GLOOM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GLOOM_1,
 };
 
-const union AnimCmd *const gAnims_VILEPLUME[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VILEPLUME_1,
+static const union AnimCmd *const sAnims_VILEPLUME[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VILEPLUME_1,
 };
 
-const union AnimCmd *const gAnims_PARAS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PARAS_1,
+static const union AnimCmd *const sAnims_PARAS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PARAS_1,
 };
 
-const union AnimCmd *const gAnims_PARASECT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PARASECT_1,
+static const union AnimCmd *const sAnims_PARASECT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PARASECT_1,
 };
 
-const union AnimCmd *const gAnims_VENONAT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VENONAT_1,
+static const union AnimCmd *const sAnims_VENONAT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VENONAT_1,
 };
 
-const union AnimCmd *const gAnims_VENOMOTH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VENOMOTH_1,
+static const union AnimCmd *const sAnims_VENOMOTH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VENOMOTH_1,
 };
 
-const union AnimCmd *const gAnims_DIGLETT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DIGLETT_1,
+static const union AnimCmd *const sAnims_DIGLETT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DIGLETT_1,
 };
 
-const union AnimCmd *const gAnims_DUGTRIO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DUGTRIO_1,
+static const union AnimCmd *const sAnims_DUGTRIO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DUGTRIO_1,
 };
 
-const union AnimCmd *const gAnims_MEOWTH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MEOWTH_1,
+static const union AnimCmd *const sAnims_MEOWTH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MEOWTH_1,
 };
 
-const union AnimCmd *const gAnims_PERSIAN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PERSIAN_1,
+static const union AnimCmd *const sAnims_PERSIAN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PERSIAN_1,
 };
 
-const union AnimCmd *const gAnims_PSYDUCK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PSYDUCK_1,
-    gAnimCmd_PSYDUCK_2,
+static const union AnimCmd *const sAnims_PSYDUCK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PSYDUCK_1,
+    sAnim_PSYDUCK_2,
 };
 
-const union AnimCmd *const gAnims_GOLDUCK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GOLDUCK_1,
-    gAnimCmd_GOLDUCK_2,
+static const union AnimCmd *const sAnims_GOLDUCK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GOLDUCK_1,
+    sAnim_GOLDUCK_2,
 };
 
-const union AnimCmd *const gAnims_MANKEY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MANKEY_1,
+static const union AnimCmd *const sAnims_MANKEY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MANKEY_1,
 };
 
-const union AnimCmd *const gAnims_PRIMEAPE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PRIMEAPE_1,
+static const union AnimCmd *const sAnims_PRIMEAPE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PRIMEAPE_1,
 };
 
-const union AnimCmd *const gAnims_GROWLITHE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GROWLITHE_1,
+static const union AnimCmd *const sAnims_GROWLITHE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GROWLITHE_1,
 };
 
-const union AnimCmd *const gAnims_ARCANINE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ARCANINE_1,
+static const union AnimCmd *const sAnims_ARCANINE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ARCANINE_1,
 };
 
-const union AnimCmd *const gAnims_POLIWAG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_POLIWAG_1,
+static const union AnimCmd *const sAnims_POLIWAG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_POLIWAG_1,
 };
 
-const union AnimCmd *const gAnims_POLIWHIRL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_POLIWHIRL_1,
+static const union AnimCmd *const sAnims_POLIWHIRL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_POLIWHIRL_1,
 };
 
-const union AnimCmd *const gAnims_POLIWRATH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_POLIWRATH_1,
+static const union AnimCmd *const sAnims_POLIWRATH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_POLIWRATH_1,
 };
 
-const union AnimCmd *const gAnims_ABRA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ABRA_1,
+static const union AnimCmd *const sAnims_ABRA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ABRA_1,
 };
 
-const union AnimCmd *const gAnims_KADABRA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KADABRA_1,
+static const union AnimCmd *const sAnims_KADABRA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KADABRA_1,
 };
 
-const union AnimCmd *const gAnims_ALAKAZAM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ALAKAZAM_1,
+static const union AnimCmd *const sAnims_ALAKAZAM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ALAKAZAM_1,
 };
 
-const union AnimCmd *const gAnims_MACHOP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MACHOP_1,
+static const union AnimCmd *const sAnims_MACHOP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MACHOP_1,
 };
 
-const union AnimCmd *const gAnims_MACHOKE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MACHOKE_1,
+static const union AnimCmd *const sAnims_MACHOKE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MACHOKE_1,
 };
 
-const union AnimCmd *const gAnims_MACHAMP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MACHAMP_1,
+static const union AnimCmd *const sAnims_MACHAMP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MACHAMP_1,
 };
 
-const union AnimCmd *const gAnims_BELLSPROUT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BELLSPROUT_1,
+static const union AnimCmd *const sAnims_BELLSPROUT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BELLSPROUT_1,
 };
 
-const union AnimCmd *const gAnims_WEEPINBELL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WEEPINBELL_1,
+static const union AnimCmd *const sAnims_WEEPINBELL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WEEPINBELL_1,
 };
 
-const union AnimCmd *const gAnims_VICTREEBEL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VICTREEBEL_1,
+static const union AnimCmd *const sAnims_VICTREEBEL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VICTREEBEL_1,
 };
 
-const union AnimCmd *const gAnims_TENTACOOL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TENTACOOL_1,
+static const union AnimCmd *const sAnims_TENTACOOL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TENTACOOL_1,
 };
 
-const union AnimCmd *const gAnims_TENTACRUEL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TENTACRUEL_1,
+static const union AnimCmd *const sAnims_TENTACRUEL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TENTACRUEL_1,
 };
 
-const union AnimCmd *const gAnims_GEODUDE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GEODUDE_1,
+static const union AnimCmd *const sAnims_GEODUDE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GEODUDE_1,
 };
 
-const union AnimCmd *const gAnims_GRAVELER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GRAVELER_1,
+static const union AnimCmd *const sAnims_GRAVELER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GRAVELER_1,
 };
 
-const union AnimCmd *const gAnims_GOLEM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GOLEM_1,
+static const union AnimCmd *const sAnims_GOLEM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GOLEM_1,
 };
 
-const union AnimCmd *const gAnims_PONYTA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PONYTA_1,
+static const union AnimCmd *const sAnims_PONYTA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PONYTA_1,
 };
 
-const union AnimCmd *const gAnims_RAPIDASH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RAPIDASH_1,
+static const union AnimCmd *const sAnims_RAPIDASH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RAPIDASH_1,
 };
 
-const union AnimCmd *const gAnims_SLOWPOKE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SLOWPOKE_1,
+static const union AnimCmd *const sAnims_SLOWPOKE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SLOWPOKE_1,
 };
 
-const union AnimCmd *const gAnims_SLOWBRO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SLOWBRO_1,
+static const union AnimCmd *const sAnims_SLOWBRO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SLOWBRO_1,
 };
 
-const union AnimCmd *const gAnims_MAGNEMITE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAGNEMITE_1,
+static const union AnimCmd *const sAnims_MAGNEMITE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAGNEMITE_1,
 };
 
-const union AnimCmd *const gAnims_MAGNETON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAGNETON_1,
+static const union AnimCmd *const sAnims_MAGNETON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAGNETON_1,
 };
 
-const union AnimCmd *const gAnims_FARFETCHD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FARFETCHD_1,
+static const union AnimCmd *const sAnims_FARFETCHD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FARFETCHD_1,
 };
 
-const union AnimCmd *const gAnims_DODUO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DODUO_1,
+static const union AnimCmd *const sAnims_DODUO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DODUO_1,
 };
 
-const union AnimCmd *const gAnims_DODRIO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DODRIO_1,
+static const union AnimCmd *const sAnims_DODRIO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DODRIO_1,
 };
 
-const union AnimCmd *const gAnims_SEEL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SEEL_1,
+static const union AnimCmd *const sAnims_SEEL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SEEL_1,
 };
 
-const union AnimCmd *const gAnims_DEWGONG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DEWGONG_1,
+static const union AnimCmd *const sAnims_DEWGONG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DEWGONG_1,
 };
 
-const union AnimCmd *const gAnims_GRIMER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GRIMER_1,
-    gAnimCmd_GRIMER_2,
+static const union AnimCmd *const sAnims_GRIMER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GRIMER_1,
+    sAnim_GRIMER_2,
 };
 
-const union AnimCmd *const gAnims_MUK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MUK_1,
-    gAnimCmd_MUK_2,
+static const union AnimCmd *const sAnims_MUK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MUK_1,
+    sAnim_MUK_2,
 };
 
-const union AnimCmd *const gAnims_SHELLDER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHELLDER_1,
+static const union AnimCmd *const sAnims_SHELLDER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHELLDER_1,
 };
 
-const union AnimCmd *const gAnims_CLOYSTER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CLOYSTER_1,
+static const union AnimCmd *const sAnims_CLOYSTER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CLOYSTER_1,
 };
 
-const union AnimCmd *const gAnims_GASTLY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GASTLY_1,
+static const union AnimCmd *const sAnims_GASTLY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GASTLY_1,
 };
 
-const union AnimCmd *const gAnims_HAUNTER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HAUNTER_1,
+static const union AnimCmd *const sAnims_HAUNTER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HAUNTER_1,
 };
 
-const union AnimCmd *const gAnims_GENGAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GENGAR_1,
+static const union AnimCmd *const sAnims_GENGAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GENGAR_1,
 };
 
-const union AnimCmd *const gAnims_ONIX[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ONIX_1,
+static const union AnimCmd *const sAnims_ONIX[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ONIX_1,
 };
 
-const union AnimCmd *const gAnims_DROWZEE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DROWZEE_1,
+static const union AnimCmd *const sAnims_DROWZEE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DROWZEE_1,
 };
 
-const union AnimCmd *const gAnims_HYPNO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HYPNO_1,
+static const union AnimCmd *const sAnims_HYPNO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HYPNO_1,
 };
 
-const union AnimCmd *const gAnims_KRABBY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KRABBY_1,
+static const union AnimCmd *const sAnims_KRABBY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KRABBY_1,
 };
 
-const union AnimCmd *const gAnims_KINGLER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KINGLER_1,
+static const union AnimCmd *const sAnims_KINGLER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KINGLER_1,
 };
 
-const union AnimCmd *const gAnims_VOLTORB[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VOLTORB_1,
+static const union AnimCmd *const sAnims_VOLTORB[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VOLTORB_1,
 };
 
-const union AnimCmd *const gAnims_ELECTRODE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ELECTRODE_1,
+static const union AnimCmd *const sAnims_ELECTRODE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ELECTRODE_1,
 };
 
-const union AnimCmd *const gAnims_EXEGGCUTE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_EXEGGCUTE_1,
+static const union AnimCmd *const sAnims_EXEGGCUTE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_EXEGGCUTE_1,
 };
 
-const union AnimCmd *const gAnims_EXEGGUTOR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_EXEGGUTOR_1,
+static const union AnimCmd *const sAnims_EXEGGUTOR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_EXEGGUTOR_1,
 };
 
-const union AnimCmd *const gAnims_CUBONE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CUBONE_1,
+static const union AnimCmd *const sAnims_CUBONE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CUBONE_1,
 };
 
-const union AnimCmd *const gAnims_MAROWAK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAROWAK_1,
+static const union AnimCmd *const sAnims_MAROWAK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAROWAK_1,
 };
 
-const union AnimCmd *const gAnims_HITMONLEE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HITMONLEE_1,
+static const union AnimCmd *const sAnims_HITMONLEE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HITMONLEE_1,
 };
 
-const union AnimCmd *const gAnims_HITMONCHAN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HITMONCHAN_1,
+static const union AnimCmd *const sAnims_HITMONCHAN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HITMONCHAN_1,
 };
 
-const union AnimCmd *const gAnims_LICKITUNG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LICKITUNG_1,
+static const union AnimCmd *const sAnims_LICKITUNG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LICKITUNG_1,
 };
 
-const union AnimCmd *const gAnims_KOFFING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KOFFING_1,
-    gAnimCmd_KOFFING_2,
+static const union AnimCmd *const sAnims_KOFFING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KOFFING_1,
+    sAnim_KOFFING_2,
 };
 
-const union AnimCmd *const gAnims_WEEZING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WEEZING_1,
-    gAnimCmd_WEEZING_2,
+static const union AnimCmd *const sAnims_WEEZING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WEEZING_1,
+    sAnim_WEEZING_2,
 };
 
-const union AnimCmd *const gAnims_RHYHORN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RHYHORN_1,
-    gAnimCmd_RHYHORN_2,
+static const union AnimCmd *const sAnims_RHYHORN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RHYHORN_1,
+    sAnim_RHYHORN_2,
 };
 
-const union AnimCmd *const gAnims_RHYDON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RHYDON_1,
-    gAnimCmd_RHYDON_2,
+static const union AnimCmd *const sAnims_RHYDON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RHYDON_1,
+    sAnim_RHYDON_2,
 };
 
-const union AnimCmd *const gAnims_CHANSEY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHANSEY_1,
+static const union AnimCmd *const sAnims_CHANSEY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHANSEY_1,
 };
 
-const union AnimCmd *const gAnims_TANGELA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TANGELA_1,
+static const union AnimCmd *const sAnims_TANGELA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TANGELA_1,
 };
 
-const union AnimCmd *const gAnims_KANGASKHAN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KANGASKHAN_1,
+static const union AnimCmd *const sAnims_KANGASKHAN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KANGASKHAN_1,
 };
 
-const union AnimCmd *const gAnims_HORSEA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HORSEA_1,
-    gAnimCmd_HORSEA_2,
+static const union AnimCmd *const sAnims_HORSEA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HORSEA_1,
+    sAnim_HORSEA_2,
 };
 
-const union AnimCmd *const gAnims_SEADRA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SEADRA_1,
-    gAnimCmd_SEADRA_2,
+static const union AnimCmd *const sAnims_SEADRA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SEADRA_1,
+    sAnim_SEADRA_2,
 };
 
-const union AnimCmd *const gAnims_GOLDEEN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GOLDEEN_1,
+static const union AnimCmd *const sAnims_GOLDEEN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GOLDEEN_1,
 };
 
-const union AnimCmd *const gAnims_SEAKING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SEAKING_1,
+static const union AnimCmd *const sAnims_SEAKING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SEAKING_1,
 };
 
-const union AnimCmd *const gAnims_STARYU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_STARYU_1,
-    gAnimCmd_STARYU_2,
+static const union AnimCmd *const sAnims_STARYU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_STARYU_1,
+    sAnim_STARYU_2,
 };
 
-const union AnimCmd *const gAnims_STARMIE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_STARMIE_1,
-    gAnimCmd_STARMIE_2,
+static const union AnimCmd *const sAnims_STARMIE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_STARMIE_1,
+    sAnim_STARMIE_2,
 };
 
-const union AnimCmd *const gAnims_MR_MIME[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MR_MIME_1,
+static const union AnimCmd *const sAnims_MR_MIME[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MR_MIME_1,
 };
 
-const union AnimCmd *const gAnims_SCYTHER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SCYTHER_1,
+static const union AnimCmd *const sAnims_SCYTHER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SCYTHER_1,
 };
 
-const union AnimCmd *const gAnims_JYNX[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_JYNX_1,
+static const union AnimCmd *const sAnims_JYNX[] ={
+    sAnim_GeneralFrame0,
+    sAnim_JYNX_1,
 };
 
-const union AnimCmd *const gAnims_ELECTABUZZ[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ELECTABUZZ_1,
+static const union AnimCmd *const sAnims_ELECTABUZZ[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ELECTABUZZ_1,
 };
 
-const union AnimCmd *const gAnims_MAGMAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAGMAR_1,
+static const union AnimCmd *const sAnims_MAGMAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAGMAR_1,
 };
 
-const union AnimCmd *const gAnims_PINSIR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PINSIR_1,
-    gAnimCmd_PINSIR_2,
+static const union AnimCmd *const sAnims_PINSIR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PINSIR_1,
+    sAnim_PINSIR_2,
 };
 
-const union AnimCmd *const gAnims_TAUROS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TAUROS_1,
+static const union AnimCmd *const sAnims_TAUROS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TAUROS_1,
 };
 
-const union AnimCmd *const gAnims_MAGIKARP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAGIKARP_1,
+static const union AnimCmd *const sAnims_MAGIKARP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAGIKARP_1,
 };
 
-const union AnimCmd *const gAnims_GYARADOS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GYARADOS_1,
+static const union AnimCmd *const sAnims_GYARADOS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GYARADOS_1,
 };
 
-const union AnimCmd *const gAnims_LAPRAS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LAPRAS_1,
+static const union AnimCmd *const sAnims_LAPRAS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LAPRAS_1,
 };
 
-const union AnimCmd *const gAnims_DITTO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DITTO_1,
+static const union AnimCmd *const sAnims_DITTO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DITTO_1,
 };
 
-const union AnimCmd *const gAnims_EEVEE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_EEVEE_1,
+static const union AnimCmd *const sAnims_EEVEE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_EEVEE_1,
 };
 
-const union AnimCmd *const gAnims_VAPOREON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VAPOREON_1,
+static const union AnimCmd *const sAnims_VAPOREON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VAPOREON_1,
 };
 
-const union AnimCmd *const gAnims_JOLTEON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_JOLTEON_1,
+static const union AnimCmd *const sAnims_JOLTEON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_JOLTEON_1,
 };
 
-const union AnimCmd *const gAnims_FLAREON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FLAREON_1,
+static const union AnimCmd *const sAnims_FLAREON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FLAREON_1,
 };
 
-const union AnimCmd *const gAnims_PORYGON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PORYGON_1,
+static const union AnimCmd *const sAnims_PORYGON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PORYGON_1,
 };
 
-const union AnimCmd *const gAnims_OMANYTE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_OMANYTE_1,
+static const union AnimCmd *const sAnims_OMANYTE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_OMANYTE_1,
 };
 
-const union AnimCmd *const gAnims_OMASTAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_OMASTAR_1,
+static const union AnimCmd *const sAnims_OMASTAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_OMASTAR_1,
 };
 
-const union AnimCmd *const gAnims_KABUTO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KABUTO_1,
+static const union AnimCmd *const sAnims_KABUTO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KABUTO_1,
 };
 
-const union AnimCmd *const gAnims_KABUTOPS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KABUTOPS_1,
+static const union AnimCmd *const sAnims_KABUTOPS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KABUTOPS_1,
 };
 
-const union AnimCmd *const gAnims_AERODACTYL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_AERODACTYL_1,
+static const union AnimCmd *const sAnims_AERODACTYL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_AERODACTYL_1,
 };
 
-const union AnimCmd *const gAnims_SNORLAX[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SNORLAX_1,
+static const union AnimCmd *const sAnims_SNORLAX[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SNORLAX_1,
 };
 
-const union AnimCmd *const gAnims_ARTICUNO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ARTICUNO_1,
+static const union AnimCmd *const sAnims_ARTICUNO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ARTICUNO_1,
 };
 
-const union AnimCmd *const gAnims_ZAPDOS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ZAPDOS_1,
+static const union AnimCmd *const sAnims_ZAPDOS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ZAPDOS_1,
 };
 
-const union AnimCmd *const gAnims_MOLTRES[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MOLTRES_1,
+static const union AnimCmd *const sAnims_MOLTRES[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MOLTRES_1,
 };
 
-const union AnimCmd *const gAnims_DRATINI[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DRATINI_1,
+static const union AnimCmd *const sAnims_DRATINI[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DRATINI_1,
 };
 
-const union AnimCmd *const gAnims_DRAGONAIR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DRAGONAIR_1,
+static const union AnimCmd *const sAnims_DRAGONAIR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DRAGONAIR_1,
 };
 
-const union AnimCmd *const gAnims_DRAGONITE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DRAGONITE_1,
+static const union AnimCmd *const sAnims_DRAGONITE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DRAGONITE_1,
 };
 
-const union AnimCmd *const gAnims_MEWTWO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MEWTWO_1,
+static const union AnimCmd *const sAnims_MEWTWO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MEWTWO_1,
 };
 
-const union AnimCmd *const gAnims_MEW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MEW_1,
+static const union AnimCmd *const sAnims_MEW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MEW_1,
 };
 
-const union AnimCmd *const gAnims_CHIKORITA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHIKORITA_1,
+static const union AnimCmd *const sAnims_CHIKORITA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHIKORITA_1,
 };
 
-const union AnimCmd *const gAnims_BAYLEEF[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BAYLEEF_1,
+static const union AnimCmd *const sAnims_BAYLEEF[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BAYLEEF_1,
 };
 
-const union AnimCmd *const gAnims_MEGANIUM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MEGANIUM_1,
+static const union AnimCmd *const sAnims_MEGANIUM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MEGANIUM_1,
 };
 
-const union AnimCmd *const gAnims_CYNDAQUIL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CYNDAQUIL_1,
+static const union AnimCmd *const sAnims_CYNDAQUIL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CYNDAQUIL_1,
 };
 
-const union AnimCmd *const gAnims_QUILAVA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_QUILAVA_1,
+static const union AnimCmd *const sAnims_QUILAVA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_QUILAVA_1,
 };
 
-const union AnimCmd *const gAnims_TYPHLOSION[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TYPHLOSION_1,
+static const union AnimCmd *const sAnims_TYPHLOSION[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TYPHLOSION_1,
 };
 
-const union AnimCmd *const gAnims_TOTODILE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TOTODILE_1,
+static const union AnimCmd *const sAnims_TOTODILE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TOTODILE_1,
 };
 
-const union AnimCmd *const gAnims_CROCONAW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CROCONAW_1,
+static const union AnimCmd *const sAnims_CROCONAW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CROCONAW_1,
 };
 
-const union AnimCmd *const gAnims_FERALIGATR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FERALIGATR_1,
+static const union AnimCmd *const sAnims_FERALIGATR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FERALIGATR_1,
 };
 
-const union AnimCmd *const gAnims_SENTRET[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SENTRET_1,
+static const union AnimCmd *const sAnims_SENTRET[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SENTRET_1,
 };
 
-const union AnimCmd *const gAnims_FURRET[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FURRET_1,
+static const union AnimCmd *const sAnims_FURRET[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FURRET_1,
 };
 
-const union AnimCmd *const gAnims_HOOTHOOT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HOOTHOOT_1,
+static const union AnimCmd *const sAnims_HOOTHOOT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HOOTHOOT_1,
 };
 
-const union AnimCmd *const gAnims_NOCTOWL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NOCTOWL_1,
+static const union AnimCmd *const sAnims_NOCTOWL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NOCTOWL_1,
 };
 
-const union AnimCmd *const gAnims_LEDYBA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LEDYBA_1,
+static const union AnimCmd *const sAnims_LEDYBA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LEDYBA_1,
 };
 
-const union AnimCmd *const gAnims_LEDIAN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LEDIAN_1,
+static const union AnimCmd *const sAnims_LEDIAN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LEDIAN_1,
 };
 
-const union AnimCmd *const gAnims_SPINARAK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SPINARAK_1,
+static const union AnimCmd *const sAnims_SPINARAK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SPINARAK_1,
 };
 
-const union AnimCmd *const gAnims_ARIADOS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ARIADOS_1,
+static const union AnimCmd *const sAnims_ARIADOS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ARIADOS_1,
 };
 
-const union AnimCmd *const gAnims_CROBAT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CROBAT_1,
+static const union AnimCmd *const sAnims_CROBAT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CROBAT_1,
 };
 
-const union AnimCmd *const gAnims_CHINCHOU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHINCHOU_1,
-    gAnimCmd_CHINCHOU_2,
+static const union AnimCmd *const sAnims_CHINCHOU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHINCHOU_1,
+    sAnim_CHINCHOU_2,
 };
 
-const union AnimCmd *const gAnims_LANTURN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LANTURN_1,
-    gAnimCmd_LANTURN_2,
+static const union AnimCmd *const sAnims_LANTURN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LANTURN_1,
+    sAnim_LANTURN_2,
 };
 
-const union AnimCmd *const gAnims_PICHU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PICHU_1,
-    gAnimCmd_PICHU_2,
+static const union AnimCmd *const sAnims_PICHU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PICHU_1,
+    sAnim_PICHU_2,
 };
 
-const union AnimCmd *const gAnims_CLEFFA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CLEFFA_1,
+static const union AnimCmd *const sAnims_CLEFFA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CLEFFA_1,
 };
 
-const union AnimCmd *const gAnims_IGGLYBUFF[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_IGGLYBUFF_1,
-    gAnimCmd_IGGLYBUFF_2,
+static const union AnimCmd *const sAnims_IGGLYBUFF[] ={
+    sAnim_GeneralFrame0,
+    sAnim_IGGLYBUFF_1,
+    sAnim_IGGLYBUFF_2,
 };
 
-const union AnimCmd *const gAnims_TOGEPI[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TOGEPI_1,
+static const union AnimCmd *const sAnims_TOGEPI[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TOGEPI_1,
 };
 
-const union AnimCmd *const gAnims_TOGETIC[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TOGETIC_1,
+static const union AnimCmd *const sAnims_TOGETIC[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TOGETIC_1,
 };
 
-const union AnimCmd *const gAnims_NATU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NATU_1,
-    gAnimCmd_NATU_2,
+static const union AnimCmd *const sAnims_NATU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NATU_1,
+    sAnim_NATU_2,
 };
 
-const union AnimCmd *const gAnims_XATU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_XATU_1,
-    gAnimCmd_XATU_2,
+static const union AnimCmd *const sAnims_XATU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_XATU_1,
+    sAnim_XATU_2,
 };
 
-const union AnimCmd *const gAnims_MAREEP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAREEP_1,
+static const union AnimCmd *const sAnims_MAREEP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAREEP_1,
 };
 
-const union AnimCmd *const gAnims_FLAAFFY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FLAAFFY_1,
+static const union AnimCmd *const sAnims_FLAAFFY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FLAAFFY_1,
 };
 
-const union AnimCmd *const gAnims_AMPHAROS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_AMPHAROS_1,
+static const union AnimCmd *const sAnims_AMPHAROS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_AMPHAROS_1,
 };
 
-const union AnimCmd *const gAnims_BELLOSSOM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BELLOSSOM_1,
+static const union AnimCmd *const sAnims_BELLOSSOM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BELLOSSOM_1,
 };
 
-const union AnimCmd *const gAnims_MARILL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MARILL_1,
+static const union AnimCmd *const sAnims_MARILL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MARILL_1,
 };
 
-const union AnimCmd *const gAnims_AZUMARILL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_AZUMARILL_1,
+static const union AnimCmd *const sAnims_AZUMARILL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_AZUMARILL_1,
 };
 
-const union AnimCmd *const gAnims_SUDOWOODO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SUDOWOODO_1,
+static const union AnimCmd *const sAnims_SUDOWOODO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SUDOWOODO_1,
 };
 
-const union AnimCmd *const gAnims_POLITOED[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_POLITOED_1,
+static const union AnimCmd *const sAnims_POLITOED[] ={
+    sAnim_GeneralFrame0,
+    sAnim_POLITOED_1,
 };
 
-const union AnimCmd *const gAnims_HOPPIP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HOPPIP_1,
+static const union AnimCmd *const sAnims_HOPPIP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HOPPIP_1,
 };
 
-const union AnimCmd *const gAnims_SKIPLOOM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SKIPLOOM_1,
+static const union AnimCmd *const sAnims_SKIPLOOM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SKIPLOOM_1,
 };
 
-const union AnimCmd *const gAnims_JUMPLUFF[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_JUMPLUFF_1,
+static const union AnimCmd *const sAnims_JUMPLUFF[] ={
+    sAnim_GeneralFrame0,
+    sAnim_JUMPLUFF_1,
 };
 
-const union AnimCmd *const gAnims_AIPOM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_AIPOM_1,
+static const union AnimCmd *const sAnims_AIPOM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_AIPOM_1,
 };
 
-const union AnimCmd *const gAnims_SUNKERN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SUNKERN_1,
+static const union AnimCmd *const sAnims_SUNKERN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SUNKERN_1,
 };
 
-const union AnimCmd *const gAnims_SUNFLORA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SUNFLORA_1,
+static const union AnimCmd *const sAnims_SUNFLORA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SUNFLORA_1,
 };
 
-const union AnimCmd *const gAnims_YANMA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_YANMA_1,
+static const union AnimCmd *const sAnims_YANMA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_YANMA_1,
 };
 
-const union AnimCmd *const gAnims_WOOPER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WOOPER_1,
+static const union AnimCmd *const sAnims_WOOPER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WOOPER_1,
 };
 
-const union AnimCmd *const gAnims_QUAGSIRE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_QUAGSIRE_1,
+static const union AnimCmd *const sAnims_QUAGSIRE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_QUAGSIRE_1,
 };
 
-const union AnimCmd *const gAnims_ESPEON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ESPEON_1,
+static const union AnimCmd *const sAnims_ESPEON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ESPEON_1,
 };
 
-const union AnimCmd *const gAnims_UMBREON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UMBREON_1,
+static const union AnimCmd *const sAnims_UMBREON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UMBREON_1,
 };
 
-const union AnimCmd *const gAnims_MURKROW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MURKROW_1,
+static const union AnimCmd *const sAnims_MURKROW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MURKROW_1,
 };
 
-const union AnimCmd *const gAnims_SLOWKING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SLOWKING_1,
+static const union AnimCmd *const sAnims_SLOWKING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SLOWKING_1,
 };
 
-const union AnimCmd *const gAnims_MISDREAVUS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MISDREAVUS_1,
+static const union AnimCmd *const sAnims_MISDREAVUS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MISDREAVUS_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_1,
+static const union AnimCmd *const sAnims_UNOWN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_1,
 };
 
-const union AnimCmd *const gAnims_WOBBUFFET[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WOBBUFFET_1,
-    gAnimCmd_WOBBUFFET_2,
+static const union AnimCmd *const sAnims_WOBBUFFET[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WOBBUFFET_1,
+    sAnim_WOBBUFFET_2,
 };
 
-const union AnimCmd *const gAnims_GIRAFARIG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GIRAFARIG_1,
-    gAnimCmd_GIRAFARIG_2,
+static const union AnimCmd *const sAnims_GIRAFARIG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GIRAFARIG_1,
+    sAnim_GIRAFARIG_2,
 };
 
-const union AnimCmd *const gAnims_PINECO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PINECO_1,
+static const union AnimCmd *const sAnims_PINECO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PINECO_1,
 };
 
-const union AnimCmd *const gAnims_FORRETRESS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FORRETRESS_1,
+static const union AnimCmd *const sAnims_FORRETRESS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FORRETRESS_1,
 };
 
-const union AnimCmd *const gAnims_DUNSPARCE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DUNSPARCE_1,
+static const union AnimCmd *const sAnims_DUNSPARCE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DUNSPARCE_1,
 };
 
-const union AnimCmd *const gAnims_GLIGAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GLIGAR_1,
+static const union AnimCmd *const sAnims_GLIGAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GLIGAR_1,
 };
 
-const union AnimCmd *const gAnims_STEELIX[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_STEELIX_1,
+static const union AnimCmd *const sAnims_STEELIX[] ={
+    sAnim_GeneralFrame0,
+    sAnim_STEELIX_1,
 };
 
-const union AnimCmd *const gAnims_SNUBBULL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SNUBBULL_1,
+static const union AnimCmd *const sAnims_SNUBBULL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SNUBBULL_1,
 };
 
-const union AnimCmd *const gAnims_GRANBULL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GRANBULL_1,
+static const union AnimCmd *const sAnims_GRANBULL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GRANBULL_1,
 };
 
-const union AnimCmd *const gAnims_QWILFISH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_QWILFISH_1,
+static const union AnimCmd *const sAnims_QWILFISH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_QWILFISH_1,
 };
 
-const union AnimCmd *const gAnims_SCIZOR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SCIZOR_1,
+static const union AnimCmd *const sAnims_SCIZOR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SCIZOR_1,
 };
 
-const union AnimCmd *const gAnims_SHUCKLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHUCKLE_1,
+static const union AnimCmd *const sAnims_SHUCKLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHUCKLE_1,
 };
 
-const union AnimCmd *const gAnims_HERACROSS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HERACROSS_1,
-    gAnimCmd_HERACROSS_2,
+static const union AnimCmd *const sAnims_HERACROSS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HERACROSS_1,
+    sAnim_HERACROSS_2,
 };
 
-const union AnimCmd *const gAnims_SNEASEL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SNEASEL_1,
+static const union AnimCmd *const sAnims_SNEASEL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SNEASEL_1,
 };
 
-const union AnimCmd *const gAnims_TEDDIURSA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TEDDIURSA_1,
+static const union AnimCmd *const sAnims_TEDDIURSA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TEDDIURSA_1,
 };
 
-const union AnimCmd *const gAnims_URSARING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_URSARING_1,
+static const union AnimCmd *const sAnims_URSARING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_URSARING_1,
 };
 
-const union AnimCmd *const gAnims_SLUGMA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SLUGMA_1,
-    gAnimCmd_SLUGMA_2,
+static const union AnimCmd *const sAnims_SLUGMA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SLUGMA_1,
+    sAnim_SLUGMA_2,
 };
 
-const union AnimCmd *const gAnims_MAGCARGO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAGCARGO_1,
-    gAnimCmd_MAGCARGO_2,
+static const union AnimCmd *const sAnims_MAGCARGO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAGCARGO_1,
+    sAnim_MAGCARGO_2,
 };
 
-const union AnimCmd *const gAnims_SWINUB[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SWINUB_1,
+static const union AnimCmd *const sAnims_SWINUB[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SWINUB_1,
 };
 
-const union AnimCmd *const gAnims_PILOSWINE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PILOSWINE_1,
+static const union AnimCmd *const sAnims_PILOSWINE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PILOSWINE_1,
 };
 
-const union AnimCmd *const gAnims_CORSOLA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CORSOLA_1,
-    gAnimCmd_CORSOLA_2,
+static const union AnimCmd *const sAnims_CORSOLA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CORSOLA_1,
+    sAnim_CORSOLA_2,
 };
 
-const union AnimCmd *const gAnims_REMORAID[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_REMORAID_1,
+static const union AnimCmd *const sAnims_REMORAID[] ={
+    sAnim_GeneralFrame0,
+    sAnim_REMORAID_1,
 };
 
-const union AnimCmd *const gAnims_OCTILLERY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_OCTILLERY_1,
+static const union AnimCmd *const sAnims_OCTILLERY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_OCTILLERY_1,
 };
 
-const union AnimCmd *const gAnims_DELIBIRD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DELIBIRD_1,
+static const union AnimCmd *const sAnims_DELIBIRD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DELIBIRD_1,
 };
 
-const union AnimCmd *const gAnims_MANTINE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MANTINE_1,
+static const union AnimCmd *const sAnims_MANTINE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MANTINE_1,
 };
 
-const union AnimCmd *const gAnims_SKARMORY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SKARMORY_1,
-    gAnimCmd_SKARMORY_2,
+static const union AnimCmd *const sAnims_SKARMORY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SKARMORY_1,
+    sAnim_SKARMORY_2,
 };
 
-const union AnimCmd *const gAnims_HOUNDOUR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HOUNDOUR_1,
+static const union AnimCmd *const sAnims_HOUNDOUR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HOUNDOUR_1,
 };
 
-const union AnimCmd *const gAnims_HOUNDOOM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HOUNDOOM_1,
+static const union AnimCmd *const sAnims_HOUNDOOM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HOUNDOOM_1,
 };
 
-const union AnimCmd *const gAnims_KINGDRA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KINGDRA_1,
-    gAnimCmd_KINGDRA_2,
+static const union AnimCmd *const sAnims_KINGDRA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KINGDRA_1,
+    sAnim_KINGDRA_2,
 };
 
-const union AnimCmd *const gAnims_PHANPY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PHANPY_1,
-    gAnimCmd_PHANPY_2,
+static const union AnimCmd *const sAnims_PHANPY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PHANPY_1,
+    sAnim_PHANPY_2,
 };
 
-const union AnimCmd *const gAnims_DONPHAN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DONPHAN_1,
-    gAnimCmd_DONPHAN_2,
+static const union AnimCmd *const sAnims_DONPHAN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DONPHAN_1,
+    sAnim_DONPHAN_2,
 };
 
-const union AnimCmd *const gAnims_PORYGON2[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PORYGON2_1,
+static const union AnimCmd *const sAnims_PORYGON2[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PORYGON2_1,
 };
 
-const union AnimCmd *const gAnims_STANTLER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_STANTLER_1,
+static const union AnimCmd *const sAnims_STANTLER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_STANTLER_1,
 };
 
-const union AnimCmd *const gAnims_SMEARGLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SMEARGLE_1,
+static const union AnimCmd *const sAnims_SMEARGLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SMEARGLE_1,
 };
 
-const union AnimCmd *const gAnims_TYROGUE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TYROGUE_1,
+static const union AnimCmd *const sAnims_TYROGUE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TYROGUE_1,
 };
 
-const union AnimCmd *const gAnims_HITMONTOP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HITMONTOP_1,
+static const union AnimCmd *const sAnims_HITMONTOP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HITMONTOP_1,
 };
 
-const union AnimCmd *const gAnims_SMOOCHUM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SMOOCHUM_1,
+static const union AnimCmd *const sAnims_SMOOCHUM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SMOOCHUM_1,
 };
 
-const union AnimCmd *const gAnims_ELEKID[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ELEKID_1,
+static const union AnimCmd *const sAnims_ELEKID[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ELEKID_1,
 };
 
-const union AnimCmd *const gAnims_MAGBY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAGBY_1,
+static const union AnimCmd *const sAnims_MAGBY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAGBY_1,
 };
 
-const union AnimCmd *const gAnims_MILTANK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MILTANK_1,
+static const union AnimCmd *const sAnims_MILTANK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MILTANK_1,
 };
 
-const union AnimCmd *const gAnims_BLISSEY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BLISSEY_1,
+static const union AnimCmd *const sAnims_BLISSEY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BLISSEY_1,
 };
 
-const union AnimCmd *const gAnims_RAIKOU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RAIKOU_1,
+static const union AnimCmd *const sAnims_RAIKOU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RAIKOU_1,
 };
 
-const union AnimCmd *const gAnims_ENTEI[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ENTEI_1,
+static const union AnimCmd *const sAnims_ENTEI[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ENTEI_1,
 };
 
-const union AnimCmd *const gAnims_SUICUNE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SUICUNE_1,
+static const union AnimCmd *const sAnims_SUICUNE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SUICUNE_1,
 };
 
-const union AnimCmd *const gAnims_LARVITAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LARVITAR_1,
+static const union AnimCmd *const sAnims_LARVITAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LARVITAR_1,
 };
 
-const union AnimCmd *const gAnims_PUPITAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PUPITAR_1,
+static const union AnimCmd *const sAnims_PUPITAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PUPITAR_1,
 };
 
-const union AnimCmd *const gAnims_TYRANITAR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TYRANITAR_1,
+static const union AnimCmd *const sAnims_TYRANITAR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TYRANITAR_1,
 };
 
-const union AnimCmd *const gAnims_LUGIA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LUGIA_1,
+static const union AnimCmd *const sAnims_LUGIA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LUGIA_1,
 };
 
-const union AnimCmd *const gAnims_HO_OH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HO_OH_1,
+static const union AnimCmd *const sAnims_HO_OH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HO_OH_1,
 };
 
-const union AnimCmd *const gAnims_CELEBI[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CELEBI_1,
+static const union AnimCmd *const sAnims_CELEBI[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CELEBI_1,
 };
 
-const union AnimCmd *const gAnims_OLD_UNOWN_B[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_OLD_UNOWN_B_1,
+static const union AnimCmd *const sAnims_OLD_UNOWN_B[] ={
+    sAnim_GeneralFrame0,
+    sAnim_OLD_UNOWN_B_1,
 };
 
-const union AnimCmd *const gAnims_TREECKO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TREECKO_1,
+static const union AnimCmd *const sAnims_TREECKO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TREECKO_1,
 };
 
-const union AnimCmd *const gAnims_GROVYLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GROVYLE_1,
+static const union AnimCmd *const sAnims_GROVYLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GROVYLE_1,
 };
 
-const union AnimCmd *const gAnims_SCEPTILE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SCEPTILE_1,
+static const union AnimCmd *const sAnims_SCEPTILE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SCEPTILE_1,
 };
 
-const union AnimCmd *const gAnims_TORCHIC[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TORCHIC_1,
+static const union AnimCmd *const sAnims_TORCHIC[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TORCHIC_1,
 };
 
-const union AnimCmd *const gAnims_COMBUSKEN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_COMBUSKEN_1,
+static const union AnimCmd *const sAnims_COMBUSKEN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_COMBUSKEN_1,
 };
 
-const union AnimCmd *const gAnims_BLAZIKEN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BLAZIKEN_1,
-    gAnimCmd_BLAZIKEN_2,
-    gAnimCmd_BLAZIKEN_3,
-    gAnimCmd_BLAZIKEN_4,
+static const union AnimCmd *const sAnims_BLAZIKEN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BLAZIKEN_1,
+    sAnim_BLAZIKEN_2,
+    sAnim_BLAZIKEN_3,
+    sAnim_BLAZIKEN_4,
 };
 
-const union AnimCmd *const gAnims_MUDKIP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MUDKIP_1,
+static const union AnimCmd *const sAnims_MUDKIP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MUDKIP_1,
 };
 
-const union AnimCmd *const gAnims_MARSHTOMP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MARSHTOMP_1,
+static const union AnimCmd *const sAnims_MARSHTOMP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MARSHTOMP_1,
 };
 
-const union AnimCmd *const gAnims_SWAMPERT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SWAMPERT_1,
+static const union AnimCmd *const sAnims_SWAMPERT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SWAMPERT_1,
 };
 
-const union AnimCmd *const gAnims_POOCHYENA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_POOCHYENA_1,
+static const union AnimCmd *const sAnims_POOCHYENA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_POOCHYENA_1,
 };
 
-const union AnimCmd *const gAnims_MIGHTYENA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MIGHTYENA_1,
+static const union AnimCmd *const sAnims_MIGHTYENA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MIGHTYENA_1,
 };
 
-const union AnimCmd *const gAnims_ZIGZAGOON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ZIGZAGOON_1,
+static const union AnimCmd *const sAnims_ZIGZAGOON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ZIGZAGOON_1,
 };
 
-const union AnimCmd *const gAnims_LINOONE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LINOONE_1,
+static const union AnimCmd *const sAnims_LINOONE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LINOONE_1,
 };
 
-const union AnimCmd *const gAnims_WURMPLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WURMPLE_1,
+static const union AnimCmd *const sAnims_WURMPLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WURMPLE_1,
 };
 
-const union AnimCmd *const gAnims_SILCOON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SILCOON_1,
-    gAnimCmd_SILCOON_2,
+static const union AnimCmd *const sAnims_SILCOON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SILCOON_1,
+    sAnim_SILCOON_2,
 };
 
-const union AnimCmd *const gAnims_BEAUTIFLY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BEAUTIFLY_1,
-    gAnimCmd_BEAUTIFLY_2,
+static const union AnimCmd *const sAnims_BEAUTIFLY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BEAUTIFLY_1,
+    sAnim_BEAUTIFLY_2,
 };
 
-const union AnimCmd *const gAnims_CASCOON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CASCOON_1,
-    gAnimCmd_CASCOON_2,
+static const union AnimCmd *const sAnims_CASCOON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CASCOON_1,
+    sAnim_CASCOON_2,
 };
 
-const union AnimCmd *const gAnims_DUSTOX[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DUSTOX_1,
-    gAnimCmd_DUSTOX_2,
+static const union AnimCmd *const sAnims_DUSTOX[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DUSTOX_1,
+    sAnim_DUSTOX_2,
 };
 
-const union AnimCmd *const gAnims_LOTAD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LOTAD_1,
+static const union AnimCmd *const sAnims_LOTAD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LOTAD_1,
 };
 
-const union AnimCmd *const gAnims_LOMBRE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LOMBRE_1,
+static const union AnimCmd *const sAnims_LOMBRE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LOMBRE_1,
 };
 
-const union AnimCmd *const gAnims_LUDICOLO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LUDICOLO_1,
+static const union AnimCmd *const sAnims_LUDICOLO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LUDICOLO_1,
 };
 
-const union AnimCmd *const gAnims_SEEDOT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SEEDOT_1,
+static const union AnimCmd *const sAnims_SEEDOT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SEEDOT_1,
 };
 
-const union AnimCmd *const gAnims_NUZLEAF[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NUZLEAF_1,
+static const union AnimCmd *const sAnims_NUZLEAF[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NUZLEAF_1,
 };
 
-const union AnimCmd *const gAnims_SHIFTRY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHIFTRY_1,
+static const union AnimCmd *const sAnims_SHIFTRY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHIFTRY_1,
 };
 
-const union AnimCmd *const gAnims_NINCADA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NINCADA_1,
+static const union AnimCmd *const sAnims_NINCADA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NINCADA_1,
 };
 
-const union AnimCmd *const gAnims_NINJASK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NINJASK_1,
+static const union AnimCmd *const sAnims_NINJASK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NINJASK_1,
 };
 
-const union AnimCmd *const gAnims_SHEDINJA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHEDINJA_1,
+static const union AnimCmd *const sAnims_SHEDINJA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHEDINJA_1,
 };
 
-const union AnimCmd *const gAnims_TAILLOW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TAILLOW_1,
+static const union AnimCmd *const sAnims_TAILLOW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TAILLOW_1,
 };
 
-const union AnimCmd *const gAnims_SWELLOW[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SWELLOW_1,
+static const union AnimCmd *const sAnims_SWELLOW[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SWELLOW_1,
 };
 
-const union AnimCmd *const gAnims_SHROOMISH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHROOMISH_1,
+static const union AnimCmd *const sAnims_SHROOMISH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHROOMISH_1,
 };
 
-const union AnimCmd *const gAnims_BRELOOM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BRELOOM_1,
+static const union AnimCmd *const sAnims_BRELOOM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BRELOOM_1,
 };
 
-const union AnimCmd *const gAnims_SPINDA[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SPINDA[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gAnims_WINGULL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WINGULL_1,
+static const union AnimCmd *const sAnims_WINGULL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WINGULL_1,
 };
 
-const union AnimCmd *const gAnims_PELIPPER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PELIPPER_1,
+static const union AnimCmd *const sAnims_PELIPPER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PELIPPER_1,
 };
 
-const union AnimCmd *const gAnims_SURSKIT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SURSKIT_1,
-    gAnimCmd_SURSKIT_2,
+static const union AnimCmd *const sAnims_SURSKIT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SURSKIT_1,
+    sAnim_SURSKIT_2,
 };
 
-const union AnimCmd *const gAnims_MASQUERAIN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MASQUERAIN_1,
-    gAnimCmd_MASQUERAIN_2,
+static const union AnimCmd *const sAnims_MASQUERAIN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MASQUERAIN_1,
+    sAnim_MASQUERAIN_2,
 };
 
-const union AnimCmd *const gAnims_WAILMER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WAILMER_1,
+static const union AnimCmd *const sAnims_WAILMER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WAILMER_1,
 };
 
-const union AnimCmd *const gAnims_WAILORD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WAILORD_1,
+static const union AnimCmd *const sAnims_WAILORD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WAILORD_1,
 };
 
-const union AnimCmd *const gAnims_SKITTY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SKITTY_1,
+static const union AnimCmd *const sAnims_SKITTY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SKITTY_1,
 };
 
-const union AnimCmd *const gAnims_DELCATTY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DELCATTY_1,
+static const union AnimCmd *const sAnims_DELCATTY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DELCATTY_1,
 };
 
-const union AnimCmd *const gAnims_KECLEON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KECLEON_1,
+static const union AnimCmd *const sAnims_KECLEON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KECLEON_1,
 };
 
-const union AnimCmd *const gAnims_BALTOY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BALTOY_1,
+static const union AnimCmd *const sAnims_BALTOY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BALTOY_1,
 };
 
-const union AnimCmd *const gAnims_CLAYDOL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CLAYDOL_1,
+static const union AnimCmd *const sAnims_CLAYDOL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CLAYDOL_1,
 };
 
-const union AnimCmd *const gAnims_NOSEPASS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NOSEPASS_1,
+static const union AnimCmd *const sAnims_NOSEPASS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NOSEPASS_1,
 };
 
-const union AnimCmd *const gAnims_TORKOAL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TORKOAL_1,
+static const union AnimCmd *const sAnims_TORKOAL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TORKOAL_1,
 };
 
-const union AnimCmd *const gAnims_SABLEYE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SABLEYE_1,
+static const union AnimCmd *const sAnims_SABLEYE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SABLEYE_1,
 };
 
-const union AnimCmd *const gAnims_BARBOACH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BARBOACH_1,
+static const union AnimCmd *const sAnims_BARBOACH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BARBOACH_1,
 };
 
-const union AnimCmd *const gAnims_WHISCASH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WHISCASH_1,
+static const union AnimCmd *const sAnims_WHISCASH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WHISCASH_1,
 };
 
-const union AnimCmd *const gAnims_LUVDISC[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LUVDISC_1,
+static const union AnimCmd *const sAnims_LUVDISC[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LUVDISC_1,
 };
 
-const union AnimCmd *const gAnims_CORPHISH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CORPHISH_1,
+static const union AnimCmd *const sAnims_CORPHISH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CORPHISH_1,
 };
 
-const union AnimCmd *const gAnims_CRAWDAUNT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CRAWDAUNT_1,
+static const union AnimCmd *const sAnims_CRAWDAUNT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CRAWDAUNT_1,
 };
 
-const union AnimCmd *const gAnims_FEEBAS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FEEBAS_1,
+static const union AnimCmd *const sAnims_FEEBAS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FEEBAS_1,
 };
 
-const union AnimCmd *const gAnims_MILOTIC[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MILOTIC_1,
+static const union AnimCmd *const sAnims_MILOTIC[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MILOTIC_1,
 };
 
-const union AnimCmd *const gAnims_CARVANHA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CARVANHA_1,
+static const union AnimCmd *const sAnims_CARVANHA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CARVANHA_1,
 };
 
-const union AnimCmd *const gAnims_SHARPEDO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHARPEDO_1,
+static const union AnimCmd *const sAnims_SHARPEDO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHARPEDO_1,
 };
 
-const union AnimCmd *const gAnims_TRAPINCH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TRAPINCH_1,
+static const union AnimCmd *const sAnims_TRAPINCH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TRAPINCH_1,
 };
 
-const union AnimCmd *const gAnims_VIBRAVA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VIBRAVA_1,
+static const union AnimCmd *const sAnims_VIBRAVA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VIBRAVA_1,
 };
 
-const union AnimCmd *const gAnims_FLYGON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_FLYGON_1,
+static const union AnimCmd *const sAnims_FLYGON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_FLYGON_1,
 };
 
-const union AnimCmd *const gAnims_MAKUHITA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAKUHITA_1,
+static const union AnimCmd *const sAnims_MAKUHITA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAKUHITA_1,
 };
 
-const union AnimCmd *const gAnims_HARIYAMA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HARIYAMA_1,
+static const union AnimCmd *const sAnims_HARIYAMA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HARIYAMA_1,
 };
 
-const union AnimCmd *const gAnims_ELECTRIKE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ELECTRIKE_1,
+static const union AnimCmd *const sAnims_ELECTRIKE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ELECTRIKE_1,
 };
 
-const union AnimCmd *const gAnims_MANECTRIC[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MANECTRIC_1,
+static const union AnimCmd *const sAnims_MANECTRIC[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MANECTRIC_1,
 };
 
-const union AnimCmd *const gAnims_NUMEL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_NUMEL_1,
+static const union AnimCmd *const sAnims_NUMEL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_NUMEL_1,
 };
 
-const union AnimCmd *const gAnims_CAMERUPT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CAMERUPT_1,
+static const union AnimCmd *const sAnims_CAMERUPT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CAMERUPT_1,
 };
 
-const union AnimCmd *const gAnims_SPHEAL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SPHEAL_1,
+static const union AnimCmd *const sAnims_SPHEAL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SPHEAL_1,
 };
 
-const union AnimCmd *const gAnims_SEALEO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SEALEO_1,
+static const union AnimCmd *const sAnims_SEALEO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SEALEO_1,
 };
 
-const union AnimCmd *const gAnims_WALREIN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WALREIN_1,
+static const union AnimCmd *const sAnims_WALREIN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WALREIN_1,
 };
 
-const union AnimCmd *const gAnims_CACNEA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CACNEA_1,
+static const union AnimCmd *const sAnims_CACNEA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CACNEA_1,
 };
 
-const union AnimCmd *const gAnims_CACTURNE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CACTURNE_1,
+static const union AnimCmd *const sAnims_CACTURNE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CACTURNE_1,
 };
 
-const union AnimCmd *const gAnims_SNORUNT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SNORUNT_1,
+static const union AnimCmd *const sAnims_SNORUNT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SNORUNT_1,
 };
 
-const union AnimCmd *const gAnims_GLALIE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GLALIE_1,
+static const union AnimCmd *const sAnims_GLALIE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GLALIE_1,
 };
 
-const union AnimCmd *const gAnims_LUNATONE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LUNATONE_1,
-    gAnimCmd_LUNATONE_2,
+static const union AnimCmd *const sAnims_LUNATONE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LUNATONE_1,
+    sAnim_LUNATONE_2,
 };
 
-const union AnimCmd *const gAnims_SOLROCK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SOLROCK_1,
-    gAnimCmd_SOLROCK_2,
+static const union AnimCmd *const sAnims_SOLROCK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SOLROCK_1,
+    sAnim_SOLROCK_2,
 };
 
-const union AnimCmd *const gAnims_AZURILL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_AZURILL_1,
+static const union AnimCmd *const sAnims_AZURILL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_AZURILL_1,
 };
 
-const union AnimCmd *const gAnims_SPOINK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SPOINK_1,
+static const union AnimCmd *const sAnims_SPOINK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SPOINK_1,
 };
 
-const union AnimCmd *const gAnims_GRUMPIG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GRUMPIG_1,
+static const union AnimCmd *const sAnims_GRUMPIG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GRUMPIG_1,
 };
 
-const union AnimCmd *const gAnims_PLUSLE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_PLUSLE_1,
+static const union AnimCmd *const sAnims_PLUSLE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_PLUSLE_1,
 };
 
-const union AnimCmd *const gAnims_MINUN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MINUN_1,
+static const union AnimCmd *const sAnims_MINUN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MINUN_1,
 };
 
-const union AnimCmd *const gAnims_MAWILE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MAWILE_1,
+static const union AnimCmd *const sAnims_MAWILE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MAWILE_1,
 };
 
-const union AnimCmd *const gAnims_MEDITITE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MEDITITE_1,
+static const union AnimCmd *const sAnims_MEDITITE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MEDITITE_1,
 };
 
-const union AnimCmd *const gAnims_MEDICHAM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_MEDICHAM_1,
+static const union AnimCmd *const sAnims_MEDICHAM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_MEDICHAM_1,
 };
 
-const union AnimCmd *const gAnims_SWABLU[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SWABLU_1,
-    gAnimCmd_SWABLU_2,
+static const union AnimCmd *const sAnims_SWABLU[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SWABLU_1,
+    sAnim_SWABLU_2,
 };
 
-const union AnimCmd *const gAnims_ALTARIA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ALTARIA_1,
-    gAnimCmd_ALTARIA_2,
+static const union AnimCmd *const sAnims_ALTARIA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ALTARIA_1,
+    sAnim_ALTARIA_2,
 };
 
-const union AnimCmd *const gAnims_WYNAUT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WYNAUT_1,
+static const union AnimCmd *const sAnims_WYNAUT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WYNAUT_1,
 };
 
-const union AnimCmd *const gAnims_DUSKULL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DUSKULL_1,
+static const union AnimCmd *const sAnims_DUSKULL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DUSKULL_1,
 };
 
-const union AnimCmd *const gAnims_DUSCLOPS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DUSCLOPS_1,
+static const union AnimCmd *const sAnims_DUSCLOPS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DUSCLOPS_1,
 };
 
-const union AnimCmd *const gAnims_ROSELIA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ROSELIA_1,
+static const union AnimCmd *const sAnims_ROSELIA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ROSELIA_1,
 };
 
-const union AnimCmd *const gAnims_SLAKOTH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SLAKOTH_1,
+static const union AnimCmd *const sAnims_SLAKOTH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SLAKOTH_1,
 };
 
-const union AnimCmd *const gAnims_VIGOROTH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VIGOROTH_1,
+static const union AnimCmd *const sAnims_VIGOROTH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VIGOROTH_1,
 };
 
-const union AnimCmd *const gAnims_SLAKING[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SLAKING_1,
+static const union AnimCmd *const sAnims_SLAKING[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SLAKING_1,
 };
 
-const union AnimCmd *const gAnims_GULPIN[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GULPIN_1,
+static const union AnimCmd *const sAnims_GULPIN[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GULPIN_1,
 };
 
-const union AnimCmd *const gAnims_SWALOT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SWALOT_1,
+static const union AnimCmd *const sAnims_SWALOT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SWALOT_1,
 };
 
-const union AnimCmd *const gAnims_TROPIUS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_TROPIUS_1,
+static const union AnimCmd *const sAnims_TROPIUS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_TROPIUS_1,
 };
 
-const union AnimCmd *const gAnims_WHISMUR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_WHISMUR_1,
+static const union AnimCmd *const sAnims_WHISMUR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_WHISMUR_1,
 };
 
-const union AnimCmd *const gAnims_LOUDRED[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LOUDRED_1,
+static const union AnimCmd *const sAnims_LOUDRED[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LOUDRED_1,
 };
 
-const union AnimCmd *const gAnims_EXPLOUD[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_EXPLOUD_1,
+static const union AnimCmd *const sAnims_EXPLOUD[] ={
+    sAnim_GeneralFrame0,
+    sAnim_EXPLOUD_1,
 };
 
-const union AnimCmd *const gAnims_CLAMPERL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CLAMPERL_1,
+static const union AnimCmd *const sAnims_CLAMPERL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CLAMPERL_1,
 };
 
-const union AnimCmd *const gAnims_HUNTAIL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_HUNTAIL_1,
+static const union AnimCmd *const sAnims_HUNTAIL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_HUNTAIL_1,
 };
 
-const union AnimCmd *const gAnims_GOREBYSS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GOREBYSS_1,
+static const union AnimCmd *const sAnims_GOREBYSS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GOREBYSS_1,
 };
 
-const union AnimCmd *const gAnims_ABSOL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ABSOL_1,
+static const union AnimCmd *const sAnims_ABSOL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ABSOL_1,
 };
 
-const union AnimCmd *const gAnims_SHUPPET[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHUPPET_1,
+static const union AnimCmd *const sAnims_SHUPPET[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHUPPET_1,
 };
 
-const union AnimCmd *const gAnims_BANETTE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BANETTE_1,
+static const union AnimCmd *const sAnims_BANETTE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BANETTE_1,
 };
 
-const union AnimCmd *const gAnims_SEVIPER[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SEVIPER_1,
+static const union AnimCmd *const sAnims_SEVIPER[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SEVIPER_1,
 };
 
-const union AnimCmd *const gAnims_ZANGOOSE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ZANGOOSE_1,
+static const union AnimCmd *const sAnims_ZANGOOSE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ZANGOOSE_1,
 };
 
-const union AnimCmd *const gAnims_RELICANTH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RELICANTH_1,
+static const union AnimCmd *const sAnims_RELICANTH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RELICANTH_1,
 };
 
-const union AnimCmd *const gAnims_ARON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ARON_1,
+static const union AnimCmd *const sAnims_ARON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ARON_1,
 };
 
-const union AnimCmd *const gAnims_LAIRON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LAIRON_1,
+static const union AnimCmd *const sAnims_LAIRON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LAIRON_1,
 };
 
-const union AnimCmd *const gAnims_AGGRON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_AGGRON_1,
+static const union AnimCmd *const sAnims_AGGRON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_AGGRON_1,
 };
 
-const union AnimCmd *const gAnims_CASTFORM[] ={
-    gAnimCmd_CASTFORM_0,
-    gAnimCmd_CASTFORM_1,
-    gAnimCmd_CASTFORM_2,
-    gAnimCmd_CASTFORM_3,
+static const union AnimCmd *const sAnims_CASTFORM[] ={
+    sAnim_CASTFORM_0,
+    sAnim_CASTFORM_1,
+    sAnim_CASTFORM_2,
+    sAnim_CASTFORM_3,
 };
 
-const union AnimCmd *const gAnims_VOLBEAT[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_VOLBEAT_1,
+static const union AnimCmd *const sAnims_VOLBEAT[] ={
+    sAnim_GeneralFrame0,
+    sAnim_VOLBEAT_1,
 };
 
-const union AnimCmd *const gAnims_ILLUMISE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ILLUMISE_1,
+static const union AnimCmd *const sAnims_ILLUMISE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ILLUMISE_1,
 };
 
-const union AnimCmd *const gAnims_LILEEP[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LILEEP_1,
+static const union AnimCmd *const sAnims_LILEEP[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LILEEP_1,
 };
 
-const union AnimCmd *const gAnims_CRADILY[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CRADILY_1,
+static const union AnimCmd *const sAnims_CRADILY[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CRADILY_1,
 };
 
-const union AnimCmd *const gAnims_ANORITH[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ANORITH_1,
+static const union AnimCmd *const sAnims_ANORITH[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ANORITH_1,
 };
 
-const union AnimCmd *const gAnims_ARMALDO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_ARMALDO_1,
+static const union AnimCmd *const sAnims_ARMALDO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_ARMALDO_1,
 };
 
-const union AnimCmd *const gAnims_RALTS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RALTS_1,
+static const union AnimCmd *const sAnims_RALTS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RALTS_1,
 };
 
-const union AnimCmd *const gAnims_KIRLIA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KIRLIA_1,
+static const union AnimCmd *const sAnims_KIRLIA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KIRLIA_1,
 };
 
-const union AnimCmd *const gAnims_GARDEVOIR[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GARDEVOIR_1,
+static const union AnimCmd *const sAnims_GARDEVOIR[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GARDEVOIR_1,
 };
 
-const union AnimCmd *const gAnims_BAGON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BAGON_1,
+static const union AnimCmd *const sAnims_BAGON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BAGON_1,
 };
 
-const union AnimCmd *const gAnims_SHELGON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SHELGON_1,
+static const union AnimCmd *const sAnims_SHELGON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SHELGON_1,
 };
 
-const union AnimCmd *const gAnims_SALAMENCE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_SALAMENCE_1,
+static const union AnimCmd *const sAnims_SALAMENCE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_SALAMENCE_1,
 };
 
-const union AnimCmd *const gAnims_BELDUM[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_BELDUM_1,
+static const union AnimCmd *const sAnims_BELDUM[] ={
+    sAnim_GeneralFrame0,
+    sAnim_BELDUM_1,
 };
 
-const union AnimCmd *const gAnims_METANG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_METANG_1,
+static const union AnimCmd *const sAnims_METANG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_METANG_1,
 };
 
-const union AnimCmd *const gAnims_METAGROSS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_METAGROSS_1,
+static const union AnimCmd *const sAnims_METAGROSS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_METAGROSS_1,
 };
 
-const union AnimCmd *const gAnims_REGIROCK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_REGIROCK_1,
-    gAnimCmd_REGIROCK_2,
+static const union AnimCmd *const sAnims_REGIROCK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_REGIROCK_1,
+    sAnim_REGIROCK_2,
 };
 
-const union AnimCmd *const gAnims_REGICE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_REGICE_1,
+static const union AnimCmd *const sAnims_REGICE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_REGICE_1,
 };
 
-const union AnimCmd *const gAnims_REGISTEEL[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_REGISTEEL_1,
-    gAnimCmd_REGISTEEL_2,
+static const union AnimCmd *const sAnims_REGISTEEL[] ={
+    sAnim_GeneralFrame0,
+    sAnim_REGISTEEL_1,
+    sAnim_REGISTEEL_2,
 };
 
-const union AnimCmd *const gAnims_KYOGRE[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_KYOGRE_1,
-    gAnimCmd_KYOGRE_2,
+static const union AnimCmd *const sAnims_KYOGRE[] ={
+    sAnim_GeneralFrame0,
+    sAnim_KYOGRE_1,
+    sAnim_KYOGRE_2,
 };
 
-const union AnimCmd *const gAnims_GROUDON[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_GROUDON_1,
-    gAnimCmd_GROUDON_2,
+static const union AnimCmd *const sAnims_GROUDON[] ={
+    sAnim_GeneralFrame0,
+    sAnim_GROUDON_1,
+    sAnim_GROUDON_2,
 };
 
-const union AnimCmd *const gAnims_RAYQUAZA[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_RAYQUAZA_1,
-    gAnimCmd_RAYQUAZA_2,
+static const union AnimCmd *const sAnims_RAYQUAZA[] ={
+    sAnim_GeneralFrame0,
+    sAnim_RAYQUAZA_1,
+    sAnim_RAYQUAZA_2,
 };
 
-const union AnimCmd *const gAnims_LATIAS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LATIAS_1,
-    gAnimCmd_LATIAS_2,
+static const union AnimCmd *const sAnims_LATIAS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LATIAS_1,
+    sAnim_LATIAS_2,
 };
 
-const union AnimCmd *const gAnims_LATIOS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_LATIOS_1,
-    gAnimCmd_LATIOS_2,
+static const union AnimCmd *const sAnims_LATIOS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_LATIOS_1,
+    sAnim_LATIOS_2,
 };
 
-const union AnimCmd *const gAnims_JIRACHI[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_JIRACHI_1,
-    gAnimCmd_JIRACHI_2,
+static const union AnimCmd *const sAnims_JIRACHI[] ={
+    sAnim_GeneralFrame0,
+    sAnim_JIRACHI_1,
+    sAnim_JIRACHI_2,
 };
 
-const union AnimCmd *const gAnims_DEOXYS[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_DEOXYS_1,
-    gAnimCmd_DEOXYS_2,
+static const union AnimCmd *const sAnims_DEOXYS[] ={
+    sAnim_GeneralFrame0,
+    sAnim_DEOXYS_1,
+    sAnim_DEOXYS_2,
 };
 
-const union AnimCmd *const gAnims_CHIMECHO[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_CHIMECHO_1,
+static const union AnimCmd *const sAnims_CHIMECHO[] ={
+    sAnim_GeneralFrame0,
+    sAnim_CHIMECHO_1,
 };
 
-const union AnimCmd *const gAnims_EGG[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_EGG_1,
+static const union AnimCmd *const sAnims_EGG[] ={
+    sAnim_GeneralFrame0,
+    sAnim_EGG_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_B[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_B_1,
+static const union AnimCmd *const sAnims_UNOWN_B[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_B_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_C[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_C_1,
+static const union AnimCmd *const sAnims_UNOWN_C[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_C_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_D[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_D_1,
+static const union AnimCmd *const sAnims_UNOWN_D[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_D_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_E[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_E_1,
+static const union AnimCmd *const sAnims_UNOWN_E[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_E_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_F[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_F_1,
+static const union AnimCmd *const sAnims_UNOWN_F[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_F_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_G[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_G_1,
+static const union AnimCmd *const sAnims_UNOWN_G[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_G_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_H[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_H_1,
+static const union AnimCmd *const sAnims_UNOWN_H[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_H_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_I[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_I_1,
+static const union AnimCmd *const sAnims_UNOWN_I[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_I_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_J[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_J_1,
+static const union AnimCmd *const sAnims_UNOWN_J[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_J_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_K[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_K_1,
+static const union AnimCmd *const sAnims_UNOWN_K[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_K_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_L[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_L_1,
+static const union AnimCmd *const sAnims_UNOWN_L[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_L_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_M[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_M_1,
+static const union AnimCmd *const sAnims_UNOWN_M[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_M_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_N[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_N_1,
+static const union AnimCmd *const sAnims_UNOWN_N[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_N_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_O[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_O_1,
+static const union AnimCmd *const sAnims_UNOWN_O[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_O_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_P[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_P_1,
+static const union AnimCmd *const sAnims_UNOWN_P[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_P_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_Q[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_Q_1,
+static const union AnimCmd *const sAnims_UNOWN_Q[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_Q_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_R[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_R_1,
+static const union AnimCmd *const sAnims_UNOWN_R[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_R_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_S[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_S_1,
+static const union AnimCmd *const sAnims_UNOWN_S[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_S_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_T[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_T_1,
+static const union AnimCmd *const sAnims_UNOWN_T[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_T_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_U[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_U_1,
+static const union AnimCmd *const sAnims_UNOWN_U[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_U_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_V[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_V_1,
+static const union AnimCmd *const sAnims_UNOWN_V[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_V_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_W[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_W_1,
+static const union AnimCmd *const sAnims_UNOWN_W[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_W_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_X[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_X_1,
+static const union AnimCmd *const sAnims_UNOWN_X[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_X_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_Y[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_Y_1,
+static const union AnimCmd *const sAnims_UNOWN_Y[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_Y_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_Z[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_Z_1,
+static const union AnimCmd *const sAnims_UNOWN_Z[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_Z_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_EMARK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_EMARK_1,
+static const union AnimCmd *const sAnims_UNOWN_EMARK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_EMARK_1,
 };
 
-const union AnimCmd *const gAnims_UNOWN_QMARK[] ={
-    gAnimCmd_General_Frame0,
-    gAnimCmd_UNOWN_QMARK_1,
+static const union AnimCmd *const sAnims_UNOWN_QMARK[] ={
+    sAnim_GeneralFrame0,
+    sAnim_UNOWN_QMARK_1,
 };
 
-#define ANIM_CMD(name)             [SPECIES_##name] = gAnims_##name
+#define ANIM_CMD(name)             [SPECIES_##name] = sAnims_##name
 #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
 
-const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[] =
+const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
 {
     ANIM_CMD(NONE),
     ANIM_CMD(BULBASAUR),
@@ -7204,30 +7203,30 @@ const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[] =
     ANIM_CMD(HO_OH),
     ANIM_CMD(CELEBI),
     ANIM_CMD(OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_C, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_D, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_E, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_F, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_G, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_H, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_I, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_J, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_K, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_L, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_M, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_N, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_O, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_P, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_Q, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_R, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_S, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_T, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_U, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_V, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_W, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_X, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_Y, gAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_Z, gAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_C, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_D, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_E, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_F, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_G, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_H, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_I, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_J, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_K, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_L, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_M, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_N, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_O, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_P, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_Q, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_R, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_S, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_T, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_U, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_V, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_W, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_X, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_Y, sAnims_OLD_UNOWN_B),
+    ANIM_CMD_FULL(OLD_UNOWN_Z, sAnims_OLD_UNOWN_B),
     ANIM_CMD(TREECKO),
     ANIM_CMD(GROVYLE),
     ANIM_CMD(SCEPTILE),
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index 95ec7a132..19de9a7dd 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -1,5 +1,3 @@
-#include "constants/species.h"
-
 const struct MonCoords gMonFrontPicCoords[] =
 {
     [SPECIES_NONE] =
diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h
index 92e6bab2e..82af860d3 100644
--- a/src/data/pokemon_graphics/front_pic_table.h
+++ b/src/data/pokemon_graphics/front_pic_table.h
@@ -1,443 +1,443 @@
 const struct CompressedSpriteSheet gMonFrontPicTable[] =
 {
-    [SPECIES_NONE] = {gMonFrontPic_CircledQuestionMark, 0x800, SPECIES_NONE},
-    [SPECIES_BULBASAUR] = {gMonFrontPic_Bulbasaur, 0x800, SPECIES_BULBASAUR},
-    [SPECIES_IVYSAUR] = {gMonFrontPic_Ivysaur, 0x800, SPECIES_IVYSAUR},
-    [SPECIES_VENUSAUR] = {gMonFrontPic_Venusaur, 0x800, SPECIES_VENUSAUR},
-    [SPECIES_CHARMANDER] = {gMonFrontPic_Charmander, 0x800, SPECIES_CHARMANDER},
-    [SPECIES_CHARMELEON] = {gMonFrontPic_Charmeleon, 0x800, SPECIES_CHARMELEON},
-    [SPECIES_CHARIZARD] = {gMonFrontPic_Charizard, 0x800, SPECIES_CHARIZARD},
-    [SPECIES_SQUIRTLE] = {gMonFrontPic_Squirtle, 0x800, SPECIES_SQUIRTLE},
-    [SPECIES_WARTORTLE] = {gMonFrontPic_Wartortle, 0x800, SPECIES_WARTORTLE},
-    [SPECIES_BLASTOISE] = {gMonFrontPic_Blastoise, 0x800, SPECIES_BLASTOISE},
-    [SPECIES_CATERPIE] = {gMonFrontPic_Caterpie, 0x800, SPECIES_CATERPIE},
-    [SPECIES_METAPOD] = {gMonFrontPic_Metapod, 0x800, SPECIES_METAPOD},
-    [SPECIES_BUTTERFREE] = {gMonFrontPic_Butterfree, 0x800, SPECIES_BUTTERFREE},
-    [SPECIES_WEEDLE] = {gMonFrontPic_Weedle, 0x800, SPECIES_WEEDLE},
-    [SPECIES_KAKUNA] = {gMonFrontPic_Kakuna, 0x800, SPECIES_KAKUNA},
-    [SPECIES_BEEDRILL] = {gMonFrontPic_Beedrill, 0x800, SPECIES_BEEDRILL},
-    [SPECIES_PIDGEY] = {gMonFrontPic_Pidgey, 0x800, SPECIES_PIDGEY},
-    [SPECIES_PIDGEOTTO] = {gMonFrontPic_Pidgeotto, 0x800, SPECIES_PIDGEOTTO},
-    [SPECIES_PIDGEOT] = {gMonFrontPic_Pidgeot, 0x800, SPECIES_PIDGEOT},
-    [SPECIES_RATTATA] = {gMonFrontPic_Rattata, 0x800, SPECIES_RATTATA},
-    [SPECIES_RATICATE] = {gMonFrontPic_Raticate, 0x800, SPECIES_RATICATE},
-    [SPECIES_SPEAROW] = {gMonFrontPic_Spearow, 0x800, SPECIES_SPEAROW},
-    [SPECIES_FEAROW] = {gMonFrontPic_Fearow, 0x800, SPECIES_FEAROW},
-    [SPECIES_EKANS] = {gMonFrontPic_Ekans, 0x800, SPECIES_EKANS},
-    [SPECIES_ARBOK] = {gMonFrontPic_Arbok, 0x800, SPECIES_ARBOK},
-    [SPECIES_PIKACHU] = {gMonFrontPic_Pikachu, 0x800, SPECIES_PIKACHU},
-    [SPECIES_RAICHU] = {gMonFrontPic_Raichu, 0x800, SPECIES_RAICHU},
-    [SPECIES_SANDSHREW] = {gMonFrontPic_Sandshrew, 0x800, SPECIES_SANDSHREW},
-    [SPECIES_SANDSLASH] = {gMonFrontPic_Sandslash, 0x800, SPECIES_SANDSLASH},
-    [SPECIES_NIDORAN_F] = {gMonFrontPic_NidoranF, 0x800, SPECIES_NIDORAN_F},
-    [SPECIES_NIDORINA] = {gMonFrontPic_Nidorina, 0x800, SPECIES_NIDORINA},
-    [SPECIES_NIDOQUEEN] = {gMonFrontPic_Nidoqueen, 0x800, SPECIES_NIDOQUEEN},
-    [SPECIES_NIDORAN_M] = {gMonFrontPic_NidoranM, 0x800, SPECIES_NIDORAN_M},
-    [SPECIES_NIDORINO] = {gMonFrontPic_Nidorino, 0x800, SPECIES_NIDORINO},
-    [SPECIES_NIDOKING] = {gMonFrontPic_Nidoking, 0x800, SPECIES_NIDOKING},
-    [SPECIES_CLEFAIRY] = {gMonFrontPic_Clefairy, 0x800, SPECIES_CLEFAIRY},
-    [SPECIES_CLEFABLE] = {gMonFrontPic_Clefable, 0x800, SPECIES_CLEFABLE},
-    [SPECIES_VULPIX] = {gMonFrontPic_Vulpix, 0x800, SPECIES_VULPIX},
-    [SPECIES_NINETALES] = {gMonFrontPic_Ninetales, 0x800, SPECIES_NINETALES},
-    [SPECIES_JIGGLYPUFF] = {gMonFrontPic_Jigglypuff, 0x800, SPECIES_JIGGLYPUFF},
-    [SPECIES_WIGGLYTUFF] = {gMonFrontPic_Wigglytuff, 0x800, SPECIES_WIGGLYTUFF},
-    [SPECIES_ZUBAT] = {gMonFrontPic_Zubat, 0x800, SPECIES_ZUBAT},
-    [SPECIES_GOLBAT] = {gMonFrontPic_Golbat, 0x800, SPECIES_GOLBAT},
-    [SPECIES_ODDISH] = {gMonFrontPic_Oddish, 0x800, SPECIES_ODDISH},
-    [SPECIES_GLOOM] = {gMonFrontPic_Gloom, 0x800, SPECIES_GLOOM},
-    [SPECIES_VILEPLUME] = {gMonFrontPic_Vileplume, 0x800, SPECIES_VILEPLUME},
-    [SPECIES_PARAS] = {gMonFrontPic_Paras, 0x800, SPECIES_PARAS},
-    [SPECIES_PARASECT] = {gMonFrontPic_Parasect, 0x800, SPECIES_PARASECT},
-    [SPECIES_VENONAT] = {gMonFrontPic_Venonat, 0x800, SPECIES_VENONAT},
-    [SPECIES_VENOMOTH] = {gMonFrontPic_Venomoth, 0x800, SPECIES_VENOMOTH},
-    [SPECIES_DIGLETT] = {gMonFrontPic_Diglett, 0x800, SPECIES_DIGLETT},
-    [SPECIES_DUGTRIO] = {gMonFrontPic_Dugtrio, 0x800, SPECIES_DUGTRIO},
-    [SPECIES_MEOWTH] = {gMonFrontPic_Meowth, 0x800, SPECIES_MEOWTH},
-    [SPECIES_PERSIAN] = {gMonFrontPic_Persian, 0x800, SPECIES_PERSIAN},
-    [SPECIES_PSYDUCK] = {gMonFrontPic_Psyduck, 0x800, SPECIES_PSYDUCK},
-    [SPECIES_GOLDUCK] = {gMonFrontPic_Golduck, 0x800, SPECIES_GOLDUCK},
-    [SPECIES_MANKEY] = {gMonFrontPic_Mankey, 0x800, SPECIES_MANKEY},
-    [SPECIES_PRIMEAPE] = {gMonFrontPic_Primeape, 0x800, SPECIES_PRIMEAPE},
-    [SPECIES_GROWLITHE] = {gMonFrontPic_Growlithe, 0x800, SPECIES_GROWLITHE},
-    [SPECIES_ARCANINE] = {gMonFrontPic_Arcanine, 0x800, SPECIES_ARCANINE},
-    [SPECIES_POLIWAG] = {gMonFrontPic_Poliwag, 0x800, SPECIES_POLIWAG},
-    [SPECIES_POLIWHIRL] = {gMonFrontPic_Poliwhirl, 0x800, SPECIES_POLIWHIRL},
-    [SPECIES_POLIWRATH] = {gMonFrontPic_Poliwrath, 0x800, SPECIES_POLIWRATH},
-    [SPECIES_ABRA] = {gMonFrontPic_Abra, 0x800, SPECIES_ABRA},
-    [SPECIES_KADABRA] = {gMonFrontPic_Kadabra, 0x800, SPECIES_KADABRA},
-    [SPECIES_ALAKAZAM] = {gMonFrontPic_Alakazam, 0x800, SPECIES_ALAKAZAM},
-    [SPECIES_MACHOP] = {gMonFrontPic_Machop, 0x800, SPECIES_MACHOP},
-    [SPECIES_MACHOKE] = {gMonFrontPic_Machoke, 0x800, SPECIES_MACHOKE},
-    [SPECIES_MACHAMP] = {gMonFrontPic_Machamp, 0x800, SPECIES_MACHAMP},
-    [SPECIES_BELLSPROUT] = {gMonFrontPic_Bellsprout, 0x800, SPECIES_BELLSPROUT},
-    [SPECIES_WEEPINBELL] = {gMonFrontPic_Weepinbell, 0x800, SPECIES_WEEPINBELL},
-    [SPECIES_VICTREEBEL] = {gMonFrontPic_Victreebel, 0x800, SPECIES_VICTREEBEL},
-    [SPECIES_TENTACOOL] = {gMonFrontPic_Tentacool, 0x800, SPECIES_TENTACOOL},
-    [SPECIES_TENTACRUEL] = {gMonFrontPic_Tentacruel, 0x800, SPECIES_TENTACRUEL},
-    [SPECIES_GEODUDE] = {gMonFrontPic_Geodude, 0x800, SPECIES_GEODUDE},
-    [SPECIES_GRAVELER] = {gMonFrontPic_Graveler, 0x800, SPECIES_GRAVELER},
-    [SPECIES_GOLEM] = {gMonFrontPic_Golem, 0x800, SPECIES_GOLEM},
-    [SPECIES_PONYTA] = {gMonFrontPic_Ponyta, 0x800, SPECIES_PONYTA},
-    [SPECIES_RAPIDASH] = {gMonFrontPic_Rapidash, 0x800, SPECIES_RAPIDASH},
-    [SPECIES_SLOWPOKE] = {gMonFrontPic_Slowpoke, 0x800, SPECIES_SLOWPOKE},
-    [SPECIES_SLOWBRO] = {gMonFrontPic_Slowbro, 0x800, SPECIES_SLOWBRO},
-    [SPECIES_MAGNEMITE] = {gMonFrontPic_Magnemite, 0x800, SPECIES_MAGNEMITE},
-    [SPECIES_MAGNETON] = {gMonFrontPic_Magneton, 0x800, SPECIES_MAGNETON},
-    [SPECIES_FARFETCHD] = {gMonFrontPic_Farfetchd, 0x800, SPECIES_FARFETCHD},
-    [SPECIES_DODUO] = {gMonFrontPic_Doduo, 0x800, SPECIES_DODUO},
-    [SPECIES_DODRIO] = {gMonFrontPic_Dodrio, 0x800, SPECIES_DODRIO},
-    [SPECIES_SEEL] = {gMonFrontPic_Seel, 0x800, SPECIES_SEEL},
-    [SPECIES_DEWGONG] = {gMonFrontPic_Dewgong, 0x800, SPECIES_DEWGONG},
-    [SPECIES_GRIMER] = {gMonFrontPic_Grimer, 0x800, SPECIES_GRIMER},
-    [SPECIES_MUK] = {gMonFrontPic_Muk, 0x800, SPECIES_MUK},
-    [SPECIES_SHELLDER] = {gMonFrontPic_Shellder, 0x800, SPECIES_SHELLDER},
-    [SPECIES_CLOYSTER] = {gMonFrontPic_Cloyster, 0x800, SPECIES_CLOYSTER},
-    [SPECIES_GASTLY] = {gMonFrontPic_Gastly, 0x800, SPECIES_GASTLY},
-    [SPECIES_HAUNTER] = {gMonFrontPic_Haunter, 0x800, SPECIES_HAUNTER},
-    [SPECIES_GENGAR] = {gMonFrontPic_Gengar, 0x800, SPECIES_GENGAR},
-    [SPECIES_ONIX] = {gMonFrontPic_Onix, 0x800, SPECIES_ONIX},
-    [SPECIES_DROWZEE] = {gMonFrontPic_Drowzee, 0x800, SPECIES_DROWZEE},
-    [SPECIES_HYPNO] = {gMonFrontPic_Hypno, 0x800, SPECIES_HYPNO},
-    [SPECIES_KRABBY] = {gMonFrontPic_Krabby, 0x800, SPECIES_KRABBY},
-    [SPECIES_KINGLER] = {gMonFrontPic_Kingler, 0x800, SPECIES_KINGLER},
-    [SPECIES_VOLTORB] = {gMonFrontPic_Voltorb, 0x800, SPECIES_VOLTORB},
-    [SPECIES_ELECTRODE] = {gMonFrontPic_Electrode, 0x800, SPECIES_ELECTRODE},
-    [SPECIES_EXEGGCUTE] = {gMonFrontPic_Exeggcute, 0x800, SPECIES_EXEGGCUTE},
-    [SPECIES_EXEGGUTOR] = {gMonFrontPic_Exeggutor, 0x800, SPECIES_EXEGGUTOR},
-    [SPECIES_CUBONE] = {gMonFrontPic_Cubone, 0x800, SPECIES_CUBONE},
-    [SPECIES_MAROWAK] = {gMonFrontPic_Marowak, 0x800, SPECIES_MAROWAK},
-    [SPECIES_HITMONLEE] = {gMonFrontPic_Hitmonlee, 0x800, SPECIES_HITMONLEE},
-    [SPECIES_HITMONCHAN] = {gMonFrontPic_Hitmonchan, 0x800, SPECIES_HITMONCHAN},
-    [SPECIES_LICKITUNG] = {gMonFrontPic_Lickitung, 0x800, SPECIES_LICKITUNG},
-    [SPECIES_KOFFING] = {gMonFrontPic_Koffing, 0x800, SPECIES_KOFFING},
-    [SPECIES_WEEZING] = {gMonFrontPic_Weezing, 0x800, SPECIES_WEEZING},
-    [SPECIES_RHYHORN] = {gMonFrontPic_Rhyhorn, 0x800, SPECIES_RHYHORN},
-    [SPECIES_RHYDON] = {gMonFrontPic_Rhydon, 0x800, SPECIES_RHYDON},
-    [SPECIES_CHANSEY] = {gMonFrontPic_Chansey, 0x800, SPECIES_CHANSEY},
-    [SPECIES_TANGELA] = {gMonFrontPic_Tangela, 0x800, SPECIES_TANGELA},
-    [SPECIES_KANGASKHAN] = {gMonFrontPic_Kangaskhan, 0x800, SPECIES_KANGASKHAN},
-    [SPECIES_HORSEA] = {gMonFrontPic_Horsea, 0x800, SPECIES_HORSEA},
-    [SPECIES_SEADRA] = {gMonFrontPic_Seadra, 0x800, SPECIES_SEADRA},
-    [SPECIES_GOLDEEN] = {gMonFrontPic_Goldeen, 0x800, SPECIES_GOLDEEN},
-    [SPECIES_SEAKING] = {gMonFrontPic_Seaking, 0x800, SPECIES_SEAKING},
-    [SPECIES_STARYU] = {gMonFrontPic_Staryu, 0x800, SPECIES_STARYU},
-    [SPECIES_STARMIE] = {gMonFrontPic_Starmie, 0x800, SPECIES_STARMIE},
-    [SPECIES_MR_MIME] = {gMonFrontPic_Mrmime, 0x800, SPECIES_MR_MIME},
-    [SPECIES_SCYTHER] = {gMonFrontPic_Scyther, 0x800, SPECIES_SCYTHER},
-    [SPECIES_JYNX] = {gMonFrontPic_Jynx, 0x800, SPECIES_JYNX},
-    [SPECIES_ELECTABUZZ] = {gMonFrontPic_Electabuzz, 0x800, SPECIES_ELECTABUZZ},
-    [SPECIES_MAGMAR] = {gMonFrontPic_Magmar, 0x800, SPECIES_MAGMAR},
-    [SPECIES_PINSIR] = {gMonFrontPic_Pinsir, 0x800, SPECIES_PINSIR},
-    [SPECIES_TAUROS] = {gMonFrontPic_Tauros, 0x800, SPECIES_TAUROS},
-    [SPECIES_MAGIKARP] = {gMonFrontPic_Magikarp, 0x800, SPECIES_MAGIKARP},
-    [SPECIES_GYARADOS] = {gMonFrontPic_Gyarados, 0x800, SPECIES_GYARADOS},
-    [SPECIES_LAPRAS] = {gMonFrontPic_Lapras, 0x800, SPECIES_LAPRAS},
-    [SPECIES_DITTO] = {gMonFrontPic_Ditto, 0x800, SPECIES_DITTO},
-    [SPECIES_EEVEE] = {gMonFrontPic_Eevee, 0x800, SPECIES_EEVEE},
-    [SPECIES_VAPOREON] = {gMonFrontPic_Vaporeon, 0x800, SPECIES_VAPOREON},
-    [SPECIES_JOLTEON] = {gMonFrontPic_Jolteon, 0x800, SPECIES_JOLTEON},
-    [SPECIES_FLAREON] = {gMonFrontPic_Flareon, 0x800, SPECIES_FLAREON},
-    [SPECIES_PORYGON] = {gMonFrontPic_Porygon, 0x800, SPECIES_PORYGON},
-    [SPECIES_OMANYTE] = {gMonFrontPic_Omanyte, 0x800, SPECIES_OMANYTE},
-    [SPECIES_OMASTAR] = {gMonFrontPic_Omastar, 0x800, SPECIES_OMASTAR},
-    [SPECIES_KABUTO] = {gMonFrontPic_Kabuto, 0x800, SPECIES_KABUTO},
-    [SPECIES_KABUTOPS] = {gMonFrontPic_Kabutops, 0x800, SPECIES_KABUTOPS},
-    [SPECIES_AERODACTYL] = {gMonFrontPic_Aerodactyl, 0x800, SPECIES_AERODACTYL},
-    [SPECIES_SNORLAX] = {gMonFrontPic_Snorlax, 0x800, SPECIES_SNORLAX},
-    [SPECIES_ARTICUNO] = {gMonFrontPic_Articuno, 0x800, SPECIES_ARTICUNO},
-    [SPECIES_ZAPDOS] = {gMonFrontPic_Zapdos, 0x800, SPECIES_ZAPDOS},
-    [SPECIES_MOLTRES] = {gMonFrontPic_Moltres, 0x800, SPECIES_MOLTRES},
-    [SPECIES_DRATINI] = {gMonFrontPic_Dratini, 0x800, SPECIES_DRATINI},
-    [SPECIES_DRAGONAIR] = {gMonFrontPic_Dragonair, 0x800, SPECIES_DRAGONAIR},
-    [SPECIES_DRAGONITE] = {gMonFrontPic_Dragonite, 0x800, SPECIES_DRAGONITE},
-    [SPECIES_MEWTWO] = {gMonFrontPic_Mewtwo, 0x800, SPECIES_MEWTWO},
-    [SPECIES_MEW] = {gMonFrontPic_Mew, 0x800, SPECIES_MEW},
-    [SPECIES_CHIKORITA] = {gMonFrontPic_Chikorita, 0x800, SPECIES_CHIKORITA},
-    [SPECIES_BAYLEEF] = {gMonFrontPic_Bayleef, 0x800, SPECIES_BAYLEEF},
-    [SPECIES_MEGANIUM] = {gMonFrontPic_Meganium, 0x800, SPECIES_MEGANIUM},
-    [SPECIES_CYNDAQUIL] = {gMonFrontPic_Cyndaquil, 0x800, SPECIES_CYNDAQUIL},
-    [SPECIES_QUILAVA] = {gMonFrontPic_Quilava, 0x800, SPECIES_QUILAVA},
-    [SPECIES_TYPHLOSION] = {gMonFrontPic_Typhlosion, 0x800, SPECIES_TYPHLOSION},
-    [SPECIES_TOTODILE] = {gMonFrontPic_Totodile, 0x800, SPECIES_TOTODILE},
-    [SPECIES_CROCONAW] = {gMonFrontPic_Croconaw, 0x800, SPECIES_CROCONAW},
-    [SPECIES_FERALIGATR] = {gMonFrontPic_Feraligatr, 0x800, SPECIES_FERALIGATR},
-    [SPECIES_SENTRET] = {gMonFrontPic_Sentret, 0x800, SPECIES_SENTRET},
-    [SPECIES_FURRET] = {gMonFrontPic_Furret, 0x800, SPECIES_FURRET},
-    [SPECIES_HOOTHOOT] = {gMonFrontPic_Hoothoot, 0x800, SPECIES_HOOTHOOT},
-    [SPECIES_NOCTOWL] = {gMonFrontPic_Noctowl, 0x800, SPECIES_NOCTOWL},
-    [SPECIES_LEDYBA] = {gMonFrontPic_Ledyba, 0x800, SPECIES_LEDYBA},
-    [SPECIES_LEDIAN] = {gMonFrontPic_Ledian, 0x800, SPECIES_LEDIAN},
-    [SPECIES_SPINARAK] = {gMonFrontPic_Spinarak, 0x800, SPECIES_SPINARAK},
-    [SPECIES_ARIADOS] = {gMonFrontPic_Ariados, 0x800, SPECIES_ARIADOS},
-    [SPECIES_CROBAT] = {gMonFrontPic_Crobat, 0x800, SPECIES_CROBAT},
-    [SPECIES_CHINCHOU] = {gMonFrontPic_Chinchou, 0x800, SPECIES_CHINCHOU},
-    [SPECIES_LANTURN] = {gMonFrontPic_Lanturn, 0x800, SPECIES_LANTURN},
-    [SPECIES_PICHU] = {gMonFrontPic_Pichu, 0x800, SPECIES_PICHU},
-    [SPECIES_CLEFFA] = {gMonFrontPic_Cleffa, 0x800, SPECIES_CLEFFA},
-    [SPECIES_IGGLYBUFF] = {gMonFrontPic_Igglybuff, 0x800, SPECIES_IGGLYBUFF},
-    [SPECIES_TOGEPI] = {gMonFrontPic_Togepi, 0x800, SPECIES_TOGEPI},
-    [SPECIES_TOGETIC] = {gMonFrontPic_Togetic, 0x800, SPECIES_TOGETIC},
-    [SPECIES_NATU] = {gMonFrontPic_Natu, 0x800, SPECIES_NATU},
-    [SPECIES_XATU] = {gMonFrontPic_Xatu, 0x800, SPECIES_XATU},
-    [SPECIES_MAREEP] = {gMonFrontPic_Mareep, 0x800, SPECIES_MAREEP},
-    [SPECIES_FLAAFFY] = {gMonFrontPic_Flaaffy, 0x800, SPECIES_FLAAFFY},
-    [SPECIES_AMPHAROS] = {gMonFrontPic_Ampharos, 0x800, SPECIES_AMPHAROS},
-    [SPECIES_BELLOSSOM] = {gMonFrontPic_Bellossom, 0x800, SPECIES_BELLOSSOM},
-    [SPECIES_MARILL] = {gMonFrontPic_Marill, 0x800, SPECIES_MARILL},
-    [SPECIES_AZUMARILL] = {gMonFrontPic_Azumarill, 0x800, SPECIES_AZUMARILL},
-    [SPECIES_SUDOWOODO] = {gMonFrontPic_Sudowoodo, 0x800, SPECIES_SUDOWOODO},
-    [SPECIES_POLITOED] = {gMonFrontPic_Politoed, 0x800, SPECIES_POLITOED},
-    [SPECIES_HOPPIP] = {gMonFrontPic_Hoppip, 0x800, SPECIES_HOPPIP},
-    [SPECIES_SKIPLOOM] = {gMonFrontPic_Skiploom, 0x800, SPECIES_SKIPLOOM},
-    [SPECIES_JUMPLUFF] = {gMonFrontPic_Jumpluff, 0x800, SPECIES_JUMPLUFF},
-    [SPECIES_AIPOM] = {gMonFrontPic_Aipom, 0x800, SPECIES_AIPOM},
-    [SPECIES_SUNKERN] = {gMonFrontPic_Sunkern, 0x800, SPECIES_SUNKERN},
-    [SPECIES_SUNFLORA] = {gMonFrontPic_Sunflora, 0x800, SPECIES_SUNFLORA},
-    [SPECIES_YANMA] = {gMonFrontPic_Yanma, 0x800, SPECIES_YANMA},
-    [SPECIES_WOOPER] = {gMonFrontPic_Wooper, 0x800, SPECIES_WOOPER},
-    [SPECIES_QUAGSIRE] = {gMonFrontPic_Quagsire, 0x800, SPECIES_QUAGSIRE},
-    [SPECIES_ESPEON] = {gMonFrontPic_Espeon, 0x800, SPECIES_ESPEON},
-    [SPECIES_UMBREON] = {gMonFrontPic_Umbreon, 0x800, SPECIES_UMBREON},
-    [SPECIES_MURKROW] = {gMonFrontPic_Murkrow, 0x800, SPECIES_MURKROW},
-    [SPECIES_SLOWKING] = {gMonFrontPic_Slowking, 0x800, SPECIES_SLOWKING},
-    [SPECIES_MISDREAVUS] = {gMonFrontPic_Misdreavus, 0x800, SPECIES_MISDREAVUS},
-    [SPECIES_UNOWN] = {gMonFrontPic_UnownA, 0x800, SPECIES_UNOWN},
-    [SPECIES_WOBBUFFET] = {gMonFrontPic_Wobbuffet, 0x800, SPECIES_WOBBUFFET},
-    [SPECIES_GIRAFARIG] = {gMonFrontPic_Girafarig, 0x800, SPECIES_GIRAFARIG},
-    [SPECIES_PINECO] = {gMonFrontPic_Pineco, 0x800, SPECIES_PINECO},
-    [SPECIES_FORRETRESS] = {gMonFrontPic_Forretress, 0x800, SPECIES_FORRETRESS},
-    [SPECIES_DUNSPARCE] = {gMonFrontPic_Dunsparce, 0x800, SPECIES_DUNSPARCE},
-    [SPECIES_GLIGAR] = {gMonFrontPic_Gligar, 0x800, SPECIES_GLIGAR},
-    [SPECIES_STEELIX] = {gMonFrontPic_Steelix, 0x800, SPECIES_STEELIX},
-    [SPECIES_SNUBBULL] = {gMonFrontPic_Snubbull, 0x800, SPECIES_SNUBBULL},
-    [SPECIES_GRANBULL] = {gMonFrontPic_Granbull, 0x800, SPECIES_GRANBULL},
-    [SPECIES_QWILFISH] = {gMonFrontPic_Qwilfish, 0x800, SPECIES_QWILFISH},
-    [SPECIES_SCIZOR] = {gMonFrontPic_Scizor, 0x800, SPECIES_SCIZOR},
-    [SPECIES_SHUCKLE] = {gMonFrontPic_Shuckle, 0x800, SPECIES_SHUCKLE},
-    [SPECIES_HERACROSS] = {gMonFrontPic_Heracross, 0x800, SPECIES_HERACROSS},
-    [SPECIES_SNEASEL] = {gMonFrontPic_Sneasel, 0x800, SPECIES_SNEASEL},
-    [SPECIES_TEDDIURSA] = {gMonFrontPic_Teddiursa, 0x800, SPECIES_TEDDIURSA},
-    [SPECIES_URSARING] = {gMonFrontPic_Ursaring, 0x800, SPECIES_URSARING},
-    [SPECIES_SLUGMA] = {gMonFrontPic_Slugma, 0x800, SPECIES_SLUGMA},
-    [SPECIES_MAGCARGO] = {gMonFrontPic_Magcargo, 0x800, SPECIES_MAGCARGO},
-    [SPECIES_SWINUB] = {gMonFrontPic_Swinub, 0x800, SPECIES_SWINUB},
-    [SPECIES_PILOSWINE] = {gMonFrontPic_Piloswine, 0x800, SPECIES_PILOSWINE},
-    [SPECIES_CORSOLA] = {gMonFrontPic_Corsola, 0x800, SPECIES_CORSOLA},
-    [SPECIES_REMORAID] = {gMonFrontPic_Remoraid, 0x800, SPECIES_REMORAID},
-    [SPECIES_OCTILLERY] = {gMonFrontPic_Octillery, 0x800, SPECIES_OCTILLERY},
-    [SPECIES_DELIBIRD] = {gMonFrontPic_Delibird, 0x800, SPECIES_DELIBIRD},
-    [SPECIES_MANTINE] = {gMonFrontPic_Mantine, 0x800, SPECIES_MANTINE},
-    [SPECIES_SKARMORY] = {gMonFrontPic_Skarmory, 0x800, SPECIES_SKARMORY},
-    [SPECIES_HOUNDOUR] = {gMonFrontPic_Houndour, 0x800, SPECIES_HOUNDOUR},
-    [SPECIES_HOUNDOOM] = {gMonFrontPic_Houndoom, 0x800, SPECIES_HOUNDOOM},
-    [SPECIES_KINGDRA] = {gMonFrontPic_Kingdra, 0x800, SPECIES_KINGDRA},
-    [SPECIES_PHANPY] = {gMonFrontPic_Phanpy, 0x800, SPECIES_PHANPY},
-    [SPECIES_DONPHAN] = {gMonFrontPic_Donphan, 0x800, SPECIES_DONPHAN},
-    [SPECIES_PORYGON2] = {gMonFrontPic_Porygon2, 0x800, SPECIES_PORYGON2},
-    [SPECIES_STANTLER] = {gMonFrontPic_Stantler, 0x800, SPECIES_STANTLER},
-    [SPECIES_SMEARGLE] = {gMonFrontPic_Smeargle, 0x800, SPECIES_SMEARGLE},
-    [SPECIES_TYROGUE] = {gMonFrontPic_Tyrogue, 0x800, SPECIES_TYROGUE},
-    [SPECIES_HITMONTOP] = {gMonFrontPic_Hitmontop, 0x800, SPECIES_HITMONTOP},
-    [SPECIES_SMOOCHUM] = {gMonFrontPic_Smoochum, 0x800, SPECIES_SMOOCHUM},
-    [SPECIES_ELEKID] = {gMonFrontPic_Elekid, 0x800, SPECIES_ELEKID},
-    [SPECIES_MAGBY] = {gMonFrontPic_Magby, 0x800, SPECIES_MAGBY},
-    [SPECIES_MILTANK] = {gMonFrontPic_Miltank, 0x800, SPECIES_MILTANK},
-    [SPECIES_BLISSEY] = {gMonFrontPic_Blissey, 0x800, SPECIES_BLISSEY},
-    [SPECIES_RAIKOU] = {gMonFrontPic_Raikou, 0x800, SPECIES_RAIKOU},
-    [SPECIES_ENTEI] = {gMonFrontPic_Entei, 0x800, SPECIES_ENTEI},
-    [SPECIES_SUICUNE] = {gMonFrontPic_Suicune, 0x800, SPECIES_SUICUNE},
-    [SPECIES_LARVITAR] = {gMonFrontPic_Larvitar, 0x800, SPECIES_LARVITAR},
-    [SPECIES_PUPITAR] = {gMonFrontPic_Pupitar, 0x800, SPECIES_PUPITAR},
-    [SPECIES_TYRANITAR] = {gMonFrontPic_Tyranitar, 0x800, SPECIES_TYRANITAR},
-    [SPECIES_LUGIA] = {gMonFrontPic_Lugia, 0x800, SPECIES_LUGIA},
-    [SPECIES_HO_OH] = {gMonFrontPic_HoOh, 0x800, SPECIES_HO_OH},
-    [SPECIES_CELEBI] = {gMonFrontPic_Celebi, 0x800, SPECIES_CELEBI},
-    [SPECIES_OLD_UNOWN_B] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_B},
-    [SPECIES_OLD_UNOWN_C] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_C},
-    [SPECIES_OLD_UNOWN_D] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_D},
-    [SPECIES_OLD_UNOWN_E] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_E},
-    [SPECIES_OLD_UNOWN_F] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_F},
-    [SPECIES_OLD_UNOWN_G] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_G},
-    [SPECIES_OLD_UNOWN_H] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_H},
-    [SPECIES_OLD_UNOWN_I] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_I},
-    [SPECIES_OLD_UNOWN_J] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_J},
-    [SPECIES_OLD_UNOWN_K] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_K},
-    [SPECIES_OLD_UNOWN_L] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_L},
-    [SPECIES_OLD_UNOWN_M] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_M},
-    [SPECIES_OLD_UNOWN_N] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_N},
-    [SPECIES_OLD_UNOWN_O] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_O},
-    [SPECIES_OLD_UNOWN_P] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_P},
-    [SPECIES_OLD_UNOWN_Q] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Q},
-    [SPECIES_OLD_UNOWN_R] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_R},
-    [SPECIES_OLD_UNOWN_S] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_S},
-    [SPECIES_OLD_UNOWN_T] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_T},
-    [SPECIES_OLD_UNOWN_U] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_U},
-    [SPECIES_OLD_UNOWN_V] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_V},
-    [SPECIES_OLD_UNOWN_W] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_W},
-    [SPECIES_OLD_UNOWN_X] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_X},
-    [SPECIES_OLD_UNOWN_Y] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Y},
-    [SPECIES_OLD_UNOWN_Z] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Z},
-    [SPECIES_TREECKO] = {gMonFrontPic_Treecko, 0x800, SPECIES_TREECKO},
-    [SPECIES_GROVYLE] = {gMonFrontPic_Grovyle, 0x800, SPECIES_GROVYLE},
-    [SPECIES_SCEPTILE] = {gMonFrontPic_Sceptile, 0x800, SPECIES_SCEPTILE},
-    [SPECIES_TORCHIC] = {gMonFrontPic_Torchic, 0x800, SPECIES_TORCHIC},
-    [SPECIES_COMBUSKEN] = {gMonFrontPic_Combusken, 0x800, SPECIES_COMBUSKEN},
-    [SPECIES_BLAZIKEN] = {gMonFrontPic_Blaziken, 0x800, SPECIES_BLAZIKEN},
-    [SPECIES_MUDKIP] = {gMonFrontPic_Mudkip, 0x800, SPECIES_MUDKIP},
-    [SPECIES_MARSHTOMP] = {gMonFrontPic_Marshtomp, 0x800, SPECIES_MARSHTOMP},
-    [SPECIES_SWAMPERT] = {gMonFrontPic_Swampert, 0x800, SPECIES_SWAMPERT},
-    [SPECIES_POOCHYENA] = {gMonFrontPic_Poochyena, 0x800, SPECIES_POOCHYENA},
-    [SPECIES_MIGHTYENA] = {gMonFrontPic_Mightyena, 0x800, SPECIES_MIGHTYENA},
-    [SPECIES_ZIGZAGOON] = {gMonFrontPic_Zigzagoon, 0x800, SPECIES_ZIGZAGOON},
-    [SPECIES_LINOONE] = {gMonFrontPic_Linoone, 0x800, SPECIES_LINOONE},
-    [SPECIES_WURMPLE] = {gMonFrontPic_Wurmple, 0x800, SPECIES_WURMPLE},
-    [SPECIES_SILCOON] = {gMonFrontPic_Silcoon, 0x800, SPECIES_SILCOON},
-    [SPECIES_BEAUTIFLY] = {gMonFrontPic_Beautifly, 0x800, SPECIES_BEAUTIFLY},
-    [SPECIES_CASCOON] = {gMonFrontPic_Cascoon, 0x800, SPECIES_CASCOON},
-    [SPECIES_DUSTOX] = {gMonFrontPic_Dustox, 0x800, SPECIES_DUSTOX},
-    [SPECIES_LOTAD] = {gMonFrontPic_Lotad, 0x800, SPECIES_LOTAD},
-    [SPECIES_LOMBRE] = {gMonFrontPic_Lombre, 0x800, SPECIES_LOMBRE},
-    [SPECIES_LUDICOLO] = {gMonFrontPic_Ludicolo, 0x800, SPECIES_LUDICOLO},
-    [SPECIES_SEEDOT] = {gMonFrontPic_Seedot, 0x800, SPECIES_SEEDOT},
-    [SPECIES_NUZLEAF] = {gMonFrontPic_Nuzleaf, 0x800, SPECIES_NUZLEAF},
-    [SPECIES_SHIFTRY] = {gMonFrontPic_Shiftry, 0x800, SPECIES_SHIFTRY},
-    [SPECIES_NINCADA] = {gMonFrontPic_Nincada, 0x800, SPECIES_NINCADA},
-    [SPECIES_NINJASK] = {gMonFrontPic_Ninjask, 0x800, SPECIES_NINJASK},
-    [SPECIES_SHEDINJA] = {gMonFrontPic_Shedinja, 0x800, SPECIES_SHEDINJA},
-    [SPECIES_TAILLOW] = {gMonFrontPic_Taillow, 0x800, SPECIES_TAILLOW},
-    [SPECIES_SWELLOW] = {gMonFrontPic_Swellow, 0x800, SPECIES_SWELLOW},
-    [SPECIES_SHROOMISH] = {gMonFrontPic_Shroomish, 0x800, SPECIES_SHROOMISH},
-    [SPECIES_BRELOOM] = {gMonFrontPic_Breloom, 0x800, SPECIES_BRELOOM},
-    [SPECIES_SPINDA] = {gMonFrontPic_Spinda, 0x800, SPECIES_SPINDA},
-    [SPECIES_WINGULL] = {gMonFrontPic_Wingull, 0x800, SPECIES_WINGULL},
-    [SPECIES_PELIPPER] = {gMonFrontPic_Pelipper, 0x800, SPECIES_PELIPPER},
-    [SPECIES_SURSKIT] = {gMonFrontPic_Surskit, 0x800, SPECIES_SURSKIT},
-    [SPECIES_MASQUERAIN] = {gMonFrontPic_Masquerain, 0x800, SPECIES_MASQUERAIN},
-    [SPECIES_WAILMER] = {gMonFrontPic_Wailmer, 0x800, SPECIES_WAILMER},
-    [SPECIES_WAILORD] = {gMonFrontPic_Wailord, 0x800, SPECIES_WAILORD},
-    [SPECIES_SKITTY] = {gMonFrontPic_Skitty, 0x800, SPECIES_SKITTY},
-    [SPECIES_DELCATTY] = {gMonFrontPic_Delcatty, 0x800, SPECIES_DELCATTY},
-    [SPECIES_KECLEON] = {gMonFrontPic_Kecleon, 0x800, SPECIES_KECLEON},
-    [SPECIES_BALTOY] = {gMonFrontPic_Baltoy, 0x800, SPECIES_BALTOY},
-    [SPECIES_CLAYDOL] = {gMonFrontPic_Claydol, 0x800, SPECIES_CLAYDOL},
-    [SPECIES_NOSEPASS] = {gMonFrontPic_Nosepass, 0x800, SPECIES_NOSEPASS},
-    [SPECIES_TORKOAL] = {gMonFrontPic_Torkoal, 0x800, SPECIES_TORKOAL},
-    [SPECIES_SABLEYE] = {gMonFrontPic_Sableye, 0x800, SPECIES_SABLEYE},
-    [SPECIES_BARBOACH] = {gMonFrontPic_Barboach, 0x800, SPECIES_BARBOACH},
-    [SPECIES_WHISCASH] = {gMonFrontPic_Whiscash, 0x800, SPECIES_WHISCASH},
-    [SPECIES_LUVDISC] = {gMonFrontPic_Luvdisc, 0x800, SPECIES_LUVDISC},
-    [SPECIES_CORPHISH] = {gMonFrontPic_Corphish, 0x800, SPECIES_CORPHISH},
-    [SPECIES_CRAWDAUNT] = {gMonFrontPic_Crawdaunt, 0x800, SPECIES_CRAWDAUNT},
-    [SPECIES_FEEBAS] = {gMonFrontPic_Feebas, 0x800, SPECIES_FEEBAS},
-    [SPECIES_MILOTIC] = {gMonFrontPic_Milotic, 0x800, SPECIES_MILOTIC},
-    [SPECIES_CARVANHA] = {gMonFrontPic_Carvanha, 0x800, SPECIES_CARVANHA},
-    [SPECIES_SHARPEDO] = {gMonFrontPic_Sharpedo, 0x800, SPECIES_SHARPEDO},
-    [SPECIES_TRAPINCH] = {gMonFrontPic_Trapinch, 0x800, SPECIES_TRAPINCH},
-    [SPECIES_VIBRAVA] = {gMonFrontPic_Vibrava, 0x800, SPECIES_VIBRAVA},
-    [SPECIES_FLYGON] = {gMonFrontPic_Flygon, 0x800, SPECIES_FLYGON},
-    [SPECIES_MAKUHITA] = {gMonFrontPic_Makuhita, 0x800, SPECIES_MAKUHITA},
-    [SPECIES_HARIYAMA] = {gMonFrontPic_Hariyama, 0x800, SPECIES_HARIYAMA},
-    [SPECIES_ELECTRIKE] = {gMonFrontPic_Electrike, 0x800, SPECIES_ELECTRIKE},
-    [SPECIES_MANECTRIC] = {gMonFrontPic_Manectric, 0x800, SPECIES_MANECTRIC},
-    [SPECIES_NUMEL] = {gMonFrontPic_Numel, 0x800, SPECIES_NUMEL},
-    [SPECIES_CAMERUPT] = {gMonFrontPic_Camerupt, 0x800, SPECIES_CAMERUPT},
-    [SPECIES_SPHEAL] = {gMonFrontPic_Spheal, 0x800, SPECIES_SPHEAL},
-    [SPECIES_SEALEO] = {gMonFrontPic_Sealeo, 0x800, SPECIES_SEALEO},
-    [SPECIES_WALREIN] = {gMonFrontPic_Walrein, 0x800, SPECIES_WALREIN},
-    [SPECIES_CACNEA] = {gMonFrontPic_Cacnea, 0x800, SPECIES_CACNEA},
-    [SPECIES_CACTURNE] = {gMonFrontPic_Cacturne, 0x800, SPECIES_CACTURNE},
-    [SPECIES_SNORUNT] = {gMonFrontPic_Snorunt, 0x800, SPECIES_SNORUNT},
-    [SPECIES_GLALIE] = {gMonFrontPic_Glalie, 0x800, SPECIES_GLALIE},
-    [SPECIES_LUNATONE] = {gMonFrontPic_Lunatone, 0x800, SPECIES_LUNATONE},
-    [SPECIES_SOLROCK] = {gMonFrontPic_Solrock, 0x800, SPECIES_SOLROCK},
-    [SPECIES_AZURILL] = {gMonFrontPic_Azurill, 0x800, SPECIES_AZURILL},
-    [SPECIES_SPOINK] = {gMonFrontPic_Spoink, 0x800, SPECIES_SPOINK},
-    [SPECIES_GRUMPIG] = {gMonFrontPic_Grumpig, 0x800, SPECIES_GRUMPIG},
-    [SPECIES_PLUSLE] = {gMonFrontPic_Plusle, 0x800, SPECIES_PLUSLE},
-    [SPECIES_MINUN] = {gMonFrontPic_Minun, 0x800, SPECIES_MINUN},
-    [SPECIES_MAWILE] = {gMonFrontPic_Mawile, 0x800, SPECIES_MAWILE},
-    [SPECIES_MEDITITE] = {gMonFrontPic_Meditite, 0x800, SPECIES_MEDITITE},
-    [SPECIES_MEDICHAM] = {gMonFrontPic_Medicham, 0x800, SPECIES_MEDICHAM},
-    [SPECIES_SWABLU] = {gMonFrontPic_Swablu, 0x800, SPECIES_SWABLU},
-    [SPECIES_ALTARIA] = {gMonFrontPic_Altaria, 0x800, SPECIES_ALTARIA},
-    [SPECIES_WYNAUT] = {gMonFrontPic_Wynaut, 0x800, SPECIES_WYNAUT},
-    [SPECIES_DUSKULL] = {gMonFrontPic_Duskull, 0x800, SPECIES_DUSKULL},
-    [SPECIES_DUSCLOPS] = {gMonFrontPic_Dusclops, 0x800, SPECIES_DUSCLOPS},
-    [SPECIES_ROSELIA] = {gMonFrontPic_Roselia, 0x800, SPECIES_ROSELIA},
-    [SPECIES_SLAKOTH] = {gMonFrontPic_Slakoth, 0x800, SPECIES_SLAKOTH},
-    [SPECIES_VIGOROTH] = {gMonFrontPic_Vigoroth, 0x800, SPECIES_VIGOROTH},
-    [SPECIES_SLAKING] = {gMonFrontPic_Slaking, 0x800, SPECIES_SLAKING},
-    [SPECIES_GULPIN] = {gMonFrontPic_Gulpin, 0x800, SPECIES_GULPIN},
-    [SPECIES_SWALOT] = {gMonFrontPic_Swalot, 0x800, SPECIES_SWALOT},
-    [SPECIES_TROPIUS] = {gMonFrontPic_Tropius, 0x800, SPECIES_TROPIUS},
-    [SPECIES_WHISMUR] = {gMonFrontPic_Whismur, 0x800, SPECIES_WHISMUR},
-    [SPECIES_LOUDRED] = {gMonFrontPic_Loudred, 0x800, SPECIES_LOUDRED},
-    [SPECIES_EXPLOUD] = {gMonFrontPic_Exploud, 0x800, SPECIES_EXPLOUD},
-    [SPECIES_CLAMPERL] = {gMonFrontPic_Clamperl, 0x800, SPECIES_CLAMPERL},
-    [SPECIES_HUNTAIL] = {gMonFrontPic_Huntail, 0x800, SPECIES_HUNTAIL},
-    [SPECIES_GOREBYSS] = {gMonFrontPic_Gorebyss, 0x800, SPECIES_GOREBYSS},
-    [SPECIES_ABSOL] = {gMonFrontPic_Absol, 0x800, SPECIES_ABSOL},
-    [SPECIES_SHUPPET] = {gMonFrontPic_Shuppet, 0x800, SPECIES_SHUPPET},
-    [SPECIES_BANETTE] = {gMonFrontPic_Banette, 0x800, SPECIES_BANETTE},
-    [SPECIES_SEVIPER] = {gMonFrontPic_Seviper, 0x800, SPECIES_SEVIPER},
-    [SPECIES_ZANGOOSE] = {gMonFrontPic_Zangoose, 0x800, SPECIES_ZANGOOSE},
-    [SPECIES_RELICANTH] = {gMonFrontPic_Relicanth, 0x800, SPECIES_RELICANTH},
-    [SPECIES_ARON] = {gMonFrontPic_Aron, 0x800, SPECIES_ARON},
-    [SPECIES_LAIRON] = {gMonFrontPic_Lairon, 0x800, SPECIES_LAIRON},
-    [SPECIES_AGGRON] = {gMonFrontPic_Aggron, 0x800, SPECIES_AGGRON},
-    [SPECIES_CASTFORM] = {gMonFrontPic_Castform, 0x800, SPECIES_CASTFORM},
-    [SPECIES_VOLBEAT] = {gMonFrontPic_Volbeat, 0x800, SPECIES_VOLBEAT},
-    [SPECIES_ILLUMISE] = {gMonFrontPic_Illumise, 0x800, SPECIES_ILLUMISE},
-    [SPECIES_LILEEP] = {gMonFrontPic_Lileep, 0x800, SPECIES_LILEEP},
-    [SPECIES_CRADILY] = {gMonFrontPic_Cradily, 0x800, SPECIES_CRADILY},
-    [SPECIES_ANORITH] = {gMonFrontPic_Anorith, 0x800, SPECIES_ANORITH},
-    [SPECIES_ARMALDO] = {gMonFrontPic_Armaldo, 0x800, SPECIES_ARMALDO},
-    [SPECIES_RALTS] = {gMonFrontPic_Ralts, 0x800, SPECIES_RALTS},
-    [SPECIES_KIRLIA] = {gMonFrontPic_Kirlia, 0x800, SPECIES_KIRLIA},
-    [SPECIES_GARDEVOIR] = {gMonFrontPic_Gardevoir, 0x800, SPECIES_GARDEVOIR},
-    [SPECIES_BAGON] = {gMonFrontPic_Bagon, 0x800, SPECIES_BAGON},
-    [SPECIES_SHELGON] = {gMonFrontPic_Shelgon, 0x800, SPECIES_SHELGON},
-    [SPECIES_SALAMENCE] = {gMonFrontPic_Salamence, 0x800, SPECIES_SALAMENCE},
-    [SPECIES_BELDUM] = {gMonFrontPic_Beldum, 0x800, SPECIES_BELDUM},
-    [SPECIES_METANG] = {gMonFrontPic_Metang, 0x800, SPECIES_METANG},
-    [SPECIES_METAGROSS] = {gMonFrontPic_Metagross, 0x800, SPECIES_METAGROSS},
-    [SPECIES_REGIROCK] = {gMonFrontPic_Regirock, 0x800, SPECIES_REGIROCK},
-    [SPECIES_REGICE] = {gMonFrontPic_Regice, 0x800, SPECIES_REGICE},
-    [SPECIES_REGISTEEL] = {gMonFrontPic_Registeel, 0x800, SPECIES_REGISTEEL},
-    [SPECIES_KYOGRE] = {gMonFrontPic_Kyogre, 0x800, SPECIES_KYOGRE},
-    [SPECIES_GROUDON] = {gMonFrontPic_Groudon, 0x800, SPECIES_GROUDON},
-    [SPECIES_RAYQUAZA] = {gMonFrontPic_Rayquaza, 0x800, SPECIES_RAYQUAZA},
-    [SPECIES_LATIAS] = {gMonFrontPic_Latias, 0x800, SPECIES_LATIAS},
-    [SPECIES_LATIOS] = {gMonFrontPic_Latios, 0x800, SPECIES_LATIOS},
-    [SPECIES_JIRACHI] = {gMonFrontPic_Jirachi, 0x800, SPECIES_JIRACHI},
-    [SPECIES_DEOXYS] = {gMonFrontPic_Deoxys, 0x800, SPECIES_DEOXYS},
-    [SPECIES_CHIMECHO] = {gMonFrontPic_Chimecho, 0x800, SPECIES_CHIMECHO},
-    [SPECIES_EGG] = {gMonFrontPic_Egg, 0x800, SPECIES_EGG},
-    [SPECIES_UNOWN_B] = {gMonFrontPic_UnownB, 0x800, SPECIES_UNOWN_B},
-    [SPECIES_UNOWN_C] = {gMonFrontPic_UnownC, 0x800, SPECIES_UNOWN_C},
-    [SPECIES_UNOWN_D] = {gMonFrontPic_UnownD, 0x800, SPECIES_UNOWN_D},
-    [SPECIES_UNOWN_E] = {gMonFrontPic_UnownE, 0x800, SPECIES_UNOWN_E},
-    [SPECIES_UNOWN_F] = {gMonFrontPic_UnownF, 0x800, SPECIES_UNOWN_F},
-    [SPECIES_UNOWN_G] = {gMonFrontPic_UnownG, 0x800, SPECIES_UNOWN_G},
-    [SPECIES_UNOWN_H] = {gMonFrontPic_UnownH, 0x800, SPECIES_UNOWN_H},
-    [SPECIES_UNOWN_I] = {gMonFrontPic_UnownI, 0x800, SPECIES_UNOWN_I},
-    [SPECIES_UNOWN_J] = {gMonFrontPic_UnownJ, 0x800, SPECIES_UNOWN_J},
-    [SPECIES_UNOWN_K] = {gMonFrontPic_UnownK, 0x800, SPECIES_UNOWN_K},
-    [SPECIES_UNOWN_L] = {gMonFrontPic_UnownL, 0x800, SPECIES_UNOWN_L},
-    [SPECIES_UNOWN_M] = {gMonFrontPic_UnownM, 0x800, SPECIES_UNOWN_M},
-    [SPECIES_UNOWN_N] = {gMonFrontPic_UnownN, 0x800, SPECIES_UNOWN_N},
-    [SPECIES_UNOWN_O] = {gMonFrontPic_UnownO, 0x800, SPECIES_UNOWN_O},
-    [SPECIES_UNOWN_P] = {gMonFrontPic_UnownP, 0x800, SPECIES_UNOWN_P},
-    [SPECIES_UNOWN_Q] = {gMonFrontPic_UnownQ, 0x800, SPECIES_UNOWN_Q},
-    [SPECIES_UNOWN_R] = {gMonFrontPic_UnownR, 0x800, SPECIES_UNOWN_R},
-    [SPECIES_UNOWN_S] = {gMonFrontPic_UnownS, 0x800, SPECIES_UNOWN_S},
-    [SPECIES_UNOWN_T] = {gMonFrontPic_UnownT, 0x800, SPECIES_UNOWN_T},
-    [SPECIES_UNOWN_U] = {gMonFrontPic_UnownU, 0x800, SPECIES_UNOWN_U},
-    [SPECIES_UNOWN_V] = {gMonFrontPic_UnownV, 0x800, SPECIES_UNOWN_V},
-    [SPECIES_UNOWN_W] = {gMonFrontPic_UnownW, 0x800, SPECIES_UNOWN_W},
-    [SPECIES_UNOWN_X] = {gMonFrontPic_UnownX, 0x800, SPECIES_UNOWN_X},
-    [SPECIES_UNOWN_Y] = {gMonFrontPic_UnownY, 0x800, SPECIES_UNOWN_Y},
-    [SPECIES_UNOWN_Z] = {gMonFrontPic_UnownZ, 0x800, SPECIES_UNOWN_Z},
-    [SPECIES_UNOWN_EMARK] = {gMonFrontPic_UnownExclamationMark, 0x800, SPECIES_UNOWN_EMARK},
-    [SPECIES_UNOWN_QMARK] = {gMonFrontPic_UnownQuestionMark, 0x800, SPECIES_UNOWN_QMARK},
+    SPECIES_SPRITE(NONE, gMonFrontPic_CircledQuestionMark),
+    SPECIES_SPRITE(BULBASAUR, gMonFrontPic_Bulbasaur),
+    SPECIES_SPRITE(IVYSAUR, gMonFrontPic_Ivysaur),
+    SPECIES_SPRITE(VENUSAUR, gMonFrontPic_Venusaur),
+    SPECIES_SPRITE(CHARMANDER, gMonFrontPic_Charmander),
+    SPECIES_SPRITE(CHARMELEON, gMonFrontPic_Charmeleon),
+    SPECIES_SPRITE(CHARIZARD, gMonFrontPic_Charizard),
+    SPECIES_SPRITE(SQUIRTLE, gMonFrontPic_Squirtle),
+    SPECIES_SPRITE(WARTORTLE, gMonFrontPic_Wartortle),
+    SPECIES_SPRITE(BLASTOISE, gMonFrontPic_Blastoise),
+    SPECIES_SPRITE(CATERPIE, gMonFrontPic_Caterpie),
+    SPECIES_SPRITE(METAPOD, gMonFrontPic_Metapod),
+    SPECIES_SPRITE(BUTTERFREE, gMonFrontPic_Butterfree),
+    SPECIES_SPRITE(WEEDLE, gMonFrontPic_Weedle),
+    SPECIES_SPRITE(KAKUNA, gMonFrontPic_Kakuna),
+    SPECIES_SPRITE(BEEDRILL, gMonFrontPic_Beedrill),
+    SPECIES_SPRITE(PIDGEY, gMonFrontPic_Pidgey),
+    SPECIES_SPRITE(PIDGEOTTO, gMonFrontPic_Pidgeotto),
+    SPECIES_SPRITE(PIDGEOT, gMonFrontPic_Pidgeot),
+    SPECIES_SPRITE(RATTATA, gMonFrontPic_Rattata),
+    SPECIES_SPRITE(RATICATE, gMonFrontPic_Raticate),
+    SPECIES_SPRITE(SPEAROW, gMonFrontPic_Spearow),
+    SPECIES_SPRITE(FEAROW, gMonFrontPic_Fearow),
+    SPECIES_SPRITE(EKANS, gMonFrontPic_Ekans),
+    SPECIES_SPRITE(ARBOK, gMonFrontPic_Arbok),
+    SPECIES_SPRITE(PIKACHU, gMonFrontPic_Pikachu),
+    SPECIES_SPRITE(RAICHU, gMonFrontPic_Raichu),
+    SPECIES_SPRITE(SANDSHREW, gMonFrontPic_Sandshrew),
+    SPECIES_SPRITE(SANDSLASH, gMonFrontPic_Sandslash),
+    SPECIES_SPRITE(NIDORAN_F, gMonFrontPic_NidoranF),
+    SPECIES_SPRITE(NIDORINA, gMonFrontPic_Nidorina),
+    SPECIES_SPRITE(NIDOQUEEN, gMonFrontPic_Nidoqueen),
+    SPECIES_SPRITE(NIDORAN_M, gMonFrontPic_NidoranM),
+    SPECIES_SPRITE(NIDORINO, gMonFrontPic_Nidorino),
+    SPECIES_SPRITE(NIDOKING, gMonFrontPic_Nidoking),
+    SPECIES_SPRITE(CLEFAIRY, gMonFrontPic_Clefairy),
+    SPECIES_SPRITE(CLEFABLE, gMonFrontPic_Clefable),
+    SPECIES_SPRITE(VULPIX, gMonFrontPic_Vulpix),
+    SPECIES_SPRITE(NINETALES, gMonFrontPic_Ninetales),
+    SPECIES_SPRITE(JIGGLYPUFF, gMonFrontPic_Jigglypuff),
+    SPECIES_SPRITE(WIGGLYTUFF, gMonFrontPic_Wigglytuff),
+    SPECIES_SPRITE(ZUBAT, gMonFrontPic_Zubat),
+    SPECIES_SPRITE(GOLBAT, gMonFrontPic_Golbat),
+    SPECIES_SPRITE(ODDISH, gMonFrontPic_Oddish),
+    SPECIES_SPRITE(GLOOM, gMonFrontPic_Gloom),
+    SPECIES_SPRITE(VILEPLUME, gMonFrontPic_Vileplume),
+    SPECIES_SPRITE(PARAS, gMonFrontPic_Paras),
+    SPECIES_SPRITE(PARASECT, gMonFrontPic_Parasect),
+    SPECIES_SPRITE(VENONAT, gMonFrontPic_Venonat),
+    SPECIES_SPRITE(VENOMOTH, gMonFrontPic_Venomoth),
+    SPECIES_SPRITE(DIGLETT, gMonFrontPic_Diglett),
+    SPECIES_SPRITE(DUGTRIO, gMonFrontPic_Dugtrio),
+    SPECIES_SPRITE(MEOWTH, gMonFrontPic_Meowth),
+    SPECIES_SPRITE(PERSIAN, gMonFrontPic_Persian),
+    SPECIES_SPRITE(PSYDUCK, gMonFrontPic_Psyduck),
+    SPECIES_SPRITE(GOLDUCK, gMonFrontPic_Golduck),
+    SPECIES_SPRITE(MANKEY, gMonFrontPic_Mankey),
+    SPECIES_SPRITE(PRIMEAPE, gMonFrontPic_Primeape),
+    SPECIES_SPRITE(GROWLITHE, gMonFrontPic_Growlithe),
+    SPECIES_SPRITE(ARCANINE, gMonFrontPic_Arcanine),
+    SPECIES_SPRITE(POLIWAG, gMonFrontPic_Poliwag),
+    SPECIES_SPRITE(POLIWHIRL, gMonFrontPic_Poliwhirl),
+    SPECIES_SPRITE(POLIWRATH, gMonFrontPic_Poliwrath),
+    SPECIES_SPRITE(ABRA, gMonFrontPic_Abra),
+    SPECIES_SPRITE(KADABRA, gMonFrontPic_Kadabra),
+    SPECIES_SPRITE(ALAKAZAM, gMonFrontPic_Alakazam),
+    SPECIES_SPRITE(MACHOP, gMonFrontPic_Machop),
+    SPECIES_SPRITE(MACHOKE, gMonFrontPic_Machoke),
+    SPECIES_SPRITE(MACHAMP, gMonFrontPic_Machamp),
+    SPECIES_SPRITE(BELLSPROUT, gMonFrontPic_Bellsprout),
+    SPECIES_SPRITE(WEEPINBELL, gMonFrontPic_Weepinbell),
+    SPECIES_SPRITE(VICTREEBEL, gMonFrontPic_Victreebel),
+    SPECIES_SPRITE(TENTACOOL, gMonFrontPic_Tentacool),
+    SPECIES_SPRITE(TENTACRUEL, gMonFrontPic_Tentacruel),
+    SPECIES_SPRITE(GEODUDE, gMonFrontPic_Geodude),
+    SPECIES_SPRITE(GRAVELER, gMonFrontPic_Graveler),
+    SPECIES_SPRITE(GOLEM, gMonFrontPic_Golem),
+    SPECIES_SPRITE(PONYTA, gMonFrontPic_Ponyta),
+    SPECIES_SPRITE(RAPIDASH, gMonFrontPic_Rapidash),
+    SPECIES_SPRITE(SLOWPOKE, gMonFrontPic_Slowpoke),
+    SPECIES_SPRITE(SLOWBRO, gMonFrontPic_Slowbro),
+    SPECIES_SPRITE(MAGNEMITE, gMonFrontPic_Magnemite),
+    SPECIES_SPRITE(MAGNETON, gMonFrontPic_Magneton),
+    SPECIES_SPRITE(FARFETCHD, gMonFrontPic_Farfetchd),
+    SPECIES_SPRITE(DODUO, gMonFrontPic_Doduo),
+    SPECIES_SPRITE(DODRIO, gMonFrontPic_Dodrio),
+    SPECIES_SPRITE(SEEL, gMonFrontPic_Seel),
+    SPECIES_SPRITE(DEWGONG, gMonFrontPic_Dewgong),
+    SPECIES_SPRITE(GRIMER, gMonFrontPic_Grimer),
+    SPECIES_SPRITE(MUK, gMonFrontPic_Muk),
+    SPECIES_SPRITE(SHELLDER, gMonFrontPic_Shellder),
+    SPECIES_SPRITE(CLOYSTER, gMonFrontPic_Cloyster),
+    SPECIES_SPRITE(GASTLY, gMonFrontPic_Gastly),
+    SPECIES_SPRITE(HAUNTER, gMonFrontPic_Haunter),
+    SPECIES_SPRITE(GENGAR, gMonFrontPic_Gengar),
+    SPECIES_SPRITE(ONIX, gMonFrontPic_Onix),
+    SPECIES_SPRITE(DROWZEE, gMonFrontPic_Drowzee),
+    SPECIES_SPRITE(HYPNO, gMonFrontPic_Hypno),
+    SPECIES_SPRITE(KRABBY, gMonFrontPic_Krabby),
+    SPECIES_SPRITE(KINGLER, gMonFrontPic_Kingler),
+    SPECIES_SPRITE(VOLTORB, gMonFrontPic_Voltorb),
+    SPECIES_SPRITE(ELECTRODE, gMonFrontPic_Electrode),
+    SPECIES_SPRITE(EXEGGCUTE, gMonFrontPic_Exeggcute),
+    SPECIES_SPRITE(EXEGGUTOR, gMonFrontPic_Exeggutor),
+    SPECIES_SPRITE(CUBONE, gMonFrontPic_Cubone),
+    SPECIES_SPRITE(MAROWAK, gMonFrontPic_Marowak),
+    SPECIES_SPRITE(HITMONLEE, gMonFrontPic_Hitmonlee),
+    SPECIES_SPRITE(HITMONCHAN, gMonFrontPic_Hitmonchan),
+    SPECIES_SPRITE(LICKITUNG, gMonFrontPic_Lickitung),
+    SPECIES_SPRITE(KOFFING, gMonFrontPic_Koffing),
+    SPECIES_SPRITE(WEEZING, gMonFrontPic_Weezing),
+    SPECIES_SPRITE(RHYHORN, gMonFrontPic_Rhyhorn),
+    SPECIES_SPRITE(RHYDON, gMonFrontPic_Rhydon),
+    SPECIES_SPRITE(CHANSEY, gMonFrontPic_Chansey),
+    SPECIES_SPRITE(TANGELA, gMonFrontPic_Tangela),
+    SPECIES_SPRITE(KANGASKHAN, gMonFrontPic_Kangaskhan),
+    SPECIES_SPRITE(HORSEA, gMonFrontPic_Horsea),
+    SPECIES_SPRITE(SEADRA, gMonFrontPic_Seadra),
+    SPECIES_SPRITE(GOLDEEN, gMonFrontPic_Goldeen),
+    SPECIES_SPRITE(SEAKING, gMonFrontPic_Seaking),
+    SPECIES_SPRITE(STARYU, gMonFrontPic_Staryu),
+    SPECIES_SPRITE(STARMIE, gMonFrontPic_Starmie),
+    SPECIES_SPRITE(MR_MIME, gMonFrontPic_Mrmime),
+    SPECIES_SPRITE(SCYTHER, gMonFrontPic_Scyther),
+    SPECIES_SPRITE(JYNX, gMonFrontPic_Jynx),
+    SPECIES_SPRITE(ELECTABUZZ, gMonFrontPic_Electabuzz),
+    SPECIES_SPRITE(MAGMAR, gMonFrontPic_Magmar),
+    SPECIES_SPRITE(PINSIR, gMonFrontPic_Pinsir),
+    SPECIES_SPRITE(TAUROS, gMonFrontPic_Tauros),
+    SPECIES_SPRITE(MAGIKARP, gMonFrontPic_Magikarp),
+    SPECIES_SPRITE(GYARADOS, gMonFrontPic_Gyarados),
+    SPECIES_SPRITE(LAPRAS, gMonFrontPic_Lapras),
+    SPECIES_SPRITE(DITTO, gMonFrontPic_Ditto),
+    SPECIES_SPRITE(EEVEE, gMonFrontPic_Eevee),
+    SPECIES_SPRITE(VAPOREON, gMonFrontPic_Vaporeon),
+    SPECIES_SPRITE(JOLTEON, gMonFrontPic_Jolteon),
+    SPECIES_SPRITE(FLAREON, gMonFrontPic_Flareon),
+    SPECIES_SPRITE(PORYGON, gMonFrontPic_Porygon),
+    SPECIES_SPRITE(OMANYTE, gMonFrontPic_Omanyte),
+    SPECIES_SPRITE(OMASTAR, gMonFrontPic_Omastar),
+    SPECIES_SPRITE(KABUTO, gMonFrontPic_Kabuto),
+    SPECIES_SPRITE(KABUTOPS, gMonFrontPic_Kabutops),
+    SPECIES_SPRITE(AERODACTYL, gMonFrontPic_Aerodactyl),
+    SPECIES_SPRITE(SNORLAX, gMonFrontPic_Snorlax),
+    SPECIES_SPRITE(ARTICUNO, gMonFrontPic_Articuno),
+    SPECIES_SPRITE(ZAPDOS, gMonFrontPic_Zapdos),
+    SPECIES_SPRITE(MOLTRES, gMonFrontPic_Moltres),
+    SPECIES_SPRITE(DRATINI, gMonFrontPic_Dratini),
+    SPECIES_SPRITE(DRAGONAIR, gMonFrontPic_Dragonair),
+    SPECIES_SPRITE(DRAGONITE, gMonFrontPic_Dragonite),
+    SPECIES_SPRITE(MEWTWO, gMonFrontPic_Mewtwo),
+    SPECIES_SPRITE(MEW, gMonFrontPic_Mew),
+    SPECIES_SPRITE(CHIKORITA, gMonFrontPic_Chikorita),
+    SPECIES_SPRITE(BAYLEEF, gMonFrontPic_Bayleef),
+    SPECIES_SPRITE(MEGANIUM, gMonFrontPic_Meganium),
+    SPECIES_SPRITE(CYNDAQUIL, gMonFrontPic_Cyndaquil),
+    SPECIES_SPRITE(QUILAVA, gMonFrontPic_Quilava),
+    SPECIES_SPRITE(TYPHLOSION, gMonFrontPic_Typhlosion),
+    SPECIES_SPRITE(TOTODILE, gMonFrontPic_Totodile),
+    SPECIES_SPRITE(CROCONAW, gMonFrontPic_Croconaw),
+    SPECIES_SPRITE(FERALIGATR, gMonFrontPic_Feraligatr),
+    SPECIES_SPRITE(SENTRET, gMonFrontPic_Sentret),
+    SPECIES_SPRITE(FURRET, gMonFrontPic_Furret),
+    SPECIES_SPRITE(HOOTHOOT, gMonFrontPic_Hoothoot),
+    SPECIES_SPRITE(NOCTOWL, gMonFrontPic_Noctowl),
+    SPECIES_SPRITE(LEDYBA, gMonFrontPic_Ledyba),
+    SPECIES_SPRITE(LEDIAN, gMonFrontPic_Ledian),
+    SPECIES_SPRITE(SPINARAK, gMonFrontPic_Spinarak),
+    SPECIES_SPRITE(ARIADOS, gMonFrontPic_Ariados),
+    SPECIES_SPRITE(CROBAT, gMonFrontPic_Crobat),
+    SPECIES_SPRITE(CHINCHOU, gMonFrontPic_Chinchou),
+    SPECIES_SPRITE(LANTURN, gMonFrontPic_Lanturn),
+    SPECIES_SPRITE(PICHU, gMonFrontPic_Pichu),
+    SPECIES_SPRITE(CLEFFA, gMonFrontPic_Cleffa),
+    SPECIES_SPRITE(IGGLYBUFF, gMonFrontPic_Igglybuff),
+    SPECIES_SPRITE(TOGEPI, gMonFrontPic_Togepi),
+    SPECIES_SPRITE(TOGETIC, gMonFrontPic_Togetic),
+    SPECIES_SPRITE(NATU, gMonFrontPic_Natu),
+    SPECIES_SPRITE(XATU, gMonFrontPic_Xatu),
+    SPECIES_SPRITE(MAREEP, gMonFrontPic_Mareep),
+    SPECIES_SPRITE(FLAAFFY, gMonFrontPic_Flaaffy),
+    SPECIES_SPRITE(AMPHAROS, gMonFrontPic_Ampharos),
+    SPECIES_SPRITE(BELLOSSOM, gMonFrontPic_Bellossom),
+    SPECIES_SPRITE(MARILL, gMonFrontPic_Marill),
+    SPECIES_SPRITE(AZUMARILL, gMonFrontPic_Azumarill),
+    SPECIES_SPRITE(SUDOWOODO, gMonFrontPic_Sudowoodo),
+    SPECIES_SPRITE(POLITOED, gMonFrontPic_Politoed),
+    SPECIES_SPRITE(HOPPIP, gMonFrontPic_Hoppip),
+    SPECIES_SPRITE(SKIPLOOM, gMonFrontPic_Skiploom),
+    SPECIES_SPRITE(JUMPLUFF, gMonFrontPic_Jumpluff),
+    SPECIES_SPRITE(AIPOM, gMonFrontPic_Aipom),
+    SPECIES_SPRITE(SUNKERN, gMonFrontPic_Sunkern),
+    SPECIES_SPRITE(SUNFLORA, gMonFrontPic_Sunflora),
+    SPECIES_SPRITE(YANMA, gMonFrontPic_Yanma),
+    SPECIES_SPRITE(WOOPER, gMonFrontPic_Wooper),
+    SPECIES_SPRITE(QUAGSIRE, gMonFrontPic_Quagsire),
+    SPECIES_SPRITE(ESPEON, gMonFrontPic_Espeon),
+    SPECIES_SPRITE(UMBREON, gMonFrontPic_Umbreon),
+    SPECIES_SPRITE(MURKROW, gMonFrontPic_Murkrow),
+    SPECIES_SPRITE(SLOWKING, gMonFrontPic_Slowking),
+    SPECIES_SPRITE(MISDREAVUS, gMonFrontPic_Misdreavus),
+    SPECIES_SPRITE(UNOWN, gMonFrontPic_UnownA),
+    SPECIES_SPRITE(WOBBUFFET, gMonFrontPic_Wobbuffet),
+    SPECIES_SPRITE(GIRAFARIG, gMonFrontPic_Girafarig),
+    SPECIES_SPRITE(PINECO, gMonFrontPic_Pineco),
+    SPECIES_SPRITE(FORRETRESS, gMonFrontPic_Forretress),
+    SPECIES_SPRITE(DUNSPARCE, gMonFrontPic_Dunsparce),
+    SPECIES_SPRITE(GLIGAR, gMonFrontPic_Gligar),
+    SPECIES_SPRITE(STEELIX, gMonFrontPic_Steelix),
+    SPECIES_SPRITE(SNUBBULL, gMonFrontPic_Snubbull),
+    SPECIES_SPRITE(GRANBULL, gMonFrontPic_Granbull),
+    SPECIES_SPRITE(QWILFISH, gMonFrontPic_Qwilfish),
+    SPECIES_SPRITE(SCIZOR, gMonFrontPic_Scizor),
+    SPECIES_SPRITE(SHUCKLE, gMonFrontPic_Shuckle),
+    SPECIES_SPRITE(HERACROSS, gMonFrontPic_Heracross),
+    SPECIES_SPRITE(SNEASEL, gMonFrontPic_Sneasel),
+    SPECIES_SPRITE(TEDDIURSA, gMonFrontPic_Teddiursa),
+    SPECIES_SPRITE(URSARING, gMonFrontPic_Ursaring),
+    SPECIES_SPRITE(SLUGMA, gMonFrontPic_Slugma),
+    SPECIES_SPRITE(MAGCARGO, gMonFrontPic_Magcargo),
+    SPECIES_SPRITE(SWINUB, gMonFrontPic_Swinub),
+    SPECIES_SPRITE(PILOSWINE, gMonFrontPic_Piloswine),
+    SPECIES_SPRITE(CORSOLA, gMonFrontPic_Corsola),
+    SPECIES_SPRITE(REMORAID, gMonFrontPic_Remoraid),
+    SPECIES_SPRITE(OCTILLERY, gMonFrontPic_Octillery),
+    SPECIES_SPRITE(DELIBIRD, gMonFrontPic_Delibird),
+    SPECIES_SPRITE(MANTINE, gMonFrontPic_Mantine),
+    SPECIES_SPRITE(SKARMORY, gMonFrontPic_Skarmory),
+    SPECIES_SPRITE(HOUNDOUR, gMonFrontPic_Houndour),
+    SPECIES_SPRITE(HOUNDOOM, gMonFrontPic_Houndoom),
+    SPECIES_SPRITE(KINGDRA, gMonFrontPic_Kingdra),
+    SPECIES_SPRITE(PHANPY, gMonFrontPic_Phanpy),
+    SPECIES_SPRITE(DONPHAN, gMonFrontPic_Donphan),
+    SPECIES_SPRITE(PORYGON2, gMonFrontPic_Porygon2),
+    SPECIES_SPRITE(STANTLER, gMonFrontPic_Stantler),
+    SPECIES_SPRITE(SMEARGLE, gMonFrontPic_Smeargle),
+    SPECIES_SPRITE(TYROGUE, gMonFrontPic_Tyrogue),
+    SPECIES_SPRITE(HITMONTOP, gMonFrontPic_Hitmontop),
+    SPECIES_SPRITE(SMOOCHUM, gMonFrontPic_Smoochum),
+    SPECIES_SPRITE(ELEKID, gMonFrontPic_Elekid),
+    SPECIES_SPRITE(MAGBY, gMonFrontPic_Magby),
+    SPECIES_SPRITE(MILTANK, gMonFrontPic_Miltank),
+    SPECIES_SPRITE(BLISSEY, gMonFrontPic_Blissey),
+    SPECIES_SPRITE(RAIKOU, gMonFrontPic_Raikou),
+    SPECIES_SPRITE(ENTEI, gMonFrontPic_Entei),
+    SPECIES_SPRITE(SUICUNE, gMonFrontPic_Suicune),
+    SPECIES_SPRITE(LARVITAR, gMonFrontPic_Larvitar),
+    SPECIES_SPRITE(PUPITAR, gMonFrontPic_Pupitar),
+    SPECIES_SPRITE(TYRANITAR, gMonFrontPic_Tyranitar),
+    SPECIES_SPRITE(LUGIA, gMonFrontPic_Lugia),
+    SPECIES_SPRITE(HO_OH, gMonFrontPic_HoOh),
+    SPECIES_SPRITE(CELEBI, gMonFrontPic_Celebi),
+    SPECIES_SPRITE(OLD_UNOWN_B, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_C, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_D, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_E, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_F, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_G, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_H, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_I, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_J, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_K, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_L, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_M, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_N, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_O, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_P, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Q, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_R, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_S, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_T, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_U, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_V, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_W, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_X, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Y, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Z, gMonFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(TREECKO, gMonFrontPic_Treecko),
+    SPECIES_SPRITE(GROVYLE, gMonFrontPic_Grovyle),
+    SPECIES_SPRITE(SCEPTILE, gMonFrontPic_Sceptile),
+    SPECIES_SPRITE(TORCHIC, gMonFrontPic_Torchic),
+    SPECIES_SPRITE(COMBUSKEN, gMonFrontPic_Combusken),
+    SPECIES_SPRITE(BLAZIKEN, gMonFrontPic_Blaziken),
+    SPECIES_SPRITE(MUDKIP, gMonFrontPic_Mudkip),
+    SPECIES_SPRITE(MARSHTOMP, gMonFrontPic_Marshtomp),
+    SPECIES_SPRITE(SWAMPERT, gMonFrontPic_Swampert),
+    SPECIES_SPRITE(POOCHYENA, gMonFrontPic_Poochyena),
+    SPECIES_SPRITE(MIGHTYENA, gMonFrontPic_Mightyena),
+    SPECIES_SPRITE(ZIGZAGOON, gMonFrontPic_Zigzagoon),
+    SPECIES_SPRITE(LINOONE, gMonFrontPic_Linoone),
+    SPECIES_SPRITE(WURMPLE, gMonFrontPic_Wurmple),
+    SPECIES_SPRITE(SILCOON, gMonFrontPic_Silcoon),
+    SPECIES_SPRITE(BEAUTIFLY, gMonFrontPic_Beautifly),
+    SPECIES_SPRITE(CASCOON, gMonFrontPic_Cascoon),
+    SPECIES_SPRITE(DUSTOX, gMonFrontPic_Dustox),
+    SPECIES_SPRITE(LOTAD, gMonFrontPic_Lotad),
+    SPECIES_SPRITE(LOMBRE, gMonFrontPic_Lombre),
+    SPECIES_SPRITE(LUDICOLO, gMonFrontPic_Ludicolo),
+    SPECIES_SPRITE(SEEDOT, gMonFrontPic_Seedot),
+    SPECIES_SPRITE(NUZLEAF, gMonFrontPic_Nuzleaf),
+    SPECIES_SPRITE(SHIFTRY, gMonFrontPic_Shiftry),
+    SPECIES_SPRITE(NINCADA, gMonFrontPic_Nincada),
+    SPECIES_SPRITE(NINJASK, gMonFrontPic_Ninjask),
+    SPECIES_SPRITE(SHEDINJA, gMonFrontPic_Shedinja),
+    SPECIES_SPRITE(TAILLOW, gMonFrontPic_Taillow),
+    SPECIES_SPRITE(SWELLOW, gMonFrontPic_Swellow),
+    SPECIES_SPRITE(SHROOMISH, gMonFrontPic_Shroomish),
+    SPECIES_SPRITE(BRELOOM, gMonFrontPic_Breloom),
+    SPECIES_SPRITE(SPINDA, gMonFrontPic_Spinda),
+    SPECIES_SPRITE(WINGULL, gMonFrontPic_Wingull),
+    SPECIES_SPRITE(PELIPPER, gMonFrontPic_Pelipper),
+    SPECIES_SPRITE(SURSKIT, gMonFrontPic_Surskit),
+    SPECIES_SPRITE(MASQUERAIN, gMonFrontPic_Masquerain),
+    SPECIES_SPRITE(WAILMER, gMonFrontPic_Wailmer),
+    SPECIES_SPRITE(WAILORD, gMonFrontPic_Wailord),
+    SPECIES_SPRITE(SKITTY, gMonFrontPic_Skitty),
+    SPECIES_SPRITE(DELCATTY, gMonFrontPic_Delcatty),
+    SPECIES_SPRITE(KECLEON, gMonFrontPic_Kecleon),
+    SPECIES_SPRITE(BALTOY, gMonFrontPic_Baltoy),
+    SPECIES_SPRITE(CLAYDOL, gMonFrontPic_Claydol),
+    SPECIES_SPRITE(NOSEPASS, gMonFrontPic_Nosepass),
+    SPECIES_SPRITE(TORKOAL, gMonFrontPic_Torkoal),
+    SPECIES_SPRITE(SABLEYE, gMonFrontPic_Sableye),
+    SPECIES_SPRITE(BARBOACH, gMonFrontPic_Barboach),
+    SPECIES_SPRITE(WHISCASH, gMonFrontPic_Whiscash),
+    SPECIES_SPRITE(LUVDISC, gMonFrontPic_Luvdisc),
+    SPECIES_SPRITE(CORPHISH, gMonFrontPic_Corphish),
+    SPECIES_SPRITE(CRAWDAUNT, gMonFrontPic_Crawdaunt),
+    SPECIES_SPRITE(FEEBAS, gMonFrontPic_Feebas),
+    SPECIES_SPRITE(MILOTIC, gMonFrontPic_Milotic),
+    SPECIES_SPRITE(CARVANHA, gMonFrontPic_Carvanha),
+    SPECIES_SPRITE(SHARPEDO, gMonFrontPic_Sharpedo),
+    SPECIES_SPRITE(TRAPINCH, gMonFrontPic_Trapinch),
+    SPECIES_SPRITE(VIBRAVA, gMonFrontPic_Vibrava),
+    SPECIES_SPRITE(FLYGON, gMonFrontPic_Flygon),
+    SPECIES_SPRITE(MAKUHITA, gMonFrontPic_Makuhita),
+    SPECIES_SPRITE(HARIYAMA, gMonFrontPic_Hariyama),
+    SPECIES_SPRITE(ELECTRIKE, gMonFrontPic_Electrike),
+    SPECIES_SPRITE(MANECTRIC, gMonFrontPic_Manectric),
+    SPECIES_SPRITE(NUMEL, gMonFrontPic_Numel),
+    SPECIES_SPRITE(CAMERUPT, gMonFrontPic_Camerupt),
+    SPECIES_SPRITE(SPHEAL, gMonFrontPic_Spheal),
+    SPECIES_SPRITE(SEALEO, gMonFrontPic_Sealeo),
+    SPECIES_SPRITE(WALREIN, gMonFrontPic_Walrein),
+    SPECIES_SPRITE(CACNEA, gMonFrontPic_Cacnea),
+    SPECIES_SPRITE(CACTURNE, gMonFrontPic_Cacturne),
+    SPECIES_SPRITE(SNORUNT, gMonFrontPic_Snorunt),
+    SPECIES_SPRITE(GLALIE, gMonFrontPic_Glalie),
+    SPECIES_SPRITE(LUNATONE, gMonFrontPic_Lunatone),
+    SPECIES_SPRITE(SOLROCK, gMonFrontPic_Solrock),
+    SPECIES_SPRITE(AZURILL, gMonFrontPic_Azurill),
+    SPECIES_SPRITE(SPOINK, gMonFrontPic_Spoink),
+    SPECIES_SPRITE(GRUMPIG, gMonFrontPic_Grumpig),
+    SPECIES_SPRITE(PLUSLE, gMonFrontPic_Plusle),
+    SPECIES_SPRITE(MINUN, gMonFrontPic_Minun),
+    SPECIES_SPRITE(MAWILE, gMonFrontPic_Mawile),
+    SPECIES_SPRITE(MEDITITE, gMonFrontPic_Meditite),
+    SPECIES_SPRITE(MEDICHAM, gMonFrontPic_Medicham),
+    SPECIES_SPRITE(SWABLU, gMonFrontPic_Swablu),
+    SPECIES_SPRITE(ALTARIA, gMonFrontPic_Altaria),
+    SPECIES_SPRITE(WYNAUT, gMonFrontPic_Wynaut),
+    SPECIES_SPRITE(DUSKULL, gMonFrontPic_Duskull),
+    SPECIES_SPRITE(DUSCLOPS, gMonFrontPic_Dusclops),
+    SPECIES_SPRITE(ROSELIA, gMonFrontPic_Roselia),
+    SPECIES_SPRITE(SLAKOTH, gMonFrontPic_Slakoth),
+    SPECIES_SPRITE(VIGOROTH, gMonFrontPic_Vigoroth),
+    SPECIES_SPRITE(SLAKING, gMonFrontPic_Slaking),
+    SPECIES_SPRITE(GULPIN, gMonFrontPic_Gulpin),
+    SPECIES_SPRITE(SWALOT, gMonFrontPic_Swalot),
+    SPECIES_SPRITE(TROPIUS, gMonFrontPic_Tropius),
+    SPECIES_SPRITE(WHISMUR, gMonFrontPic_Whismur),
+    SPECIES_SPRITE(LOUDRED, gMonFrontPic_Loudred),
+    SPECIES_SPRITE(EXPLOUD, gMonFrontPic_Exploud),
+    SPECIES_SPRITE(CLAMPERL, gMonFrontPic_Clamperl),
+    SPECIES_SPRITE(HUNTAIL, gMonFrontPic_Huntail),
+    SPECIES_SPRITE(GOREBYSS, gMonFrontPic_Gorebyss),
+    SPECIES_SPRITE(ABSOL, gMonFrontPic_Absol),
+    SPECIES_SPRITE(SHUPPET, gMonFrontPic_Shuppet),
+    SPECIES_SPRITE(BANETTE, gMonFrontPic_Banette),
+    SPECIES_SPRITE(SEVIPER, gMonFrontPic_Seviper),
+    SPECIES_SPRITE(ZANGOOSE, gMonFrontPic_Zangoose),
+    SPECIES_SPRITE(RELICANTH, gMonFrontPic_Relicanth),
+    SPECIES_SPRITE(ARON, gMonFrontPic_Aron),
+    SPECIES_SPRITE(LAIRON, gMonFrontPic_Lairon),
+    SPECIES_SPRITE(AGGRON, gMonFrontPic_Aggron),
+    SPECIES_SPRITE(CASTFORM, gMonFrontPic_Castform),
+    SPECIES_SPRITE(VOLBEAT, gMonFrontPic_Volbeat),
+    SPECIES_SPRITE(ILLUMISE, gMonFrontPic_Illumise),
+    SPECIES_SPRITE(LILEEP, gMonFrontPic_Lileep),
+    SPECIES_SPRITE(CRADILY, gMonFrontPic_Cradily),
+    SPECIES_SPRITE(ANORITH, gMonFrontPic_Anorith),
+    SPECIES_SPRITE(ARMALDO, gMonFrontPic_Armaldo),
+    SPECIES_SPRITE(RALTS, gMonFrontPic_Ralts),
+    SPECIES_SPRITE(KIRLIA, gMonFrontPic_Kirlia),
+    SPECIES_SPRITE(GARDEVOIR, gMonFrontPic_Gardevoir),
+    SPECIES_SPRITE(BAGON, gMonFrontPic_Bagon),
+    SPECIES_SPRITE(SHELGON, gMonFrontPic_Shelgon),
+    SPECIES_SPRITE(SALAMENCE, gMonFrontPic_Salamence),
+    SPECIES_SPRITE(BELDUM, gMonFrontPic_Beldum),
+    SPECIES_SPRITE(METANG, gMonFrontPic_Metang),
+    SPECIES_SPRITE(METAGROSS, gMonFrontPic_Metagross),
+    SPECIES_SPRITE(REGIROCK, gMonFrontPic_Regirock),
+    SPECIES_SPRITE(REGICE, gMonFrontPic_Regice),
+    SPECIES_SPRITE(REGISTEEL, gMonFrontPic_Registeel),
+    SPECIES_SPRITE(KYOGRE, gMonFrontPic_Kyogre),
+    SPECIES_SPRITE(GROUDON, gMonFrontPic_Groudon),
+    SPECIES_SPRITE(RAYQUAZA, gMonFrontPic_Rayquaza),
+    SPECIES_SPRITE(LATIAS, gMonFrontPic_Latias),
+    SPECIES_SPRITE(LATIOS, gMonFrontPic_Latios),
+    SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi),
+    SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys),
+    SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho),
+    SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
+    SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB),
+    SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC),
+    SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD),
+    SPECIES_SPRITE(UNOWN_E, gMonFrontPic_UnownE),
+    SPECIES_SPRITE(UNOWN_F, gMonFrontPic_UnownF),
+    SPECIES_SPRITE(UNOWN_G, gMonFrontPic_UnownG),
+    SPECIES_SPRITE(UNOWN_H, gMonFrontPic_UnownH),
+    SPECIES_SPRITE(UNOWN_I, gMonFrontPic_UnownI),
+    SPECIES_SPRITE(UNOWN_J, gMonFrontPic_UnownJ),
+    SPECIES_SPRITE(UNOWN_K, gMonFrontPic_UnownK),
+    SPECIES_SPRITE(UNOWN_L, gMonFrontPic_UnownL),
+    SPECIES_SPRITE(UNOWN_M, gMonFrontPic_UnownM),
+    SPECIES_SPRITE(UNOWN_N, gMonFrontPic_UnownN),
+    SPECIES_SPRITE(UNOWN_O, gMonFrontPic_UnownO),
+    SPECIES_SPRITE(UNOWN_P, gMonFrontPic_UnownP),
+    SPECIES_SPRITE(UNOWN_Q, gMonFrontPic_UnownQ),
+    SPECIES_SPRITE(UNOWN_R, gMonFrontPic_UnownR),
+    SPECIES_SPRITE(UNOWN_S, gMonFrontPic_UnownS),
+    SPECIES_SPRITE(UNOWN_T, gMonFrontPic_UnownT),
+    SPECIES_SPRITE(UNOWN_U, gMonFrontPic_UnownU),
+    SPECIES_SPRITE(UNOWN_V, gMonFrontPic_UnownV),
+    SPECIES_SPRITE(UNOWN_W, gMonFrontPic_UnownW),
+    SPECIES_SPRITE(UNOWN_X, gMonFrontPic_UnownX),
+    SPECIES_SPRITE(UNOWN_Y, gMonFrontPic_UnownY),
+    SPECIES_SPRITE(UNOWN_Z, gMonFrontPic_UnownZ),
+    SPECIES_SPRITE(UNOWN_EMARK, gMonFrontPic_UnownExclamationMark),
+    SPECIES_SPRITE(UNOWN_QMARK, gMonFrontPic_UnownQuestionMark),
 };
diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h
index 3b60d8567..35edcc76c 100644
--- a/src/data/pokemon_graphics/palette_table.h
+++ b/src/data/pokemon_graphics/palette_table.h
@@ -1,443 +1,443 @@
 const struct CompressedSpritePalette gMonPaletteTable[] =
 {
-    [SPECIES_NONE] = {gMonPalette_CircledQuestionMark, SPECIES_NONE},
-    [SPECIES_BULBASAUR] = {gMonPalette_Bulbasaur, SPECIES_BULBASAUR},
-    [SPECIES_IVYSAUR] = {gMonPalette_Ivysaur, SPECIES_IVYSAUR},
-    [SPECIES_VENUSAUR] = {gMonPalette_Venusaur, SPECIES_VENUSAUR},
-    [SPECIES_CHARMANDER] = {gMonPalette_Charmander, SPECIES_CHARMANDER},
-    [SPECIES_CHARMELEON] = {gMonPalette_Charmeleon, SPECIES_CHARMELEON},
-    [SPECIES_CHARIZARD] = {gMonPalette_Charizard, SPECIES_CHARIZARD},
-    [SPECIES_SQUIRTLE] = {gMonPalette_Squirtle, SPECIES_SQUIRTLE},
-    [SPECIES_WARTORTLE] = {gMonPalette_Wartortle, SPECIES_WARTORTLE},
-    [SPECIES_BLASTOISE] = {gMonPalette_Blastoise, SPECIES_BLASTOISE},
-    [SPECIES_CATERPIE] = {gMonPalette_Caterpie, SPECIES_CATERPIE},
-    [SPECIES_METAPOD] = {gMonPalette_Metapod, SPECIES_METAPOD},
-    [SPECIES_BUTTERFREE] = {gMonPalette_Butterfree, SPECIES_BUTTERFREE},
-    [SPECIES_WEEDLE] = {gMonPalette_Weedle, SPECIES_WEEDLE},
-    [SPECIES_KAKUNA] = {gMonPalette_Kakuna, SPECIES_KAKUNA},
-    [SPECIES_BEEDRILL] = {gMonPalette_Beedrill, SPECIES_BEEDRILL},
-    [SPECIES_PIDGEY] = {gMonPalette_Pidgey, SPECIES_PIDGEY},
-    [SPECIES_PIDGEOTTO] = {gMonPalette_Pidgeotto, SPECIES_PIDGEOTTO},
-    [SPECIES_PIDGEOT] = {gMonPalette_Pidgeot, SPECIES_PIDGEOT},
-    [SPECIES_RATTATA] = {gMonPalette_Rattata, SPECIES_RATTATA},
-    [SPECIES_RATICATE] = {gMonPalette_Raticate, SPECIES_RATICATE},
-    [SPECIES_SPEAROW] = {gMonPalette_Spearow, SPECIES_SPEAROW},
-    [SPECIES_FEAROW] = {gMonPalette_Fearow, SPECIES_FEAROW},
-    [SPECIES_EKANS] = {gMonPalette_Ekans, SPECIES_EKANS},
-    [SPECIES_ARBOK] = {gMonPalette_Arbok, SPECIES_ARBOK},
-    [SPECIES_PIKACHU] = {gMonPalette_Pikachu, SPECIES_PIKACHU},
-    [SPECIES_RAICHU] = {gMonPalette_Raichu, SPECIES_RAICHU},
-    [SPECIES_SANDSHREW] = {gMonPalette_Sandshrew, SPECIES_SANDSHREW},
-    [SPECIES_SANDSLASH] = {gMonPalette_Sandslash, SPECIES_SANDSLASH},
-    [SPECIES_NIDORAN_F] = {gMonPalette_NidoranF, SPECIES_NIDORAN_F},
-    [SPECIES_NIDORINA] = {gMonPalette_Nidorina, SPECIES_NIDORINA},
-    [SPECIES_NIDOQUEEN] = {gMonPalette_Nidoqueen, SPECIES_NIDOQUEEN},
-    [SPECIES_NIDORAN_M] = {gMonPalette_NidoranM, SPECIES_NIDORAN_M},
-    [SPECIES_NIDORINO] = {gMonPalette_Nidorino, SPECIES_NIDORINO},
-    [SPECIES_NIDOKING] = {gMonPalette_Nidoking, SPECIES_NIDOKING},
-    [SPECIES_CLEFAIRY] = {gMonPalette_Clefairy, SPECIES_CLEFAIRY},
-    [SPECIES_CLEFABLE] = {gMonPalette_Clefable, SPECIES_CLEFABLE},
-    [SPECIES_VULPIX] = {gMonPalette_Vulpix, SPECIES_VULPIX},
-    [SPECIES_NINETALES] = {gMonPalette_Ninetales, SPECIES_NINETALES},
-    [SPECIES_JIGGLYPUFF] = {gMonPalette_Jigglypuff, SPECIES_JIGGLYPUFF},
-    [SPECIES_WIGGLYTUFF] = {gMonPalette_Wigglytuff, SPECIES_WIGGLYTUFF},
-    [SPECIES_ZUBAT] = {gMonPalette_Zubat, SPECIES_ZUBAT},
-    [SPECIES_GOLBAT] = {gMonPalette_Golbat, SPECIES_GOLBAT},
-    [SPECIES_ODDISH] = {gMonPalette_Oddish, SPECIES_ODDISH},
-    [SPECIES_GLOOM] = {gMonPalette_Gloom, SPECIES_GLOOM},
-    [SPECIES_VILEPLUME] = {gMonPalette_Vileplume, SPECIES_VILEPLUME},
-    [SPECIES_PARAS] = {gMonPalette_Paras, SPECIES_PARAS},
-    [SPECIES_PARASECT] = {gMonPalette_Parasect, SPECIES_PARASECT},
-    [SPECIES_VENONAT] = {gMonPalette_Venonat, SPECIES_VENONAT},
-    [SPECIES_VENOMOTH] = {gMonPalette_Venomoth, SPECIES_VENOMOTH},
-    [SPECIES_DIGLETT] = {gMonPalette_Diglett, SPECIES_DIGLETT},
-    [SPECIES_DUGTRIO] = {gMonPalette_Dugtrio, SPECIES_DUGTRIO},
-    [SPECIES_MEOWTH] = {gMonPalette_Meowth, SPECIES_MEOWTH},
-    [SPECIES_PERSIAN] = {gMonPalette_Persian, SPECIES_PERSIAN},
-    [SPECIES_PSYDUCK] = {gMonPalette_Psyduck, SPECIES_PSYDUCK},
-    [SPECIES_GOLDUCK] = {gMonPalette_Golduck, SPECIES_GOLDUCK},
-    [SPECIES_MANKEY] = {gMonPalette_Mankey, SPECIES_MANKEY},
-    [SPECIES_PRIMEAPE] = {gMonPalette_Primeape, SPECIES_PRIMEAPE},
-    [SPECIES_GROWLITHE] = {gMonPalette_Growlithe, SPECIES_GROWLITHE},
-    [SPECIES_ARCANINE] = {gMonPalette_Arcanine, SPECIES_ARCANINE},
-    [SPECIES_POLIWAG] = {gMonPalette_Poliwag, SPECIES_POLIWAG},
-    [SPECIES_POLIWHIRL] = {gMonPalette_Poliwhirl, SPECIES_POLIWHIRL},
-    [SPECIES_POLIWRATH] = {gMonPalette_Poliwrath, SPECIES_POLIWRATH},
-    [SPECIES_ABRA] = {gMonPalette_Abra, SPECIES_ABRA},
-    [SPECIES_KADABRA] = {gMonPalette_Kadabra, SPECIES_KADABRA},
-    [SPECIES_ALAKAZAM] = {gMonPalette_Alakazam, SPECIES_ALAKAZAM},
-    [SPECIES_MACHOP] = {gMonPalette_Machop, SPECIES_MACHOP},
-    [SPECIES_MACHOKE] = {gMonPalette_Machoke, SPECIES_MACHOKE},
-    [SPECIES_MACHAMP] = {gMonPalette_Machamp, SPECIES_MACHAMP},
-    [SPECIES_BELLSPROUT] = {gMonPalette_Bellsprout, SPECIES_BELLSPROUT},
-    [SPECIES_WEEPINBELL] = {gMonPalette_Weepinbell, SPECIES_WEEPINBELL},
-    [SPECIES_VICTREEBEL] = {gMonPalette_Victreebel, SPECIES_VICTREEBEL},
-    [SPECIES_TENTACOOL] = {gMonPalette_Tentacool, SPECIES_TENTACOOL},
-    [SPECIES_TENTACRUEL] = {gMonPalette_Tentacruel, SPECIES_TENTACRUEL},
-    [SPECIES_GEODUDE] = {gMonPalette_Geodude, SPECIES_GEODUDE},
-    [SPECIES_GRAVELER] = {gMonPalette_Graveler, SPECIES_GRAVELER},
-    [SPECIES_GOLEM] = {gMonPalette_Golem, SPECIES_GOLEM},
-    [SPECIES_PONYTA] = {gMonPalette_Ponyta, SPECIES_PONYTA},
-    [SPECIES_RAPIDASH] = {gMonPalette_Rapidash, SPECIES_RAPIDASH},
-    [SPECIES_SLOWPOKE] = {gMonPalette_Slowpoke, SPECIES_SLOWPOKE},
-    [SPECIES_SLOWBRO] = {gMonPalette_Slowbro, SPECIES_SLOWBRO},
-    [SPECIES_MAGNEMITE] = {gMonPalette_Magnemite, SPECIES_MAGNEMITE},
-    [SPECIES_MAGNETON] = {gMonPalette_Magneton, SPECIES_MAGNETON},
-    [SPECIES_FARFETCHD] = {gMonPalette_Farfetchd, SPECIES_FARFETCHD},
-    [SPECIES_DODUO] = {gMonPalette_Doduo, SPECIES_DODUO},
-    [SPECIES_DODRIO] = {gMonPalette_Dodrio, SPECIES_DODRIO},
-    [SPECIES_SEEL] = {gMonPalette_Seel, SPECIES_SEEL},
-    [SPECIES_DEWGONG] = {gMonPalette_Dewgong, SPECIES_DEWGONG},
-    [SPECIES_GRIMER] = {gMonPalette_Grimer, SPECIES_GRIMER},
-    [SPECIES_MUK] = {gMonPalette_Muk, SPECIES_MUK},
-    [SPECIES_SHELLDER] = {gMonPalette_Shellder, SPECIES_SHELLDER},
-    [SPECIES_CLOYSTER] = {gMonPalette_Cloyster, SPECIES_CLOYSTER},
-    [SPECIES_GASTLY] = {gMonPalette_Gastly, SPECIES_GASTLY},
-    [SPECIES_HAUNTER] = {gMonPalette_Haunter, SPECIES_HAUNTER},
-    [SPECIES_GENGAR] = {gMonPalette_Gengar, SPECIES_GENGAR},
-    [SPECIES_ONIX] = {gMonPalette_Onix, SPECIES_ONIX},
-    [SPECIES_DROWZEE] = {gMonPalette_Drowzee, SPECIES_DROWZEE},
-    [SPECIES_HYPNO] = {gMonPalette_Hypno, SPECIES_HYPNO},
-    [SPECIES_KRABBY] = {gMonPalette_Krabby, SPECIES_KRABBY},
-    [SPECIES_KINGLER] = {gMonPalette_Kingler, SPECIES_KINGLER},
-    [SPECIES_VOLTORB] = {gMonPalette_Voltorb, SPECIES_VOLTORB},
-    [SPECIES_ELECTRODE] = {gMonPalette_Electrode, SPECIES_ELECTRODE},
-    [SPECIES_EXEGGCUTE] = {gMonPalette_Exeggcute, SPECIES_EXEGGCUTE},
-    [SPECIES_EXEGGUTOR] = {gMonPalette_Exeggutor, SPECIES_EXEGGUTOR},
-    [SPECIES_CUBONE] = {gMonPalette_Cubone, SPECIES_CUBONE},
-    [SPECIES_MAROWAK] = {gMonPalette_Marowak, SPECIES_MAROWAK},
-    [SPECIES_HITMONLEE] = {gMonPalette_Hitmonlee, SPECIES_HITMONLEE},
-    [SPECIES_HITMONCHAN] = {gMonPalette_Hitmonchan, SPECIES_HITMONCHAN},
-    [SPECIES_LICKITUNG] = {gMonPalette_Lickitung, SPECIES_LICKITUNG},
-    [SPECIES_KOFFING] = {gMonPalette_Koffing, SPECIES_KOFFING},
-    [SPECIES_WEEZING] = {gMonPalette_Weezing, SPECIES_WEEZING},
-    [SPECIES_RHYHORN] = {gMonPalette_Rhyhorn, SPECIES_RHYHORN},
-    [SPECIES_RHYDON] = {gMonPalette_Rhydon, SPECIES_RHYDON},
-    [SPECIES_CHANSEY] = {gMonPalette_Chansey, SPECIES_CHANSEY},
-    [SPECIES_TANGELA] = {gMonPalette_Tangela, SPECIES_TANGELA},
-    [SPECIES_KANGASKHAN] = {gMonPalette_Kangaskhan, SPECIES_KANGASKHAN},
-    [SPECIES_HORSEA] = {gMonPalette_Horsea, SPECIES_HORSEA},
-    [SPECIES_SEADRA] = {gMonPalette_Seadra, SPECIES_SEADRA},
-    [SPECIES_GOLDEEN] = {gMonPalette_Goldeen, SPECIES_GOLDEEN},
-    [SPECIES_SEAKING] = {gMonPalette_Seaking, SPECIES_SEAKING},
-    [SPECIES_STARYU] = {gMonPalette_Staryu, SPECIES_STARYU},
-    [SPECIES_STARMIE] = {gMonPalette_Starmie, SPECIES_STARMIE},
-    [SPECIES_MR_MIME] = {gMonPalette_Mrmime, SPECIES_MR_MIME},
-    [SPECIES_SCYTHER] = {gMonPalette_Scyther, SPECIES_SCYTHER},
-    [SPECIES_JYNX] = {gMonPalette_Jynx, SPECIES_JYNX},
-    [SPECIES_ELECTABUZZ] = {gMonPalette_Electabuzz, SPECIES_ELECTABUZZ},
-    [SPECIES_MAGMAR] = {gMonPalette_Magmar, SPECIES_MAGMAR},
-    [SPECIES_PINSIR] = {gMonPalette_Pinsir, SPECIES_PINSIR},
-    [SPECIES_TAUROS] = {gMonPalette_Tauros, SPECIES_TAUROS},
-    [SPECIES_MAGIKARP] = {gMonPalette_Magikarp, SPECIES_MAGIKARP},
-    [SPECIES_GYARADOS] = {gMonPalette_Gyarados, SPECIES_GYARADOS},
-    [SPECIES_LAPRAS] = {gMonPalette_Lapras, SPECIES_LAPRAS},
-    [SPECIES_DITTO] = {gMonPalette_Ditto, SPECIES_DITTO},
-    [SPECIES_EEVEE] = {gMonPalette_Eevee, SPECIES_EEVEE},
-    [SPECIES_VAPOREON] = {gMonPalette_Vaporeon, SPECIES_VAPOREON},
-    [SPECIES_JOLTEON] = {gMonPalette_Jolteon, SPECIES_JOLTEON},
-    [SPECIES_FLAREON] = {gMonPalette_Flareon, SPECIES_FLAREON},
-    [SPECIES_PORYGON] = {gMonPalette_Porygon, SPECIES_PORYGON},
-    [SPECIES_OMANYTE] = {gMonPalette_Omanyte, SPECIES_OMANYTE},
-    [SPECIES_OMASTAR] = {gMonPalette_Omastar, SPECIES_OMASTAR},
-    [SPECIES_KABUTO] = {gMonPalette_Kabuto, SPECIES_KABUTO},
-    [SPECIES_KABUTOPS] = {gMonPalette_Kabutops, SPECIES_KABUTOPS},
-    [SPECIES_AERODACTYL] = {gMonPalette_Aerodactyl, SPECIES_AERODACTYL},
-    [SPECIES_SNORLAX] = {gMonPalette_Snorlax, SPECIES_SNORLAX},
-    [SPECIES_ARTICUNO] = {gMonPalette_Articuno, SPECIES_ARTICUNO},
-    [SPECIES_ZAPDOS] = {gMonPalette_Zapdos, SPECIES_ZAPDOS},
-    [SPECIES_MOLTRES] = {gMonPalette_Moltres, SPECIES_MOLTRES},
-    [SPECIES_DRATINI] = {gMonPalette_Dratini, SPECIES_DRATINI},
-    [SPECIES_DRAGONAIR] = {gMonPalette_Dragonair, SPECIES_DRAGONAIR},
-    [SPECIES_DRAGONITE] = {gMonPalette_Dragonite, SPECIES_DRAGONITE},
-    [SPECIES_MEWTWO] = {gMonPalette_Mewtwo, SPECIES_MEWTWO},
-    [SPECIES_MEW] = {gMonPalette_Mew, SPECIES_MEW},
-    [SPECIES_CHIKORITA] = {gMonPalette_Chikorita, SPECIES_CHIKORITA},
-    [SPECIES_BAYLEEF] = {gMonPalette_Bayleef, SPECIES_BAYLEEF},
-    [SPECIES_MEGANIUM] = {gMonPalette_Meganium, SPECIES_MEGANIUM},
-    [SPECIES_CYNDAQUIL] = {gMonPalette_Cyndaquil, SPECIES_CYNDAQUIL},
-    [SPECIES_QUILAVA] = {gMonPalette_Quilava, SPECIES_QUILAVA},
-    [SPECIES_TYPHLOSION] = {gMonPalette_Typhlosion, SPECIES_TYPHLOSION},
-    [SPECIES_TOTODILE] = {gMonPalette_Totodile, SPECIES_TOTODILE},
-    [SPECIES_CROCONAW] = {gMonPalette_Croconaw, SPECIES_CROCONAW},
-    [SPECIES_FERALIGATR] = {gMonPalette_Feraligatr, SPECIES_FERALIGATR},
-    [SPECIES_SENTRET] = {gMonPalette_Sentret, SPECIES_SENTRET},
-    [SPECIES_FURRET] = {gMonPalette_Furret, SPECIES_FURRET},
-    [SPECIES_HOOTHOOT] = {gMonPalette_Hoothoot, SPECIES_HOOTHOOT},
-    [SPECIES_NOCTOWL] = {gMonPalette_Noctowl, SPECIES_NOCTOWL},
-    [SPECIES_LEDYBA] = {gMonPalette_Ledyba, SPECIES_LEDYBA},
-    [SPECIES_LEDIAN] = {gMonPalette_Ledian, SPECIES_LEDIAN},
-    [SPECIES_SPINARAK] = {gMonPalette_Spinarak, SPECIES_SPINARAK},
-    [SPECIES_ARIADOS] = {gMonPalette_Ariados, SPECIES_ARIADOS},
-    [SPECIES_CROBAT] = {gMonPalette_Crobat, SPECIES_CROBAT},
-    [SPECIES_CHINCHOU] = {gMonPalette_Chinchou, SPECIES_CHINCHOU},
-    [SPECIES_LANTURN] = {gMonPalette_Lanturn, SPECIES_LANTURN},
-    [SPECIES_PICHU] = {gMonPalette_Pichu, SPECIES_PICHU},
-    [SPECIES_CLEFFA] = {gMonPalette_Cleffa, SPECIES_CLEFFA},
-    [SPECIES_IGGLYBUFF] = {gMonPalette_Igglybuff, SPECIES_IGGLYBUFF},
-    [SPECIES_TOGEPI] = {gMonPalette_Togepi, SPECIES_TOGEPI},
-    [SPECIES_TOGETIC] = {gMonPalette_Togetic, SPECIES_TOGETIC},
-    [SPECIES_NATU] = {gMonPalette_Natu, SPECIES_NATU},
-    [SPECIES_XATU] = {gMonPalette_Xatu, SPECIES_XATU},
-    [SPECIES_MAREEP] = {gMonPalette_Mareep, SPECIES_MAREEP},
-    [SPECIES_FLAAFFY] = {gMonPalette_Flaaffy, SPECIES_FLAAFFY},
-    [SPECIES_AMPHAROS] = {gMonPalette_Ampharos, SPECIES_AMPHAROS},
-    [SPECIES_BELLOSSOM] = {gMonPalette_Bellossom, SPECIES_BELLOSSOM},
-    [SPECIES_MARILL] = {gMonPalette_Marill, SPECIES_MARILL},
-    [SPECIES_AZUMARILL] = {gMonPalette_Azumarill, SPECIES_AZUMARILL},
-    [SPECIES_SUDOWOODO] = {gMonPalette_Sudowoodo, SPECIES_SUDOWOODO},
-    [SPECIES_POLITOED] = {gMonPalette_Politoed, SPECIES_POLITOED},
-    [SPECIES_HOPPIP] = {gMonPalette_Hoppip, SPECIES_HOPPIP},
-    [SPECIES_SKIPLOOM] = {gMonPalette_Skiploom, SPECIES_SKIPLOOM},
-    [SPECIES_JUMPLUFF] = {gMonPalette_Jumpluff, SPECIES_JUMPLUFF},
-    [SPECIES_AIPOM] = {gMonPalette_Aipom, SPECIES_AIPOM},
-    [SPECIES_SUNKERN] = {gMonPalette_Sunkern, SPECIES_SUNKERN},
-    [SPECIES_SUNFLORA] = {gMonPalette_Sunflora, SPECIES_SUNFLORA},
-    [SPECIES_YANMA] = {gMonPalette_Yanma, SPECIES_YANMA},
-    [SPECIES_WOOPER] = {gMonPalette_Wooper, SPECIES_WOOPER},
-    [SPECIES_QUAGSIRE] = {gMonPalette_Quagsire, SPECIES_QUAGSIRE},
-    [SPECIES_ESPEON] = {gMonPalette_Espeon, SPECIES_ESPEON},
-    [SPECIES_UMBREON] = {gMonPalette_Umbreon, SPECIES_UMBREON},
-    [SPECIES_MURKROW] = {gMonPalette_Murkrow, SPECIES_MURKROW},
-    [SPECIES_SLOWKING] = {gMonPalette_Slowking, SPECIES_SLOWKING},
-    [SPECIES_MISDREAVUS] = {gMonPalette_Misdreavus, SPECIES_MISDREAVUS},
-    [SPECIES_UNOWN] = {gMonPalette_Unown, SPECIES_UNOWN},
-    [SPECIES_WOBBUFFET] = {gMonPalette_Wobbuffet, SPECIES_WOBBUFFET},
-    [SPECIES_GIRAFARIG] = {gMonPalette_Girafarig, SPECIES_GIRAFARIG},
-    [SPECIES_PINECO] = {gMonPalette_Pineco, SPECIES_PINECO},
-    [SPECIES_FORRETRESS] = {gMonPalette_Forretress, SPECIES_FORRETRESS},
-    [SPECIES_DUNSPARCE] = {gMonPalette_Dunsparce, SPECIES_DUNSPARCE},
-    [SPECIES_GLIGAR] = {gMonPalette_Gligar, SPECIES_GLIGAR},
-    [SPECIES_STEELIX] = {gMonPalette_Steelix, SPECIES_STEELIX},
-    [SPECIES_SNUBBULL] = {gMonPalette_Snubbull, SPECIES_SNUBBULL},
-    [SPECIES_GRANBULL] = {gMonPalette_Granbull, SPECIES_GRANBULL},
-    [SPECIES_QWILFISH] = {gMonPalette_Qwilfish, SPECIES_QWILFISH},
-    [SPECIES_SCIZOR] = {gMonPalette_Scizor, SPECIES_SCIZOR},
-    [SPECIES_SHUCKLE] = {gMonPalette_Shuckle, SPECIES_SHUCKLE},
-    [SPECIES_HERACROSS] = {gMonPalette_Heracross, SPECIES_HERACROSS},
-    [SPECIES_SNEASEL] = {gMonPalette_Sneasel, SPECIES_SNEASEL},
-    [SPECIES_TEDDIURSA] = {gMonPalette_Teddiursa, SPECIES_TEDDIURSA},
-    [SPECIES_URSARING] = {gMonPalette_Ursaring, SPECIES_URSARING},
-    [SPECIES_SLUGMA] = {gMonPalette_Slugma, SPECIES_SLUGMA},
-    [SPECIES_MAGCARGO] = {gMonPalette_Magcargo, SPECIES_MAGCARGO},
-    [SPECIES_SWINUB] = {gMonPalette_Swinub, SPECIES_SWINUB},
-    [SPECIES_PILOSWINE] = {gMonPalette_Piloswine, SPECIES_PILOSWINE},
-    [SPECIES_CORSOLA] = {gMonPalette_Corsola, SPECIES_CORSOLA},
-    [SPECIES_REMORAID] = {gMonPalette_Remoraid, SPECIES_REMORAID},
-    [SPECIES_OCTILLERY] = {gMonPalette_Octillery, SPECIES_OCTILLERY},
-    [SPECIES_DELIBIRD] = {gMonPalette_Delibird, SPECIES_DELIBIRD},
-    [SPECIES_MANTINE] = {gMonPalette_Mantine, SPECIES_MANTINE},
-    [SPECIES_SKARMORY] = {gMonPalette_Skarmory, SPECIES_SKARMORY},
-    [SPECIES_HOUNDOUR] = {gMonPalette_Houndour, SPECIES_HOUNDOUR},
-    [SPECIES_HOUNDOOM] = {gMonPalette_Houndoom, SPECIES_HOUNDOOM},
-    [SPECIES_KINGDRA] = {gMonPalette_Kingdra, SPECIES_KINGDRA},
-    [SPECIES_PHANPY] = {gMonPalette_Phanpy, SPECIES_PHANPY},
-    [SPECIES_DONPHAN] = {gMonPalette_Donphan, SPECIES_DONPHAN},
-    [SPECIES_PORYGON2] = {gMonPalette_Porygon2, SPECIES_PORYGON2},
-    [SPECIES_STANTLER] = {gMonPalette_Stantler, SPECIES_STANTLER},
-    [SPECIES_SMEARGLE] = {gMonPalette_Smeargle, SPECIES_SMEARGLE},
-    [SPECIES_TYROGUE] = {gMonPalette_Tyrogue, SPECIES_TYROGUE},
-    [SPECIES_HITMONTOP] = {gMonPalette_Hitmontop, SPECIES_HITMONTOP},
-    [SPECIES_SMOOCHUM] = {gMonPalette_Smoochum, SPECIES_SMOOCHUM},
-    [SPECIES_ELEKID] = {gMonPalette_Elekid, SPECIES_ELEKID},
-    [SPECIES_MAGBY] = {gMonPalette_Magby, SPECIES_MAGBY},
-    [SPECIES_MILTANK] = {gMonPalette_Miltank, SPECIES_MILTANK},
-    [SPECIES_BLISSEY] = {gMonPalette_Blissey, SPECIES_BLISSEY},
-    [SPECIES_RAIKOU] = {gMonPalette_Raikou, SPECIES_RAIKOU},
-    [SPECIES_ENTEI] = {gMonPalette_Entei, SPECIES_ENTEI},
-    [SPECIES_SUICUNE] = {gMonPalette_Suicune, SPECIES_SUICUNE},
-    [SPECIES_LARVITAR] = {gMonPalette_Larvitar, SPECIES_LARVITAR},
-    [SPECIES_PUPITAR] = {gMonPalette_Pupitar, SPECIES_PUPITAR},
-    [SPECIES_TYRANITAR] = {gMonPalette_Tyranitar, SPECIES_TYRANITAR},
-    [SPECIES_LUGIA] = {gMonPalette_Lugia, SPECIES_LUGIA},
-    [SPECIES_HO_OH] = {gMonPalette_HoOh, SPECIES_HO_OH},
-    [SPECIES_CELEBI] = {gMonPalette_Celebi, SPECIES_CELEBI},
-    [SPECIES_OLD_UNOWN_B] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_B},
-    [SPECIES_OLD_UNOWN_C] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_C},
-    [SPECIES_OLD_UNOWN_D] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_D},
-    [SPECIES_OLD_UNOWN_E] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_E},
-    [SPECIES_OLD_UNOWN_F] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_F},
-    [SPECIES_OLD_UNOWN_G] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_G},
-    [SPECIES_OLD_UNOWN_H] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_H},
-    [SPECIES_OLD_UNOWN_I] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_I},
-    [SPECIES_OLD_UNOWN_J] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_J},
-    [SPECIES_OLD_UNOWN_K] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_K},
-    [SPECIES_OLD_UNOWN_L] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_L},
-    [SPECIES_OLD_UNOWN_M] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_M},
-    [SPECIES_OLD_UNOWN_N] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_N},
-    [SPECIES_OLD_UNOWN_O] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_O},
-    [SPECIES_OLD_UNOWN_P] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_P},
-    [SPECIES_OLD_UNOWN_Q] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Q},
-    [SPECIES_OLD_UNOWN_R] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_R},
-    [SPECIES_OLD_UNOWN_S] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_S},
-    [SPECIES_OLD_UNOWN_T] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_T},
-    [SPECIES_OLD_UNOWN_U] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_U},
-    [SPECIES_OLD_UNOWN_V] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_V},
-    [SPECIES_OLD_UNOWN_W] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_W},
-    [SPECIES_OLD_UNOWN_X] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_X},
-    [SPECIES_OLD_UNOWN_Y] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Y},
-    [SPECIES_OLD_UNOWN_Z] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Z},
-    [SPECIES_TREECKO] = {gMonPalette_Treecko, SPECIES_TREECKO},
-    [SPECIES_GROVYLE] = {gMonPalette_Grovyle, SPECIES_GROVYLE},
-    [SPECIES_SCEPTILE] = {gMonPalette_Sceptile, SPECIES_SCEPTILE},
-    [SPECIES_TORCHIC] = {gMonPalette_Torchic, SPECIES_TORCHIC},
-    [SPECIES_COMBUSKEN] = {gMonPalette_Combusken, SPECIES_COMBUSKEN},
-    [SPECIES_BLAZIKEN] = {gMonPalette_Blaziken, SPECIES_BLAZIKEN},
-    [SPECIES_MUDKIP] = {gMonPalette_Mudkip, SPECIES_MUDKIP},
-    [SPECIES_MARSHTOMP] = {gMonPalette_Marshtomp, SPECIES_MARSHTOMP},
-    [SPECIES_SWAMPERT] = {gMonPalette_Swampert, SPECIES_SWAMPERT},
-    [SPECIES_POOCHYENA] = {gMonPalette_Poochyena, SPECIES_POOCHYENA},
-    [SPECIES_MIGHTYENA] = {gMonPalette_Mightyena, SPECIES_MIGHTYENA},
-    [SPECIES_ZIGZAGOON] = {gMonPalette_Zigzagoon, SPECIES_ZIGZAGOON},
-    [SPECIES_LINOONE] = {gMonPalette_Linoone, SPECIES_LINOONE},
-    [SPECIES_WURMPLE] = {gMonPalette_Wurmple, SPECIES_WURMPLE},
-    [SPECIES_SILCOON] = {gMonPalette_Silcoon, SPECIES_SILCOON},
-    [SPECIES_BEAUTIFLY] = {gMonPalette_Beautifly, SPECIES_BEAUTIFLY},
-    [SPECIES_CASCOON] = {gMonPalette_Cascoon, SPECIES_CASCOON},
-    [SPECIES_DUSTOX] = {gMonPalette_Dustox, SPECIES_DUSTOX},
-    [SPECIES_LOTAD] = {gMonPalette_Lotad, SPECIES_LOTAD},
-    [SPECIES_LOMBRE] = {gMonPalette_Lombre, SPECIES_LOMBRE},
-    [SPECIES_LUDICOLO] = {gMonPalette_Ludicolo, SPECIES_LUDICOLO},
-    [SPECIES_SEEDOT] = {gMonPalette_Seedot, SPECIES_SEEDOT},
-    [SPECIES_NUZLEAF] = {gMonPalette_Nuzleaf, SPECIES_NUZLEAF},
-    [SPECIES_SHIFTRY] = {gMonPalette_Shiftry, SPECIES_SHIFTRY},
-    [SPECIES_NINCADA] = {gMonPalette_Nincada, SPECIES_NINCADA},
-    [SPECIES_NINJASK] = {gMonPalette_Ninjask, SPECIES_NINJASK},
-    [SPECIES_SHEDINJA] = {gMonPalette_Shedinja, SPECIES_SHEDINJA},
-    [SPECIES_TAILLOW] = {gMonPalette_Taillow, SPECIES_TAILLOW},
-    [SPECIES_SWELLOW] = {gMonPalette_Swellow, SPECIES_SWELLOW},
-    [SPECIES_SHROOMISH] = {gMonPalette_Shroomish, SPECIES_SHROOMISH},
-    [SPECIES_BRELOOM] = {gMonPalette_Breloom, SPECIES_BRELOOM},
-    [SPECIES_SPINDA] = {gMonPalette_Spinda, SPECIES_SPINDA},
-    [SPECIES_WINGULL] = {gMonPalette_Wingull, SPECIES_WINGULL},
-    [SPECIES_PELIPPER] = {gMonPalette_Pelipper, SPECIES_PELIPPER},
-    [SPECIES_SURSKIT] = {gMonPalette_Surskit, SPECIES_SURSKIT},
-    [SPECIES_MASQUERAIN] = {gMonPalette_Masquerain, SPECIES_MASQUERAIN},
-    [SPECIES_WAILMER] = {gMonPalette_Wailmer, SPECIES_WAILMER},
-    [SPECIES_WAILORD] = {gMonPalette_Wailord, SPECIES_WAILORD},
-    [SPECIES_SKITTY] = {gMonPalette_Skitty, SPECIES_SKITTY},
-    [SPECIES_DELCATTY] = {gMonPalette_Delcatty, SPECIES_DELCATTY},
-    [SPECIES_KECLEON] = {gMonPalette_Kecleon, SPECIES_KECLEON},
-    [SPECIES_BALTOY] = {gMonPalette_Baltoy, SPECIES_BALTOY},
-    [SPECIES_CLAYDOL] = {gMonPalette_Claydol, SPECIES_CLAYDOL},
-    [SPECIES_NOSEPASS] = {gMonPalette_Nosepass, SPECIES_NOSEPASS},
-    [SPECIES_TORKOAL] = {gMonPalette_Torkoal, SPECIES_TORKOAL},
-    [SPECIES_SABLEYE] = {gMonPalette_Sableye, SPECIES_SABLEYE},
-    [SPECIES_BARBOACH] = {gMonPalette_Barboach, SPECIES_BARBOACH},
-    [SPECIES_WHISCASH] = {gMonPalette_Whiscash, SPECIES_WHISCASH},
-    [SPECIES_LUVDISC] = {gMonPalette_Luvdisc, SPECIES_LUVDISC},
-    [SPECIES_CORPHISH] = {gMonPalette_Corphish, SPECIES_CORPHISH},
-    [SPECIES_CRAWDAUNT] = {gMonPalette_Crawdaunt, SPECIES_CRAWDAUNT},
-    [SPECIES_FEEBAS] = {gMonPalette_Feebas, SPECIES_FEEBAS},
-    [SPECIES_MILOTIC] = {gMonPalette_Milotic, SPECIES_MILOTIC},
-    [SPECIES_CARVANHA] = {gMonPalette_Carvanha, SPECIES_CARVANHA},
-    [SPECIES_SHARPEDO] = {gMonPalette_Sharpedo, SPECIES_SHARPEDO},
-    [SPECIES_TRAPINCH] = {gMonPalette_Trapinch, SPECIES_TRAPINCH},
-    [SPECIES_VIBRAVA] = {gMonPalette_Vibrava, SPECIES_VIBRAVA},
-    [SPECIES_FLYGON] = {gMonPalette_Flygon, SPECIES_FLYGON},
-    [SPECIES_MAKUHITA] = {gMonPalette_Makuhita, SPECIES_MAKUHITA},
-    [SPECIES_HARIYAMA] = {gMonPalette_Hariyama, SPECIES_HARIYAMA},
-    [SPECIES_ELECTRIKE] = {gMonPalette_Electrike, SPECIES_ELECTRIKE},
-    [SPECIES_MANECTRIC] = {gMonPalette_Manectric, SPECIES_MANECTRIC},
-    [SPECIES_NUMEL] = {gMonPalette_Numel, SPECIES_NUMEL},
-    [SPECIES_CAMERUPT] = {gMonPalette_Camerupt, SPECIES_CAMERUPT},
-    [SPECIES_SPHEAL] = {gMonPalette_Spheal, SPECIES_SPHEAL},
-    [SPECIES_SEALEO] = {gMonPalette_Sealeo, SPECIES_SEALEO},
-    [SPECIES_WALREIN] = {gMonPalette_Walrein, SPECIES_WALREIN},
-    [SPECIES_CACNEA] = {gMonPalette_Cacnea, SPECIES_CACNEA},
-    [SPECIES_CACTURNE] = {gMonPalette_Cacturne, SPECIES_CACTURNE},
-    [SPECIES_SNORUNT] = {gMonPalette_Snorunt, SPECIES_SNORUNT},
-    [SPECIES_GLALIE] = {gMonPalette_Glalie, SPECIES_GLALIE},
-    [SPECIES_LUNATONE] = {gMonPalette_Lunatone, SPECIES_LUNATONE},
-    [SPECIES_SOLROCK] = {gMonPalette_Solrock, SPECIES_SOLROCK},
-    [SPECIES_AZURILL] = {gMonPalette_Azurill, SPECIES_AZURILL},
-    [SPECIES_SPOINK] = {gMonPalette_Spoink, SPECIES_SPOINK},
-    [SPECIES_GRUMPIG] = {gMonPalette_Grumpig, SPECIES_GRUMPIG},
-    [SPECIES_PLUSLE] = {gMonPalette_Plusle, SPECIES_PLUSLE},
-    [SPECIES_MINUN] = {gMonPalette_Minun, SPECIES_MINUN},
-    [SPECIES_MAWILE] = {gMonPalette_Mawile, SPECIES_MAWILE},
-    [SPECIES_MEDITITE] = {gMonPalette_Meditite, SPECIES_MEDITITE},
-    [SPECIES_MEDICHAM] = {gMonPalette_Medicham, SPECIES_MEDICHAM},
-    [SPECIES_SWABLU] = {gMonPalette_Swablu, SPECIES_SWABLU},
-    [SPECIES_ALTARIA] = {gMonPalette_Altaria, SPECIES_ALTARIA},
-    [SPECIES_WYNAUT] = {gMonPalette_Wynaut, SPECIES_WYNAUT},
-    [SPECIES_DUSKULL] = {gMonPalette_Duskull, SPECIES_DUSKULL},
-    [SPECIES_DUSCLOPS] = {gMonPalette_Dusclops, SPECIES_DUSCLOPS},
-    [SPECIES_ROSELIA] = {gMonPalette_Roselia, SPECIES_ROSELIA},
-    [SPECIES_SLAKOTH] = {gMonPalette_Slakoth, SPECIES_SLAKOTH},
-    [SPECIES_VIGOROTH] = {gMonPalette_Vigoroth, SPECIES_VIGOROTH},
-    [SPECIES_SLAKING] = {gMonPalette_Slaking, SPECIES_SLAKING},
-    [SPECIES_GULPIN] = {gMonPalette_Gulpin, SPECIES_GULPIN},
-    [SPECIES_SWALOT] = {gMonPalette_Swalot, SPECIES_SWALOT},
-    [SPECIES_TROPIUS] = {gMonPalette_Tropius, SPECIES_TROPIUS},
-    [SPECIES_WHISMUR] = {gMonPalette_Whismur, SPECIES_WHISMUR},
-    [SPECIES_LOUDRED] = {gMonPalette_Loudred, SPECIES_LOUDRED},
-    [SPECIES_EXPLOUD] = {gMonPalette_Exploud, SPECIES_EXPLOUD},
-    [SPECIES_CLAMPERL] = {gMonPalette_Clamperl, SPECIES_CLAMPERL},
-    [SPECIES_HUNTAIL] = {gMonPalette_Huntail, SPECIES_HUNTAIL},
-    [SPECIES_GOREBYSS] = {gMonPalette_Gorebyss, SPECIES_GOREBYSS},
-    [SPECIES_ABSOL] = {gMonPalette_Absol, SPECIES_ABSOL},
-    [SPECIES_SHUPPET] = {gMonPalette_Shuppet, SPECIES_SHUPPET},
-    [SPECIES_BANETTE] = {gMonPalette_Banette, SPECIES_BANETTE},
-    [SPECIES_SEVIPER] = {gMonPalette_Seviper, SPECIES_SEVIPER},
-    [SPECIES_ZANGOOSE] = {gMonPalette_Zangoose, SPECIES_ZANGOOSE},
-    [SPECIES_RELICANTH] = {gMonPalette_Relicanth, SPECIES_RELICANTH},
-    [SPECIES_ARON] = {gMonPalette_Aron, SPECIES_ARON},
-    [SPECIES_LAIRON] = {gMonPalette_Lairon, SPECIES_LAIRON},
-    [SPECIES_AGGRON] = {gMonPalette_Aggron, SPECIES_AGGRON},
-    [SPECIES_CASTFORM] = {gMonPalette_Castform, SPECIES_CASTFORM},
-    [SPECIES_VOLBEAT] = {gMonPalette_Volbeat, SPECIES_VOLBEAT},
-    [SPECIES_ILLUMISE] = {gMonPalette_Illumise, SPECIES_ILLUMISE},
-    [SPECIES_LILEEP] = {gMonPalette_Lileep, SPECIES_LILEEP},
-    [SPECIES_CRADILY] = {gMonPalette_Cradily, SPECIES_CRADILY},
-    [SPECIES_ANORITH] = {gMonPalette_Anorith, SPECIES_ANORITH},
-    [SPECIES_ARMALDO] = {gMonPalette_Armaldo, SPECIES_ARMALDO},
-    [SPECIES_RALTS] = {gMonPalette_Ralts, SPECIES_RALTS},
-    [SPECIES_KIRLIA] = {gMonPalette_Kirlia, SPECIES_KIRLIA},
-    [SPECIES_GARDEVOIR] = {gMonPalette_Gardevoir, SPECIES_GARDEVOIR},
-    [SPECIES_BAGON] = {gMonPalette_Bagon, SPECIES_BAGON},
-    [SPECIES_SHELGON] = {gMonPalette_Shelgon, SPECIES_SHELGON},
-    [SPECIES_SALAMENCE] = {gMonPalette_Salamence, SPECIES_SALAMENCE},
-    [SPECIES_BELDUM] = {gMonPalette_Beldum, SPECIES_BELDUM},
-    [SPECIES_METANG] = {gMonPalette_Metang, SPECIES_METANG},
-    [SPECIES_METAGROSS] = {gMonPalette_Metagross, SPECIES_METAGROSS},
-    [SPECIES_REGIROCK] = {gMonPalette_Regirock, SPECIES_REGIROCK},
-    [SPECIES_REGICE] = {gMonPalette_Regice, SPECIES_REGICE},
-    [SPECIES_REGISTEEL] = {gMonPalette_Registeel, SPECIES_REGISTEEL},
-    [SPECIES_KYOGRE] = {gMonPalette_Kyogre, SPECIES_KYOGRE},
-    [SPECIES_GROUDON] = {gMonPalette_Groudon, SPECIES_GROUDON},
-    [SPECIES_RAYQUAZA] = {gMonPalette_Rayquaza, SPECIES_RAYQUAZA},
-    [SPECIES_LATIAS] = {gMonPalette_Latias, SPECIES_LATIAS},
-    [SPECIES_LATIOS] = {gMonPalette_Latios, SPECIES_LATIOS},
-    [SPECIES_JIRACHI] = {gMonPalette_Jirachi, SPECIES_JIRACHI},
-    [SPECIES_DEOXYS] = {gMonPalette_Deoxys, SPECIES_DEOXYS},
-    [SPECIES_CHIMECHO] = {gMonPalette_Chimecho, SPECIES_CHIMECHO},
-    [SPECIES_EGG] = {gMonPalette_Egg, SPECIES_EGG},
-    [SPECIES_UNOWN_B] = {gMonPalette_Unown, SPECIES_UNOWN_B},
-    [SPECIES_UNOWN_C] = {gMonPalette_Unown, SPECIES_UNOWN_C},
-    [SPECIES_UNOWN_D] = {gMonPalette_Unown, SPECIES_UNOWN_D},
-    [SPECIES_UNOWN_E] = {gMonPalette_Unown, SPECIES_UNOWN_E},
-    [SPECIES_UNOWN_F] = {gMonPalette_Unown, SPECIES_UNOWN_F},
-    [SPECIES_UNOWN_G] = {gMonPalette_Unown, SPECIES_UNOWN_G},
-    [SPECIES_UNOWN_H] = {gMonPalette_Unown, SPECIES_UNOWN_H},
-    [SPECIES_UNOWN_I] = {gMonPalette_Unown, SPECIES_UNOWN_I},
-    [SPECIES_UNOWN_J] = {gMonPalette_Unown, SPECIES_UNOWN_J},
-    [SPECIES_UNOWN_K] = {gMonPalette_Unown, SPECIES_UNOWN_K},
-    [SPECIES_UNOWN_L] = {gMonPalette_Unown, SPECIES_UNOWN_L},
-    [SPECIES_UNOWN_M] = {gMonPalette_Unown, SPECIES_UNOWN_M},
-    [SPECIES_UNOWN_N] = {gMonPalette_Unown, SPECIES_UNOWN_N},
-    [SPECIES_UNOWN_O] = {gMonPalette_Unown, SPECIES_UNOWN_O},
-    [SPECIES_UNOWN_P] = {gMonPalette_Unown, SPECIES_UNOWN_P},
-    [SPECIES_UNOWN_Q] = {gMonPalette_Unown, SPECIES_UNOWN_Q},
-    [SPECIES_UNOWN_R] = {gMonPalette_Unown, SPECIES_UNOWN_R},
-    [SPECIES_UNOWN_S] = {gMonPalette_Unown, SPECIES_UNOWN_S},
-    [SPECIES_UNOWN_T] = {gMonPalette_Unown, SPECIES_UNOWN_T},
-    [SPECIES_UNOWN_U] = {gMonPalette_Unown, SPECIES_UNOWN_U},
-    [SPECIES_UNOWN_V] = {gMonPalette_Unown, SPECIES_UNOWN_V},
-    [SPECIES_UNOWN_W] = {gMonPalette_Unown, SPECIES_UNOWN_W},
-    [SPECIES_UNOWN_X] = {gMonPalette_Unown, SPECIES_UNOWN_X},
-    [SPECIES_UNOWN_Y] = {gMonPalette_Unown, SPECIES_UNOWN_Y},
-    [SPECIES_UNOWN_Z] = {gMonPalette_Unown, SPECIES_UNOWN_Z},
-    [SPECIES_UNOWN_EMARK] = {gMonPalette_Unown, SPECIES_UNOWN_EMARK},
-    [SPECIES_UNOWN_QMARK] = {gMonPalette_Unown, SPECIES_UNOWN_QMARK},
+    SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark),
+    SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur),
+    SPECIES_PAL(IVYSAUR, gMonPalette_Ivysaur),
+    SPECIES_PAL(VENUSAUR, gMonPalette_Venusaur),
+    SPECIES_PAL(CHARMANDER, gMonPalette_Charmander),
+    SPECIES_PAL(CHARMELEON, gMonPalette_Charmeleon),
+    SPECIES_PAL(CHARIZARD, gMonPalette_Charizard),
+    SPECIES_PAL(SQUIRTLE, gMonPalette_Squirtle),
+    SPECIES_PAL(WARTORTLE, gMonPalette_Wartortle),
+    SPECIES_PAL(BLASTOISE, gMonPalette_Blastoise),
+    SPECIES_PAL(CATERPIE, gMonPalette_Caterpie),
+    SPECIES_PAL(METAPOD, gMonPalette_Metapod),
+    SPECIES_PAL(BUTTERFREE, gMonPalette_Butterfree),
+    SPECIES_PAL(WEEDLE, gMonPalette_Weedle),
+    SPECIES_PAL(KAKUNA, gMonPalette_Kakuna),
+    SPECIES_PAL(BEEDRILL, gMonPalette_Beedrill),
+    SPECIES_PAL(PIDGEY, gMonPalette_Pidgey),
+    SPECIES_PAL(PIDGEOTTO, gMonPalette_Pidgeotto),
+    SPECIES_PAL(PIDGEOT, gMonPalette_Pidgeot),
+    SPECIES_PAL(RATTATA, gMonPalette_Rattata),
+    SPECIES_PAL(RATICATE, gMonPalette_Raticate),
+    SPECIES_PAL(SPEAROW, gMonPalette_Spearow),
+    SPECIES_PAL(FEAROW, gMonPalette_Fearow),
+    SPECIES_PAL(EKANS, gMonPalette_Ekans),
+    SPECIES_PAL(ARBOK, gMonPalette_Arbok),
+    SPECIES_PAL(PIKACHU, gMonPalette_Pikachu),
+    SPECIES_PAL(RAICHU, gMonPalette_Raichu),
+    SPECIES_PAL(SANDSHREW, gMonPalette_Sandshrew),
+    SPECIES_PAL(SANDSLASH, gMonPalette_Sandslash),
+    SPECIES_PAL(NIDORAN_F, gMonPalette_NidoranF),
+    SPECIES_PAL(NIDORINA, gMonPalette_Nidorina),
+    SPECIES_PAL(NIDOQUEEN, gMonPalette_Nidoqueen),
+    SPECIES_PAL(NIDORAN_M, gMonPalette_NidoranM),
+    SPECIES_PAL(NIDORINO, gMonPalette_Nidorino),
+    SPECIES_PAL(NIDOKING, gMonPalette_Nidoking),
+    SPECIES_PAL(CLEFAIRY, gMonPalette_Clefairy),
+    SPECIES_PAL(CLEFABLE, gMonPalette_Clefable),
+    SPECIES_PAL(VULPIX, gMonPalette_Vulpix),
+    SPECIES_PAL(NINETALES, gMonPalette_Ninetales),
+    SPECIES_PAL(JIGGLYPUFF, gMonPalette_Jigglypuff),
+    SPECIES_PAL(WIGGLYTUFF, gMonPalette_Wigglytuff),
+    SPECIES_PAL(ZUBAT, gMonPalette_Zubat),
+    SPECIES_PAL(GOLBAT, gMonPalette_Golbat),
+    SPECIES_PAL(ODDISH, gMonPalette_Oddish),
+    SPECIES_PAL(GLOOM, gMonPalette_Gloom),
+    SPECIES_PAL(VILEPLUME, gMonPalette_Vileplume),
+    SPECIES_PAL(PARAS, gMonPalette_Paras),
+    SPECIES_PAL(PARASECT, gMonPalette_Parasect),
+    SPECIES_PAL(VENONAT, gMonPalette_Venonat),
+    SPECIES_PAL(VENOMOTH, gMonPalette_Venomoth),
+    SPECIES_PAL(DIGLETT, gMonPalette_Diglett),
+    SPECIES_PAL(DUGTRIO, gMonPalette_Dugtrio),
+    SPECIES_PAL(MEOWTH, gMonPalette_Meowth),
+    SPECIES_PAL(PERSIAN, gMonPalette_Persian),
+    SPECIES_PAL(PSYDUCK, gMonPalette_Psyduck),
+    SPECIES_PAL(GOLDUCK, gMonPalette_Golduck),
+    SPECIES_PAL(MANKEY, gMonPalette_Mankey),
+    SPECIES_PAL(PRIMEAPE, gMonPalette_Primeape),
+    SPECIES_PAL(GROWLITHE, gMonPalette_Growlithe),
+    SPECIES_PAL(ARCANINE, gMonPalette_Arcanine),
+    SPECIES_PAL(POLIWAG, gMonPalette_Poliwag),
+    SPECIES_PAL(POLIWHIRL, gMonPalette_Poliwhirl),
+    SPECIES_PAL(POLIWRATH, gMonPalette_Poliwrath),
+    SPECIES_PAL(ABRA, gMonPalette_Abra),
+    SPECIES_PAL(KADABRA, gMonPalette_Kadabra),
+    SPECIES_PAL(ALAKAZAM, gMonPalette_Alakazam),
+    SPECIES_PAL(MACHOP, gMonPalette_Machop),
+    SPECIES_PAL(MACHOKE, gMonPalette_Machoke),
+    SPECIES_PAL(MACHAMP, gMonPalette_Machamp),
+    SPECIES_PAL(BELLSPROUT, gMonPalette_Bellsprout),
+    SPECIES_PAL(WEEPINBELL, gMonPalette_Weepinbell),
+    SPECIES_PAL(VICTREEBEL, gMonPalette_Victreebel),
+    SPECIES_PAL(TENTACOOL, gMonPalette_Tentacool),
+    SPECIES_PAL(TENTACRUEL, gMonPalette_Tentacruel),
+    SPECIES_PAL(GEODUDE, gMonPalette_Geodude),
+    SPECIES_PAL(GRAVELER, gMonPalette_Graveler),
+    SPECIES_PAL(GOLEM, gMonPalette_Golem),
+    SPECIES_PAL(PONYTA, gMonPalette_Ponyta),
+    SPECIES_PAL(RAPIDASH, gMonPalette_Rapidash),
+    SPECIES_PAL(SLOWPOKE, gMonPalette_Slowpoke),
+    SPECIES_PAL(SLOWBRO, gMonPalette_Slowbro),
+    SPECIES_PAL(MAGNEMITE, gMonPalette_Magnemite),
+    SPECIES_PAL(MAGNETON, gMonPalette_Magneton),
+    SPECIES_PAL(FARFETCHD, gMonPalette_Farfetchd),
+    SPECIES_PAL(DODUO, gMonPalette_Doduo),
+    SPECIES_PAL(DODRIO, gMonPalette_Dodrio),
+    SPECIES_PAL(SEEL, gMonPalette_Seel),
+    SPECIES_PAL(DEWGONG, gMonPalette_Dewgong),
+    SPECIES_PAL(GRIMER, gMonPalette_Grimer),
+    SPECIES_PAL(MUK, gMonPalette_Muk),
+    SPECIES_PAL(SHELLDER, gMonPalette_Shellder),
+    SPECIES_PAL(CLOYSTER, gMonPalette_Cloyster),
+    SPECIES_PAL(GASTLY, gMonPalette_Gastly),
+    SPECIES_PAL(HAUNTER, gMonPalette_Haunter),
+    SPECIES_PAL(GENGAR, gMonPalette_Gengar),
+    SPECIES_PAL(ONIX, gMonPalette_Onix),
+    SPECIES_PAL(DROWZEE, gMonPalette_Drowzee),
+    SPECIES_PAL(HYPNO, gMonPalette_Hypno),
+    SPECIES_PAL(KRABBY, gMonPalette_Krabby),
+    SPECIES_PAL(KINGLER, gMonPalette_Kingler),
+    SPECIES_PAL(VOLTORB, gMonPalette_Voltorb),
+    SPECIES_PAL(ELECTRODE, gMonPalette_Electrode),
+    SPECIES_PAL(EXEGGCUTE, gMonPalette_Exeggcute),
+    SPECIES_PAL(EXEGGUTOR, gMonPalette_Exeggutor),
+    SPECIES_PAL(CUBONE, gMonPalette_Cubone),
+    SPECIES_PAL(MAROWAK, gMonPalette_Marowak),
+    SPECIES_PAL(HITMONLEE, gMonPalette_Hitmonlee),
+    SPECIES_PAL(HITMONCHAN, gMonPalette_Hitmonchan),
+    SPECIES_PAL(LICKITUNG, gMonPalette_Lickitung),
+    SPECIES_PAL(KOFFING, gMonPalette_Koffing),
+    SPECIES_PAL(WEEZING, gMonPalette_Weezing),
+    SPECIES_PAL(RHYHORN, gMonPalette_Rhyhorn),
+    SPECIES_PAL(RHYDON, gMonPalette_Rhydon),
+    SPECIES_PAL(CHANSEY, gMonPalette_Chansey),
+    SPECIES_PAL(TANGELA, gMonPalette_Tangela),
+    SPECIES_PAL(KANGASKHAN, gMonPalette_Kangaskhan),
+    SPECIES_PAL(HORSEA, gMonPalette_Horsea),
+    SPECIES_PAL(SEADRA, gMonPalette_Seadra),
+    SPECIES_PAL(GOLDEEN, gMonPalette_Goldeen),
+    SPECIES_PAL(SEAKING, gMonPalette_Seaking),
+    SPECIES_PAL(STARYU, gMonPalette_Staryu),
+    SPECIES_PAL(STARMIE, gMonPalette_Starmie),
+    SPECIES_PAL(MR_MIME, gMonPalette_Mrmime),
+    SPECIES_PAL(SCYTHER, gMonPalette_Scyther),
+    SPECIES_PAL(JYNX, gMonPalette_Jynx),
+    SPECIES_PAL(ELECTABUZZ, gMonPalette_Electabuzz),
+    SPECIES_PAL(MAGMAR, gMonPalette_Magmar),
+    SPECIES_PAL(PINSIR, gMonPalette_Pinsir),
+    SPECIES_PAL(TAUROS, gMonPalette_Tauros),
+    SPECIES_PAL(MAGIKARP, gMonPalette_Magikarp),
+    SPECIES_PAL(GYARADOS, gMonPalette_Gyarados),
+    SPECIES_PAL(LAPRAS, gMonPalette_Lapras),
+    SPECIES_PAL(DITTO, gMonPalette_Ditto),
+    SPECIES_PAL(EEVEE, gMonPalette_Eevee),
+    SPECIES_PAL(VAPOREON, gMonPalette_Vaporeon),
+    SPECIES_PAL(JOLTEON, gMonPalette_Jolteon),
+    SPECIES_PAL(FLAREON, gMonPalette_Flareon),
+    SPECIES_PAL(PORYGON, gMonPalette_Porygon),
+    SPECIES_PAL(OMANYTE, gMonPalette_Omanyte),
+    SPECIES_PAL(OMASTAR, gMonPalette_Omastar),
+    SPECIES_PAL(KABUTO, gMonPalette_Kabuto),
+    SPECIES_PAL(KABUTOPS, gMonPalette_Kabutops),
+    SPECIES_PAL(AERODACTYL, gMonPalette_Aerodactyl),
+    SPECIES_PAL(SNORLAX, gMonPalette_Snorlax),
+    SPECIES_PAL(ARTICUNO, gMonPalette_Articuno),
+    SPECIES_PAL(ZAPDOS, gMonPalette_Zapdos),
+    SPECIES_PAL(MOLTRES, gMonPalette_Moltres),
+    SPECIES_PAL(DRATINI, gMonPalette_Dratini),
+    SPECIES_PAL(DRAGONAIR, gMonPalette_Dragonair),
+    SPECIES_PAL(DRAGONITE, gMonPalette_Dragonite),
+    SPECIES_PAL(MEWTWO, gMonPalette_Mewtwo),
+    SPECIES_PAL(MEW, gMonPalette_Mew),
+    SPECIES_PAL(CHIKORITA, gMonPalette_Chikorita),
+    SPECIES_PAL(BAYLEEF, gMonPalette_Bayleef),
+    SPECIES_PAL(MEGANIUM, gMonPalette_Meganium),
+    SPECIES_PAL(CYNDAQUIL, gMonPalette_Cyndaquil),
+    SPECIES_PAL(QUILAVA, gMonPalette_Quilava),
+    SPECIES_PAL(TYPHLOSION, gMonPalette_Typhlosion),
+    SPECIES_PAL(TOTODILE, gMonPalette_Totodile),
+    SPECIES_PAL(CROCONAW, gMonPalette_Croconaw),
+    SPECIES_PAL(FERALIGATR, gMonPalette_Feraligatr),
+    SPECIES_PAL(SENTRET, gMonPalette_Sentret),
+    SPECIES_PAL(FURRET, gMonPalette_Furret),
+    SPECIES_PAL(HOOTHOOT, gMonPalette_Hoothoot),
+    SPECIES_PAL(NOCTOWL, gMonPalette_Noctowl),
+    SPECIES_PAL(LEDYBA, gMonPalette_Ledyba),
+    SPECIES_PAL(LEDIAN, gMonPalette_Ledian),
+    SPECIES_PAL(SPINARAK, gMonPalette_Spinarak),
+    SPECIES_PAL(ARIADOS, gMonPalette_Ariados),
+    SPECIES_PAL(CROBAT, gMonPalette_Crobat),
+    SPECIES_PAL(CHINCHOU, gMonPalette_Chinchou),
+    SPECIES_PAL(LANTURN, gMonPalette_Lanturn),
+    SPECIES_PAL(PICHU, gMonPalette_Pichu),
+    SPECIES_PAL(CLEFFA, gMonPalette_Cleffa),
+    SPECIES_PAL(IGGLYBUFF, gMonPalette_Igglybuff),
+    SPECIES_PAL(TOGEPI, gMonPalette_Togepi),
+    SPECIES_PAL(TOGETIC, gMonPalette_Togetic),
+    SPECIES_PAL(NATU, gMonPalette_Natu),
+    SPECIES_PAL(XATU, gMonPalette_Xatu),
+    SPECIES_PAL(MAREEP, gMonPalette_Mareep),
+    SPECIES_PAL(FLAAFFY, gMonPalette_Flaaffy),
+    SPECIES_PAL(AMPHAROS, gMonPalette_Ampharos),
+    SPECIES_PAL(BELLOSSOM, gMonPalette_Bellossom),
+    SPECIES_PAL(MARILL, gMonPalette_Marill),
+    SPECIES_PAL(AZUMARILL, gMonPalette_Azumarill),
+    SPECIES_PAL(SUDOWOODO, gMonPalette_Sudowoodo),
+    SPECIES_PAL(POLITOED, gMonPalette_Politoed),
+    SPECIES_PAL(HOPPIP, gMonPalette_Hoppip),
+    SPECIES_PAL(SKIPLOOM, gMonPalette_Skiploom),
+    SPECIES_PAL(JUMPLUFF, gMonPalette_Jumpluff),
+    SPECIES_PAL(AIPOM, gMonPalette_Aipom),
+    SPECIES_PAL(SUNKERN, gMonPalette_Sunkern),
+    SPECIES_PAL(SUNFLORA, gMonPalette_Sunflora),
+    SPECIES_PAL(YANMA, gMonPalette_Yanma),
+    SPECIES_PAL(WOOPER, gMonPalette_Wooper),
+    SPECIES_PAL(QUAGSIRE, gMonPalette_Quagsire),
+    SPECIES_PAL(ESPEON, gMonPalette_Espeon),
+    SPECIES_PAL(UMBREON, gMonPalette_Umbreon),
+    SPECIES_PAL(MURKROW, gMonPalette_Murkrow),
+    SPECIES_PAL(SLOWKING, gMonPalette_Slowking),
+    SPECIES_PAL(MISDREAVUS, gMonPalette_Misdreavus),
+    SPECIES_PAL(UNOWN, gMonPalette_Unown),
+    SPECIES_PAL(WOBBUFFET, gMonPalette_Wobbuffet),
+    SPECIES_PAL(GIRAFARIG, gMonPalette_Girafarig),
+    SPECIES_PAL(PINECO, gMonPalette_Pineco),
+    SPECIES_PAL(FORRETRESS, gMonPalette_Forretress),
+    SPECIES_PAL(DUNSPARCE, gMonPalette_Dunsparce),
+    SPECIES_PAL(GLIGAR, gMonPalette_Gligar),
+    SPECIES_PAL(STEELIX, gMonPalette_Steelix),
+    SPECIES_PAL(SNUBBULL, gMonPalette_Snubbull),
+    SPECIES_PAL(GRANBULL, gMonPalette_Granbull),
+    SPECIES_PAL(QWILFISH, gMonPalette_Qwilfish),
+    SPECIES_PAL(SCIZOR, gMonPalette_Scizor),
+    SPECIES_PAL(SHUCKLE, gMonPalette_Shuckle),
+    SPECIES_PAL(HERACROSS, gMonPalette_Heracross),
+    SPECIES_PAL(SNEASEL, gMonPalette_Sneasel),
+    SPECIES_PAL(TEDDIURSA, gMonPalette_Teddiursa),
+    SPECIES_PAL(URSARING, gMonPalette_Ursaring),
+    SPECIES_PAL(SLUGMA, gMonPalette_Slugma),
+    SPECIES_PAL(MAGCARGO, gMonPalette_Magcargo),
+    SPECIES_PAL(SWINUB, gMonPalette_Swinub),
+    SPECIES_PAL(PILOSWINE, gMonPalette_Piloswine),
+    SPECIES_PAL(CORSOLA, gMonPalette_Corsola),
+    SPECIES_PAL(REMORAID, gMonPalette_Remoraid),
+    SPECIES_PAL(OCTILLERY, gMonPalette_Octillery),
+    SPECIES_PAL(DELIBIRD, gMonPalette_Delibird),
+    SPECIES_PAL(MANTINE, gMonPalette_Mantine),
+    SPECIES_PAL(SKARMORY, gMonPalette_Skarmory),
+    SPECIES_PAL(HOUNDOUR, gMonPalette_Houndour),
+    SPECIES_PAL(HOUNDOOM, gMonPalette_Houndoom),
+    SPECIES_PAL(KINGDRA, gMonPalette_Kingdra),
+    SPECIES_PAL(PHANPY, gMonPalette_Phanpy),
+    SPECIES_PAL(DONPHAN, gMonPalette_Donphan),
+    SPECIES_PAL(PORYGON2, gMonPalette_Porygon2),
+    SPECIES_PAL(STANTLER, gMonPalette_Stantler),
+    SPECIES_PAL(SMEARGLE, gMonPalette_Smeargle),
+    SPECIES_PAL(TYROGUE, gMonPalette_Tyrogue),
+    SPECIES_PAL(HITMONTOP, gMonPalette_Hitmontop),
+    SPECIES_PAL(SMOOCHUM, gMonPalette_Smoochum),
+    SPECIES_PAL(ELEKID, gMonPalette_Elekid),
+    SPECIES_PAL(MAGBY, gMonPalette_Magby),
+    SPECIES_PAL(MILTANK, gMonPalette_Miltank),
+    SPECIES_PAL(BLISSEY, gMonPalette_Blissey),
+    SPECIES_PAL(RAIKOU, gMonPalette_Raikou),
+    SPECIES_PAL(ENTEI, gMonPalette_Entei),
+    SPECIES_PAL(SUICUNE, gMonPalette_Suicune),
+    SPECIES_PAL(LARVITAR, gMonPalette_Larvitar),
+    SPECIES_PAL(PUPITAR, gMonPalette_Pupitar),
+    SPECIES_PAL(TYRANITAR, gMonPalette_Tyranitar),
+    SPECIES_PAL(LUGIA, gMonPalette_Lugia),
+    SPECIES_PAL(HO_OH, gMonPalette_HoOh),
+    SPECIES_PAL(CELEBI, gMonPalette_Celebi),
+    SPECIES_PAL(OLD_UNOWN_B, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_C, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_D, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_E, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_F, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_G, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_H, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_I, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_J, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_K, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_L, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_M, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_N, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_O, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_P, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_Q, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_R, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_S, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_T, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_U, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_V, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_W, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_X, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_Y, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(OLD_UNOWN_Z, gMonPalette_DoubleQuestionMark),
+    SPECIES_PAL(TREECKO, gMonPalette_Treecko),
+    SPECIES_PAL(GROVYLE, gMonPalette_Grovyle),
+    SPECIES_PAL(SCEPTILE, gMonPalette_Sceptile),
+    SPECIES_PAL(TORCHIC, gMonPalette_Torchic),
+    SPECIES_PAL(COMBUSKEN, gMonPalette_Combusken),
+    SPECIES_PAL(BLAZIKEN, gMonPalette_Blaziken),
+    SPECIES_PAL(MUDKIP, gMonPalette_Mudkip),
+    SPECIES_PAL(MARSHTOMP, gMonPalette_Marshtomp),
+    SPECIES_PAL(SWAMPERT, gMonPalette_Swampert),
+    SPECIES_PAL(POOCHYENA, gMonPalette_Poochyena),
+    SPECIES_PAL(MIGHTYENA, gMonPalette_Mightyena),
+    SPECIES_PAL(ZIGZAGOON, gMonPalette_Zigzagoon),
+    SPECIES_PAL(LINOONE, gMonPalette_Linoone),
+    SPECIES_PAL(WURMPLE, gMonPalette_Wurmple),
+    SPECIES_PAL(SILCOON, gMonPalette_Silcoon),
+    SPECIES_PAL(BEAUTIFLY, gMonPalette_Beautifly),
+    SPECIES_PAL(CASCOON, gMonPalette_Cascoon),
+    SPECIES_PAL(DUSTOX, gMonPalette_Dustox),
+    SPECIES_PAL(LOTAD, gMonPalette_Lotad),
+    SPECIES_PAL(LOMBRE, gMonPalette_Lombre),
+    SPECIES_PAL(LUDICOLO, gMonPalette_Ludicolo),
+    SPECIES_PAL(SEEDOT, gMonPalette_Seedot),
+    SPECIES_PAL(NUZLEAF, gMonPalette_Nuzleaf),
+    SPECIES_PAL(SHIFTRY, gMonPalette_Shiftry),
+    SPECIES_PAL(NINCADA, gMonPalette_Nincada),
+    SPECIES_PAL(NINJASK, gMonPalette_Ninjask),
+    SPECIES_PAL(SHEDINJA, gMonPalette_Shedinja),
+    SPECIES_PAL(TAILLOW, gMonPalette_Taillow),
+    SPECIES_PAL(SWELLOW, gMonPalette_Swellow),
+    SPECIES_PAL(SHROOMISH, gMonPalette_Shroomish),
+    SPECIES_PAL(BRELOOM, gMonPalette_Breloom),
+    SPECIES_PAL(SPINDA, gMonPalette_Spinda),
+    SPECIES_PAL(WINGULL, gMonPalette_Wingull),
+    SPECIES_PAL(PELIPPER, gMonPalette_Pelipper),
+    SPECIES_PAL(SURSKIT, gMonPalette_Surskit),
+    SPECIES_PAL(MASQUERAIN, gMonPalette_Masquerain),
+    SPECIES_PAL(WAILMER, gMonPalette_Wailmer),
+    SPECIES_PAL(WAILORD, gMonPalette_Wailord),
+    SPECIES_PAL(SKITTY, gMonPalette_Skitty),
+    SPECIES_PAL(DELCATTY, gMonPalette_Delcatty),
+    SPECIES_PAL(KECLEON, gMonPalette_Kecleon),
+    SPECIES_PAL(BALTOY, gMonPalette_Baltoy),
+    SPECIES_PAL(CLAYDOL, gMonPalette_Claydol),
+    SPECIES_PAL(NOSEPASS, gMonPalette_Nosepass),
+    SPECIES_PAL(TORKOAL, gMonPalette_Torkoal),
+    SPECIES_PAL(SABLEYE, gMonPalette_Sableye),
+    SPECIES_PAL(BARBOACH, gMonPalette_Barboach),
+    SPECIES_PAL(WHISCASH, gMonPalette_Whiscash),
+    SPECIES_PAL(LUVDISC, gMonPalette_Luvdisc),
+    SPECIES_PAL(CORPHISH, gMonPalette_Corphish),
+    SPECIES_PAL(CRAWDAUNT, gMonPalette_Crawdaunt),
+    SPECIES_PAL(FEEBAS, gMonPalette_Feebas),
+    SPECIES_PAL(MILOTIC, gMonPalette_Milotic),
+    SPECIES_PAL(CARVANHA, gMonPalette_Carvanha),
+    SPECIES_PAL(SHARPEDO, gMonPalette_Sharpedo),
+    SPECIES_PAL(TRAPINCH, gMonPalette_Trapinch),
+    SPECIES_PAL(VIBRAVA, gMonPalette_Vibrava),
+    SPECIES_PAL(FLYGON, gMonPalette_Flygon),
+    SPECIES_PAL(MAKUHITA, gMonPalette_Makuhita),
+    SPECIES_PAL(HARIYAMA, gMonPalette_Hariyama),
+    SPECIES_PAL(ELECTRIKE, gMonPalette_Electrike),
+    SPECIES_PAL(MANECTRIC, gMonPalette_Manectric),
+    SPECIES_PAL(NUMEL, gMonPalette_Numel),
+    SPECIES_PAL(CAMERUPT, gMonPalette_Camerupt),
+    SPECIES_PAL(SPHEAL, gMonPalette_Spheal),
+    SPECIES_PAL(SEALEO, gMonPalette_Sealeo),
+    SPECIES_PAL(WALREIN, gMonPalette_Walrein),
+    SPECIES_PAL(CACNEA, gMonPalette_Cacnea),
+    SPECIES_PAL(CACTURNE, gMonPalette_Cacturne),
+    SPECIES_PAL(SNORUNT, gMonPalette_Snorunt),
+    SPECIES_PAL(GLALIE, gMonPalette_Glalie),
+    SPECIES_PAL(LUNATONE, gMonPalette_Lunatone),
+    SPECIES_PAL(SOLROCK, gMonPalette_Solrock),
+    SPECIES_PAL(AZURILL, gMonPalette_Azurill),
+    SPECIES_PAL(SPOINK, gMonPalette_Spoink),
+    SPECIES_PAL(GRUMPIG, gMonPalette_Grumpig),
+    SPECIES_PAL(PLUSLE, gMonPalette_Plusle),
+    SPECIES_PAL(MINUN, gMonPalette_Minun),
+    SPECIES_PAL(MAWILE, gMonPalette_Mawile),
+    SPECIES_PAL(MEDITITE, gMonPalette_Meditite),
+    SPECIES_PAL(MEDICHAM, gMonPalette_Medicham),
+    SPECIES_PAL(SWABLU, gMonPalette_Swablu),
+    SPECIES_PAL(ALTARIA, gMonPalette_Altaria),
+    SPECIES_PAL(WYNAUT, gMonPalette_Wynaut),
+    SPECIES_PAL(DUSKULL, gMonPalette_Duskull),
+    SPECIES_PAL(DUSCLOPS, gMonPalette_Dusclops),
+    SPECIES_PAL(ROSELIA, gMonPalette_Roselia),
+    SPECIES_PAL(SLAKOTH, gMonPalette_Slakoth),
+    SPECIES_PAL(VIGOROTH, gMonPalette_Vigoroth),
+    SPECIES_PAL(SLAKING, gMonPalette_Slaking),
+    SPECIES_PAL(GULPIN, gMonPalette_Gulpin),
+    SPECIES_PAL(SWALOT, gMonPalette_Swalot),
+    SPECIES_PAL(TROPIUS, gMonPalette_Tropius),
+    SPECIES_PAL(WHISMUR, gMonPalette_Whismur),
+    SPECIES_PAL(LOUDRED, gMonPalette_Loudred),
+    SPECIES_PAL(EXPLOUD, gMonPalette_Exploud),
+    SPECIES_PAL(CLAMPERL, gMonPalette_Clamperl),
+    SPECIES_PAL(HUNTAIL, gMonPalette_Huntail),
+    SPECIES_PAL(GOREBYSS, gMonPalette_Gorebyss),
+    SPECIES_PAL(ABSOL, gMonPalette_Absol),
+    SPECIES_PAL(SHUPPET, gMonPalette_Shuppet),
+    SPECIES_PAL(BANETTE, gMonPalette_Banette),
+    SPECIES_PAL(SEVIPER, gMonPalette_Seviper),
+    SPECIES_PAL(ZANGOOSE, gMonPalette_Zangoose),
+    SPECIES_PAL(RELICANTH, gMonPalette_Relicanth),
+    SPECIES_PAL(ARON, gMonPalette_Aron),
+    SPECIES_PAL(LAIRON, gMonPalette_Lairon),
+    SPECIES_PAL(AGGRON, gMonPalette_Aggron),
+    SPECIES_PAL(CASTFORM, gMonPalette_Castform),
+    SPECIES_PAL(VOLBEAT, gMonPalette_Volbeat),
+    SPECIES_PAL(ILLUMISE, gMonPalette_Illumise),
+    SPECIES_PAL(LILEEP, gMonPalette_Lileep),
+    SPECIES_PAL(CRADILY, gMonPalette_Cradily),
+    SPECIES_PAL(ANORITH, gMonPalette_Anorith),
+    SPECIES_PAL(ARMALDO, gMonPalette_Armaldo),
+    SPECIES_PAL(RALTS, gMonPalette_Ralts),
+    SPECIES_PAL(KIRLIA, gMonPalette_Kirlia),
+    SPECIES_PAL(GARDEVOIR, gMonPalette_Gardevoir),
+    SPECIES_PAL(BAGON, gMonPalette_Bagon),
+    SPECIES_PAL(SHELGON, gMonPalette_Shelgon),
+    SPECIES_PAL(SALAMENCE, gMonPalette_Salamence),
+    SPECIES_PAL(BELDUM, gMonPalette_Beldum),
+    SPECIES_PAL(METANG, gMonPalette_Metang),
+    SPECIES_PAL(METAGROSS, gMonPalette_Metagross),
+    SPECIES_PAL(REGIROCK, gMonPalette_Regirock),
+    SPECIES_PAL(REGICE, gMonPalette_Regice),
+    SPECIES_PAL(REGISTEEL, gMonPalette_Registeel),
+    SPECIES_PAL(KYOGRE, gMonPalette_Kyogre),
+    SPECIES_PAL(GROUDON, gMonPalette_Groudon),
+    SPECIES_PAL(RAYQUAZA, gMonPalette_Rayquaza),
+    SPECIES_PAL(LATIAS, gMonPalette_Latias),
+    SPECIES_PAL(LATIOS, gMonPalette_Latios),
+    SPECIES_PAL(JIRACHI, gMonPalette_Jirachi),
+    SPECIES_PAL(DEOXYS, gMonPalette_Deoxys),
+    SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho),
+    SPECIES_PAL(EGG, gMonPalette_Egg),
+    SPECIES_PAL(UNOWN_B, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_C, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_D, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_E, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_F, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_G, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_H, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_I, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_J, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_K, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_L, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_M, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_N, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_O, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_P, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_Q, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_R, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_S, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_T, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_U, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_V, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_W, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_X, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_Y, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_Z, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_EMARK, gMonPalette_Unown),
+    SPECIES_PAL(UNOWN_QMARK, gMonPalette_Unown),
 };
diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h
index 0c3f990cf..8b1cfcaac 100644
--- a/src/data/pokemon_graphics/shiny_palette_table.h
+++ b/src/data/pokemon_graphics/shiny_palette_table.h
@@ -1,443 +1,443 @@
 const struct CompressedSpritePalette gMonShinyPaletteTable[] =
 {
-    [SPECIES_NONE] = {gMonShinyPalette_CircledQuestionMark, SPECIES_NONE + 500},
-    [SPECIES_BULBASAUR] = {gMonShinyPalette_Bulbasaur, SPECIES_BULBASAUR + 500},
-    [SPECIES_IVYSAUR] = {gMonShinyPalette_Ivysaur, SPECIES_IVYSAUR + 500},
-    [SPECIES_VENUSAUR] = {gMonShinyPalette_Venusaur, SPECIES_VENUSAUR + 500},
-    [SPECIES_CHARMANDER] = {gMonShinyPalette_Charmander, SPECIES_CHARMANDER + 500},
-    [SPECIES_CHARMELEON] = {gMonShinyPalette_Charmeleon, SPECIES_CHARMELEON + 500},
-    [SPECIES_CHARIZARD] = {gMonShinyPalette_Charizard, SPECIES_CHARIZARD + 500},
-    [SPECIES_SQUIRTLE] = {gMonShinyPalette_Squirtle, SPECIES_SQUIRTLE + 500},
-    [SPECIES_WARTORTLE] = {gMonShinyPalette_Wartortle, SPECIES_WARTORTLE + 500},
-    [SPECIES_BLASTOISE] = {gMonShinyPalette_Blastoise, SPECIES_BLASTOISE + 500},
-    [SPECIES_CATERPIE] = {gMonShinyPalette_Caterpie, SPECIES_CATERPIE + 500},
-    [SPECIES_METAPOD] = {gMonShinyPalette_Metapod, SPECIES_METAPOD + 500},
-    [SPECIES_BUTTERFREE] = {gMonShinyPalette_Butterfree, SPECIES_BUTTERFREE + 500},
-    [SPECIES_WEEDLE] = {gMonShinyPalette_Weedle, SPECIES_WEEDLE + 500},
-    [SPECIES_KAKUNA] = {gMonShinyPalette_Kakuna, SPECIES_KAKUNA + 500},
-    [SPECIES_BEEDRILL] = {gMonShinyPalette_Beedrill, SPECIES_BEEDRILL + 500},
-    [SPECIES_PIDGEY] = {gMonShinyPalette_Pidgey, SPECIES_PIDGEY + 500},
-    [SPECIES_PIDGEOTTO] = {gMonShinyPalette_Pidgeotto, SPECIES_PIDGEOTTO + 500},
-    [SPECIES_PIDGEOT] = {gMonShinyPalette_Pidgeot, SPECIES_PIDGEOT + 500},
-    [SPECIES_RATTATA] = {gMonShinyPalette_Rattata, SPECIES_RATTATA + 500},
-    [SPECIES_RATICATE] = {gMonShinyPalette_Raticate, SPECIES_RATICATE + 500},
-    [SPECIES_SPEAROW] = {gMonShinyPalette_Spearow, SPECIES_SPEAROW + 500},
-    [SPECIES_FEAROW] = {gMonShinyPalette_Fearow, SPECIES_FEAROW + 500},
-    [SPECIES_EKANS] = {gMonShinyPalette_Ekans, SPECIES_EKANS + 500},
-    [SPECIES_ARBOK] = {gMonShinyPalette_Arbok, SPECIES_ARBOK + 500},
-    [SPECIES_PIKACHU] = {gMonShinyPalette_Pikachu, SPECIES_PIKACHU + 500},
-    [SPECIES_RAICHU] = {gMonShinyPalette_Raichu, SPECIES_RAICHU + 500},
-    [SPECIES_SANDSHREW] = {gMonShinyPalette_Sandshrew, SPECIES_SANDSHREW + 500},
-    [SPECIES_SANDSLASH] = {gMonShinyPalette_Sandslash, SPECIES_SANDSLASH + 500},
-    [SPECIES_NIDORAN_F] = {gMonShinyPalette_NidoranF, SPECIES_NIDORAN_F + 500},
-    [SPECIES_NIDORINA] = {gMonShinyPalette_Nidorina, SPECIES_NIDORINA + 500},
-    [SPECIES_NIDOQUEEN] = {gMonShinyPalette_Nidoqueen, SPECIES_NIDOQUEEN + 500},
-    [SPECIES_NIDORAN_M] = {gMonShinyPalette_NidoranM, SPECIES_NIDORAN_M + 500},
-    [SPECIES_NIDORINO] = {gMonShinyPalette_Nidorino, SPECIES_NIDORINO + 500},
-    [SPECIES_NIDOKING] = {gMonShinyPalette_Nidoking, SPECIES_NIDOKING + 500},
-    [SPECIES_CLEFAIRY] = {gMonShinyPalette_Clefairy, SPECIES_CLEFAIRY + 500},
-    [SPECIES_CLEFABLE] = {gMonShinyPalette_Clefable, SPECIES_CLEFABLE + 500},
-    [SPECIES_VULPIX] = {gMonShinyPalette_Vulpix, SPECIES_VULPIX + 500},
-    [SPECIES_NINETALES] = {gMonShinyPalette_Ninetales, SPECIES_NINETALES + 500},
-    [SPECIES_JIGGLYPUFF] = {gMonShinyPalette_Jigglypuff, SPECIES_JIGGLYPUFF + 500},
-    [SPECIES_WIGGLYTUFF] = {gMonShinyPalette_Wigglytuff, SPECIES_WIGGLYTUFF + 500},
-    [SPECIES_ZUBAT] = {gMonShinyPalette_Zubat, SPECIES_ZUBAT + 500},
-    [SPECIES_GOLBAT] = {gMonShinyPalette_Golbat, SPECIES_GOLBAT + 500},
-    [SPECIES_ODDISH] = {gMonShinyPalette_Oddish, SPECIES_ODDISH + 500},
-    [SPECIES_GLOOM] = {gMonShinyPalette_Gloom, SPECIES_GLOOM + 500},
-    [SPECIES_VILEPLUME] = {gMonShinyPalette_Vileplume, SPECIES_VILEPLUME + 500},
-    [SPECIES_PARAS] = {gMonShinyPalette_Paras, SPECIES_PARAS + 500},
-    [SPECIES_PARASECT] = {gMonShinyPalette_Parasect, SPECIES_PARASECT + 500},
-    [SPECIES_VENONAT] = {gMonShinyPalette_Venonat, SPECIES_VENONAT + 500},
-    [SPECIES_VENOMOTH] = {gMonShinyPalette_Venomoth, SPECIES_VENOMOTH + 500},
-    [SPECIES_DIGLETT] = {gMonShinyPalette_Diglett, SPECIES_DIGLETT + 500},
-    [SPECIES_DUGTRIO] = {gMonShinyPalette_Dugtrio, SPECIES_DUGTRIO + 500},
-    [SPECIES_MEOWTH] = {gMonShinyPalette_Meowth, SPECIES_MEOWTH + 500},
-    [SPECIES_PERSIAN] = {gMonShinyPalette_Persian, SPECIES_PERSIAN + 500},
-    [SPECIES_PSYDUCK] = {gMonShinyPalette_Psyduck, SPECIES_PSYDUCK + 500},
-    [SPECIES_GOLDUCK] = {gMonShinyPalette_Golduck, SPECIES_GOLDUCK + 500},
-    [SPECIES_MANKEY] = {gMonShinyPalette_Mankey, SPECIES_MANKEY + 500},
-    [SPECIES_PRIMEAPE] = {gMonShinyPalette_Primeape, SPECIES_PRIMEAPE + 500},
-    [SPECIES_GROWLITHE] = {gMonShinyPalette_Growlithe, SPECIES_GROWLITHE + 500},
-    [SPECIES_ARCANINE] = {gMonShinyPalette_Arcanine, SPECIES_ARCANINE + 500},
-    [SPECIES_POLIWAG] = {gMonShinyPalette_Poliwag, SPECIES_POLIWAG + 500},
-    [SPECIES_POLIWHIRL] = {gMonShinyPalette_Poliwhirl, SPECIES_POLIWHIRL + 500},
-    [SPECIES_POLIWRATH] = {gMonShinyPalette_Poliwrath, SPECIES_POLIWRATH + 500},
-    [SPECIES_ABRA] = {gMonShinyPalette_Abra, SPECIES_ABRA + 500},
-    [SPECIES_KADABRA] = {gMonShinyPalette_Kadabra, SPECIES_KADABRA + 500},
-    [SPECIES_ALAKAZAM] = {gMonShinyPalette_Alakazam, SPECIES_ALAKAZAM + 500},
-    [SPECIES_MACHOP] = {gMonShinyPalette_Machop, SPECIES_MACHOP + 500},
-    [SPECIES_MACHOKE] = {gMonShinyPalette_Machoke, SPECIES_MACHOKE + 500},
-    [SPECIES_MACHAMP] = {gMonShinyPalette_Machamp, SPECIES_MACHAMP + 500},
-    [SPECIES_BELLSPROUT] = {gMonShinyPalette_Bellsprout, SPECIES_BELLSPROUT + 500},
-    [SPECIES_WEEPINBELL] = {gMonShinyPalette_Weepinbell, SPECIES_WEEPINBELL + 500},
-    [SPECIES_VICTREEBEL] = {gMonShinyPalette_Victreebel, SPECIES_VICTREEBEL + 500},
-    [SPECIES_TENTACOOL] = {gMonShinyPalette_Tentacool, SPECIES_TENTACOOL + 500},
-    [SPECIES_TENTACRUEL] = {gMonShinyPalette_Tentacruel, SPECIES_TENTACRUEL + 500},
-    [SPECIES_GEODUDE] = {gMonShinyPalette_Geodude, SPECIES_GEODUDE + 500},
-    [SPECIES_GRAVELER] = {gMonShinyPalette_Graveler, SPECIES_GRAVELER + 500},
-    [SPECIES_GOLEM] = {gMonShinyPalette_Golem, SPECIES_GOLEM + 500},
-    [SPECIES_PONYTA] = {gMonShinyPalette_Ponyta, SPECIES_PONYTA + 500},
-    [SPECIES_RAPIDASH] = {gMonShinyPalette_Rapidash, SPECIES_RAPIDASH + 500},
-    [SPECIES_SLOWPOKE] = {gMonShinyPalette_Slowpoke, SPECIES_SLOWPOKE + 500},
-    [SPECIES_SLOWBRO] = {gMonShinyPalette_Slowbro, SPECIES_SLOWBRO + 500},
-    [SPECIES_MAGNEMITE] = {gMonShinyPalette_Magnemite, SPECIES_MAGNEMITE + 500},
-    [SPECIES_MAGNETON] = {gMonShinyPalette_Magneton, SPECIES_MAGNETON + 500},
-    [SPECIES_FARFETCHD] = {gMonShinyPalette_Farfetchd, SPECIES_FARFETCHD + 500},
-    [SPECIES_DODUO] = {gMonShinyPalette_Doduo, SPECIES_DODUO + 500},
-    [SPECIES_DODRIO] = {gMonShinyPalette_Dodrio, SPECIES_DODRIO + 500},
-    [SPECIES_SEEL] = {gMonShinyPalette_Seel, SPECIES_SEEL + 500},
-    [SPECIES_DEWGONG] = {gMonShinyPalette_Dewgong, SPECIES_DEWGONG + 500},
-    [SPECIES_GRIMER] = {gMonShinyPalette_Grimer, SPECIES_GRIMER + 500},
-    [SPECIES_MUK] = {gMonShinyPalette_Muk, SPECIES_MUK + 500},
-    [SPECIES_SHELLDER] = {gMonShinyPalette_Shellder, SPECIES_SHELLDER + 500},
-    [SPECIES_CLOYSTER] = {gMonShinyPalette_Cloyster, SPECIES_CLOYSTER + 500},
-    [SPECIES_GASTLY] = {gMonShinyPalette_Gastly, SPECIES_GASTLY + 500},
-    [SPECIES_HAUNTER] = {gMonShinyPalette_Haunter, SPECIES_HAUNTER + 500},
-    [SPECIES_GENGAR] = {gMonShinyPalette_Gengar, SPECIES_GENGAR + 500},
-    [SPECIES_ONIX] = {gMonShinyPalette_Onix, SPECIES_ONIX + 500},
-    [SPECIES_DROWZEE] = {gMonShinyPalette_Drowzee, SPECIES_DROWZEE + 500},
-    [SPECIES_HYPNO] = {gMonShinyPalette_Hypno, SPECIES_HYPNO + 500},
-    [SPECIES_KRABBY] = {gMonShinyPalette_Krabby, SPECIES_KRABBY + 500},
-    [SPECIES_KINGLER] = {gMonShinyPalette_Kingler, SPECIES_KINGLER + 500},
-    [SPECIES_VOLTORB] = {gMonShinyPalette_Voltorb, SPECIES_VOLTORB + 500},
-    [SPECIES_ELECTRODE] = {gMonShinyPalette_Electrode, SPECIES_ELECTRODE + 500},
-    [SPECIES_EXEGGCUTE] = {gMonShinyPalette_Exeggcute, SPECIES_EXEGGCUTE + 500},
-    [SPECIES_EXEGGUTOR] = {gMonShinyPalette_Exeggutor, SPECIES_EXEGGUTOR + 500},
-    [SPECIES_CUBONE] = {gMonShinyPalette_Cubone, SPECIES_CUBONE + 500},
-    [SPECIES_MAROWAK] = {gMonShinyPalette_Marowak, SPECIES_MAROWAK + 500},
-    [SPECIES_HITMONLEE] = {gMonShinyPalette_Hitmonlee, SPECIES_HITMONLEE + 500},
-    [SPECIES_HITMONCHAN] = {gMonShinyPalette_Hitmonchan, SPECIES_HITMONCHAN + 500},
-    [SPECIES_LICKITUNG] = {gMonShinyPalette_Lickitung, SPECIES_LICKITUNG + 500},
-    [SPECIES_KOFFING] = {gMonShinyPalette_Koffing, SPECIES_KOFFING + 500},
-    [SPECIES_WEEZING] = {gMonShinyPalette_Weezing, SPECIES_WEEZING + 500},
-    [SPECIES_RHYHORN] = {gMonShinyPalette_Rhyhorn, SPECIES_RHYHORN + 500},
-    [SPECIES_RHYDON] = {gMonShinyPalette_Rhydon, SPECIES_RHYDON + 500},
-    [SPECIES_CHANSEY] = {gMonShinyPalette_Chansey, SPECIES_CHANSEY + 500},
-    [SPECIES_TANGELA] = {gMonShinyPalette_Tangela, SPECIES_TANGELA + 500},
-    [SPECIES_KANGASKHAN] = {gMonShinyPalette_Kangaskhan, SPECIES_KANGASKHAN + 500},
-    [SPECIES_HORSEA] = {gMonShinyPalette_Horsea, SPECIES_HORSEA + 500},
-    [SPECIES_SEADRA] = {gMonShinyPalette_Seadra, SPECIES_SEADRA + 500},
-    [SPECIES_GOLDEEN] = {gMonShinyPalette_Goldeen, SPECIES_GOLDEEN + 500},
-    [SPECIES_SEAKING] = {gMonShinyPalette_Seaking, SPECIES_SEAKING + 500},
-    [SPECIES_STARYU] = {gMonShinyPalette_Staryu, SPECIES_STARYU + 500},
-    [SPECIES_STARMIE] = {gMonShinyPalette_Starmie, SPECIES_STARMIE + 500},
-    [SPECIES_MR_MIME] = {gMonShinyPalette_Mrmime, SPECIES_MR_MIME + 500},
-    [SPECIES_SCYTHER] = {gMonShinyPalette_Scyther, SPECIES_SCYTHER + 500},
-    [SPECIES_JYNX] = {gMonShinyPalette_Jynx, SPECIES_JYNX + 500},
-    [SPECIES_ELECTABUZZ] = {gMonShinyPalette_Electabuzz, SPECIES_ELECTABUZZ + 500},
-    [SPECIES_MAGMAR] = {gMonShinyPalette_Magmar, SPECIES_MAGMAR + 500},
-    [SPECIES_PINSIR] = {gMonShinyPalette_Pinsir, SPECIES_PINSIR + 500},
-    [SPECIES_TAUROS] = {gMonShinyPalette_Tauros, SPECIES_TAUROS + 500},
-    [SPECIES_MAGIKARP] = {gMonShinyPalette_Magikarp, SPECIES_MAGIKARP + 500},
-    [SPECIES_GYARADOS] = {gMonShinyPalette_Gyarados, SPECIES_GYARADOS + 500},
-    [SPECIES_LAPRAS] = {gMonShinyPalette_Lapras, SPECIES_LAPRAS + 500},
-    [SPECIES_DITTO] = {gMonShinyPalette_Ditto, SPECIES_DITTO + 500},
-    [SPECIES_EEVEE] = {gMonShinyPalette_Eevee, SPECIES_EEVEE + 500},
-    [SPECIES_VAPOREON] = {gMonShinyPalette_Vaporeon, SPECIES_VAPOREON + 500},
-    [SPECIES_JOLTEON] = {gMonShinyPalette_Jolteon, SPECIES_JOLTEON + 500},
-    [SPECIES_FLAREON] = {gMonShinyPalette_Flareon, SPECIES_FLAREON + 500},
-    [SPECIES_PORYGON] = {gMonShinyPalette_Porygon, SPECIES_PORYGON + 500},
-    [SPECIES_OMANYTE] = {gMonShinyPalette_Omanyte, SPECIES_OMANYTE + 500},
-    [SPECIES_OMASTAR] = {gMonShinyPalette_Omastar, SPECIES_OMASTAR + 500},
-    [SPECIES_KABUTO] = {gMonShinyPalette_Kabuto, SPECIES_KABUTO + 500},
-    [SPECIES_KABUTOPS] = {gMonShinyPalette_Kabutops, SPECIES_KABUTOPS + 500},
-    [SPECIES_AERODACTYL] = {gMonShinyPalette_Aerodactyl, SPECIES_AERODACTYL + 500},
-    [SPECIES_SNORLAX] = {gMonShinyPalette_Snorlax, SPECIES_SNORLAX + 500},
-    [SPECIES_ARTICUNO] = {gMonShinyPalette_Articuno, SPECIES_ARTICUNO + 500},
-    [SPECIES_ZAPDOS] = {gMonShinyPalette_Zapdos, SPECIES_ZAPDOS + 500},
-    [SPECIES_MOLTRES] = {gMonShinyPalette_Moltres, SPECIES_MOLTRES + 500},
-    [SPECIES_DRATINI] = {gMonShinyPalette_Dratini, SPECIES_DRATINI + 500},
-    [SPECIES_DRAGONAIR] = {gMonShinyPalette_Dragonair, SPECIES_DRAGONAIR + 500},
-    [SPECIES_DRAGONITE] = {gMonShinyPalette_Dragonite, SPECIES_DRAGONITE + 500},
-    [SPECIES_MEWTWO] = {gMonShinyPalette_Mewtwo, SPECIES_MEWTWO + 500},
-    [SPECIES_MEW] = {gMonShinyPalette_Mew, SPECIES_MEW + 500},
-    [SPECIES_CHIKORITA] = {gMonShinyPalette_Chikorita, SPECIES_CHIKORITA + 500},
-    [SPECIES_BAYLEEF] = {gMonShinyPalette_Bayleef, SPECIES_BAYLEEF + 500},
-    [SPECIES_MEGANIUM] = {gMonShinyPalette_Meganium, SPECIES_MEGANIUM + 500},
-    [SPECIES_CYNDAQUIL] = {gMonShinyPalette_Cyndaquil, SPECIES_CYNDAQUIL + 500},
-    [SPECIES_QUILAVA] = {gMonShinyPalette_Quilava, SPECIES_QUILAVA + 500},
-    [SPECIES_TYPHLOSION] = {gMonShinyPalette_Typhlosion, SPECIES_TYPHLOSION + 500},
-    [SPECIES_TOTODILE] = {gMonShinyPalette_Totodile, SPECIES_TOTODILE + 500},
-    [SPECIES_CROCONAW] = {gMonShinyPalette_Croconaw, SPECIES_CROCONAW + 500},
-    [SPECIES_FERALIGATR] = {gMonShinyPalette_Feraligatr, SPECIES_FERALIGATR + 500},
-    [SPECIES_SENTRET] = {gMonShinyPalette_Sentret, SPECIES_SENTRET + 500},
-    [SPECIES_FURRET] = {gMonShinyPalette_Furret, SPECIES_FURRET + 500},
-    [SPECIES_HOOTHOOT] = {gMonShinyPalette_Hoothoot, SPECIES_HOOTHOOT + 500},
-    [SPECIES_NOCTOWL] = {gMonShinyPalette_Noctowl, SPECIES_NOCTOWL + 500},
-    [SPECIES_LEDYBA] = {gMonShinyPalette_Ledyba, SPECIES_LEDYBA + 500},
-    [SPECIES_LEDIAN] = {gMonShinyPalette_Ledian, SPECIES_LEDIAN + 500},
-    [SPECIES_SPINARAK] = {gMonShinyPalette_Spinarak, SPECIES_SPINARAK + 500},
-    [SPECIES_ARIADOS] = {gMonShinyPalette_Ariados, SPECIES_ARIADOS + 500},
-    [SPECIES_CROBAT] = {gMonShinyPalette_Crobat, SPECIES_CROBAT + 500},
-    [SPECIES_CHINCHOU] = {gMonShinyPalette_Chinchou, SPECIES_CHINCHOU + 500},
-    [SPECIES_LANTURN] = {gMonShinyPalette_Lanturn, SPECIES_LANTURN + 500},
-    [SPECIES_PICHU] = {gMonShinyPalette_Pichu, SPECIES_PICHU + 500},
-    [SPECIES_CLEFFA] = {gMonShinyPalette_Cleffa, SPECIES_CLEFFA + 500},
-    [SPECIES_IGGLYBUFF] = {gMonShinyPalette_Igglybuff, SPECIES_IGGLYBUFF + 500},
-    [SPECIES_TOGEPI] = {gMonShinyPalette_Togepi, SPECIES_TOGEPI + 500},
-    [SPECIES_TOGETIC] = {gMonShinyPalette_Togetic, SPECIES_TOGETIC + 500},
-    [SPECIES_NATU] = {gMonShinyPalette_Natu, SPECIES_NATU + 500},
-    [SPECIES_XATU] = {gMonShinyPalette_Xatu, SPECIES_XATU + 500},
-    [SPECIES_MAREEP] = {gMonShinyPalette_Mareep, SPECIES_MAREEP + 500},
-    [SPECIES_FLAAFFY] = {gMonShinyPalette_Flaaffy, SPECIES_FLAAFFY + 500},
-    [SPECIES_AMPHAROS] = {gMonShinyPalette_Ampharos, SPECIES_AMPHAROS + 500},
-    [SPECIES_BELLOSSOM] = {gMonShinyPalette_Bellossom, SPECIES_BELLOSSOM + 500},
-    [SPECIES_MARILL] = {gMonShinyPalette_Marill, SPECIES_MARILL + 500},
-    [SPECIES_AZUMARILL] = {gMonShinyPalette_Azumarill, SPECIES_AZUMARILL + 500},
-    [SPECIES_SUDOWOODO] = {gMonShinyPalette_Sudowoodo, SPECIES_SUDOWOODO + 500},
-    [SPECIES_POLITOED] = {gMonShinyPalette_Politoed, SPECIES_POLITOED + 500},
-    [SPECIES_HOPPIP] = {gMonShinyPalette_Hoppip, SPECIES_HOPPIP + 500},
-    [SPECIES_SKIPLOOM] = {gMonShinyPalette_Skiploom, SPECIES_SKIPLOOM + 500},
-    [SPECIES_JUMPLUFF] = {gMonShinyPalette_Jumpluff, SPECIES_JUMPLUFF + 500},
-    [SPECIES_AIPOM] = {gMonShinyPalette_Aipom, SPECIES_AIPOM + 500},
-    [SPECIES_SUNKERN] = {gMonShinyPalette_Sunkern, SPECIES_SUNKERN + 500},
-    [SPECIES_SUNFLORA] = {gMonShinyPalette_Sunflora, SPECIES_SUNFLORA + 500},
-    [SPECIES_YANMA] = {gMonShinyPalette_Yanma, SPECIES_YANMA + 500},
-    [SPECIES_WOOPER] = {gMonShinyPalette_Wooper, SPECIES_WOOPER + 500},
-    [SPECIES_QUAGSIRE] = {gMonShinyPalette_Quagsire, SPECIES_QUAGSIRE + 500},
-    [SPECIES_ESPEON] = {gMonShinyPalette_Espeon, SPECIES_ESPEON + 500},
-    [SPECIES_UMBREON] = {gMonShinyPalette_Umbreon, SPECIES_UMBREON + 500},
-    [SPECIES_MURKROW] = {gMonShinyPalette_Murkrow, SPECIES_MURKROW + 500},
-    [SPECIES_SLOWKING] = {gMonShinyPalette_Slowking, SPECIES_SLOWKING + 500},
-    [SPECIES_MISDREAVUS] = {gMonShinyPalette_Misdreavus, SPECIES_MISDREAVUS + 500},
-    [SPECIES_UNOWN] = {gMonShinyPalette_Unown, SPECIES_UNOWN + 500},
-    [SPECIES_WOBBUFFET] = {gMonShinyPalette_Wobbuffet, SPECIES_WOBBUFFET + 500},
-    [SPECIES_GIRAFARIG] = {gMonShinyPalette_Girafarig, SPECIES_GIRAFARIG + 500},
-    [SPECIES_PINECO] = {gMonShinyPalette_Pineco, SPECIES_PINECO + 500},
-    [SPECIES_FORRETRESS] = {gMonShinyPalette_Forretress, SPECIES_FORRETRESS + 500},
-    [SPECIES_DUNSPARCE] = {gMonShinyPalette_Dunsparce, SPECIES_DUNSPARCE + 500},
-    [SPECIES_GLIGAR] = {gMonShinyPalette_Gligar, SPECIES_GLIGAR + 500},
-    [SPECIES_STEELIX] = {gMonShinyPalette_Steelix, SPECIES_STEELIX + 500},
-    [SPECIES_SNUBBULL] = {gMonShinyPalette_Snubbull, SPECIES_SNUBBULL + 500},
-    [SPECIES_GRANBULL] = {gMonShinyPalette_Granbull, SPECIES_GRANBULL + 500},
-    [SPECIES_QWILFISH] = {gMonShinyPalette_Qwilfish, SPECIES_QWILFISH + 500},
-    [SPECIES_SCIZOR] = {gMonShinyPalette_Scizor, SPECIES_SCIZOR + 500},
-    [SPECIES_SHUCKLE] = {gMonShinyPalette_Shuckle, SPECIES_SHUCKLE + 500},
-    [SPECIES_HERACROSS] = {gMonShinyPalette_Heracross, SPECIES_HERACROSS + 500},
-    [SPECIES_SNEASEL] = {gMonShinyPalette_Sneasel, SPECIES_SNEASEL + 500},
-    [SPECIES_TEDDIURSA] = {gMonShinyPalette_Teddiursa, SPECIES_TEDDIURSA + 500},
-    [SPECIES_URSARING] = {gMonShinyPalette_Ursaring, SPECIES_URSARING + 500},
-    [SPECIES_SLUGMA] = {gMonShinyPalette_Slugma, SPECIES_SLUGMA + 500},
-    [SPECIES_MAGCARGO] = {gMonShinyPalette_Magcargo, SPECIES_MAGCARGO + 500},
-    [SPECIES_SWINUB] = {gMonShinyPalette_Swinub, SPECIES_SWINUB + 500},
-    [SPECIES_PILOSWINE] = {gMonShinyPalette_Piloswine, SPECIES_PILOSWINE + 500},
-    [SPECIES_CORSOLA] = {gMonShinyPalette_Corsola, SPECIES_CORSOLA + 500},
-    [SPECIES_REMORAID] = {gMonShinyPalette_Remoraid, SPECIES_REMORAID + 500},
-    [SPECIES_OCTILLERY] = {gMonShinyPalette_Octillery, SPECIES_OCTILLERY + 500},
-    [SPECIES_DELIBIRD] = {gMonShinyPalette_Delibird, SPECIES_DELIBIRD + 500},
-    [SPECIES_MANTINE] = {gMonShinyPalette_Mantine, SPECIES_MANTINE + 500},
-    [SPECIES_SKARMORY] = {gMonShinyPalette_Skarmory, SPECIES_SKARMORY + 500},
-    [SPECIES_HOUNDOUR] = {gMonShinyPalette_Houndour, SPECIES_HOUNDOUR + 500},
-    [SPECIES_HOUNDOOM] = {gMonShinyPalette_Houndoom, SPECIES_HOUNDOOM + 500},
-    [SPECIES_KINGDRA] = {gMonShinyPalette_Kingdra, SPECIES_KINGDRA + 500},
-    [SPECIES_PHANPY] = {gMonShinyPalette_Phanpy, SPECIES_PHANPY + 500},
-    [SPECIES_DONPHAN] = {gMonShinyPalette_Donphan, SPECIES_DONPHAN + 500},
-    [SPECIES_PORYGON2] = {gMonShinyPalette_Porygon2, SPECIES_PORYGON2 + 500},
-    [SPECIES_STANTLER] = {gMonShinyPalette_Stantler, SPECIES_STANTLER + 500},
-    [SPECIES_SMEARGLE] = {gMonShinyPalette_Smeargle, SPECIES_SMEARGLE + 500},
-    [SPECIES_TYROGUE] = {gMonShinyPalette_Tyrogue, SPECIES_TYROGUE + 500},
-    [SPECIES_HITMONTOP] = {gMonShinyPalette_Hitmontop, SPECIES_HITMONTOP + 500},
-    [SPECIES_SMOOCHUM] = {gMonShinyPalette_Smoochum, SPECIES_SMOOCHUM + 500},
-    [SPECIES_ELEKID] = {gMonShinyPalette_Elekid, SPECIES_ELEKID + 500},
-    [SPECIES_MAGBY] = {gMonShinyPalette_Magby, SPECIES_MAGBY + 500},
-    [SPECIES_MILTANK] = {gMonShinyPalette_Miltank, SPECIES_MILTANK + 500},
-    [SPECIES_BLISSEY] = {gMonShinyPalette_Blissey, SPECIES_BLISSEY + 500},
-    [SPECIES_RAIKOU] = {gMonShinyPalette_Raikou, SPECIES_RAIKOU + 500},
-    [SPECIES_ENTEI] = {gMonShinyPalette_Entei, SPECIES_ENTEI + 500},
-    [SPECIES_SUICUNE] = {gMonShinyPalette_Suicune, SPECIES_SUICUNE + 500},
-    [SPECIES_LARVITAR] = {gMonShinyPalette_Larvitar, SPECIES_LARVITAR + 500},
-    [SPECIES_PUPITAR] = {gMonShinyPalette_Pupitar, SPECIES_PUPITAR + 500},
-    [SPECIES_TYRANITAR] = {gMonShinyPalette_Tyranitar, SPECIES_TYRANITAR + 500},
-    [SPECIES_LUGIA] = {gMonShinyPalette_Lugia, SPECIES_LUGIA + 500},
-    [SPECIES_HO_OH] = {gMonShinyPalette_HoOh, SPECIES_HO_OH + 500},
-    [SPECIES_CELEBI] = {gMonShinyPalette_Celebi, SPECIES_CELEBI + 500},
-    [SPECIES_OLD_UNOWN_B] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_B + 500},
-    [SPECIES_OLD_UNOWN_C] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_C + 500},
-    [SPECIES_OLD_UNOWN_D] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_D + 500},
-    [SPECIES_OLD_UNOWN_E] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_E + 500},
-    [SPECIES_OLD_UNOWN_F] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_F + 500},
-    [SPECIES_OLD_UNOWN_G] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_G + 500},
-    [SPECIES_OLD_UNOWN_H] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_H + 500},
-    [SPECIES_OLD_UNOWN_I] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_I + 500},
-    [SPECIES_OLD_UNOWN_J] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_J + 500},
-    [SPECIES_OLD_UNOWN_K] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_K + 500},
-    [SPECIES_OLD_UNOWN_L] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_L + 500},
-    [SPECIES_OLD_UNOWN_M] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_M + 500},
-    [SPECIES_OLD_UNOWN_N] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_N + 500},
-    [SPECIES_OLD_UNOWN_O] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_O + 500},
-    [SPECIES_OLD_UNOWN_P] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_P + 500},
-    [SPECIES_OLD_UNOWN_Q] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Q + 500},
-    [SPECIES_OLD_UNOWN_R] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_R + 500},
-    [SPECIES_OLD_UNOWN_S] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_S + 500},
-    [SPECIES_OLD_UNOWN_T] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_T + 500},
-    [SPECIES_OLD_UNOWN_U] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_U + 500},
-    [SPECIES_OLD_UNOWN_V] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_V + 500},
-    [SPECIES_OLD_UNOWN_W] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_W + 500},
-    [SPECIES_OLD_UNOWN_X] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_X + 500},
-    [SPECIES_OLD_UNOWN_Y] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Y + 500},
-    [SPECIES_OLD_UNOWN_Z] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Z + 500},
-    [SPECIES_TREECKO] = {gMonShinyPalette_Treecko, SPECIES_TREECKO + 500},
-    [SPECIES_GROVYLE] = {gMonShinyPalette_Grovyle, SPECIES_GROVYLE + 500},
-    [SPECIES_SCEPTILE] = {gMonShinyPalette_Sceptile, SPECIES_SCEPTILE + 500},
-    [SPECIES_TORCHIC] = {gMonShinyPalette_Torchic, SPECIES_TORCHIC + 500},
-    [SPECIES_COMBUSKEN] = {gMonShinyPalette_Combusken, SPECIES_COMBUSKEN + 500},
-    [SPECIES_BLAZIKEN] = {gMonShinyPalette_Blaziken, SPECIES_BLAZIKEN + 500},
-    [SPECIES_MUDKIP] = {gMonShinyPalette_Mudkip, SPECIES_MUDKIP + 500},
-    [SPECIES_MARSHTOMP] = {gMonShinyPalette_Marshtomp, SPECIES_MARSHTOMP + 500},
-    [SPECIES_SWAMPERT] = {gMonShinyPalette_Swampert, SPECIES_SWAMPERT + 500},
-    [SPECIES_POOCHYENA] = {gMonShinyPalette_Poochyena, SPECIES_POOCHYENA + 500},
-    [SPECIES_MIGHTYENA] = {gMonShinyPalette_Mightyena, SPECIES_MIGHTYENA + 500},
-    [SPECIES_ZIGZAGOON] = {gMonShinyPalette_Zigzagoon, SPECIES_ZIGZAGOON + 500},
-    [SPECIES_LINOONE] = {gMonShinyPalette_Linoone, SPECIES_LINOONE + 500},
-    [SPECIES_WURMPLE] = {gMonShinyPalette_Wurmple, SPECIES_WURMPLE + 500},
-    [SPECIES_SILCOON] = {gMonShinyPalette_Silcoon, SPECIES_SILCOON + 500},
-    [SPECIES_BEAUTIFLY] = {gMonShinyPalette_Beautifly, SPECIES_BEAUTIFLY + 500},
-    [SPECIES_CASCOON] = {gMonShinyPalette_Cascoon, SPECIES_CASCOON + 500},
-    [SPECIES_DUSTOX] = {gMonShinyPalette_Dustox, SPECIES_DUSTOX + 500},
-    [SPECIES_LOTAD] = {gMonShinyPalette_Lotad, SPECIES_LOTAD + 500},
-    [SPECIES_LOMBRE] = {gMonShinyPalette_Lombre, SPECIES_LOMBRE + 500},
-    [SPECIES_LUDICOLO] = {gMonShinyPalette_Ludicolo, SPECIES_LUDICOLO + 500},
-    [SPECIES_SEEDOT] = {gMonShinyPalette_Seedot, SPECIES_SEEDOT + 500},
-    [SPECIES_NUZLEAF] = {gMonShinyPalette_Nuzleaf, SPECIES_NUZLEAF + 500},
-    [SPECIES_SHIFTRY] = {gMonShinyPalette_Shiftry, SPECIES_SHIFTRY + 500},
-    [SPECIES_NINCADA] = {gMonShinyPalette_Nincada, SPECIES_NINCADA + 500},
-    [SPECIES_NINJASK] = {gMonShinyPalette_Ninjask, SPECIES_NINJASK + 500},
-    [SPECIES_SHEDINJA] = {gMonShinyPalette_Shedinja, SPECIES_SHEDINJA + 500},
-    [SPECIES_TAILLOW] = {gMonShinyPalette_Taillow, SPECIES_TAILLOW + 500},
-    [SPECIES_SWELLOW] = {gMonShinyPalette_Swellow, SPECIES_SWELLOW + 500},
-    [SPECIES_SHROOMISH] = {gMonShinyPalette_Shroomish, SPECIES_SHROOMISH + 500},
-    [SPECIES_BRELOOM] = {gMonShinyPalette_Breloom, SPECIES_BRELOOM + 500},
-    [SPECIES_SPINDA] = {gMonShinyPalette_Spinda, SPECIES_SPINDA + 500},
-    [SPECIES_WINGULL] = {gMonShinyPalette_Wingull, SPECIES_WINGULL + 500},
-    [SPECIES_PELIPPER] = {gMonShinyPalette_Pelipper, SPECIES_PELIPPER + 500},
-    [SPECIES_SURSKIT] = {gMonShinyPalette_Surskit, SPECIES_SURSKIT + 500},
-    [SPECIES_MASQUERAIN] = {gMonShinyPalette_Masquerain, SPECIES_MASQUERAIN + 500},
-    [SPECIES_WAILMER] = {gMonShinyPalette_Wailmer, SPECIES_WAILMER + 500},
-    [SPECIES_WAILORD] = {gMonShinyPalette_Wailord, SPECIES_WAILORD + 500},
-    [SPECIES_SKITTY] = {gMonShinyPalette_Skitty, SPECIES_SKITTY + 500},
-    [SPECIES_DELCATTY] = {gMonShinyPalette_Delcatty, SPECIES_DELCATTY + 500},
-    [SPECIES_KECLEON] = {gMonShinyPalette_Kecleon, SPECIES_KECLEON + 500},
-    [SPECIES_BALTOY] = {gMonShinyPalette_Baltoy, SPECIES_BALTOY + 500},
-    [SPECIES_CLAYDOL] = {gMonShinyPalette_Claydol, SPECIES_CLAYDOL + 500},
-    [SPECIES_NOSEPASS] = {gMonShinyPalette_Nosepass, SPECIES_NOSEPASS + 500},
-    [SPECIES_TORKOAL] = {gMonShinyPalette_Torkoal, SPECIES_TORKOAL + 500},
-    [SPECIES_SABLEYE] = {gMonShinyPalette_Sableye, SPECIES_SABLEYE + 500},
-    [SPECIES_BARBOACH] = {gMonShinyPalette_Barboach, SPECIES_BARBOACH + 500},
-    [SPECIES_WHISCASH] = {gMonShinyPalette_Whiscash, SPECIES_WHISCASH + 500},
-    [SPECIES_LUVDISC] = {gMonShinyPalette_Luvdisc, SPECIES_LUVDISC + 500},
-    [SPECIES_CORPHISH] = {gMonShinyPalette_Corphish, SPECIES_CORPHISH + 500},
-    [SPECIES_CRAWDAUNT] = {gMonShinyPalette_Crawdaunt, SPECIES_CRAWDAUNT + 500},
-    [SPECIES_FEEBAS] = {gMonShinyPalette_Feebas, SPECIES_FEEBAS + 500},
-    [SPECIES_MILOTIC] = {gMonShinyPalette_Milotic, SPECIES_MILOTIC + 500},
-    [SPECIES_CARVANHA] = {gMonShinyPalette_Carvanha, SPECIES_CARVANHA + 500},
-    [SPECIES_SHARPEDO] = {gMonShinyPalette_Sharpedo, SPECIES_SHARPEDO + 500},
-    [SPECIES_TRAPINCH] = {gMonShinyPalette_Trapinch, SPECIES_TRAPINCH + 500},
-    [SPECIES_VIBRAVA] = {gMonShinyPalette_Vibrava, SPECIES_VIBRAVA + 500},
-    [SPECIES_FLYGON] = {gMonShinyPalette_Flygon, SPECIES_FLYGON + 500},
-    [SPECIES_MAKUHITA] = {gMonShinyPalette_Makuhita, SPECIES_MAKUHITA + 500},
-    [SPECIES_HARIYAMA] = {gMonShinyPalette_Hariyama, SPECIES_HARIYAMA + 500},
-    [SPECIES_ELECTRIKE] = {gMonShinyPalette_Electrike, SPECIES_ELECTRIKE + 500},
-    [SPECIES_MANECTRIC] = {gMonShinyPalette_Manectric, SPECIES_MANECTRIC + 500},
-    [SPECIES_NUMEL] = {gMonShinyPalette_Numel, SPECIES_NUMEL + 500},
-    [SPECIES_CAMERUPT] = {gMonShinyPalette_Camerupt, SPECIES_CAMERUPT + 500},
-    [SPECIES_SPHEAL] = {gMonShinyPalette_Spheal, SPECIES_SPHEAL + 500},
-    [SPECIES_SEALEO] = {gMonShinyPalette_Sealeo, SPECIES_SEALEO + 500},
-    [SPECIES_WALREIN] = {gMonShinyPalette_Walrein, SPECIES_WALREIN + 500},
-    [SPECIES_CACNEA] = {gMonShinyPalette_Cacnea, SPECIES_CACNEA + 500},
-    [SPECIES_CACTURNE] = {gMonShinyPalette_Cacturne, SPECIES_CACTURNE + 500},
-    [SPECIES_SNORUNT] = {gMonShinyPalette_Snorunt, SPECIES_SNORUNT + 500},
-    [SPECIES_GLALIE] = {gMonShinyPalette_Glalie, SPECIES_GLALIE + 500},
-    [SPECIES_LUNATONE] = {gMonShinyPalette_Lunatone, SPECIES_LUNATONE + 500},
-    [SPECIES_SOLROCK] = {gMonShinyPalette_Solrock, SPECIES_SOLROCK + 500},
-    [SPECIES_AZURILL] = {gMonShinyPalette_Azurill, SPECIES_AZURILL + 500},
-    [SPECIES_SPOINK] = {gMonShinyPalette_Spoink, SPECIES_SPOINK + 500},
-    [SPECIES_GRUMPIG] = {gMonShinyPalette_Grumpig, SPECIES_GRUMPIG + 500},
-    [SPECIES_PLUSLE] = {gMonShinyPalette_Plusle, SPECIES_PLUSLE + 500},
-    [SPECIES_MINUN] = {gMonShinyPalette_Minun, SPECIES_MINUN + 500},
-    [SPECIES_MAWILE] = {gMonShinyPalette_Mawile, SPECIES_MAWILE + 500},
-    [SPECIES_MEDITITE] = {gMonShinyPalette_Meditite, SPECIES_MEDITITE + 500},
-    [SPECIES_MEDICHAM] = {gMonShinyPalette_Medicham, SPECIES_MEDICHAM + 500},
-    [SPECIES_SWABLU] = {gMonShinyPalette_Swablu, SPECIES_SWABLU + 500},
-    [SPECIES_ALTARIA] = {gMonShinyPalette_Altaria, SPECIES_ALTARIA + 500},
-    [SPECIES_WYNAUT] = {gMonShinyPalette_Wynaut, SPECIES_WYNAUT + 500},
-    [SPECIES_DUSKULL] = {gMonShinyPalette_Duskull, SPECIES_DUSKULL + 500},
-    [SPECIES_DUSCLOPS] = {gMonShinyPalette_Dusclops, SPECIES_DUSCLOPS + 500},
-    [SPECIES_ROSELIA] = {gMonShinyPalette_Roselia, SPECIES_ROSELIA + 500},
-    [SPECIES_SLAKOTH] = {gMonShinyPalette_Slakoth, SPECIES_SLAKOTH + 500},
-    [SPECIES_VIGOROTH] = {gMonShinyPalette_Vigoroth, SPECIES_VIGOROTH + 500},
-    [SPECIES_SLAKING] = {gMonShinyPalette_Slaking, SPECIES_SLAKING + 500},
-    [SPECIES_GULPIN] = {gMonShinyPalette_Gulpin, SPECIES_GULPIN + 500},
-    [SPECIES_SWALOT] = {gMonShinyPalette_Swalot, SPECIES_SWALOT + 500},
-    [SPECIES_TROPIUS] = {gMonShinyPalette_Tropius, SPECIES_TROPIUS + 500},
-    [SPECIES_WHISMUR] = {gMonShinyPalette_Whismur, SPECIES_WHISMUR + 500},
-    [SPECIES_LOUDRED] = {gMonShinyPalette_Loudred, SPECIES_LOUDRED + 500},
-    [SPECIES_EXPLOUD] = {gMonShinyPalette_Exploud, SPECIES_EXPLOUD + 500},
-    [SPECIES_CLAMPERL] = {gMonShinyPalette_Clamperl, SPECIES_CLAMPERL + 500},
-    [SPECIES_HUNTAIL] = {gMonShinyPalette_Huntail, SPECIES_HUNTAIL + 500},
-    [SPECIES_GOREBYSS] = {gMonShinyPalette_Gorebyss, SPECIES_GOREBYSS + 500},
-    [SPECIES_ABSOL] = {gMonShinyPalette_Absol, SPECIES_ABSOL + 500},
-    [SPECIES_SHUPPET] = {gMonShinyPalette_Shuppet, SPECIES_SHUPPET + 500},
-    [SPECIES_BANETTE] = {gMonShinyPalette_Banette, SPECIES_BANETTE + 500},
-    [SPECIES_SEVIPER] = {gMonShinyPalette_Seviper, SPECIES_SEVIPER + 500},
-    [SPECIES_ZANGOOSE] = {gMonShinyPalette_Zangoose, SPECIES_ZANGOOSE + 500},
-    [SPECIES_RELICANTH] = {gMonShinyPalette_Relicanth, SPECIES_RELICANTH + 500},
-    [SPECIES_ARON] = {gMonShinyPalette_Aron, SPECIES_ARON + 500},
-    [SPECIES_LAIRON] = {gMonShinyPalette_Lairon, SPECIES_LAIRON + 500},
-    [SPECIES_AGGRON] = {gMonShinyPalette_Aggron, SPECIES_AGGRON + 500},
-    [SPECIES_CASTFORM] = {gMonShinyPalette_Castform, SPECIES_CASTFORM + 500},
-    [SPECIES_VOLBEAT] = {gMonShinyPalette_Volbeat, SPECIES_VOLBEAT + 500},
-    [SPECIES_ILLUMISE] = {gMonShinyPalette_Illumise, SPECIES_ILLUMISE + 500},
-    [SPECIES_LILEEP] = {gMonShinyPalette_Lileep, SPECIES_LILEEP + 500},
-    [SPECIES_CRADILY] = {gMonShinyPalette_Cradily, SPECIES_CRADILY + 500},
-    [SPECIES_ANORITH] = {gMonShinyPalette_Anorith, SPECIES_ANORITH + 500},
-    [SPECIES_ARMALDO] = {gMonShinyPalette_Armaldo, SPECIES_ARMALDO + 500},
-    [SPECIES_RALTS] = {gMonShinyPalette_Ralts, SPECIES_RALTS + 500},
-    [SPECIES_KIRLIA] = {gMonShinyPalette_Kirlia, SPECIES_KIRLIA + 500},
-    [SPECIES_GARDEVOIR] = {gMonShinyPalette_Gardevoir, SPECIES_GARDEVOIR + 500},
-    [SPECIES_BAGON] = {gMonShinyPalette_Bagon, SPECIES_BAGON + 500},
-    [SPECIES_SHELGON] = {gMonShinyPalette_Shelgon, SPECIES_SHELGON + 500},
-    [SPECIES_SALAMENCE] = {gMonShinyPalette_Salamence, SPECIES_SALAMENCE + 500},
-    [SPECIES_BELDUM] = {gMonShinyPalette_Beldum, SPECIES_BELDUM + 500},
-    [SPECIES_METANG] = {gMonShinyPalette_Metang, SPECIES_METANG + 500},
-    [SPECIES_METAGROSS] = {gMonShinyPalette_Metagross, SPECIES_METAGROSS + 500},
-    [SPECIES_REGIROCK] = {gMonShinyPalette_Regirock, SPECIES_REGIROCK + 500},
-    [SPECIES_REGICE] = {gMonShinyPalette_Regice, SPECIES_REGICE + 500},
-    [SPECIES_REGISTEEL] = {gMonShinyPalette_Registeel, SPECIES_REGISTEEL + 500},
-    [SPECIES_KYOGRE] = {gMonShinyPalette_Kyogre, SPECIES_KYOGRE + 500},
-    [SPECIES_GROUDON] = {gMonShinyPalette_Groudon, SPECIES_GROUDON + 500},
-    [SPECIES_RAYQUAZA] = {gMonShinyPalette_Rayquaza, SPECIES_RAYQUAZA + 500},
-    [SPECIES_LATIAS] = {gMonShinyPalette_Latias, SPECIES_LATIAS + 500},
-    [SPECIES_LATIOS] = {gMonShinyPalette_Latios, SPECIES_LATIOS + 500},
-    [SPECIES_JIRACHI] = {gMonShinyPalette_Jirachi, SPECIES_JIRACHI + 500},
-    [SPECIES_DEOXYS] = {gMonShinyPalette_Deoxys, SPECIES_DEOXYS + 500},
-    [SPECIES_CHIMECHO] = {gMonShinyPalette_Chimecho, SPECIES_CHIMECHO + 500},
-    [SPECIES_EGG] = {gMonPalette_Egg, SPECIES_EGG + 500},
-    [SPECIES_UNOWN_B] = {gMonShinyPalette_Unown, SPECIES_UNOWN_B + 500},
-    [SPECIES_UNOWN_C] = {gMonShinyPalette_Unown, SPECIES_UNOWN_C + 500},
-    [SPECIES_UNOWN_D] = {gMonShinyPalette_Unown, SPECIES_UNOWN_D + 500},
-    [SPECIES_UNOWN_E] = {gMonShinyPalette_Unown, SPECIES_UNOWN_E + 500},
-    [SPECIES_UNOWN_F] = {gMonShinyPalette_Unown, SPECIES_UNOWN_F + 500},
-    [SPECIES_UNOWN_G] = {gMonShinyPalette_Unown, SPECIES_UNOWN_G + 500},
-    [SPECIES_UNOWN_H] = {gMonShinyPalette_Unown, SPECIES_UNOWN_H + 500},
-    [SPECIES_UNOWN_I] = {gMonShinyPalette_Unown, SPECIES_UNOWN_I + 500},
-    [SPECIES_UNOWN_J] = {gMonShinyPalette_Unown, SPECIES_UNOWN_J + 500},
-    [SPECIES_UNOWN_K] = {gMonShinyPalette_Unown, SPECIES_UNOWN_K + 500},
-    [SPECIES_UNOWN_L] = {gMonShinyPalette_Unown, SPECIES_UNOWN_L + 500},
-    [SPECIES_UNOWN_M] = {gMonShinyPalette_Unown, SPECIES_UNOWN_M + 500},
-    [SPECIES_UNOWN_N] = {gMonShinyPalette_Unown, SPECIES_UNOWN_N + 500},
-    [SPECIES_UNOWN_O] = {gMonShinyPalette_Unown, SPECIES_UNOWN_O + 500},
-    [SPECIES_UNOWN_P] = {gMonShinyPalette_Unown, SPECIES_UNOWN_P + 500},
-    [SPECIES_UNOWN_Q] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Q + 500},
-    [SPECIES_UNOWN_R] = {gMonShinyPalette_Unown, SPECIES_UNOWN_R + 500},
-    [SPECIES_UNOWN_S] = {gMonShinyPalette_Unown, SPECIES_UNOWN_S + 500},
-    [SPECIES_UNOWN_T] = {gMonShinyPalette_Unown, SPECIES_UNOWN_T + 500},
-    [SPECIES_UNOWN_U] = {gMonShinyPalette_Unown, SPECIES_UNOWN_U + 500},
-    [SPECIES_UNOWN_V] = {gMonShinyPalette_Unown, SPECIES_UNOWN_V + 500},
-    [SPECIES_UNOWN_W] = {gMonShinyPalette_Unown, SPECIES_UNOWN_W + 500},
-    [SPECIES_UNOWN_X] = {gMonShinyPalette_Unown, SPECIES_UNOWN_X + 500},
-    [SPECIES_UNOWN_Y] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Y + 500},
-    [SPECIES_UNOWN_Z] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Z + 500},
-    [SPECIES_UNOWN_EMARK] = {gMonShinyPalette_Unown, SPECIES_UNOWN_EMARK + 500},
-    [SPECIES_UNOWN_QMARK] = {gMonShinyPalette_Unown, SPECIES_UNOWN_QMARK + 500},
+    SPECIES_SHINY_PAL(NONE, gMonShinyPalette_CircledQuestionMark),
+    SPECIES_SHINY_PAL(BULBASAUR, gMonShinyPalette_Bulbasaur),
+    SPECIES_SHINY_PAL(IVYSAUR, gMonShinyPalette_Ivysaur),
+    SPECIES_SHINY_PAL(VENUSAUR, gMonShinyPalette_Venusaur),
+    SPECIES_SHINY_PAL(CHARMANDER, gMonShinyPalette_Charmander),
+    SPECIES_SHINY_PAL(CHARMELEON, gMonShinyPalette_Charmeleon),
+    SPECIES_SHINY_PAL(CHARIZARD, gMonShinyPalette_Charizard),
+    SPECIES_SHINY_PAL(SQUIRTLE, gMonShinyPalette_Squirtle),
+    SPECIES_SHINY_PAL(WARTORTLE, gMonShinyPalette_Wartortle),
+    SPECIES_SHINY_PAL(BLASTOISE, gMonShinyPalette_Blastoise),
+    SPECIES_SHINY_PAL(CATERPIE, gMonShinyPalette_Caterpie),
+    SPECIES_SHINY_PAL(METAPOD, gMonShinyPalette_Metapod),
+    SPECIES_SHINY_PAL(BUTTERFREE, gMonShinyPalette_Butterfree),
+    SPECIES_SHINY_PAL(WEEDLE, gMonShinyPalette_Weedle),
+    SPECIES_SHINY_PAL(KAKUNA, gMonShinyPalette_Kakuna),
+    SPECIES_SHINY_PAL(BEEDRILL, gMonShinyPalette_Beedrill),
+    SPECIES_SHINY_PAL(PIDGEY, gMonShinyPalette_Pidgey),
+    SPECIES_SHINY_PAL(PIDGEOTTO, gMonShinyPalette_Pidgeotto),
+    SPECIES_SHINY_PAL(PIDGEOT, gMonShinyPalette_Pidgeot),
+    SPECIES_SHINY_PAL(RATTATA, gMonShinyPalette_Rattata),
+    SPECIES_SHINY_PAL(RATICATE, gMonShinyPalette_Raticate),
+    SPECIES_SHINY_PAL(SPEAROW, gMonShinyPalette_Spearow),
+    SPECIES_SHINY_PAL(FEAROW, gMonShinyPalette_Fearow),
+    SPECIES_SHINY_PAL(EKANS, gMonShinyPalette_Ekans),
+    SPECIES_SHINY_PAL(ARBOK, gMonShinyPalette_Arbok),
+    SPECIES_SHINY_PAL(PIKACHU, gMonShinyPalette_Pikachu),
+    SPECIES_SHINY_PAL(RAICHU, gMonShinyPalette_Raichu),
+    SPECIES_SHINY_PAL(SANDSHREW, gMonShinyPalette_Sandshrew),
+    SPECIES_SHINY_PAL(SANDSLASH, gMonShinyPalette_Sandslash),
+    SPECIES_SHINY_PAL(NIDORAN_F, gMonShinyPalette_NidoranF),
+    SPECIES_SHINY_PAL(NIDORINA, gMonShinyPalette_Nidorina),
+    SPECIES_SHINY_PAL(NIDOQUEEN, gMonShinyPalette_Nidoqueen),
+    SPECIES_SHINY_PAL(NIDORAN_M, gMonShinyPalette_NidoranM),
+    SPECIES_SHINY_PAL(NIDORINO, gMonShinyPalette_Nidorino),
+    SPECIES_SHINY_PAL(NIDOKING, gMonShinyPalette_Nidoking),
+    SPECIES_SHINY_PAL(CLEFAIRY, gMonShinyPalette_Clefairy),
+    SPECIES_SHINY_PAL(CLEFABLE, gMonShinyPalette_Clefable),
+    SPECIES_SHINY_PAL(VULPIX, gMonShinyPalette_Vulpix),
+    SPECIES_SHINY_PAL(NINETALES, gMonShinyPalette_Ninetales),
+    SPECIES_SHINY_PAL(JIGGLYPUFF, gMonShinyPalette_Jigglypuff),
+    SPECIES_SHINY_PAL(WIGGLYTUFF, gMonShinyPalette_Wigglytuff),
+    SPECIES_SHINY_PAL(ZUBAT, gMonShinyPalette_Zubat),
+    SPECIES_SHINY_PAL(GOLBAT, gMonShinyPalette_Golbat),
+    SPECIES_SHINY_PAL(ODDISH, gMonShinyPalette_Oddish),
+    SPECIES_SHINY_PAL(GLOOM, gMonShinyPalette_Gloom),
+    SPECIES_SHINY_PAL(VILEPLUME, gMonShinyPalette_Vileplume),
+    SPECIES_SHINY_PAL(PARAS, gMonShinyPalette_Paras),
+    SPECIES_SHINY_PAL(PARASECT, gMonShinyPalette_Parasect),
+    SPECIES_SHINY_PAL(VENONAT, gMonShinyPalette_Venonat),
+    SPECIES_SHINY_PAL(VENOMOTH, gMonShinyPalette_Venomoth),
+    SPECIES_SHINY_PAL(DIGLETT, gMonShinyPalette_Diglett),
+    SPECIES_SHINY_PAL(DUGTRIO, gMonShinyPalette_Dugtrio),
+    SPECIES_SHINY_PAL(MEOWTH, gMonShinyPalette_Meowth),
+    SPECIES_SHINY_PAL(PERSIAN, gMonShinyPalette_Persian),
+    SPECIES_SHINY_PAL(PSYDUCK, gMonShinyPalette_Psyduck),
+    SPECIES_SHINY_PAL(GOLDUCK, gMonShinyPalette_Golduck),
+    SPECIES_SHINY_PAL(MANKEY, gMonShinyPalette_Mankey),
+    SPECIES_SHINY_PAL(PRIMEAPE, gMonShinyPalette_Primeape),
+    SPECIES_SHINY_PAL(GROWLITHE, gMonShinyPalette_Growlithe),
+    SPECIES_SHINY_PAL(ARCANINE, gMonShinyPalette_Arcanine),
+    SPECIES_SHINY_PAL(POLIWAG, gMonShinyPalette_Poliwag),
+    SPECIES_SHINY_PAL(POLIWHIRL, gMonShinyPalette_Poliwhirl),
+    SPECIES_SHINY_PAL(POLIWRATH, gMonShinyPalette_Poliwrath),
+    SPECIES_SHINY_PAL(ABRA, gMonShinyPalette_Abra),
+    SPECIES_SHINY_PAL(KADABRA, gMonShinyPalette_Kadabra),
+    SPECIES_SHINY_PAL(ALAKAZAM, gMonShinyPalette_Alakazam),
+    SPECIES_SHINY_PAL(MACHOP, gMonShinyPalette_Machop),
+    SPECIES_SHINY_PAL(MACHOKE, gMonShinyPalette_Machoke),
+    SPECIES_SHINY_PAL(MACHAMP, gMonShinyPalette_Machamp),
+    SPECIES_SHINY_PAL(BELLSPROUT, gMonShinyPalette_Bellsprout),
+    SPECIES_SHINY_PAL(WEEPINBELL, gMonShinyPalette_Weepinbell),
+    SPECIES_SHINY_PAL(VICTREEBEL, gMonShinyPalette_Victreebel),
+    SPECIES_SHINY_PAL(TENTACOOL, gMonShinyPalette_Tentacool),
+    SPECIES_SHINY_PAL(TENTACRUEL, gMonShinyPalette_Tentacruel),
+    SPECIES_SHINY_PAL(GEODUDE, gMonShinyPalette_Geodude),
+    SPECIES_SHINY_PAL(GRAVELER, gMonShinyPalette_Graveler),
+    SPECIES_SHINY_PAL(GOLEM, gMonShinyPalette_Golem),
+    SPECIES_SHINY_PAL(PONYTA, gMonShinyPalette_Ponyta),
+    SPECIES_SHINY_PAL(RAPIDASH, gMonShinyPalette_Rapidash),
+    SPECIES_SHINY_PAL(SLOWPOKE, gMonShinyPalette_Slowpoke),
+    SPECIES_SHINY_PAL(SLOWBRO, gMonShinyPalette_Slowbro),
+    SPECIES_SHINY_PAL(MAGNEMITE, gMonShinyPalette_Magnemite),
+    SPECIES_SHINY_PAL(MAGNETON, gMonShinyPalette_Magneton),
+    SPECIES_SHINY_PAL(FARFETCHD, gMonShinyPalette_Farfetchd),
+    SPECIES_SHINY_PAL(DODUO, gMonShinyPalette_Doduo),
+    SPECIES_SHINY_PAL(DODRIO, gMonShinyPalette_Dodrio),
+    SPECIES_SHINY_PAL(SEEL, gMonShinyPalette_Seel),
+    SPECIES_SHINY_PAL(DEWGONG, gMonShinyPalette_Dewgong),
+    SPECIES_SHINY_PAL(GRIMER, gMonShinyPalette_Grimer),
+    SPECIES_SHINY_PAL(MUK, gMonShinyPalette_Muk),
+    SPECIES_SHINY_PAL(SHELLDER, gMonShinyPalette_Shellder),
+    SPECIES_SHINY_PAL(CLOYSTER, gMonShinyPalette_Cloyster),
+    SPECIES_SHINY_PAL(GASTLY, gMonShinyPalette_Gastly),
+    SPECIES_SHINY_PAL(HAUNTER, gMonShinyPalette_Haunter),
+    SPECIES_SHINY_PAL(GENGAR, gMonShinyPalette_Gengar),
+    SPECIES_SHINY_PAL(ONIX, gMonShinyPalette_Onix),
+    SPECIES_SHINY_PAL(DROWZEE, gMonShinyPalette_Drowzee),
+    SPECIES_SHINY_PAL(HYPNO, gMonShinyPalette_Hypno),
+    SPECIES_SHINY_PAL(KRABBY, gMonShinyPalette_Krabby),
+    SPECIES_SHINY_PAL(KINGLER, gMonShinyPalette_Kingler),
+    SPECIES_SHINY_PAL(VOLTORB, gMonShinyPalette_Voltorb),
+    SPECIES_SHINY_PAL(ELECTRODE, gMonShinyPalette_Electrode),
+    SPECIES_SHINY_PAL(EXEGGCUTE, gMonShinyPalette_Exeggcute),
+    SPECIES_SHINY_PAL(EXEGGUTOR, gMonShinyPalette_Exeggutor),
+    SPECIES_SHINY_PAL(CUBONE, gMonShinyPalette_Cubone),
+    SPECIES_SHINY_PAL(MAROWAK, gMonShinyPalette_Marowak),
+    SPECIES_SHINY_PAL(HITMONLEE, gMonShinyPalette_Hitmonlee),
+    SPECIES_SHINY_PAL(HITMONCHAN, gMonShinyPalette_Hitmonchan),
+    SPECIES_SHINY_PAL(LICKITUNG, gMonShinyPalette_Lickitung),
+    SPECIES_SHINY_PAL(KOFFING, gMonShinyPalette_Koffing),
+    SPECIES_SHINY_PAL(WEEZING, gMonShinyPalette_Weezing),
+    SPECIES_SHINY_PAL(RHYHORN, gMonShinyPalette_Rhyhorn),
+    SPECIES_SHINY_PAL(RHYDON, gMonShinyPalette_Rhydon),
+    SPECIES_SHINY_PAL(CHANSEY, gMonShinyPalette_Chansey),
+    SPECIES_SHINY_PAL(TANGELA, gMonShinyPalette_Tangela),
+    SPECIES_SHINY_PAL(KANGASKHAN, gMonShinyPalette_Kangaskhan),
+    SPECIES_SHINY_PAL(HORSEA, gMonShinyPalette_Horsea),
+    SPECIES_SHINY_PAL(SEADRA, gMonShinyPalette_Seadra),
+    SPECIES_SHINY_PAL(GOLDEEN, gMonShinyPalette_Goldeen),
+    SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking),
+    SPECIES_SHINY_PAL(STARYU, gMonShinyPalette_Staryu),
+    SPECIES_SHINY_PAL(STARMIE, gMonShinyPalette_Starmie),
+    SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_Mrmime),
+    SPECIES_SHINY_PAL(SCYTHER, gMonShinyPalette_Scyther),
+    SPECIES_SHINY_PAL(JYNX, gMonShinyPalette_Jynx),
+    SPECIES_SHINY_PAL(ELECTABUZZ, gMonShinyPalette_Electabuzz),
+    SPECIES_SHINY_PAL(MAGMAR, gMonShinyPalette_Magmar),
+    SPECIES_SHINY_PAL(PINSIR, gMonShinyPalette_Pinsir),
+    SPECIES_SHINY_PAL(TAUROS, gMonShinyPalette_Tauros),
+    SPECIES_SHINY_PAL(MAGIKARP, gMonShinyPalette_Magikarp),
+    SPECIES_SHINY_PAL(GYARADOS, gMonShinyPalette_Gyarados),
+    SPECIES_SHINY_PAL(LAPRAS, gMonShinyPalette_Lapras),
+    SPECIES_SHINY_PAL(DITTO, gMonShinyPalette_Ditto),
+    SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee),
+    SPECIES_SHINY_PAL(VAPOREON, gMonShinyPalette_Vaporeon),
+    SPECIES_SHINY_PAL(JOLTEON, gMonShinyPalette_Jolteon),
+    SPECIES_SHINY_PAL(FLAREON, gMonShinyPalette_Flareon),
+    SPECIES_SHINY_PAL(PORYGON, gMonShinyPalette_Porygon),
+    SPECIES_SHINY_PAL(OMANYTE, gMonShinyPalette_Omanyte),
+    SPECIES_SHINY_PAL(OMASTAR, gMonShinyPalette_Omastar),
+    SPECIES_SHINY_PAL(KABUTO, gMonShinyPalette_Kabuto),
+    SPECIES_SHINY_PAL(KABUTOPS, gMonShinyPalette_Kabutops),
+    SPECIES_SHINY_PAL(AERODACTYL, gMonShinyPalette_Aerodactyl),
+    SPECIES_SHINY_PAL(SNORLAX, gMonShinyPalette_Snorlax),
+    SPECIES_SHINY_PAL(ARTICUNO, gMonShinyPalette_Articuno),
+    SPECIES_SHINY_PAL(ZAPDOS, gMonShinyPalette_Zapdos),
+    SPECIES_SHINY_PAL(MOLTRES, gMonShinyPalette_Moltres),
+    SPECIES_SHINY_PAL(DRATINI, gMonShinyPalette_Dratini),
+    SPECIES_SHINY_PAL(DRAGONAIR, gMonShinyPalette_Dragonair),
+    SPECIES_SHINY_PAL(DRAGONITE, gMonShinyPalette_Dragonite),
+    SPECIES_SHINY_PAL(MEWTWO, gMonShinyPalette_Mewtwo),
+    SPECIES_SHINY_PAL(MEW, gMonShinyPalette_Mew),
+    SPECIES_SHINY_PAL(CHIKORITA, gMonShinyPalette_Chikorita),
+    SPECIES_SHINY_PAL(BAYLEEF, gMonShinyPalette_Bayleef),
+    SPECIES_SHINY_PAL(MEGANIUM, gMonShinyPalette_Meganium),
+    SPECIES_SHINY_PAL(CYNDAQUIL, gMonShinyPalette_Cyndaquil),
+    SPECIES_SHINY_PAL(QUILAVA, gMonShinyPalette_Quilava),
+    SPECIES_SHINY_PAL(TYPHLOSION, gMonShinyPalette_Typhlosion),
+    SPECIES_SHINY_PAL(TOTODILE, gMonShinyPalette_Totodile),
+    SPECIES_SHINY_PAL(CROCONAW, gMonShinyPalette_Croconaw),
+    SPECIES_SHINY_PAL(FERALIGATR, gMonShinyPalette_Feraligatr),
+    SPECIES_SHINY_PAL(SENTRET, gMonShinyPalette_Sentret),
+    SPECIES_SHINY_PAL(FURRET, gMonShinyPalette_Furret),
+    SPECIES_SHINY_PAL(HOOTHOOT, gMonShinyPalette_Hoothoot),
+    SPECIES_SHINY_PAL(NOCTOWL, gMonShinyPalette_Noctowl),
+    SPECIES_SHINY_PAL(LEDYBA, gMonShinyPalette_Ledyba),
+    SPECIES_SHINY_PAL(LEDIAN, gMonShinyPalette_Ledian),
+    SPECIES_SHINY_PAL(SPINARAK, gMonShinyPalette_Spinarak),
+    SPECIES_SHINY_PAL(ARIADOS, gMonShinyPalette_Ariados),
+    SPECIES_SHINY_PAL(CROBAT, gMonShinyPalette_Crobat),
+    SPECIES_SHINY_PAL(CHINCHOU, gMonShinyPalette_Chinchou),
+    SPECIES_SHINY_PAL(LANTURN, gMonShinyPalette_Lanturn),
+    SPECIES_SHINY_PAL(PICHU, gMonShinyPalette_Pichu),
+    SPECIES_SHINY_PAL(CLEFFA, gMonShinyPalette_Cleffa),
+    SPECIES_SHINY_PAL(IGGLYBUFF, gMonShinyPalette_Igglybuff),
+    SPECIES_SHINY_PAL(TOGEPI, gMonShinyPalette_Togepi),
+    SPECIES_SHINY_PAL(TOGETIC, gMonShinyPalette_Togetic),
+    SPECIES_SHINY_PAL(NATU, gMonShinyPalette_Natu),
+    SPECIES_SHINY_PAL(XATU, gMonShinyPalette_Xatu),
+    SPECIES_SHINY_PAL(MAREEP, gMonShinyPalette_Mareep),
+    SPECIES_SHINY_PAL(FLAAFFY, gMonShinyPalette_Flaaffy),
+    SPECIES_SHINY_PAL(AMPHAROS, gMonShinyPalette_Ampharos),
+    SPECIES_SHINY_PAL(BELLOSSOM, gMonShinyPalette_Bellossom),
+    SPECIES_SHINY_PAL(MARILL, gMonShinyPalette_Marill),
+    SPECIES_SHINY_PAL(AZUMARILL, gMonShinyPalette_Azumarill),
+    SPECIES_SHINY_PAL(SUDOWOODO, gMonShinyPalette_Sudowoodo),
+    SPECIES_SHINY_PAL(POLITOED, gMonShinyPalette_Politoed),
+    SPECIES_SHINY_PAL(HOPPIP, gMonShinyPalette_Hoppip),
+    SPECIES_SHINY_PAL(SKIPLOOM, gMonShinyPalette_Skiploom),
+    SPECIES_SHINY_PAL(JUMPLUFF, gMonShinyPalette_Jumpluff),
+    SPECIES_SHINY_PAL(AIPOM, gMonShinyPalette_Aipom),
+    SPECIES_SHINY_PAL(SUNKERN, gMonShinyPalette_Sunkern),
+    SPECIES_SHINY_PAL(SUNFLORA, gMonShinyPalette_Sunflora),
+    SPECIES_SHINY_PAL(YANMA, gMonShinyPalette_Yanma),
+    SPECIES_SHINY_PAL(WOOPER, gMonShinyPalette_Wooper),
+    SPECIES_SHINY_PAL(QUAGSIRE, gMonShinyPalette_Quagsire),
+    SPECIES_SHINY_PAL(ESPEON, gMonShinyPalette_Espeon),
+    SPECIES_SHINY_PAL(UMBREON, gMonShinyPalette_Umbreon),
+    SPECIES_SHINY_PAL(MURKROW, gMonShinyPalette_Murkrow),
+    SPECIES_SHINY_PAL(SLOWKING, gMonShinyPalette_Slowking),
+    SPECIES_SHINY_PAL(MISDREAVUS, gMonShinyPalette_Misdreavus),
+    SPECIES_SHINY_PAL(UNOWN, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(WOBBUFFET, gMonShinyPalette_Wobbuffet),
+    SPECIES_SHINY_PAL(GIRAFARIG, gMonShinyPalette_Girafarig),
+    SPECIES_SHINY_PAL(PINECO, gMonShinyPalette_Pineco),
+    SPECIES_SHINY_PAL(FORRETRESS, gMonShinyPalette_Forretress),
+    SPECIES_SHINY_PAL(DUNSPARCE, gMonShinyPalette_Dunsparce),
+    SPECIES_SHINY_PAL(GLIGAR, gMonShinyPalette_Gligar),
+    SPECIES_SHINY_PAL(STEELIX, gMonShinyPalette_Steelix),
+    SPECIES_SHINY_PAL(SNUBBULL, gMonShinyPalette_Snubbull),
+    SPECIES_SHINY_PAL(GRANBULL, gMonShinyPalette_Granbull),
+    SPECIES_SHINY_PAL(QWILFISH, gMonShinyPalette_Qwilfish),
+    SPECIES_SHINY_PAL(SCIZOR, gMonShinyPalette_Scizor),
+    SPECIES_SHINY_PAL(SHUCKLE, gMonShinyPalette_Shuckle),
+    SPECIES_SHINY_PAL(HERACROSS, gMonShinyPalette_Heracross),
+    SPECIES_SHINY_PAL(SNEASEL, gMonShinyPalette_Sneasel),
+    SPECIES_SHINY_PAL(TEDDIURSA, gMonShinyPalette_Teddiursa),
+    SPECIES_SHINY_PAL(URSARING, gMonShinyPalette_Ursaring),
+    SPECIES_SHINY_PAL(SLUGMA, gMonShinyPalette_Slugma),
+    SPECIES_SHINY_PAL(MAGCARGO, gMonShinyPalette_Magcargo),
+    SPECIES_SHINY_PAL(SWINUB, gMonShinyPalette_Swinub),
+    SPECIES_SHINY_PAL(PILOSWINE, gMonShinyPalette_Piloswine),
+    SPECIES_SHINY_PAL(CORSOLA, gMonShinyPalette_Corsola),
+    SPECIES_SHINY_PAL(REMORAID, gMonShinyPalette_Remoraid),
+    SPECIES_SHINY_PAL(OCTILLERY, gMonShinyPalette_Octillery),
+    SPECIES_SHINY_PAL(DELIBIRD, gMonShinyPalette_Delibird),
+    SPECIES_SHINY_PAL(MANTINE, gMonShinyPalette_Mantine),
+    SPECIES_SHINY_PAL(SKARMORY, gMonShinyPalette_Skarmory),
+    SPECIES_SHINY_PAL(HOUNDOUR, gMonShinyPalette_Houndour),
+    SPECIES_SHINY_PAL(HOUNDOOM, gMonShinyPalette_Houndoom),
+    SPECIES_SHINY_PAL(KINGDRA, gMonShinyPalette_Kingdra),
+    SPECIES_SHINY_PAL(PHANPY, gMonShinyPalette_Phanpy),
+    SPECIES_SHINY_PAL(DONPHAN, gMonShinyPalette_Donphan),
+    SPECIES_SHINY_PAL(PORYGON2, gMonShinyPalette_Porygon2),
+    SPECIES_SHINY_PAL(STANTLER, gMonShinyPalette_Stantler),
+    SPECIES_SHINY_PAL(SMEARGLE, gMonShinyPalette_Smeargle),
+    SPECIES_SHINY_PAL(TYROGUE, gMonShinyPalette_Tyrogue),
+    SPECIES_SHINY_PAL(HITMONTOP, gMonShinyPalette_Hitmontop),
+    SPECIES_SHINY_PAL(SMOOCHUM, gMonShinyPalette_Smoochum),
+    SPECIES_SHINY_PAL(ELEKID, gMonShinyPalette_Elekid),
+    SPECIES_SHINY_PAL(MAGBY, gMonShinyPalette_Magby),
+    SPECIES_SHINY_PAL(MILTANK, gMonShinyPalette_Miltank),
+    SPECIES_SHINY_PAL(BLISSEY, gMonShinyPalette_Blissey),
+    SPECIES_SHINY_PAL(RAIKOU, gMonShinyPalette_Raikou),
+    SPECIES_SHINY_PAL(ENTEI, gMonShinyPalette_Entei),
+    SPECIES_SHINY_PAL(SUICUNE, gMonShinyPalette_Suicune),
+    SPECIES_SHINY_PAL(LARVITAR, gMonShinyPalette_Larvitar),
+    SPECIES_SHINY_PAL(PUPITAR, gMonShinyPalette_Pupitar),
+    SPECIES_SHINY_PAL(TYRANITAR, gMonShinyPalette_Tyranitar),
+    SPECIES_SHINY_PAL(LUGIA, gMonShinyPalette_Lugia),
+    SPECIES_SHINY_PAL(HO_OH, gMonShinyPalette_HoOh),
+    SPECIES_SHINY_PAL(CELEBI, gMonShinyPalette_Celebi),
+    SPECIES_SHINY_PAL(OLD_UNOWN_B, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_C, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_D, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_E, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_F, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_G, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_H, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_I, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_J, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_K, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_L, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_M, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_N, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_O, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_P, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_Q, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_R, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_S, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_T, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_U, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_V, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_W, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_X, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_Y, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(OLD_UNOWN_Z, gMonShinyPalette_DoubleQuestionMark),
+    SPECIES_SHINY_PAL(TREECKO, gMonShinyPalette_Treecko),
+    SPECIES_SHINY_PAL(GROVYLE, gMonShinyPalette_Grovyle),
+    SPECIES_SHINY_PAL(SCEPTILE, gMonShinyPalette_Sceptile),
+    SPECIES_SHINY_PAL(TORCHIC, gMonShinyPalette_Torchic),
+    SPECIES_SHINY_PAL(COMBUSKEN, gMonShinyPalette_Combusken),
+    SPECIES_SHINY_PAL(BLAZIKEN, gMonShinyPalette_Blaziken),
+    SPECIES_SHINY_PAL(MUDKIP, gMonShinyPalette_Mudkip),
+    SPECIES_SHINY_PAL(MARSHTOMP, gMonShinyPalette_Marshtomp),
+    SPECIES_SHINY_PAL(SWAMPERT, gMonShinyPalette_Swampert),
+    SPECIES_SHINY_PAL(POOCHYENA, gMonShinyPalette_Poochyena),
+    SPECIES_SHINY_PAL(MIGHTYENA, gMonShinyPalette_Mightyena),
+    SPECIES_SHINY_PAL(ZIGZAGOON, gMonShinyPalette_Zigzagoon),
+    SPECIES_SHINY_PAL(LINOONE, gMonShinyPalette_Linoone),
+    SPECIES_SHINY_PAL(WURMPLE, gMonShinyPalette_Wurmple),
+    SPECIES_SHINY_PAL(SILCOON, gMonShinyPalette_Silcoon),
+    SPECIES_SHINY_PAL(BEAUTIFLY, gMonShinyPalette_Beautifly),
+    SPECIES_SHINY_PAL(CASCOON, gMonShinyPalette_Cascoon),
+    SPECIES_SHINY_PAL(DUSTOX, gMonShinyPalette_Dustox),
+    SPECIES_SHINY_PAL(LOTAD, gMonShinyPalette_Lotad),
+    SPECIES_SHINY_PAL(LOMBRE, gMonShinyPalette_Lombre),
+    SPECIES_SHINY_PAL(LUDICOLO, gMonShinyPalette_Ludicolo),
+    SPECIES_SHINY_PAL(SEEDOT, gMonShinyPalette_Seedot),
+    SPECIES_SHINY_PAL(NUZLEAF, gMonShinyPalette_Nuzleaf),
+    SPECIES_SHINY_PAL(SHIFTRY, gMonShinyPalette_Shiftry),
+    SPECIES_SHINY_PAL(NINCADA, gMonShinyPalette_Nincada),
+    SPECIES_SHINY_PAL(NINJASK, gMonShinyPalette_Ninjask),
+    SPECIES_SHINY_PAL(SHEDINJA, gMonShinyPalette_Shedinja),
+    SPECIES_SHINY_PAL(TAILLOW, gMonShinyPalette_Taillow),
+    SPECIES_SHINY_PAL(SWELLOW, gMonShinyPalette_Swellow),
+    SPECIES_SHINY_PAL(SHROOMISH, gMonShinyPalette_Shroomish),
+    SPECIES_SHINY_PAL(BRELOOM, gMonShinyPalette_Breloom),
+    SPECIES_SHINY_PAL(SPINDA, gMonShinyPalette_Spinda),
+    SPECIES_SHINY_PAL(WINGULL, gMonShinyPalette_Wingull),
+    SPECIES_SHINY_PAL(PELIPPER, gMonShinyPalette_Pelipper),
+    SPECIES_SHINY_PAL(SURSKIT, gMonShinyPalette_Surskit),
+    SPECIES_SHINY_PAL(MASQUERAIN, gMonShinyPalette_Masquerain),
+    SPECIES_SHINY_PAL(WAILMER, gMonShinyPalette_Wailmer),
+    SPECIES_SHINY_PAL(WAILORD, gMonShinyPalette_Wailord),
+    SPECIES_SHINY_PAL(SKITTY, gMonShinyPalette_Skitty),
+    SPECIES_SHINY_PAL(DELCATTY, gMonShinyPalette_Delcatty),
+    SPECIES_SHINY_PAL(KECLEON, gMonShinyPalette_Kecleon),
+    SPECIES_SHINY_PAL(BALTOY, gMonShinyPalette_Baltoy),
+    SPECIES_SHINY_PAL(CLAYDOL, gMonShinyPalette_Claydol),
+    SPECIES_SHINY_PAL(NOSEPASS, gMonShinyPalette_Nosepass),
+    SPECIES_SHINY_PAL(TORKOAL, gMonShinyPalette_Torkoal),
+    SPECIES_SHINY_PAL(SABLEYE, gMonShinyPalette_Sableye),
+    SPECIES_SHINY_PAL(BARBOACH, gMonShinyPalette_Barboach),
+    SPECIES_SHINY_PAL(WHISCASH, gMonShinyPalette_Whiscash),
+    SPECIES_SHINY_PAL(LUVDISC, gMonShinyPalette_Luvdisc),
+    SPECIES_SHINY_PAL(CORPHISH, gMonShinyPalette_Corphish),
+    SPECIES_SHINY_PAL(CRAWDAUNT, gMonShinyPalette_Crawdaunt),
+    SPECIES_SHINY_PAL(FEEBAS, gMonShinyPalette_Feebas),
+    SPECIES_SHINY_PAL(MILOTIC, gMonShinyPalette_Milotic),
+    SPECIES_SHINY_PAL(CARVANHA, gMonShinyPalette_Carvanha),
+    SPECIES_SHINY_PAL(SHARPEDO, gMonShinyPalette_Sharpedo),
+    SPECIES_SHINY_PAL(TRAPINCH, gMonShinyPalette_Trapinch),
+    SPECIES_SHINY_PAL(VIBRAVA, gMonShinyPalette_Vibrava),
+    SPECIES_SHINY_PAL(FLYGON, gMonShinyPalette_Flygon),
+    SPECIES_SHINY_PAL(MAKUHITA, gMonShinyPalette_Makuhita),
+    SPECIES_SHINY_PAL(HARIYAMA, gMonShinyPalette_Hariyama),
+    SPECIES_SHINY_PAL(ELECTRIKE, gMonShinyPalette_Electrike),
+    SPECIES_SHINY_PAL(MANECTRIC, gMonShinyPalette_Manectric),
+    SPECIES_SHINY_PAL(NUMEL, gMonShinyPalette_Numel),
+    SPECIES_SHINY_PAL(CAMERUPT, gMonShinyPalette_Camerupt),
+    SPECIES_SHINY_PAL(SPHEAL, gMonShinyPalette_Spheal),
+    SPECIES_SHINY_PAL(SEALEO, gMonShinyPalette_Sealeo),
+    SPECIES_SHINY_PAL(WALREIN, gMonShinyPalette_Walrein),
+    SPECIES_SHINY_PAL(CACNEA, gMonShinyPalette_Cacnea),
+    SPECIES_SHINY_PAL(CACTURNE, gMonShinyPalette_Cacturne),
+    SPECIES_SHINY_PAL(SNORUNT, gMonShinyPalette_Snorunt),
+    SPECIES_SHINY_PAL(GLALIE, gMonShinyPalette_Glalie),
+    SPECIES_SHINY_PAL(LUNATONE, gMonShinyPalette_Lunatone),
+    SPECIES_SHINY_PAL(SOLROCK, gMonShinyPalette_Solrock),
+    SPECIES_SHINY_PAL(AZURILL, gMonShinyPalette_Azurill),
+    SPECIES_SHINY_PAL(SPOINK, gMonShinyPalette_Spoink),
+    SPECIES_SHINY_PAL(GRUMPIG, gMonShinyPalette_Grumpig),
+    SPECIES_SHINY_PAL(PLUSLE, gMonShinyPalette_Plusle),
+    SPECIES_SHINY_PAL(MINUN, gMonShinyPalette_Minun),
+    SPECIES_SHINY_PAL(MAWILE, gMonShinyPalette_Mawile),
+    SPECIES_SHINY_PAL(MEDITITE, gMonShinyPalette_Meditite),
+    SPECIES_SHINY_PAL(MEDICHAM, gMonShinyPalette_Medicham),
+    SPECIES_SHINY_PAL(SWABLU, gMonShinyPalette_Swablu),
+    SPECIES_SHINY_PAL(ALTARIA, gMonShinyPalette_Altaria),
+    SPECIES_SHINY_PAL(WYNAUT, gMonShinyPalette_Wynaut),
+    SPECIES_SHINY_PAL(DUSKULL, gMonShinyPalette_Duskull),
+    SPECIES_SHINY_PAL(DUSCLOPS, gMonShinyPalette_Dusclops),
+    SPECIES_SHINY_PAL(ROSELIA, gMonShinyPalette_Roselia),
+    SPECIES_SHINY_PAL(SLAKOTH, gMonShinyPalette_Slakoth),
+    SPECIES_SHINY_PAL(VIGOROTH, gMonShinyPalette_Vigoroth),
+    SPECIES_SHINY_PAL(SLAKING, gMonShinyPalette_Slaking),
+    SPECIES_SHINY_PAL(GULPIN, gMonShinyPalette_Gulpin),
+    SPECIES_SHINY_PAL(SWALOT, gMonShinyPalette_Swalot),
+    SPECIES_SHINY_PAL(TROPIUS, gMonShinyPalette_Tropius),
+    SPECIES_SHINY_PAL(WHISMUR, gMonShinyPalette_Whismur),
+    SPECIES_SHINY_PAL(LOUDRED, gMonShinyPalette_Loudred),
+    SPECIES_SHINY_PAL(EXPLOUD, gMonShinyPalette_Exploud),
+    SPECIES_SHINY_PAL(CLAMPERL, gMonShinyPalette_Clamperl),
+    SPECIES_SHINY_PAL(HUNTAIL, gMonShinyPalette_Huntail),
+    SPECIES_SHINY_PAL(GOREBYSS, gMonShinyPalette_Gorebyss),
+    SPECIES_SHINY_PAL(ABSOL, gMonShinyPalette_Absol),
+    SPECIES_SHINY_PAL(SHUPPET, gMonShinyPalette_Shuppet),
+    SPECIES_SHINY_PAL(BANETTE, gMonShinyPalette_Banette),
+    SPECIES_SHINY_PAL(SEVIPER, gMonShinyPalette_Seviper),
+    SPECIES_SHINY_PAL(ZANGOOSE, gMonShinyPalette_Zangoose),
+    SPECIES_SHINY_PAL(RELICANTH, gMonShinyPalette_Relicanth),
+    SPECIES_SHINY_PAL(ARON, gMonShinyPalette_Aron),
+    SPECIES_SHINY_PAL(LAIRON, gMonShinyPalette_Lairon),
+    SPECIES_SHINY_PAL(AGGRON, gMonShinyPalette_Aggron),
+    SPECIES_SHINY_PAL(CASTFORM, gMonShinyPalette_Castform),
+    SPECIES_SHINY_PAL(VOLBEAT, gMonShinyPalette_Volbeat),
+    SPECIES_SHINY_PAL(ILLUMISE, gMonShinyPalette_Illumise),
+    SPECIES_SHINY_PAL(LILEEP, gMonShinyPalette_Lileep),
+    SPECIES_SHINY_PAL(CRADILY, gMonShinyPalette_Cradily),
+    SPECIES_SHINY_PAL(ANORITH, gMonShinyPalette_Anorith),
+    SPECIES_SHINY_PAL(ARMALDO, gMonShinyPalette_Armaldo),
+    SPECIES_SHINY_PAL(RALTS, gMonShinyPalette_Ralts),
+    SPECIES_SHINY_PAL(KIRLIA, gMonShinyPalette_Kirlia),
+    SPECIES_SHINY_PAL(GARDEVOIR, gMonShinyPalette_Gardevoir),
+    SPECIES_SHINY_PAL(BAGON, gMonShinyPalette_Bagon),
+    SPECIES_SHINY_PAL(SHELGON, gMonShinyPalette_Shelgon),
+    SPECIES_SHINY_PAL(SALAMENCE, gMonShinyPalette_Salamence),
+    SPECIES_SHINY_PAL(BELDUM, gMonShinyPalette_Beldum),
+    SPECIES_SHINY_PAL(METANG, gMonShinyPalette_Metang),
+    SPECIES_SHINY_PAL(METAGROSS, gMonShinyPalette_Metagross),
+    SPECIES_SHINY_PAL(REGIROCK, gMonShinyPalette_Regirock),
+    SPECIES_SHINY_PAL(REGICE, gMonShinyPalette_Regice),
+    SPECIES_SHINY_PAL(REGISTEEL, gMonShinyPalette_Registeel),
+    SPECIES_SHINY_PAL(KYOGRE, gMonShinyPalette_Kyogre),
+    SPECIES_SHINY_PAL(GROUDON, gMonShinyPalette_Groudon),
+    SPECIES_SHINY_PAL(RAYQUAZA, gMonShinyPalette_Rayquaza),
+    SPECIES_SHINY_PAL(LATIAS, gMonShinyPalette_Latias),
+    SPECIES_SHINY_PAL(LATIOS, gMonShinyPalette_Latios),
+    SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi),
+    SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys),
+    SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho),
+    SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
+    SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_D, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_E, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_F, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_G, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_H, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_I, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_J, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_K, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_L, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_M, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_N, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_O, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_P, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_Q, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_R, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_S, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_T, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_U, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_V, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_W, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_X, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_Y, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_Z, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_EMARK, gMonShinyPalette_Unown),
+    SPECIES_SHINY_PAL(UNOWN_QMARK, gMonShinyPalette_Unown),
 };
diff --git a/src/data/pokemon_graphics/still_front_pic_table.h b/src/data/pokemon_graphics/still_front_pic_table.h
index 308a872b4..985a3aa2f 100644
--- a/src/data/pokemon_graphics/still_front_pic_table.h
+++ b/src/data/pokemon_graphics/still_front_pic_table.h
@@ -1,448 +1,446 @@
-#define STILL_FRONT_PIC(species, frontpic) [SPECIES_##species] = {frontpic, 0x800, SPECIES_##species}
-
-const struct CompressedSpriteSheet gMonStillFrontPicTable[] = 
+const struct CompressedSpriteSheet gMonStillFrontPicTable[] =
 {
-    STILL_FRONT_PIC(NONE,          gMonStillFrontPic_CircledQuestionMark),
-    STILL_FRONT_PIC(BULBASAUR,     gMonStillFrontPic_Bulbasaur),
-    STILL_FRONT_PIC(IVYSAUR,       gMonStillFrontPic_Ivysaur),
-    STILL_FRONT_PIC(VENUSAUR,      gMonStillFrontPic_Venusaur),
-    STILL_FRONT_PIC(CHARMANDER,    gMonStillFrontPic_Charmander),
-    STILL_FRONT_PIC(CHARMELEON,    gMonStillFrontPic_Charmeleon),
-    STILL_FRONT_PIC(CHARIZARD,     gMonStillFrontPic_Charizard),
-    STILL_FRONT_PIC(SQUIRTLE,      gMonStillFrontPic_Squirtle),
-    STILL_FRONT_PIC(WARTORTLE,     gMonStillFrontPic_Wartortle),
-    STILL_FRONT_PIC(BLASTOISE,     gMonStillFrontPic_Blastoise),
-    STILL_FRONT_PIC(CATERPIE,      gMonStillFrontPic_Caterpie),
-    STILL_FRONT_PIC(METAPOD,       gMonStillFrontPic_Metapod),
-    STILL_FRONT_PIC(BUTTERFREE,    gMonStillFrontPic_Butterfree),
-    STILL_FRONT_PIC(WEEDLE,        gMonStillFrontPic_Weedle),
-    STILL_FRONT_PIC(KAKUNA,        gMonStillFrontPic_Kakuna),
-    STILL_FRONT_PIC(BEEDRILL,      gMonStillFrontPic_Beedrill),
-    STILL_FRONT_PIC(PIDGEY,        gMonStillFrontPic_Pidgey),
-    STILL_FRONT_PIC(PIDGEOTTO,     gMonStillFrontPic_Pidgeotto),
-    STILL_FRONT_PIC(PIDGEOT,       gMonStillFrontPic_Pidgeot),
-    STILL_FRONT_PIC(RATTATA,       gMonStillFrontPic_Rattata),
-    STILL_FRONT_PIC(RATICATE,      gMonStillFrontPic_Raticate),
-    STILL_FRONT_PIC(SPEAROW,       gMonStillFrontPic_Spearow),
-    STILL_FRONT_PIC(FEAROW,        gMonStillFrontPic_Fearow),
-    STILL_FRONT_PIC(EKANS,         gMonStillFrontPic_Ekans),
-    STILL_FRONT_PIC(ARBOK,         gMonStillFrontPic_Arbok),
-    STILL_FRONT_PIC(PIKACHU,       gMonStillFrontPic_Pikachu),
-    STILL_FRONT_PIC(RAICHU,        gMonStillFrontPic_Raichu),
-    STILL_FRONT_PIC(SANDSHREW,     gMonStillFrontPic_Sandshrew),
-    STILL_FRONT_PIC(SANDSLASH,     gMonStillFrontPic_Sandslash),
-    STILL_FRONT_PIC(NIDORAN_F,     gMonStillFrontPic_NidoranF),
-    STILL_FRONT_PIC(NIDORINA,      gMonStillFrontPic_Nidorina),
-    STILL_FRONT_PIC(NIDOQUEEN,     gMonStillFrontPic_Nidoqueen),
-    STILL_FRONT_PIC(NIDORAN_M,     gMonStillFrontPic_NidoranM),
-    STILL_FRONT_PIC(NIDORINO,      gMonStillFrontPic_Nidorino),
-    STILL_FRONT_PIC(NIDOKING,      gMonStillFrontPic_Nidoking),
-    STILL_FRONT_PIC(CLEFAIRY,      gMonStillFrontPic_Clefairy),
-    STILL_FRONT_PIC(CLEFABLE,      gMonStillFrontPic_Clefable),
-    STILL_FRONT_PIC(VULPIX,        gMonStillFrontPic_Vulpix),
-    STILL_FRONT_PIC(NINETALES,     gMonStillFrontPic_Ninetales),
-    STILL_FRONT_PIC(JIGGLYPUFF,    gMonStillFrontPic_Jigglypuff),
-    STILL_FRONT_PIC(WIGGLYTUFF,    gMonStillFrontPic_Wigglytuff),
-    STILL_FRONT_PIC(ZUBAT,         gMonStillFrontPic_Zubat),
-    STILL_FRONT_PIC(GOLBAT,        gMonStillFrontPic_Golbat),
-    STILL_FRONT_PIC(ODDISH,        gMonStillFrontPic_Oddish),
-    STILL_FRONT_PIC(GLOOM,         gMonStillFrontPic_Gloom),
-    STILL_FRONT_PIC(VILEPLUME,     gMonStillFrontPic_Vileplume),
-    STILL_FRONT_PIC(PARAS,         gMonStillFrontPic_Paras),
-    STILL_FRONT_PIC(PARASECT,      gMonStillFrontPic_Parasect),
-    STILL_FRONT_PIC(VENONAT,       gMonStillFrontPic_Venonat),
-    STILL_FRONT_PIC(VENOMOTH,      gMonStillFrontPic_Venomoth),
-    STILL_FRONT_PIC(DIGLETT,       gMonStillFrontPic_Diglett),
-    STILL_FRONT_PIC(DUGTRIO,       gMonStillFrontPic_Dugtrio),
-    STILL_FRONT_PIC(MEOWTH,        gMonStillFrontPic_Meowth),
-    STILL_FRONT_PIC(PERSIAN,       gMonStillFrontPic_Persian),
-    STILL_FRONT_PIC(PSYDUCK,       gMonStillFrontPic_Psyduck),
-    STILL_FRONT_PIC(GOLDUCK,       gMonStillFrontPic_Golduck),
-    STILL_FRONT_PIC(MANKEY,        gMonStillFrontPic_Mankey),
-    STILL_FRONT_PIC(PRIMEAPE,      gMonStillFrontPic_Primeape),
-    STILL_FRONT_PIC(GROWLITHE,     gMonStillFrontPic_Growlithe),
-    STILL_FRONT_PIC(ARCANINE,      gMonStillFrontPic_Arcanine),
-    STILL_FRONT_PIC(POLIWAG,       gMonStillFrontPic_Poliwag),
-    STILL_FRONT_PIC(POLIWHIRL,     gMonStillFrontPic_Poliwhirl),
-    STILL_FRONT_PIC(POLIWRATH,     gMonStillFrontPic_Poliwrath),
-    STILL_FRONT_PIC(ABRA,          gMonStillFrontPic_Abra),
-    STILL_FRONT_PIC(KADABRA,       gMonStillFrontPic_Kadabra),
-    STILL_FRONT_PIC(ALAKAZAM,      gMonStillFrontPic_Alakazam),
-    STILL_FRONT_PIC(MACHOP,        gMonStillFrontPic_Machop),
-    STILL_FRONT_PIC(MACHOKE,       gMonStillFrontPic_Machoke),
-    STILL_FRONT_PIC(MACHAMP,       gMonStillFrontPic_Machamp),
-    STILL_FRONT_PIC(BELLSPROUT,    gMonStillFrontPic_Bellsprout),
-    STILL_FRONT_PIC(WEEPINBELL,    gMonStillFrontPic_Weepinbell),
-    STILL_FRONT_PIC(VICTREEBEL,    gMonStillFrontPic_Victreebel),
-    STILL_FRONT_PIC(TENTACOOL,     gMonStillFrontPic_Tentacool),
-    STILL_FRONT_PIC(TENTACRUEL,    gMonStillFrontPic_Tentacruel),
-    STILL_FRONT_PIC(GEODUDE,       gMonStillFrontPic_Geodude),
-    STILL_FRONT_PIC(GRAVELER,      gMonStillFrontPic_Graveler),
-    STILL_FRONT_PIC(GOLEM,         gMonStillFrontPic_Golem),
-    STILL_FRONT_PIC(PONYTA,        gMonStillFrontPic_Ponyta),
-    STILL_FRONT_PIC(RAPIDASH,      gMonStillFrontPic_Rapidash),
-    STILL_FRONT_PIC(SLOWPOKE,      gMonStillFrontPic_Slowpoke),
-    STILL_FRONT_PIC(SLOWBRO,       gMonStillFrontPic_Slowbro),
-    STILL_FRONT_PIC(MAGNEMITE,     gMonStillFrontPic_Magnemite),
-    STILL_FRONT_PIC(MAGNETON,      gMonStillFrontPic_Magneton),
-    STILL_FRONT_PIC(FARFETCHD,     gMonStillFrontPic_Farfetchd),
-    STILL_FRONT_PIC(DODUO,         gMonStillFrontPic_Doduo),
-    STILL_FRONT_PIC(DODRIO,        gMonStillFrontPic_Dodrio),
-    STILL_FRONT_PIC(SEEL,          gMonStillFrontPic_Seel),
-    STILL_FRONT_PIC(DEWGONG,       gMonStillFrontPic_Dewgong),
-    STILL_FRONT_PIC(GRIMER,        gMonStillFrontPic_Grimer),
-    STILL_FRONT_PIC(MUK,           gMonStillFrontPic_Muk),
-    STILL_FRONT_PIC(SHELLDER,      gMonStillFrontPic_Shellder),
-    STILL_FRONT_PIC(CLOYSTER,      gMonStillFrontPic_Cloyster),
-    STILL_FRONT_PIC(GASTLY,        gMonStillFrontPic_Gastly),
-    STILL_FRONT_PIC(HAUNTER,       gMonStillFrontPic_Haunter),
-    STILL_FRONT_PIC(GENGAR,        gMonStillFrontPic_Gengar),
-    STILL_FRONT_PIC(ONIX,          gMonStillFrontPic_Onix),
-    STILL_FRONT_PIC(DROWZEE,       gMonStillFrontPic_Drowzee),
-    STILL_FRONT_PIC(HYPNO,         gMonStillFrontPic_Hypno),
-    STILL_FRONT_PIC(KRABBY,        gMonStillFrontPic_Krabby),
-    STILL_FRONT_PIC(KINGLER,       gMonStillFrontPic_Kingler),
-    STILL_FRONT_PIC(VOLTORB,       gMonStillFrontPic_Voltorb),
-    STILL_FRONT_PIC(ELECTRODE,     gMonStillFrontPic_Electrode),
-    STILL_FRONT_PIC(EXEGGCUTE,     gMonStillFrontPic_Exeggcute),
-    STILL_FRONT_PIC(EXEGGUTOR,     gMonStillFrontPic_Exeggutor),
-    STILL_FRONT_PIC(CUBONE,        gMonStillFrontPic_Cubone),
-    STILL_FRONT_PIC(MAROWAK,       gMonStillFrontPic_Marowak),
-    STILL_FRONT_PIC(HITMONLEE,     gMonStillFrontPic_Hitmonlee),
-    STILL_FRONT_PIC(HITMONCHAN,    gMonStillFrontPic_Hitmonchan),
-    STILL_FRONT_PIC(LICKITUNG,     gMonStillFrontPic_Lickitung),
-    STILL_FRONT_PIC(KOFFING,       gMonStillFrontPic_Koffing),
-    STILL_FRONT_PIC(WEEZING,       gMonStillFrontPic_Weezing),
-    STILL_FRONT_PIC(RHYHORN,       gMonStillFrontPic_Rhyhorn),
-    STILL_FRONT_PIC(RHYDON,        gMonStillFrontPic_Rhydon),
-    STILL_FRONT_PIC(CHANSEY,       gMonStillFrontPic_Chansey),
-    STILL_FRONT_PIC(TANGELA,       gMonStillFrontPic_Tangela),
-    STILL_FRONT_PIC(KANGASKHAN,    gMonStillFrontPic_Kangaskhan),
-    STILL_FRONT_PIC(HORSEA,        gMonStillFrontPic_Horsea),
-    STILL_FRONT_PIC(SEADRA,        gMonStillFrontPic_Seadra),
-    STILL_FRONT_PIC(GOLDEEN,       gMonStillFrontPic_Goldeen),
-    STILL_FRONT_PIC(SEAKING,       gMonStillFrontPic_Seaking),
-    STILL_FRONT_PIC(STARYU,        gMonStillFrontPic_Staryu),
-    STILL_FRONT_PIC(STARMIE,       gMonStillFrontPic_Starmie),
-    STILL_FRONT_PIC(MR_MIME,       gMonStillFrontPic_Mrmime),
-    STILL_FRONT_PIC(SCYTHER,       gMonStillFrontPic_Scyther),
-    STILL_FRONT_PIC(JYNX,          gMonStillFrontPic_Jynx),
-    STILL_FRONT_PIC(ELECTABUZZ,    gMonStillFrontPic_Electabuzz),
-    STILL_FRONT_PIC(MAGMAR,        gMonStillFrontPic_Magmar),
-    STILL_FRONT_PIC(PINSIR,        gMonStillFrontPic_Pinsir),
-    STILL_FRONT_PIC(TAUROS,        gMonStillFrontPic_Tauros),
-    STILL_FRONT_PIC(MAGIKARP,      gMonStillFrontPic_Magikarp),
-    STILL_FRONT_PIC(GYARADOS,      gMonStillFrontPic_Gyarados),
-    STILL_FRONT_PIC(LAPRAS,        gMonStillFrontPic_Lapras),
-    STILL_FRONT_PIC(DITTO,         gMonStillFrontPic_Ditto),
-    STILL_FRONT_PIC(EEVEE,         gMonStillFrontPic_Eevee),
-    STILL_FRONT_PIC(VAPOREON,      gMonStillFrontPic_Vaporeon),
-    STILL_FRONT_PIC(JOLTEON,       gMonStillFrontPic_Jolteon),
-    STILL_FRONT_PIC(FLAREON,       gMonStillFrontPic_Flareon),
-    STILL_FRONT_PIC(PORYGON,       gMonStillFrontPic_Porygon),
-    STILL_FRONT_PIC(OMANYTE,       gMonStillFrontPic_Omanyte),
-    STILL_FRONT_PIC(OMASTAR,       gMonStillFrontPic_Omastar),
-    STILL_FRONT_PIC(KABUTO,        gMonStillFrontPic_Kabuto),
-    STILL_FRONT_PIC(KABUTOPS,      gMonStillFrontPic_Kabutops),
-    STILL_FRONT_PIC(AERODACTYL,    gMonStillFrontPic_Aerodactyl),
-    STILL_FRONT_PIC(SNORLAX,       gMonStillFrontPic_Snorlax),
-    STILL_FRONT_PIC(ARTICUNO,      gMonStillFrontPic_Articuno),
-    STILL_FRONT_PIC(ZAPDOS,        gMonStillFrontPic_Zapdos),
-    STILL_FRONT_PIC(MOLTRES,       gMonStillFrontPic_Moltres),
-    STILL_FRONT_PIC(DRATINI,       gMonStillFrontPic_Dratini),
-    STILL_FRONT_PIC(DRAGONAIR,     gMonStillFrontPic_Dragonair),
-    STILL_FRONT_PIC(DRAGONITE,     gMonStillFrontPic_Dragonite),
-    STILL_FRONT_PIC(MEWTWO,        gMonStillFrontPic_Mewtwo),
-    STILL_FRONT_PIC(MEW,           gMonStillFrontPic_Mew),
+    SPECIES_SPRITE(NONE,          gMonStillFrontPic_CircledQuestionMark),
+    SPECIES_SPRITE(BULBASAUR,     gMonStillFrontPic_Bulbasaur),
+    SPECIES_SPRITE(IVYSAUR,       gMonStillFrontPic_Ivysaur),
+    SPECIES_SPRITE(VENUSAUR,      gMonStillFrontPic_Venusaur),
+    SPECIES_SPRITE(CHARMANDER,    gMonStillFrontPic_Charmander),
+    SPECIES_SPRITE(CHARMELEON,    gMonStillFrontPic_Charmeleon),
+    SPECIES_SPRITE(CHARIZARD,     gMonStillFrontPic_Charizard),
+    SPECIES_SPRITE(SQUIRTLE,      gMonStillFrontPic_Squirtle),
+    SPECIES_SPRITE(WARTORTLE,     gMonStillFrontPic_Wartortle),
+    SPECIES_SPRITE(BLASTOISE,     gMonStillFrontPic_Blastoise),
+    SPECIES_SPRITE(CATERPIE,      gMonStillFrontPic_Caterpie),
+    SPECIES_SPRITE(METAPOD,       gMonStillFrontPic_Metapod),
+    SPECIES_SPRITE(BUTTERFREE,    gMonStillFrontPic_Butterfree),
+    SPECIES_SPRITE(WEEDLE,        gMonStillFrontPic_Weedle),
+    SPECIES_SPRITE(KAKUNA,        gMonStillFrontPic_Kakuna),
+    SPECIES_SPRITE(BEEDRILL,      gMonStillFrontPic_Beedrill),
+    SPECIES_SPRITE(PIDGEY,        gMonStillFrontPic_Pidgey),
+    SPECIES_SPRITE(PIDGEOTTO,     gMonStillFrontPic_Pidgeotto),
+    SPECIES_SPRITE(PIDGEOT,       gMonStillFrontPic_Pidgeot),
+    SPECIES_SPRITE(RATTATA,       gMonStillFrontPic_Rattata),
+    SPECIES_SPRITE(RATICATE,      gMonStillFrontPic_Raticate),
+    SPECIES_SPRITE(SPEAROW,       gMonStillFrontPic_Spearow),
+    SPECIES_SPRITE(FEAROW,        gMonStillFrontPic_Fearow),
+    SPECIES_SPRITE(EKANS,         gMonStillFrontPic_Ekans),
+    SPECIES_SPRITE(ARBOK,         gMonStillFrontPic_Arbok),
+    SPECIES_SPRITE(PIKACHU,       gMonStillFrontPic_Pikachu),
+    SPECIES_SPRITE(RAICHU,        gMonStillFrontPic_Raichu),
+    SPECIES_SPRITE(SANDSHREW,     gMonStillFrontPic_Sandshrew),
+    SPECIES_SPRITE(SANDSLASH,     gMonStillFrontPic_Sandslash),
+    SPECIES_SPRITE(NIDORAN_F,     gMonStillFrontPic_NidoranF),
+    SPECIES_SPRITE(NIDORINA,      gMonStillFrontPic_Nidorina),
+    SPECIES_SPRITE(NIDOQUEEN,     gMonStillFrontPic_Nidoqueen),
+    SPECIES_SPRITE(NIDORAN_M,     gMonStillFrontPic_NidoranM),
+    SPECIES_SPRITE(NIDORINO,      gMonStillFrontPic_Nidorino),
+    SPECIES_SPRITE(NIDOKING,      gMonStillFrontPic_Nidoking),
+    SPECIES_SPRITE(CLEFAIRY,      gMonStillFrontPic_Clefairy),
+    SPECIES_SPRITE(CLEFABLE,      gMonStillFrontPic_Clefable),
+    SPECIES_SPRITE(VULPIX,        gMonStillFrontPic_Vulpix),
+    SPECIES_SPRITE(NINETALES,     gMonStillFrontPic_Ninetales),
+    SPECIES_SPRITE(JIGGLYPUFF,    gMonStillFrontPic_Jigglypuff),
+    SPECIES_SPRITE(WIGGLYTUFF,    gMonStillFrontPic_Wigglytuff),
+    SPECIES_SPRITE(ZUBAT,         gMonStillFrontPic_Zubat),
+    SPECIES_SPRITE(GOLBAT,        gMonStillFrontPic_Golbat),
+    SPECIES_SPRITE(ODDISH,        gMonStillFrontPic_Oddish),
+    SPECIES_SPRITE(GLOOM,         gMonStillFrontPic_Gloom),
+    SPECIES_SPRITE(VILEPLUME,     gMonStillFrontPic_Vileplume),
+    SPECIES_SPRITE(PARAS,         gMonStillFrontPic_Paras),
+    SPECIES_SPRITE(PARASECT,      gMonStillFrontPic_Parasect),
+    SPECIES_SPRITE(VENONAT,       gMonStillFrontPic_Venonat),
+    SPECIES_SPRITE(VENOMOTH,      gMonStillFrontPic_Venomoth),
+    SPECIES_SPRITE(DIGLETT,       gMonStillFrontPic_Diglett),
+    SPECIES_SPRITE(DUGTRIO,       gMonStillFrontPic_Dugtrio),
+    SPECIES_SPRITE(MEOWTH,        gMonStillFrontPic_Meowth),
+    SPECIES_SPRITE(PERSIAN,       gMonStillFrontPic_Persian),
+    SPECIES_SPRITE(PSYDUCK,       gMonStillFrontPic_Psyduck),
+    SPECIES_SPRITE(GOLDUCK,       gMonStillFrontPic_Golduck),
+    SPECIES_SPRITE(MANKEY,        gMonStillFrontPic_Mankey),
+    SPECIES_SPRITE(PRIMEAPE,      gMonStillFrontPic_Primeape),
+    SPECIES_SPRITE(GROWLITHE,     gMonStillFrontPic_Growlithe),
+    SPECIES_SPRITE(ARCANINE,      gMonStillFrontPic_Arcanine),
+    SPECIES_SPRITE(POLIWAG,       gMonStillFrontPic_Poliwag),
+    SPECIES_SPRITE(POLIWHIRL,     gMonStillFrontPic_Poliwhirl),
+    SPECIES_SPRITE(POLIWRATH,     gMonStillFrontPic_Poliwrath),
+    SPECIES_SPRITE(ABRA,          gMonStillFrontPic_Abra),
+    SPECIES_SPRITE(KADABRA,       gMonStillFrontPic_Kadabra),
+    SPECIES_SPRITE(ALAKAZAM,      gMonStillFrontPic_Alakazam),
+    SPECIES_SPRITE(MACHOP,        gMonStillFrontPic_Machop),
+    SPECIES_SPRITE(MACHOKE,       gMonStillFrontPic_Machoke),
+    SPECIES_SPRITE(MACHAMP,       gMonStillFrontPic_Machamp),
+    SPECIES_SPRITE(BELLSPROUT,    gMonStillFrontPic_Bellsprout),
+    SPECIES_SPRITE(WEEPINBELL,    gMonStillFrontPic_Weepinbell),
+    SPECIES_SPRITE(VICTREEBEL,    gMonStillFrontPic_Victreebel),
+    SPECIES_SPRITE(TENTACOOL,     gMonStillFrontPic_Tentacool),
+    SPECIES_SPRITE(TENTACRUEL,    gMonStillFrontPic_Tentacruel),
+    SPECIES_SPRITE(GEODUDE,       gMonStillFrontPic_Geodude),
+    SPECIES_SPRITE(GRAVELER,      gMonStillFrontPic_Graveler),
+    SPECIES_SPRITE(GOLEM,         gMonStillFrontPic_Golem),
+    SPECIES_SPRITE(PONYTA,        gMonStillFrontPic_Ponyta),
+    SPECIES_SPRITE(RAPIDASH,      gMonStillFrontPic_Rapidash),
+    SPECIES_SPRITE(SLOWPOKE,      gMonStillFrontPic_Slowpoke),
+    SPECIES_SPRITE(SLOWBRO,       gMonStillFrontPic_Slowbro),
+    SPECIES_SPRITE(MAGNEMITE,     gMonStillFrontPic_Magnemite),
+    SPECIES_SPRITE(MAGNETON,      gMonStillFrontPic_Magneton),
+    SPECIES_SPRITE(FARFETCHD,     gMonStillFrontPic_Farfetchd),
+    SPECIES_SPRITE(DODUO,         gMonStillFrontPic_Doduo),
+    SPECIES_SPRITE(DODRIO,        gMonStillFrontPic_Dodrio),
+    SPECIES_SPRITE(SEEL,          gMonStillFrontPic_Seel),
+    SPECIES_SPRITE(DEWGONG,       gMonStillFrontPic_Dewgong),
+    SPECIES_SPRITE(GRIMER,        gMonStillFrontPic_Grimer),
+    SPECIES_SPRITE(MUK,           gMonStillFrontPic_Muk),
+    SPECIES_SPRITE(SHELLDER,      gMonStillFrontPic_Shellder),
+    SPECIES_SPRITE(CLOYSTER,      gMonStillFrontPic_Cloyster),
+    SPECIES_SPRITE(GASTLY,        gMonStillFrontPic_Gastly),
+    SPECIES_SPRITE(HAUNTER,       gMonStillFrontPic_Haunter),
+    SPECIES_SPRITE(GENGAR,        gMonStillFrontPic_Gengar),
+    SPECIES_SPRITE(ONIX,          gMonStillFrontPic_Onix),
+    SPECIES_SPRITE(DROWZEE,       gMonStillFrontPic_Drowzee),
+    SPECIES_SPRITE(HYPNO,         gMonStillFrontPic_Hypno),
+    SPECIES_SPRITE(KRABBY,        gMonStillFrontPic_Krabby),
+    SPECIES_SPRITE(KINGLER,       gMonStillFrontPic_Kingler),
+    SPECIES_SPRITE(VOLTORB,       gMonStillFrontPic_Voltorb),
+    SPECIES_SPRITE(ELECTRODE,     gMonStillFrontPic_Electrode),
+    SPECIES_SPRITE(EXEGGCUTE,     gMonStillFrontPic_Exeggcute),
+    SPECIES_SPRITE(EXEGGUTOR,     gMonStillFrontPic_Exeggutor),
+    SPECIES_SPRITE(CUBONE,        gMonStillFrontPic_Cubone),
+    SPECIES_SPRITE(MAROWAK,       gMonStillFrontPic_Marowak),
+    SPECIES_SPRITE(HITMONLEE,     gMonStillFrontPic_Hitmonlee),
+    SPECIES_SPRITE(HITMONCHAN,    gMonStillFrontPic_Hitmonchan),
+    SPECIES_SPRITE(LICKITUNG,     gMonStillFrontPic_Lickitung),
+    SPECIES_SPRITE(KOFFING,       gMonStillFrontPic_Koffing),
+    SPECIES_SPRITE(WEEZING,       gMonStillFrontPic_Weezing),
+    SPECIES_SPRITE(RHYHORN,       gMonStillFrontPic_Rhyhorn),
+    SPECIES_SPRITE(RHYDON,        gMonStillFrontPic_Rhydon),
+    SPECIES_SPRITE(CHANSEY,       gMonStillFrontPic_Chansey),
+    SPECIES_SPRITE(TANGELA,       gMonStillFrontPic_Tangela),
+    SPECIES_SPRITE(KANGASKHAN,    gMonStillFrontPic_Kangaskhan),
+    SPECIES_SPRITE(HORSEA,        gMonStillFrontPic_Horsea),
+    SPECIES_SPRITE(SEADRA,        gMonStillFrontPic_Seadra),
+    SPECIES_SPRITE(GOLDEEN,       gMonStillFrontPic_Goldeen),
+    SPECIES_SPRITE(SEAKING,       gMonStillFrontPic_Seaking),
+    SPECIES_SPRITE(STARYU,        gMonStillFrontPic_Staryu),
+    SPECIES_SPRITE(STARMIE,       gMonStillFrontPic_Starmie),
+    SPECIES_SPRITE(MR_MIME,       gMonStillFrontPic_Mrmime),
+    SPECIES_SPRITE(SCYTHER,       gMonStillFrontPic_Scyther),
+    SPECIES_SPRITE(JYNX,          gMonStillFrontPic_Jynx),
+    SPECIES_SPRITE(ELECTABUZZ,    gMonStillFrontPic_Electabuzz),
+    SPECIES_SPRITE(MAGMAR,        gMonStillFrontPic_Magmar),
+    SPECIES_SPRITE(PINSIR,        gMonStillFrontPic_Pinsir),
+    SPECIES_SPRITE(TAUROS,        gMonStillFrontPic_Tauros),
+    SPECIES_SPRITE(MAGIKARP,      gMonStillFrontPic_Magikarp),
+    SPECIES_SPRITE(GYARADOS,      gMonStillFrontPic_Gyarados),
+    SPECIES_SPRITE(LAPRAS,        gMonStillFrontPic_Lapras),
+    SPECIES_SPRITE(DITTO,         gMonStillFrontPic_Ditto),
+    SPECIES_SPRITE(EEVEE,         gMonStillFrontPic_Eevee),
+    SPECIES_SPRITE(VAPOREON,      gMonStillFrontPic_Vaporeon),
+    SPECIES_SPRITE(JOLTEON,       gMonStillFrontPic_Jolteon),
+    SPECIES_SPRITE(FLAREON,       gMonStillFrontPic_Flareon),
+    SPECIES_SPRITE(PORYGON,       gMonStillFrontPic_Porygon),
+    SPECIES_SPRITE(OMANYTE,       gMonStillFrontPic_Omanyte),
+    SPECIES_SPRITE(OMASTAR,       gMonStillFrontPic_Omastar),
+    SPECIES_SPRITE(KABUTO,        gMonStillFrontPic_Kabuto),
+    SPECIES_SPRITE(KABUTOPS,      gMonStillFrontPic_Kabutops),
+    SPECIES_SPRITE(AERODACTYL,    gMonStillFrontPic_Aerodactyl),
+    SPECIES_SPRITE(SNORLAX,       gMonStillFrontPic_Snorlax),
+    SPECIES_SPRITE(ARTICUNO,      gMonStillFrontPic_Articuno),
+    SPECIES_SPRITE(ZAPDOS,        gMonStillFrontPic_Zapdos),
+    SPECIES_SPRITE(MOLTRES,       gMonStillFrontPic_Moltres),
+    SPECIES_SPRITE(DRATINI,       gMonStillFrontPic_Dratini),
+    SPECIES_SPRITE(DRAGONAIR,     gMonStillFrontPic_Dragonair),
+    SPECIES_SPRITE(DRAGONITE,     gMonStillFrontPic_Dragonite),
+    SPECIES_SPRITE(MEWTWO,        gMonStillFrontPic_Mewtwo),
+    SPECIES_SPRITE(MEW,           gMonStillFrontPic_Mew),
 // Gen II
-    STILL_FRONT_PIC(CHIKORITA,     gMonStillFrontPic_Chikorita),
-    STILL_FRONT_PIC(BAYLEEF,       gMonStillFrontPic_Bayleef),
-    STILL_FRONT_PIC(MEGANIUM,      gMonStillFrontPic_Meganium),
-    STILL_FRONT_PIC(CYNDAQUIL,     gMonStillFrontPic_Cyndaquil),
-    STILL_FRONT_PIC(QUILAVA,       gMonStillFrontPic_Quilava),
-    STILL_FRONT_PIC(TYPHLOSION,    gMonStillFrontPic_Typhlosion),
-    STILL_FRONT_PIC(TOTODILE,      gMonStillFrontPic_Totodile),
-    STILL_FRONT_PIC(CROCONAW,      gMonStillFrontPic_Croconaw),
-    STILL_FRONT_PIC(FERALIGATR,    gMonStillFrontPic_Feraligatr),
-    STILL_FRONT_PIC(SENTRET,       gMonStillFrontPic_Sentret),
-    STILL_FRONT_PIC(FURRET,        gMonStillFrontPic_Furret),
-    STILL_FRONT_PIC(HOOTHOOT,      gMonStillFrontPic_Hoothoot),
-    STILL_FRONT_PIC(NOCTOWL,       gMonStillFrontPic_Noctowl),
-    STILL_FRONT_PIC(LEDYBA,        gMonStillFrontPic_Ledyba),
-    STILL_FRONT_PIC(LEDIAN,        gMonStillFrontPic_Ledian),
-    STILL_FRONT_PIC(SPINARAK,      gMonStillFrontPic_Spinarak),
-    STILL_FRONT_PIC(ARIADOS,       gMonStillFrontPic_Ariados),
-    STILL_FRONT_PIC(CROBAT,        gMonStillFrontPic_Crobat),
-    STILL_FRONT_PIC(CHINCHOU,      gMonStillFrontPic_Chinchou),
-    STILL_FRONT_PIC(LANTURN,       gMonStillFrontPic_Lanturn),
-    STILL_FRONT_PIC(PICHU,         gMonStillFrontPic_Pichu),
-    STILL_FRONT_PIC(CLEFFA,        gMonStillFrontPic_Cleffa),
-    STILL_FRONT_PIC(IGGLYBUFF,     gMonStillFrontPic_Igglybuff),
-    STILL_FRONT_PIC(TOGEPI,        gMonStillFrontPic_Togepi),
-    STILL_FRONT_PIC(TOGETIC,       gMonStillFrontPic_Togetic),
-    STILL_FRONT_PIC(NATU,          gMonStillFrontPic_Natu),
-    STILL_FRONT_PIC(XATU,          gMonStillFrontPic_Xatu),
-    STILL_FRONT_PIC(MAREEP,        gMonStillFrontPic_Mareep),
-    STILL_FRONT_PIC(FLAAFFY,       gMonStillFrontPic_Flaaffy),
-    STILL_FRONT_PIC(AMPHAROS,      gMonStillFrontPic_Ampharos),
-    STILL_FRONT_PIC(BELLOSSOM,     gMonStillFrontPic_Bellossom),
-    STILL_FRONT_PIC(MARILL,        gMonStillFrontPic_Marill),
-    STILL_FRONT_PIC(AZUMARILL,     gMonStillFrontPic_Azumarill),
-    STILL_FRONT_PIC(SUDOWOODO,     gMonStillFrontPic_Sudowoodo),
-    STILL_FRONT_PIC(POLITOED,      gMonStillFrontPic_Politoed),
-    STILL_FRONT_PIC(HOPPIP,        gMonStillFrontPic_Hoppip),
-    STILL_FRONT_PIC(SKIPLOOM,      gMonStillFrontPic_Skiploom),
-    STILL_FRONT_PIC(JUMPLUFF,      gMonStillFrontPic_Jumpluff),
-    STILL_FRONT_PIC(AIPOM,         gMonStillFrontPic_Aipom),
-    STILL_FRONT_PIC(SUNKERN,       gMonStillFrontPic_Sunkern),
-    STILL_FRONT_PIC(SUNFLORA,      gMonStillFrontPic_Sunflora),
-    STILL_FRONT_PIC(YANMA,         gMonStillFrontPic_Yanma),
-    STILL_FRONT_PIC(WOOPER,        gMonStillFrontPic_Wooper),
-    STILL_FRONT_PIC(QUAGSIRE,      gMonStillFrontPic_Quagsire),
-    STILL_FRONT_PIC(ESPEON,        gMonStillFrontPic_Espeon),
-    STILL_FRONT_PIC(UMBREON,       gMonStillFrontPic_Umbreon),
-    STILL_FRONT_PIC(MURKROW,       gMonStillFrontPic_Murkrow),
-    STILL_FRONT_PIC(SLOWKING,      gMonStillFrontPic_Slowking),
-    STILL_FRONT_PIC(MISDREAVUS,    gMonStillFrontPic_Misdreavus),
-    STILL_FRONT_PIC(UNOWN,         gMonStillFrontPic_UnownA),
-    STILL_FRONT_PIC(WOBBUFFET,     gMonStillFrontPic_Wobbuffet),
-    STILL_FRONT_PIC(GIRAFARIG,     gMonStillFrontPic_Girafarig),
-    STILL_FRONT_PIC(PINECO,        gMonStillFrontPic_Pineco),
-    STILL_FRONT_PIC(FORRETRESS,    gMonStillFrontPic_Forretress),
-    STILL_FRONT_PIC(DUNSPARCE,     gMonStillFrontPic_Dunsparce),
-    STILL_FRONT_PIC(GLIGAR,        gMonStillFrontPic_Gligar),
-    STILL_FRONT_PIC(STEELIX,       gMonStillFrontPic_Steelix),
-    STILL_FRONT_PIC(SNUBBULL,      gMonStillFrontPic_Snubbull),
-    STILL_FRONT_PIC(GRANBULL,      gMonStillFrontPic_Granbull),
-    STILL_FRONT_PIC(QWILFISH,      gMonStillFrontPic_Qwilfish),
-    STILL_FRONT_PIC(SCIZOR,        gMonStillFrontPic_Scizor),
-    STILL_FRONT_PIC(SHUCKLE,       gMonStillFrontPic_Shuckle),
-    STILL_FRONT_PIC(HERACROSS,     gMonStillFrontPic_Heracross),
-    STILL_FRONT_PIC(SNEASEL,       gMonStillFrontPic_Sneasel),
-    STILL_FRONT_PIC(TEDDIURSA,     gMonStillFrontPic_Teddiursa),
-    STILL_FRONT_PIC(URSARING,      gMonStillFrontPic_Ursaring),
-    STILL_FRONT_PIC(SLUGMA,        gMonStillFrontPic_Slugma),
-    STILL_FRONT_PIC(MAGCARGO,      gMonStillFrontPic_Magcargo),
-    STILL_FRONT_PIC(SWINUB,        gMonStillFrontPic_Swinub),
-    STILL_FRONT_PIC(PILOSWINE,     gMonStillFrontPic_Piloswine),
-    STILL_FRONT_PIC(CORSOLA,       gMonStillFrontPic_Corsola),
-    STILL_FRONT_PIC(REMORAID,      gMonStillFrontPic_Remoraid),
-    STILL_FRONT_PIC(OCTILLERY,     gMonStillFrontPic_Octillery),
-    STILL_FRONT_PIC(DELIBIRD,      gMonStillFrontPic_Delibird),
-    STILL_FRONT_PIC(MANTINE,       gMonStillFrontPic_Mantine),
-    STILL_FRONT_PIC(SKARMORY,      gMonStillFrontPic_Skarmory),
-    STILL_FRONT_PIC(HOUNDOUR,      gMonStillFrontPic_Houndour),
-    STILL_FRONT_PIC(HOUNDOOM,      gMonStillFrontPic_Houndoom),
-    STILL_FRONT_PIC(KINGDRA,       gMonStillFrontPic_Kingdra),
-    STILL_FRONT_PIC(PHANPY,        gMonStillFrontPic_Phanpy),
-    STILL_FRONT_PIC(DONPHAN,       gMonStillFrontPic_Donphan),
-    STILL_FRONT_PIC(PORYGON2,      gMonStillFrontPic_Porygon2),
-    STILL_FRONT_PIC(STANTLER,      gMonStillFrontPic_Stantler),
-    STILL_FRONT_PIC(SMEARGLE,      gMonStillFrontPic_Smeargle),
-    STILL_FRONT_PIC(TYROGUE,       gMonStillFrontPic_Tyrogue),
-    STILL_FRONT_PIC(HITMONTOP,     gMonStillFrontPic_Hitmontop),
-    STILL_FRONT_PIC(SMOOCHUM,      gMonStillFrontPic_Smoochum),
-    STILL_FRONT_PIC(ELEKID,        gMonStillFrontPic_Elekid),
-    STILL_FRONT_PIC(MAGBY,         gMonStillFrontPic_Magby),
-    STILL_FRONT_PIC(MILTANK,       gMonStillFrontPic_Miltank),
-    STILL_FRONT_PIC(BLISSEY,       gMonStillFrontPic_Blissey),
-    STILL_FRONT_PIC(RAIKOU,        gMonStillFrontPic_Raikou),
-    STILL_FRONT_PIC(ENTEI,         gMonStillFrontPic_Entei),
-    STILL_FRONT_PIC(SUICUNE,       gMonStillFrontPic_Suicune),
-    STILL_FRONT_PIC(LARVITAR,      gMonStillFrontPic_Larvitar),
-    STILL_FRONT_PIC(PUPITAR,       gMonStillFrontPic_Pupitar),
-    STILL_FRONT_PIC(TYRANITAR,     gMonStillFrontPic_Tyranitar),
-    STILL_FRONT_PIC(LUGIA,         gMonStillFrontPic_Lugia),
-    STILL_FRONT_PIC(HO_OH,         gMonStillFrontPic_HoOh),
-    STILL_FRONT_PIC(CELEBI,        gMonStillFrontPic_Celebi),
+    SPECIES_SPRITE(CHIKORITA,     gMonStillFrontPic_Chikorita),
+    SPECIES_SPRITE(BAYLEEF,       gMonStillFrontPic_Bayleef),
+    SPECIES_SPRITE(MEGANIUM,      gMonStillFrontPic_Meganium),
+    SPECIES_SPRITE(CYNDAQUIL,     gMonStillFrontPic_Cyndaquil),
+    SPECIES_SPRITE(QUILAVA,       gMonStillFrontPic_Quilava),
+    SPECIES_SPRITE(TYPHLOSION,    gMonStillFrontPic_Typhlosion),
+    SPECIES_SPRITE(TOTODILE,      gMonStillFrontPic_Totodile),
+    SPECIES_SPRITE(CROCONAW,      gMonStillFrontPic_Croconaw),
+    SPECIES_SPRITE(FERALIGATR,    gMonStillFrontPic_Feraligatr),
+    SPECIES_SPRITE(SENTRET,       gMonStillFrontPic_Sentret),
+    SPECIES_SPRITE(FURRET,        gMonStillFrontPic_Furret),
+    SPECIES_SPRITE(HOOTHOOT,      gMonStillFrontPic_Hoothoot),
+    SPECIES_SPRITE(NOCTOWL,       gMonStillFrontPic_Noctowl),
+    SPECIES_SPRITE(LEDYBA,        gMonStillFrontPic_Ledyba),
+    SPECIES_SPRITE(LEDIAN,        gMonStillFrontPic_Ledian),
+    SPECIES_SPRITE(SPINARAK,      gMonStillFrontPic_Spinarak),
+    SPECIES_SPRITE(ARIADOS,       gMonStillFrontPic_Ariados),
+    SPECIES_SPRITE(CROBAT,        gMonStillFrontPic_Crobat),
+    SPECIES_SPRITE(CHINCHOU,      gMonStillFrontPic_Chinchou),
+    SPECIES_SPRITE(LANTURN,       gMonStillFrontPic_Lanturn),
+    SPECIES_SPRITE(PICHU,         gMonStillFrontPic_Pichu),
+    SPECIES_SPRITE(CLEFFA,        gMonStillFrontPic_Cleffa),
+    SPECIES_SPRITE(IGGLYBUFF,     gMonStillFrontPic_Igglybuff),
+    SPECIES_SPRITE(TOGEPI,        gMonStillFrontPic_Togepi),
+    SPECIES_SPRITE(TOGETIC,       gMonStillFrontPic_Togetic),
+    SPECIES_SPRITE(NATU,          gMonStillFrontPic_Natu),
+    SPECIES_SPRITE(XATU,          gMonStillFrontPic_Xatu),
+    SPECIES_SPRITE(MAREEP,        gMonStillFrontPic_Mareep),
+    SPECIES_SPRITE(FLAAFFY,       gMonStillFrontPic_Flaaffy),
+    SPECIES_SPRITE(AMPHAROS,      gMonStillFrontPic_Ampharos),
+    SPECIES_SPRITE(BELLOSSOM,     gMonStillFrontPic_Bellossom),
+    SPECIES_SPRITE(MARILL,        gMonStillFrontPic_Marill),
+    SPECIES_SPRITE(AZUMARILL,     gMonStillFrontPic_Azumarill),
+    SPECIES_SPRITE(SUDOWOODO,     gMonStillFrontPic_Sudowoodo),
+    SPECIES_SPRITE(POLITOED,      gMonStillFrontPic_Politoed),
+    SPECIES_SPRITE(HOPPIP,        gMonStillFrontPic_Hoppip),
+    SPECIES_SPRITE(SKIPLOOM,      gMonStillFrontPic_Skiploom),
+    SPECIES_SPRITE(JUMPLUFF,      gMonStillFrontPic_Jumpluff),
+    SPECIES_SPRITE(AIPOM,         gMonStillFrontPic_Aipom),
+    SPECIES_SPRITE(SUNKERN,       gMonStillFrontPic_Sunkern),
+    SPECIES_SPRITE(SUNFLORA,      gMonStillFrontPic_Sunflora),
+    SPECIES_SPRITE(YANMA,         gMonStillFrontPic_Yanma),
+    SPECIES_SPRITE(WOOPER,        gMonStillFrontPic_Wooper),
+    SPECIES_SPRITE(QUAGSIRE,      gMonStillFrontPic_Quagsire),
+    SPECIES_SPRITE(ESPEON,        gMonStillFrontPic_Espeon),
+    SPECIES_SPRITE(UMBREON,       gMonStillFrontPic_Umbreon),
+    SPECIES_SPRITE(MURKROW,       gMonStillFrontPic_Murkrow),
+    SPECIES_SPRITE(SLOWKING,      gMonStillFrontPic_Slowking),
+    SPECIES_SPRITE(MISDREAVUS,    gMonStillFrontPic_Misdreavus),
+    SPECIES_SPRITE(UNOWN,         gMonStillFrontPic_UnownA),
+    SPECIES_SPRITE(WOBBUFFET,     gMonStillFrontPic_Wobbuffet),
+    SPECIES_SPRITE(GIRAFARIG,     gMonStillFrontPic_Girafarig),
+    SPECIES_SPRITE(PINECO,        gMonStillFrontPic_Pineco),
+    SPECIES_SPRITE(FORRETRESS,    gMonStillFrontPic_Forretress),
+    SPECIES_SPRITE(DUNSPARCE,     gMonStillFrontPic_Dunsparce),
+    SPECIES_SPRITE(GLIGAR,        gMonStillFrontPic_Gligar),
+    SPECIES_SPRITE(STEELIX,       gMonStillFrontPic_Steelix),
+    SPECIES_SPRITE(SNUBBULL,      gMonStillFrontPic_Snubbull),
+    SPECIES_SPRITE(GRANBULL,      gMonStillFrontPic_Granbull),
+    SPECIES_SPRITE(QWILFISH,      gMonStillFrontPic_Qwilfish),
+    SPECIES_SPRITE(SCIZOR,        gMonStillFrontPic_Scizor),
+    SPECIES_SPRITE(SHUCKLE,       gMonStillFrontPic_Shuckle),
+    SPECIES_SPRITE(HERACROSS,     gMonStillFrontPic_Heracross),
+    SPECIES_SPRITE(SNEASEL,       gMonStillFrontPic_Sneasel),
+    SPECIES_SPRITE(TEDDIURSA,     gMonStillFrontPic_Teddiursa),
+    SPECIES_SPRITE(URSARING,      gMonStillFrontPic_Ursaring),
+    SPECIES_SPRITE(SLUGMA,        gMonStillFrontPic_Slugma),
+    SPECIES_SPRITE(MAGCARGO,      gMonStillFrontPic_Magcargo),
+    SPECIES_SPRITE(SWINUB,        gMonStillFrontPic_Swinub),
+    SPECIES_SPRITE(PILOSWINE,     gMonStillFrontPic_Piloswine),
+    SPECIES_SPRITE(CORSOLA,       gMonStillFrontPic_Corsola),
+    SPECIES_SPRITE(REMORAID,      gMonStillFrontPic_Remoraid),
+    SPECIES_SPRITE(OCTILLERY,     gMonStillFrontPic_Octillery),
+    SPECIES_SPRITE(DELIBIRD,      gMonStillFrontPic_Delibird),
+    SPECIES_SPRITE(MANTINE,       gMonStillFrontPic_Mantine),
+    SPECIES_SPRITE(SKARMORY,      gMonStillFrontPic_Skarmory),
+    SPECIES_SPRITE(HOUNDOUR,      gMonStillFrontPic_Houndour),
+    SPECIES_SPRITE(HOUNDOOM,      gMonStillFrontPic_Houndoom),
+    SPECIES_SPRITE(KINGDRA,       gMonStillFrontPic_Kingdra),
+    SPECIES_SPRITE(PHANPY,        gMonStillFrontPic_Phanpy),
+    SPECIES_SPRITE(DONPHAN,       gMonStillFrontPic_Donphan),
+    SPECIES_SPRITE(PORYGON2,      gMonStillFrontPic_Porygon2),
+    SPECIES_SPRITE(STANTLER,      gMonStillFrontPic_Stantler),
+    SPECIES_SPRITE(SMEARGLE,      gMonStillFrontPic_Smeargle),
+    SPECIES_SPRITE(TYROGUE,       gMonStillFrontPic_Tyrogue),
+    SPECIES_SPRITE(HITMONTOP,     gMonStillFrontPic_Hitmontop),
+    SPECIES_SPRITE(SMOOCHUM,      gMonStillFrontPic_Smoochum),
+    SPECIES_SPRITE(ELEKID,        gMonStillFrontPic_Elekid),
+    SPECIES_SPRITE(MAGBY,         gMonStillFrontPic_Magby),
+    SPECIES_SPRITE(MILTANK,       gMonStillFrontPic_Miltank),
+    SPECIES_SPRITE(BLISSEY,       gMonStillFrontPic_Blissey),
+    SPECIES_SPRITE(RAIKOU,        gMonStillFrontPic_Raikou),
+    SPECIES_SPRITE(ENTEI,         gMonStillFrontPic_Entei),
+    SPECIES_SPRITE(SUICUNE,       gMonStillFrontPic_Suicune),
+    SPECIES_SPRITE(LARVITAR,      gMonStillFrontPic_Larvitar),
+    SPECIES_SPRITE(PUPITAR,       gMonStillFrontPic_Pupitar),
+    SPECIES_SPRITE(TYRANITAR,     gMonStillFrontPic_Tyranitar),
+    SPECIES_SPRITE(LUGIA,         gMonStillFrontPic_Lugia),
+    SPECIES_SPRITE(HO_OH,         gMonStillFrontPic_HoOh),
+    SPECIES_SPRITE(CELEBI,        gMonStillFrontPic_Celebi),
 // Empty slots
-    STILL_FRONT_PIC(OLD_UNOWN_B,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_C,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_D,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_E,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_F,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_G,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_H,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_I,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_J,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_K,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_L,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_M,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_N,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_O,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_P,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_Q,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_R,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_S,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_T,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_U,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_V,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_W,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_X,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_Y,   gMonStillFrontPic_DoubleQuestionMark),
-    STILL_FRONT_PIC(OLD_UNOWN_Z,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_B,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_C,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_D,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_E,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_F,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_G,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_H,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_I,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_J,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_K,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_L,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_M,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_N,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_O,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_P,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Q,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_R,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_S,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_T,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_U,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_V,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_W,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_X,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Y,   gMonStillFrontPic_DoubleQuestionMark),
+    SPECIES_SPRITE(OLD_UNOWN_Z,   gMonStillFrontPic_DoubleQuestionMark),
 // Gen III
-    STILL_FRONT_PIC(TREECKO,       gMonStillFrontPic_Treecko),
-    STILL_FRONT_PIC(GROVYLE,       gMonStillFrontPic_Grovyle),
-    STILL_FRONT_PIC(SCEPTILE,      gMonStillFrontPic_Sceptile),
-    STILL_FRONT_PIC(TORCHIC,       gMonStillFrontPic_Torchic),
-    STILL_FRONT_PIC(COMBUSKEN,     gMonStillFrontPic_Combusken),
-    STILL_FRONT_PIC(BLAZIKEN,      gMonStillFrontPic_Blaziken),
-    STILL_FRONT_PIC(MUDKIP,        gMonStillFrontPic_Mudkip),
-    STILL_FRONT_PIC(MARSHTOMP,     gMonStillFrontPic_Marshtomp),
-    STILL_FRONT_PIC(SWAMPERT,      gMonStillFrontPic_Swampert),
-    STILL_FRONT_PIC(POOCHYENA,     gMonStillFrontPic_Poochyena),
-    STILL_FRONT_PIC(MIGHTYENA,     gMonStillFrontPic_Mightyena),
-    STILL_FRONT_PIC(ZIGZAGOON,     gMonStillFrontPic_Zigzagoon),
-    STILL_FRONT_PIC(LINOONE,       gMonStillFrontPic_Linoone),
-    STILL_FRONT_PIC(WURMPLE,       gMonStillFrontPic_Wurmple),
-    STILL_FRONT_PIC(SILCOON,       gMonStillFrontPic_Silcoon),
-    STILL_FRONT_PIC(BEAUTIFLY,     gMonStillFrontPic_Beautifly),
-    STILL_FRONT_PIC(CASCOON,       gMonStillFrontPic_Cascoon),
-    STILL_FRONT_PIC(DUSTOX,        gMonStillFrontPic_Dustox),
-    STILL_FRONT_PIC(LOTAD,         gMonStillFrontPic_Lotad),
-    STILL_FRONT_PIC(LOMBRE,        gMonStillFrontPic_Lombre),
-    STILL_FRONT_PIC(LUDICOLO,      gMonStillFrontPic_Ludicolo),
-    STILL_FRONT_PIC(SEEDOT,        gMonStillFrontPic_Seedot),
-    STILL_FRONT_PIC(NUZLEAF,       gMonStillFrontPic_Nuzleaf),
-    STILL_FRONT_PIC(SHIFTRY,       gMonStillFrontPic_Shiftry),
-    STILL_FRONT_PIC(NINCADA,       gMonStillFrontPic_Nincada),
-    STILL_FRONT_PIC(NINJASK,       gMonStillFrontPic_Ninjask),
-    STILL_FRONT_PIC(SHEDINJA,      gMonStillFrontPic_Shedinja),
-    STILL_FRONT_PIC(TAILLOW,       gMonStillFrontPic_Taillow),
-    STILL_FRONT_PIC(SWELLOW,       gMonStillFrontPic_Swellow),
-    STILL_FRONT_PIC(SHROOMISH,     gMonStillFrontPic_Shroomish),
-    STILL_FRONT_PIC(BRELOOM,       gMonStillFrontPic_Breloom),
-    STILL_FRONT_PIC(SPINDA,        gMonStillFrontPic_Spinda),
-    STILL_FRONT_PIC(WINGULL,       gMonStillFrontPic_Wingull),
-    STILL_FRONT_PIC(PELIPPER,      gMonStillFrontPic_Pelipper),
-    STILL_FRONT_PIC(SURSKIT,       gMonStillFrontPic_Surskit),
-    STILL_FRONT_PIC(MASQUERAIN,    gMonStillFrontPic_Masquerain),
-    STILL_FRONT_PIC(WAILMER,       gMonStillFrontPic_Wailmer),
-    STILL_FRONT_PIC(WAILORD,       gMonStillFrontPic_Wailord),
-    STILL_FRONT_PIC(SKITTY,        gMonStillFrontPic_Skitty),
-    STILL_FRONT_PIC(DELCATTY,      gMonStillFrontPic_Delcatty),
-    STILL_FRONT_PIC(KECLEON,       gMonStillFrontPic_Kecleon),
-    STILL_FRONT_PIC(BALTOY,        gMonStillFrontPic_Baltoy),
-    STILL_FRONT_PIC(CLAYDOL,       gMonStillFrontPic_Claydol),
-    STILL_FRONT_PIC(NOSEPASS,      gMonStillFrontPic_Nosepass),
-    STILL_FRONT_PIC(TORKOAL,       gMonStillFrontPic_Torkoal),
-    STILL_FRONT_PIC(SABLEYE,       gMonStillFrontPic_Sableye),
-    STILL_FRONT_PIC(BARBOACH,      gMonStillFrontPic_Barboach),
-    STILL_FRONT_PIC(WHISCASH,      gMonStillFrontPic_Whiscash),
-    STILL_FRONT_PIC(LUVDISC,       gMonStillFrontPic_Luvdisc),
-    STILL_FRONT_PIC(CORPHISH,      gMonStillFrontPic_Corphish),
-    STILL_FRONT_PIC(CRAWDAUNT,     gMonStillFrontPic_Crawdaunt),
-    STILL_FRONT_PIC(FEEBAS,        gMonStillFrontPic_Feebas),
-    STILL_FRONT_PIC(MILOTIC,       gMonStillFrontPic_Milotic),
-    STILL_FRONT_PIC(CARVANHA,      gMonStillFrontPic_Carvanha),
-    STILL_FRONT_PIC(SHARPEDO,      gMonStillFrontPic_Sharpedo),
-    STILL_FRONT_PIC(TRAPINCH,      gMonStillFrontPic_Trapinch),
-    STILL_FRONT_PIC(VIBRAVA,       gMonStillFrontPic_Vibrava),
-    STILL_FRONT_PIC(FLYGON,        gMonStillFrontPic_Flygon),
-    STILL_FRONT_PIC(MAKUHITA,      gMonStillFrontPic_Makuhita),
-    STILL_FRONT_PIC(HARIYAMA,      gMonStillFrontPic_Hariyama),
-    STILL_FRONT_PIC(ELECTRIKE,     gMonStillFrontPic_Electrike),
-    STILL_FRONT_PIC(MANECTRIC,     gMonStillFrontPic_Manectric),
-    STILL_FRONT_PIC(NUMEL,         gMonStillFrontPic_Numel),
-    STILL_FRONT_PIC(CAMERUPT,      gMonStillFrontPic_Camerupt),
-    STILL_FRONT_PIC(SPHEAL,        gMonStillFrontPic_Spheal),
-    STILL_FRONT_PIC(SEALEO,        gMonStillFrontPic_Sealeo),
-    STILL_FRONT_PIC(WALREIN,       gMonStillFrontPic_Walrein),
-    STILL_FRONT_PIC(CACNEA,        gMonStillFrontPic_Cacnea),
-    STILL_FRONT_PIC(CACTURNE,      gMonStillFrontPic_Cacturne),
-    STILL_FRONT_PIC(SNORUNT,       gMonStillFrontPic_Snorunt),
-    STILL_FRONT_PIC(GLALIE,        gMonStillFrontPic_Glalie),
-    STILL_FRONT_PIC(LUNATONE,      gMonStillFrontPic_Lunatone),
-    STILL_FRONT_PIC(SOLROCK,       gMonStillFrontPic_Solrock),
-    STILL_FRONT_PIC(AZURILL,       gMonStillFrontPic_Azurill),
-    STILL_FRONT_PIC(SPOINK,        gMonStillFrontPic_Spoink),
-    STILL_FRONT_PIC(GRUMPIG,       gMonStillFrontPic_Grumpig),
-    STILL_FRONT_PIC(PLUSLE,        gMonStillFrontPic_Plusle),
-    STILL_FRONT_PIC(MINUN,         gMonStillFrontPic_Minun),
-    STILL_FRONT_PIC(MAWILE,        gMonStillFrontPic_Mawile),
-    STILL_FRONT_PIC(MEDITITE,      gMonStillFrontPic_Meditite),
-    STILL_FRONT_PIC(MEDICHAM,      gMonStillFrontPic_Medicham),
-    STILL_FRONT_PIC(SWABLU,        gMonStillFrontPic_Swablu),
-    STILL_FRONT_PIC(ALTARIA,       gMonStillFrontPic_Altaria),
-    STILL_FRONT_PIC(WYNAUT,        gMonStillFrontPic_Wynaut),
-    STILL_FRONT_PIC(DUSKULL,       gMonStillFrontPic_Duskull),
-    STILL_FRONT_PIC(DUSCLOPS,      gMonStillFrontPic_Dusclops),
-    STILL_FRONT_PIC(ROSELIA,       gMonStillFrontPic_Roselia),
-    STILL_FRONT_PIC(SLAKOTH,       gMonStillFrontPic_Slakoth),
-    STILL_FRONT_PIC(VIGOROTH,      gMonStillFrontPic_Vigoroth),
-    STILL_FRONT_PIC(SLAKING,       gMonStillFrontPic_Slaking),
-    STILL_FRONT_PIC(GULPIN,        gMonStillFrontPic_Gulpin),
-    STILL_FRONT_PIC(SWALOT,        gMonStillFrontPic_Swalot),
-    STILL_FRONT_PIC(TROPIUS,       gMonStillFrontPic_Tropius),
-    STILL_FRONT_PIC(WHISMUR,       gMonStillFrontPic_Whismur),
-    STILL_FRONT_PIC(LOUDRED,       gMonStillFrontPic_Loudred),
-    STILL_FRONT_PIC(EXPLOUD,       gMonStillFrontPic_Exploud),
-    STILL_FRONT_PIC(CLAMPERL,      gMonStillFrontPic_Clamperl),
-    STILL_FRONT_PIC(HUNTAIL,       gMonStillFrontPic_Huntail),
-    STILL_FRONT_PIC(GOREBYSS,      gMonStillFrontPic_Gorebyss),
-    STILL_FRONT_PIC(ABSOL,         gMonStillFrontPic_Absol),
-    STILL_FRONT_PIC(SHUPPET,       gMonStillFrontPic_Shuppet),
-    STILL_FRONT_PIC(BANETTE,       gMonStillFrontPic_Banette),
-    STILL_FRONT_PIC(SEVIPER,       gMonStillFrontPic_Seviper),
-    STILL_FRONT_PIC(ZANGOOSE,      gMonStillFrontPic_Zangoose),
-    STILL_FRONT_PIC(RELICANTH,     gMonStillFrontPic_Relicanth),
-    STILL_FRONT_PIC(ARON,          gMonStillFrontPic_Aron),
-    STILL_FRONT_PIC(LAIRON,        gMonStillFrontPic_Lairon),
-    STILL_FRONT_PIC(AGGRON,        gMonStillFrontPic_Aggron),
-    STILL_FRONT_PIC(CASTFORM,      gMonStillFrontPic_Castform),
-    STILL_FRONT_PIC(VOLBEAT,       gMonStillFrontPic_Volbeat),
-    STILL_FRONT_PIC(ILLUMISE,      gMonStillFrontPic_Illumise),
-    STILL_FRONT_PIC(LILEEP,        gMonStillFrontPic_Lileep),
-    STILL_FRONT_PIC(CRADILY,       gMonStillFrontPic_Cradily),
-    STILL_FRONT_PIC(ANORITH,       gMonStillFrontPic_Anorith),
-    STILL_FRONT_PIC(ARMALDO,       gMonStillFrontPic_Armaldo),
-    STILL_FRONT_PIC(RALTS,         gMonStillFrontPic_Ralts),
-    STILL_FRONT_PIC(KIRLIA,        gMonStillFrontPic_Kirlia),
-    STILL_FRONT_PIC(GARDEVOIR,     gMonStillFrontPic_Gardevoir),
-    STILL_FRONT_PIC(BAGON,         gMonStillFrontPic_Bagon),
-    STILL_FRONT_PIC(SHELGON,       gMonStillFrontPic_Shelgon),
-    STILL_FRONT_PIC(SALAMENCE,     gMonStillFrontPic_Salamence),
-    STILL_FRONT_PIC(BELDUM,        gMonStillFrontPic_Beldum),
-    STILL_FRONT_PIC(METANG,        gMonStillFrontPic_Metang),
-    STILL_FRONT_PIC(METAGROSS,     gMonStillFrontPic_Metagross),
-    STILL_FRONT_PIC(REGIROCK,      gMonStillFrontPic_Regirock),
-    STILL_FRONT_PIC(REGICE,        gMonStillFrontPic_Regice),
-    STILL_FRONT_PIC(REGISTEEL,     gMonStillFrontPic_Registeel),
-    STILL_FRONT_PIC(KYOGRE,        gMonStillFrontPic_Kyogre),
-    STILL_FRONT_PIC(GROUDON,       gMonStillFrontPic_Groudon),
-    STILL_FRONT_PIC(RAYQUAZA,      gMonStillFrontPic_Rayquaza),
-    STILL_FRONT_PIC(LATIAS,        gMonStillFrontPic_Latias),
-    STILL_FRONT_PIC(LATIOS,        gMonStillFrontPic_Latios),
-    STILL_FRONT_PIC(JIRACHI,       gMonStillFrontPic_Jirachi),
-    STILL_FRONT_PIC(DEOXYS,        gMonStillFrontPic_Deoxys),
-    STILL_FRONT_PIC(CHIMECHO,      gMonStillFrontPic_Chimecho),
-    STILL_FRONT_PIC(EGG,           gMonStillFrontPic_Egg),
-    STILL_FRONT_PIC(UNOWN_B,       gMonStillFrontPic_UnownB),
-    STILL_FRONT_PIC(UNOWN_C,       gMonStillFrontPic_UnownC),
-    STILL_FRONT_PIC(UNOWN_D,       gMonStillFrontPic_UnownD),
-    STILL_FRONT_PIC(UNOWN_E,       gMonStillFrontPic_UnownE),
-    STILL_FRONT_PIC(UNOWN_F,       gMonStillFrontPic_UnownF),
-    STILL_FRONT_PIC(UNOWN_G,       gMonStillFrontPic_UnownG),
-    STILL_FRONT_PIC(UNOWN_H,       gMonStillFrontPic_UnownH),
-    STILL_FRONT_PIC(UNOWN_I,       gMonStillFrontPic_UnownI),
-    STILL_FRONT_PIC(UNOWN_J,       gMonStillFrontPic_UnownJ),
-    STILL_FRONT_PIC(UNOWN_K,       gMonStillFrontPic_UnownK),
-    STILL_FRONT_PIC(UNOWN_L,       gMonStillFrontPic_UnownL),
-    STILL_FRONT_PIC(UNOWN_M,       gMonStillFrontPic_UnownM),
-    STILL_FRONT_PIC(UNOWN_N,       gMonStillFrontPic_UnownN),
-    STILL_FRONT_PIC(UNOWN_O,       gMonStillFrontPic_UnownO),
-    STILL_FRONT_PIC(UNOWN_P,       gMonStillFrontPic_UnownP),
-    STILL_FRONT_PIC(UNOWN_Q,       gMonStillFrontPic_UnownQ),
-    STILL_FRONT_PIC(UNOWN_R,       gMonStillFrontPic_UnownR),
-    STILL_FRONT_PIC(UNOWN_S,       gMonStillFrontPic_UnownS),
-    STILL_FRONT_PIC(UNOWN_T,       gMonStillFrontPic_UnownT),
-    STILL_FRONT_PIC(UNOWN_U,       gMonStillFrontPic_UnownU),
-    STILL_FRONT_PIC(UNOWN_V,       gMonStillFrontPic_UnownV),
-    STILL_FRONT_PIC(UNOWN_W,       gMonStillFrontPic_UnownW),
-    STILL_FRONT_PIC(UNOWN_X,       gMonStillFrontPic_UnownX),
-    STILL_FRONT_PIC(UNOWN_Y,       gMonStillFrontPic_UnownY),
-    STILL_FRONT_PIC(UNOWN_Z,       gMonStillFrontPic_UnownZ),
-    STILL_FRONT_PIC(UNOWN_EMARK,   gMonStillFrontPic_UnownExclamationMark),
-    STILL_FRONT_PIC(UNOWN_QMARK,   gMonStillFrontPic_UnownQuestionMark),
+    SPECIES_SPRITE(TREECKO,       gMonStillFrontPic_Treecko),
+    SPECIES_SPRITE(GROVYLE,       gMonStillFrontPic_Grovyle),
+    SPECIES_SPRITE(SCEPTILE,      gMonStillFrontPic_Sceptile),
+    SPECIES_SPRITE(TORCHIC,       gMonStillFrontPic_Torchic),
+    SPECIES_SPRITE(COMBUSKEN,     gMonStillFrontPic_Combusken),
+    SPECIES_SPRITE(BLAZIKEN,      gMonStillFrontPic_Blaziken),
+    SPECIES_SPRITE(MUDKIP,        gMonStillFrontPic_Mudkip),
+    SPECIES_SPRITE(MARSHTOMP,     gMonStillFrontPic_Marshtomp),
+    SPECIES_SPRITE(SWAMPERT,      gMonStillFrontPic_Swampert),
+    SPECIES_SPRITE(POOCHYENA,     gMonStillFrontPic_Poochyena),
+    SPECIES_SPRITE(MIGHTYENA,     gMonStillFrontPic_Mightyena),
+    SPECIES_SPRITE(ZIGZAGOON,     gMonStillFrontPic_Zigzagoon),
+    SPECIES_SPRITE(LINOONE,       gMonStillFrontPic_Linoone),
+    SPECIES_SPRITE(WURMPLE,       gMonStillFrontPic_Wurmple),
+    SPECIES_SPRITE(SILCOON,       gMonStillFrontPic_Silcoon),
+    SPECIES_SPRITE(BEAUTIFLY,     gMonStillFrontPic_Beautifly),
+    SPECIES_SPRITE(CASCOON,       gMonStillFrontPic_Cascoon),
+    SPECIES_SPRITE(DUSTOX,        gMonStillFrontPic_Dustox),
+    SPECIES_SPRITE(LOTAD,         gMonStillFrontPic_Lotad),
+    SPECIES_SPRITE(LOMBRE,        gMonStillFrontPic_Lombre),
+    SPECIES_SPRITE(LUDICOLO,      gMonStillFrontPic_Ludicolo),
+    SPECIES_SPRITE(SEEDOT,        gMonStillFrontPic_Seedot),
+    SPECIES_SPRITE(NUZLEAF,       gMonStillFrontPic_Nuzleaf),
+    SPECIES_SPRITE(SHIFTRY,       gMonStillFrontPic_Shiftry),
+    SPECIES_SPRITE(NINCADA,       gMonStillFrontPic_Nincada),
+    SPECIES_SPRITE(NINJASK,       gMonStillFrontPic_Ninjask),
+    SPECIES_SPRITE(SHEDINJA,      gMonStillFrontPic_Shedinja),
+    SPECIES_SPRITE(TAILLOW,       gMonStillFrontPic_Taillow),
+    SPECIES_SPRITE(SWELLOW,       gMonStillFrontPic_Swellow),
+    SPECIES_SPRITE(SHROOMISH,     gMonStillFrontPic_Shroomish),
+    SPECIES_SPRITE(BRELOOM,       gMonStillFrontPic_Breloom),
+    SPECIES_SPRITE(SPINDA,        gMonStillFrontPic_Spinda),
+    SPECIES_SPRITE(WINGULL,       gMonStillFrontPic_Wingull),
+    SPECIES_SPRITE(PELIPPER,      gMonStillFrontPic_Pelipper),
+    SPECIES_SPRITE(SURSKIT,       gMonStillFrontPic_Surskit),
+    SPECIES_SPRITE(MASQUERAIN,    gMonStillFrontPic_Masquerain),
+    SPECIES_SPRITE(WAILMER,       gMonStillFrontPic_Wailmer),
+    SPECIES_SPRITE(WAILORD,       gMonStillFrontPic_Wailord),
+    SPECIES_SPRITE(SKITTY,        gMonStillFrontPic_Skitty),
+    SPECIES_SPRITE(DELCATTY,      gMonStillFrontPic_Delcatty),
+    SPECIES_SPRITE(KECLEON,       gMonStillFrontPic_Kecleon),
+    SPECIES_SPRITE(BALTOY,        gMonStillFrontPic_Baltoy),
+    SPECIES_SPRITE(CLAYDOL,       gMonStillFrontPic_Claydol),
+    SPECIES_SPRITE(NOSEPASS,      gMonStillFrontPic_Nosepass),
+    SPECIES_SPRITE(TORKOAL,       gMonStillFrontPic_Torkoal),
+    SPECIES_SPRITE(SABLEYE,       gMonStillFrontPic_Sableye),
+    SPECIES_SPRITE(BARBOACH,      gMonStillFrontPic_Barboach),
+    SPECIES_SPRITE(WHISCASH,      gMonStillFrontPic_Whiscash),
+    SPECIES_SPRITE(LUVDISC,       gMonStillFrontPic_Luvdisc),
+    SPECIES_SPRITE(CORPHISH,      gMonStillFrontPic_Corphish),
+    SPECIES_SPRITE(CRAWDAUNT,     gMonStillFrontPic_Crawdaunt),
+    SPECIES_SPRITE(FEEBAS,        gMonStillFrontPic_Feebas),
+    SPECIES_SPRITE(MILOTIC,       gMonStillFrontPic_Milotic),
+    SPECIES_SPRITE(CARVANHA,      gMonStillFrontPic_Carvanha),
+    SPECIES_SPRITE(SHARPEDO,      gMonStillFrontPic_Sharpedo),
+    SPECIES_SPRITE(TRAPINCH,      gMonStillFrontPic_Trapinch),
+    SPECIES_SPRITE(VIBRAVA,       gMonStillFrontPic_Vibrava),
+    SPECIES_SPRITE(FLYGON,        gMonStillFrontPic_Flygon),
+    SPECIES_SPRITE(MAKUHITA,      gMonStillFrontPic_Makuhita),
+    SPECIES_SPRITE(HARIYAMA,      gMonStillFrontPic_Hariyama),
+    SPECIES_SPRITE(ELECTRIKE,     gMonStillFrontPic_Electrike),
+    SPECIES_SPRITE(MANECTRIC,     gMonStillFrontPic_Manectric),
+    SPECIES_SPRITE(NUMEL,         gMonStillFrontPic_Numel),
+    SPECIES_SPRITE(CAMERUPT,      gMonStillFrontPic_Camerupt),
+    SPECIES_SPRITE(SPHEAL,        gMonStillFrontPic_Spheal),
+    SPECIES_SPRITE(SEALEO,        gMonStillFrontPic_Sealeo),
+    SPECIES_SPRITE(WALREIN,       gMonStillFrontPic_Walrein),
+    SPECIES_SPRITE(CACNEA,        gMonStillFrontPic_Cacnea),
+    SPECIES_SPRITE(CACTURNE,      gMonStillFrontPic_Cacturne),
+    SPECIES_SPRITE(SNORUNT,       gMonStillFrontPic_Snorunt),
+    SPECIES_SPRITE(GLALIE,        gMonStillFrontPic_Glalie),
+    SPECIES_SPRITE(LUNATONE,      gMonStillFrontPic_Lunatone),
+    SPECIES_SPRITE(SOLROCK,       gMonStillFrontPic_Solrock),
+    SPECIES_SPRITE(AZURILL,       gMonStillFrontPic_Azurill),
+    SPECIES_SPRITE(SPOINK,        gMonStillFrontPic_Spoink),
+    SPECIES_SPRITE(GRUMPIG,       gMonStillFrontPic_Grumpig),
+    SPECIES_SPRITE(PLUSLE,        gMonStillFrontPic_Plusle),
+    SPECIES_SPRITE(MINUN,         gMonStillFrontPic_Minun),
+    SPECIES_SPRITE(MAWILE,        gMonStillFrontPic_Mawile),
+    SPECIES_SPRITE(MEDITITE,      gMonStillFrontPic_Meditite),
+    SPECIES_SPRITE(MEDICHAM,      gMonStillFrontPic_Medicham),
+    SPECIES_SPRITE(SWABLU,        gMonStillFrontPic_Swablu),
+    SPECIES_SPRITE(ALTARIA,       gMonStillFrontPic_Altaria),
+    SPECIES_SPRITE(WYNAUT,        gMonStillFrontPic_Wynaut),
+    SPECIES_SPRITE(DUSKULL,       gMonStillFrontPic_Duskull),
+    SPECIES_SPRITE(DUSCLOPS,      gMonStillFrontPic_Dusclops),
+    SPECIES_SPRITE(ROSELIA,       gMonStillFrontPic_Roselia),
+    SPECIES_SPRITE(SLAKOTH,       gMonStillFrontPic_Slakoth),
+    SPECIES_SPRITE(VIGOROTH,      gMonStillFrontPic_Vigoroth),
+    SPECIES_SPRITE(SLAKING,       gMonStillFrontPic_Slaking),
+    SPECIES_SPRITE(GULPIN,        gMonStillFrontPic_Gulpin),
+    SPECIES_SPRITE(SWALOT,        gMonStillFrontPic_Swalot),
+    SPECIES_SPRITE(TROPIUS,       gMonStillFrontPic_Tropius),
+    SPECIES_SPRITE(WHISMUR,       gMonStillFrontPic_Whismur),
+    SPECIES_SPRITE(LOUDRED,       gMonStillFrontPic_Loudred),
+    SPECIES_SPRITE(EXPLOUD,       gMonStillFrontPic_Exploud),
+    SPECIES_SPRITE(CLAMPERL,      gMonStillFrontPic_Clamperl),
+    SPECIES_SPRITE(HUNTAIL,       gMonStillFrontPic_Huntail),
+    SPECIES_SPRITE(GOREBYSS,      gMonStillFrontPic_Gorebyss),
+    SPECIES_SPRITE(ABSOL,         gMonStillFrontPic_Absol),
+    SPECIES_SPRITE(SHUPPET,       gMonStillFrontPic_Shuppet),
+    SPECIES_SPRITE(BANETTE,       gMonStillFrontPic_Banette),
+    SPECIES_SPRITE(SEVIPER,       gMonStillFrontPic_Seviper),
+    SPECIES_SPRITE(ZANGOOSE,      gMonStillFrontPic_Zangoose),
+    SPECIES_SPRITE(RELICANTH,     gMonStillFrontPic_Relicanth),
+    SPECIES_SPRITE(ARON,          gMonStillFrontPic_Aron),
+    SPECIES_SPRITE(LAIRON,        gMonStillFrontPic_Lairon),
+    SPECIES_SPRITE(AGGRON,        gMonStillFrontPic_Aggron),
+    SPECIES_SPRITE(CASTFORM,      gMonStillFrontPic_Castform),
+    SPECIES_SPRITE(VOLBEAT,       gMonStillFrontPic_Volbeat),
+    SPECIES_SPRITE(ILLUMISE,      gMonStillFrontPic_Illumise),
+    SPECIES_SPRITE(LILEEP,        gMonStillFrontPic_Lileep),
+    SPECIES_SPRITE(CRADILY,       gMonStillFrontPic_Cradily),
+    SPECIES_SPRITE(ANORITH,       gMonStillFrontPic_Anorith),
+    SPECIES_SPRITE(ARMALDO,       gMonStillFrontPic_Armaldo),
+    SPECIES_SPRITE(RALTS,         gMonStillFrontPic_Ralts),
+    SPECIES_SPRITE(KIRLIA,        gMonStillFrontPic_Kirlia),
+    SPECIES_SPRITE(GARDEVOIR,     gMonStillFrontPic_Gardevoir),
+    SPECIES_SPRITE(BAGON,         gMonStillFrontPic_Bagon),
+    SPECIES_SPRITE(SHELGON,       gMonStillFrontPic_Shelgon),
+    SPECIES_SPRITE(SALAMENCE,     gMonStillFrontPic_Salamence),
+    SPECIES_SPRITE(BELDUM,        gMonStillFrontPic_Beldum),
+    SPECIES_SPRITE(METANG,        gMonStillFrontPic_Metang),
+    SPECIES_SPRITE(METAGROSS,     gMonStillFrontPic_Metagross),
+    SPECIES_SPRITE(REGIROCK,      gMonStillFrontPic_Regirock),
+    SPECIES_SPRITE(REGICE,        gMonStillFrontPic_Regice),
+    SPECIES_SPRITE(REGISTEEL,     gMonStillFrontPic_Registeel),
+    SPECIES_SPRITE(KYOGRE,        gMonStillFrontPic_Kyogre),
+    SPECIES_SPRITE(GROUDON,       gMonStillFrontPic_Groudon),
+    SPECIES_SPRITE(RAYQUAZA,      gMonStillFrontPic_Rayquaza),
+    SPECIES_SPRITE(LATIAS,        gMonStillFrontPic_Latias),
+    SPECIES_SPRITE(LATIOS,        gMonStillFrontPic_Latios),
+    SPECIES_SPRITE(JIRACHI,       gMonStillFrontPic_Jirachi),
+    SPECIES_SPRITE(DEOXYS,        gMonStillFrontPic_Deoxys),
+    SPECIES_SPRITE(CHIMECHO,      gMonStillFrontPic_Chimecho),
+    SPECIES_SPRITE(EGG,           gMonStillFrontPic_Egg),
+    SPECIES_SPRITE(UNOWN_B,       gMonStillFrontPic_UnownB),
+    SPECIES_SPRITE(UNOWN_C,       gMonStillFrontPic_UnownC),
+    SPECIES_SPRITE(UNOWN_D,       gMonStillFrontPic_UnownD),
+    SPECIES_SPRITE(UNOWN_E,       gMonStillFrontPic_UnownE),
+    SPECIES_SPRITE(UNOWN_F,       gMonStillFrontPic_UnownF),
+    SPECIES_SPRITE(UNOWN_G,       gMonStillFrontPic_UnownG),
+    SPECIES_SPRITE(UNOWN_H,       gMonStillFrontPic_UnownH),
+    SPECIES_SPRITE(UNOWN_I,       gMonStillFrontPic_UnownI),
+    SPECIES_SPRITE(UNOWN_J,       gMonStillFrontPic_UnownJ),
+    SPECIES_SPRITE(UNOWN_K,       gMonStillFrontPic_UnownK),
+    SPECIES_SPRITE(UNOWN_L,       gMonStillFrontPic_UnownL),
+    SPECIES_SPRITE(UNOWN_M,       gMonStillFrontPic_UnownM),
+    SPECIES_SPRITE(UNOWN_N,       gMonStillFrontPic_UnownN),
+    SPECIES_SPRITE(UNOWN_O,       gMonStillFrontPic_UnownO),
+    SPECIES_SPRITE(UNOWN_P,       gMonStillFrontPic_UnownP),
+    SPECIES_SPRITE(UNOWN_Q,       gMonStillFrontPic_UnownQ),
+    SPECIES_SPRITE(UNOWN_R,       gMonStillFrontPic_UnownR),
+    SPECIES_SPRITE(UNOWN_S,       gMonStillFrontPic_UnownS),
+    SPECIES_SPRITE(UNOWN_T,       gMonStillFrontPic_UnownT),
+    SPECIES_SPRITE(UNOWN_U,       gMonStillFrontPic_UnownU),
+    SPECIES_SPRITE(UNOWN_V,       gMonStillFrontPic_UnownV),
+    SPECIES_SPRITE(UNOWN_W,       gMonStillFrontPic_UnownW),
+    SPECIES_SPRITE(UNOWN_X,       gMonStillFrontPic_UnownX),
+    SPECIES_SPRITE(UNOWN_Y,       gMonStillFrontPic_UnownY),
+    SPECIES_SPRITE(UNOWN_Z,       gMonStillFrontPic_UnownZ),
+    SPECIES_SPRITE(UNOWN_EMARK,   gMonStillFrontPic_UnownExclamationMark),
+    SPECIES_SPRITE(UNOWN_QMARK,   gMonStillFrontPic_UnownQuestionMark),
 };
diff --git a/src/data/pokemon_graphics/unknown_anims.h b/src/data/pokemon_graphics/unknown_anims.h
index 313e7ae35..bb4862d09 100644
--- a/src/data/pokemon_graphics/unknown_anims.h
+++ b/src/data/pokemon_graphics/unknown_anims.h
@@ -1,36 +1,5 @@
-const union AnimCmd gUnknown_082FF6EC[] =
-{
-    ANIMCMD_FRAME(0, 0),
-    ANIMCMD_END,
-};
-
-const union AnimCmd gUnknown_082FF6F4[] =
-{
-    ANIMCMD_FRAME(1, 0),
-    ANIMCMD_END,
-};
-
-const union AnimCmd gUnknown_082FF6FC[] =
-{
-    ANIMCMD_FRAME(2, 0),
-    ANIMCMD_END,
-};
-
-const union AnimCmd gUnknown_082FF704[] =
-{
-    ANIMCMD_FRAME(3, 0),
-    ANIMCMD_END,
-};
-
-const union AnimCmd *const gPlayerMonSpriteAnimsTable[] =
-{
-    gUnknown_082FF6EC,
-    gUnknown_082FF6F4,
-    gUnknown_082FF6FC,
-    gUnknown_082FF704,
-};
-
-const union AnimCmd gUnknown_082FF71C[] =
+// unused and unkown
+static const union AnimCmd gUnknown_082FF71C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 25),
@@ -40,7 +9,7 @@ const union AnimCmd gUnknown_082FF71C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF734[] =
+static const union AnimCmd gUnknown_082FF734[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 8),
@@ -48,20 +17,20 @@ const union AnimCmd gUnknown_082FF734[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF744[] =
+static const union AnimCmd gUnknown_082FF744[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(2, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF750[] =
+static const union AnimCmd gUnknown_082FF750[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF758[] =
+static const union AnimCmd gUnknown_082FF758[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 5),
@@ -72,7 +41,7 @@ const union AnimCmd gUnknown_082FF758[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF774[] =
+static const union AnimCmd gUnknown_082FF774[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 12),
@@ -83,14 +52,14 @@ const union AnimCmd gUnknown_082FF774[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF790[] =
+static const union AnimCmd gUnknown_082FF790[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(2, 12),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF79C[] =
+static const union AnimCmd gUnknown_082FF79C[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -99,7 +68,7 @@ const union AnimCmd gUnknown_082FF79C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7B0[] =
+static const union AnimCmd gUnknown_082FF7B0[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(2, 10),
@@ -108,193 +77,193 @@ const union AnimCmd gUnknown_082FF7B0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7C4[] =
+static const union AnimCmd gUnknown_082FF7C4[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7CC[] =
+static const union AnimCmd gUnknown_082FF7CC[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7D4[] =
+static const union AnimCmd gUnknown_082FF7D4[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7DC[] =
+static const union AnimCmd gUnknown_082FF7DC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7E4[] =
+static const union AnimCmd gUnknown_082FF7E4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7EC[] =
+static const union AnimCmd gUnknown_082FF7EC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7F4[] =
+static const union AnimCmd gUnknown_082FF7F4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF7FC[] =
+static const union AnimCmd gUnknown_082FF7FC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF804[] =
+static const union AnimCmd gUnknown_082FF804[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF80C[] =
+static const union AnimCmd gUnknown_082FF80C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF814[] =
+static const union AnimCmd gUnknown_082FF814[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF81C[] =
+static const union AnimCmd gUnknown_082FF81C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF824[] =
+static const union AnimCmd gUnknown_082FF824[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF82C[] =
+static const union AnimCmd gUnknown_082FF82C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF834[] =
+static const union AnimCmd gUnknown_082FF834[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF83C[] =
+static const union AnimCmd gUnknown_082FF83C[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF844[] =
+static const union AnimCmd gUnknown_082FF844[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF84C[] =
+static const union AnimCmd gUnknown_082FF84C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF854[] =
+static const union AnimCmd gUnknown_082FF854[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF85C[] =
+static const union AnimCmd gUnknown_082FF85C[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF864[] =
+static const union AnimCmd gUnknown_082FF864[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF86C[] =
+static const union AnimCmd gUnknown_082FF86C[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF874[] =
+static const union AnimCmd gUnknown_082FF874[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF87C[] =
+static const union AnimCmd gUnknown_082FF87C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF884[] =
+static const union AnimCmd gUnknown_082FF884[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF88C[] =
+static const union AnimCmd gUnknown_082FF88C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF894[] =
+static const union AnimCmd gUnknown_082FF894[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF89C[] =
+static const union AnimCmd gUnknown_082FF89C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF8A4[] =
+static const union AnimCmd gUnknown_082FF8A4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF8AC[] =
+static const union AnimCmd gUnknown_082FF8AC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF8B4[] =
+static const union AnimCmd gUnknown_082FF8B4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF8BC[] =
+static const union AnimCmd gUnknown_082FF8BC[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(8, 15),
@@ -314,7 +283,7 @@ const union AnimCmd gUnknown_082FF8BC[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF8FC[] =
+static const union AnimCmd gUnknown_082FF8FC[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(8, 15),
@@ -326,7 +295,7 @@ const union AnimCmd gUnknown_082FF8FC[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF91C[] =
+static const union AnimCmd gUnknown_082FF91C[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(9, 10),
@@ -335,26 +304,26 @@ const union AnimCmd gUnknown_082FF91C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF930[] =
+static const union AnimCmd gUnknown_082FF930[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(11, 15),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF93C[] =
+static const union AnimCmd gUnknown_082FF93C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF944[] =
+static const union AnimCmd gUnknown_082FF944[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF94C[] =
+static const union AnimCmd gUnknown_082FF94C[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 7),
@@ -381,7 +350,7 @@ const union AnimCmd gUnknown_082FF94C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FF9A8[] =
+static const union AnimCmd gUnknown_082FF9A8[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(7, 12),
@@ -407,7 +376,7 @@ const union AnimCmd gUnknown_082FF9A8[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA00[] =
+static const union AnimCmd gUnknown_082FFA00[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(7, 12),
@@ -433,182 +402,182 @@ const union AnimCmd gUnknown_082FFA00[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA58[] =
+static const union AnimCmd gUnknown_082FFA58[] =
 {
     ANIMCMD_FRAME(0,18),
     ANIMCMD_FRAME(10, 18),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA64[] =
+static const union AnimCmd gUnknown_082FFA64[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA6C[] =
+static const union AnimCmd gUnknown_082FFA6C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA74[] =
+static const union AnimCmd gUnknown_082FFA74[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA7C[] =
+static const union AnimCmd gUnknown_082FFA7C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA84[] =
+static const union AnimCmd gUnknown_082FFA84[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA8C[] =
+static const union AnimCmd gUnknown_082FFA8C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA94[] =
+static const union AnimCmd gUnknown_082FFA94[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFA9C[] =
+static const union AnimCmd gUnknown_082FFA9C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAA4[] =
+static const union AnimCmd gUnknown_082FFAA4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAAC[] =
+static const union AnimCmd gUnknown_082FFAAC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAB4[] =
+static const union AnimCmd gUnknown_082FFAB4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFABC[] =
+static const union AnimCmd gUnknown_082FFABC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAC4[] =
+static const union AnimCmd gUnknown_082FFAC4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFACC[] =
+static const union AnimCmd gUnknown_082FFACC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAD4[] =
+static const union AnimCmd gUnknown_082FFAD4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFADC[] =
+static const union AnimCmd gUnknown_082FFADC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAE4[] =
+static const union AnimCmd gUnknown_082FFAE4[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAEC[] =
+static const union AnimCmd gUnknown_082FFAEC[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAF4[] =
+static const union AnimCmd gUnknown_082FFAF4[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFAFC[] =
+static const union AnimCmd gUnknown_082FFAFC[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB04[] =
+static const union AnimCmd gUnknown_082FFB04[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB0C[] =
+static const union AnimCmd gUnknown_082FFB0C[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB14[] =
+static const union AnimCmd gUnknown_082FFB14[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB1C[] =
+static const union AnimCmd gUnknown_082FFB1C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB24[] =
+static const union AnimCmd gUnknown_082FFB24[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB2C[] =
+static const union AnimCmd gUnknown_082FFB2C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB34[] =
+static const union AnimCmd gUnknown_082FFB34[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB3C[] =
+static const union AnimCmd gUnknown_082FFB3C[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB44[] =
+static const union AnimCmd gUnknown_082FFB44[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 18),
@@ -619,7 +588,7 @@ const union AnimCmd gUnknown_082FFB44[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB60[] =
+static const union AnimCmd gUnknown_082FFB60[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 18),
@@ -630,7 +599,7 @@ const union AnimCmd gUnknown_082FFB60[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFB7C[] =
+static const union AnimCmd gUnknown_082FFB7C[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(2, 5),
@@ -650,7 +619,7 @@ const union AnimCmd gUnknown_082FFB7C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFBBC[] =
+static const union AnimCmd gUnknown_082FFBBC[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -663,7 +632,7 @@ const union AnimCmd gUnknown_082FFBBC[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFBE0[] =
+static const union AnimCmd gUnknown_082FFBE0[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(5, 12),
@@ -672,61 +641,61 @@ const union AnimCmd gUnknown_082FFBE0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFBF4[] =
+static const union AnimCmd gUnknown_082FFBF4[] =
 {
     ANIMCMD_FRAME(7, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFBFC[] =
+static const union AnimCmd gUnknown_082FFBFC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC04[] =
+static const union AnimCmd gUnknown_082FFC04[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC0C[] =
+static const union AnimCmd gUnknown_082FFC0C[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC14[] =
+static const union AnimCmd gUnknown_082FFC14[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC1C[] =
+static const union AnimCmd gUnknown_082FFC1C[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC24[] =
+static const union AnimCmd gUnknown_082FFC24[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC2C[] =
+static const union AnimCmd gUnknown_082FFC2C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC34[] =
+static const union AnimCmd gUnknown_082FFC34[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC3C[] =
+static const union AnimCmd gUnknown_082FFC3C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 10),
@@ -737,7 +706,7 @@ const union AnimCmd gUnknown_082FFC3C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC58[] =
+static const union AnimCmd gUnknown_082FFC58[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 8),
@@ -748,217 +717,217 @@ const union AnimCmd gUnknown_082FFC58[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC74[] =
+static const union AnimCmd gUnknown_082FFC74[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC7C[] =
+static const union AnimCmd gUnknown_082FFC7C[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC84[] =
+static const union AnimCmd gUnknown_082FFC84[] =
 {
     ANIMCMD_FRAME(1, 9),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC8C[] =
+static const union AnimCmd gUnknown_082FFC8C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC94[] =
+static const union AnimCmd gUnknown_082FFC94[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFC9C[] =
+static const union AnimCmd gUnknown_082FFC9C[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCA4[] =
+static const union AnimCmd gUnknown_082FFCA4[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCAC[] =
+static const union AnimCmd gUnknown_082FFCAC[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCB4[] =
+static const union AnimCmd gUnknown_082FFCB4[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCBC[] =
+static const union AnimCmd gUnknown_082FFCBC[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCC4[] =
+static const union AnimCmd gUnknown_082FFCC4[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCCC[] =
+static const union AnimCmd gUnknown_082FFCCC[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCD4[] =
+static const union AnimCmd gUnknown_082FFCD4[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCDC[] =
+static const union AnimCmd gUnknown_082FFCDC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCE4[] =
+static const union AnimCmd gUnknown_082FFCE4[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCEC[] =
+static const union AnimCmd gUnknown_082FFCEC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCF4[] =
+static const union AnimCmd gUnknown_082FFCF4[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFCFC[] =
+static const union AnimCmd gUnknown_082FFCFC[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD04[] =
+static const union AnimCmd gUnknown_082FFD04[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD0C[] =
+static const union AnimCmd gUnknown_082FFD0C[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD14[] =
+static const union AnimCmd gUnknown_082FFD14[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD1C[] =
+static const union AnimCmd gUnknown_082FFD1C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD24[] =
+static const union AnimCmd gUnknown_082FFD24[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD2C[] =
+static const union AnimCmd gUnknown_082FFD2C[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD34[] =
+static const union AnimCmd gUnknown_082FFD34[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD3C[] =
+static const union AnimCmd gUnknown_082FFD3C[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD44[] =
+static const union AnimCmd gUnknown_082FFD44[] =
 {
     ANIMCMD_FRAME(0, 63),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD4C[] =
+static const union AnimCmd gUnknown_082FFD4C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD54[] =
+static const union AnimCmd gUnknown_082FFD54[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD5C[] =
+static const union AnimCmd gUnknown_082FFD5C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD64[] =
+static const union AnimCmd gUnknown_082FFD64[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD6C[] =
+static const union AnimCmd gUnknown_082FFD6C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD74[] =
+static const union AnimCmd gUnknown_082FFD74[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD7C[] =
+static const union AnimCmd gUnknown_082FFD7C[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD84[] =
+static const union AnimCmd gUnknown_082FFD84[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFD8C[] =
+static const union AnimCmd gUnknown_082FFD8C[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 30),
@@ -967,7 +936,7 @@ const union AnimCmd gUnknown_082FFD8C[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFDA0[] =
+static const union AnimCmd gUnknown_082FFDA0[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -976,933 +945,933 @@ const union AnimCmd gUnknown_082FFDA0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFDB4[] =
+static const union AnimCmd gUnknown_082FFDB4[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFDBC[] =
+static const union AnimCmd gUnknown_082FFDBC[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-const union AnimCmd gUnknown_082FFDC4[] =
+static const union AnimCmd gUnknown_082FFDC4[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gUnknown_082FFDCC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDD0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDD4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDD8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDDC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDE0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDE4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDE8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDEC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDF0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDF4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDF8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFDFC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE00[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE04[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE08[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE0C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE10[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE14[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE18[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE1C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE20[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE24[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE28[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE2C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE30[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE34[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE38[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE3C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE40[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE44[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE48[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE4C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE50[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE54[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE58[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE5C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE60[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE64[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE68[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE6C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE70[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE74[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE78[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE7C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE80[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE84[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE88[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE8C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE90[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE94[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE98[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFE9C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEA0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEA4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEA8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEAC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEB0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEB4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEB8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEBC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEC0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEC4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEC8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFECC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFED0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFED4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFED8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEDC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEE0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEE4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEE8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEEC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEF0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEF4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEF8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFEFC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF00[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF04[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF08[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF0C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF10[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF14[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF18[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF1C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF20[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF24[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF28[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF2C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF30[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF34[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF38[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF3C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF40[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF44[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF48[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF4C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF50[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF54[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF58[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF5C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF60[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF64[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF68[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF6C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF70[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF74[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF78[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF7C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF80[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF84[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF88[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF8C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF90[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF94[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF98[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFF9C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFA0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFA4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFA8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFAC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFB0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFB4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFB8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFBC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFC0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFC4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFC8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFCC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFD0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFD4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFD8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFDC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFE0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFE4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFE8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFEC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFF0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFF4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFF8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_082FFFFC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300000[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300004[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300008[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830000C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300010[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300014[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300018[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830001C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300020[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300024[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300028[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830002C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300030[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300034[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300038[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830003C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300040[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300044[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300048[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830004C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300050[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300054[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300058[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830005C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300060[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300064[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300068[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830006C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300070[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300074[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300078[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830007C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300080[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300084[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300088[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830008C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300090[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300094[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300098[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830009C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000A0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000A4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000A8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000AC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000B0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000B4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000B8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000BC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000C0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000C4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000C8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000CC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000D0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000D4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000D8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000DC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000E0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000E4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000E8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000EC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000F0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000F4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000F8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083000FC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300100[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300104[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300108[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830010C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300110[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300114[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300118[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830011C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300120[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300124[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300128[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830012C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300130[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300134[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300138[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830013C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300140[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300144[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300148[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830014C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300150[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300154[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300158[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830015C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300160[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300164[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300168[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830016C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300170[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300174[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300178[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830017C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300180[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300184[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300188[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830018C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300190[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300194[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300198[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830019C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001A0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001A4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001A8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001AC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001B0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001B4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001B8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001BC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001C0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001C4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001C8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001CC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083001D0[] = {gAnimCmd_General_Frame0};
-
-const union AnimCmd *const gUnknown_083001D4[] =
-{
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const gUnknown_082FFDCC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDD0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDD4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDD8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDDC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDE0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDE4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDE8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDEC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDF0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDF4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDF8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFDFC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE00[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE04[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE08[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE0C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE10[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE14[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE18[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE1C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE20[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE24[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE28[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE2C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE30[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE34[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE38[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE3C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE40[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE44[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE48[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE4C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE50[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE54[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE58[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE5C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE60[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE64[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE68[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE6C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE70[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE74[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE78[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE7C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE80[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE84[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE88[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE8C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE90[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE94[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE98[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFE9C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEA0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEA4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEA8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEAC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEB0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEB4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEB8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEBC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEC0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEC4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEC8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFECC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFED0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFED4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFED8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEDC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEE0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEE4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEE8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEEC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEF0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEF4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEF8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFEFC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF00[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF04[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF08[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF0C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF10[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF14[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF18[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF1C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF20[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF24[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF28[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF2C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF30[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF34[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF38[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF3C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF40[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF44[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF48[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF4C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF50[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF54[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF58[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF5C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF60[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF64[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF68[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF6C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF70[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF74[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF78[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF7C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF80[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF84[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF88[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF8C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF90[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF94[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF98[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFF9C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFA0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFA4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFA8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFAC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFB0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFB4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFB8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFBC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFC0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFC4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFC8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFCC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFD0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFD4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFD8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFDC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFE0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFE4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFE8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFEC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFF0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFF4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFF8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_082FFFFC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300000[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300004[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300008[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830000C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300010[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300014[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300018[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830001C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300020[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300024[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300028[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830002C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300030[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300034[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300038[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830003C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300040[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300044[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300048[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830004C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300050[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300054[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300058[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830005C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300060[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300064[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300068[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830006C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300070[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300074[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300078[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830007C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300080[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300084[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300088[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830008C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300090[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300094[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300098[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830009C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000A0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000A4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000A8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000AC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000B0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000B4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000B8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000BC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000C0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000C4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000C8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000CC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000D0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000D4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000D8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000DC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000E0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000E4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000E8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000EC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000F0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000F4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000F8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083000FC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300100[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300104[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300108[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830010C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300110[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300114[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300118[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830011C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300120[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300124[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300128[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830012C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300130[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300134[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300138[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830013C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300140[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300144[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300148[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830014C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300150[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300154[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300158[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830015C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300160[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300164[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300168[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830016C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300170[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300174[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300178[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830017C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300180[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300184[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300188[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830018C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300190[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300194[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300198[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830019C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001A0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001A4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001A8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001AC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001B0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001B4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001B8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001BC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001C0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001C4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001C8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001CC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083001D0[] = {sAnim_GeneralFrame0};
+
+static const union AnimCmd *const gUnknown_083001D4[] =
+{
+    sAnim_GeneralFrame0,
     gUnknown_082FF71C,
     gUnknown_082FF734,
     gUnknown_082FF744,
     gUnknown_082FF750,
 };
 
-const union AnimCmd *const gUnknown_083001E8[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083001E8[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083001EC[] =
+static const union AnimCmd *const gUnknown_083001EC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF758,
     gUnknown_082FF774,
     gUnknown_082FF790,
 };
 
-const union AnimCmd *const gUnknown_083001FC[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083001FC[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300200[] =
+static const union AnimCmd *const gUnknown_08300200[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF79C,
     gUnknown_082FF7B0,
 };
 
-const union AnimCmd *const gUnknown_0830020C[] =
+static const union AnimCmd *const gUnknown_0830020C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF7C4,
 };
 
-const union AnimCmd *const gUnknown_08300214[] =
+static const union AnimCmd *const gUnknown_08300214[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF7CC,
 };
 
-const union AnimCmd *const gUnknown_0830021C[] =
+static const union AnimCmd *const gUnknown_0830021C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF7D4,
 };
 
-const union AnimCmd *const gUnknown_08300224[] =
+static const union AnimCmd *const gUnknown_08300224[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF7DC,
     gUnknown_082FF7E4,
 };
 
-const union AnimCmd *const gUnknown_08300230[] =
+static const union AnimCmd *const gUnknown_08300230[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF7EC,
     gUnknown_082FF7F4,
 };
 
-const union AnimCmd *const gUnknown_0830023C[] =
+static const union AnimCmd *const gUnknown_0830023C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF7FC,
     gUnknown_082FF804,
 };
 
-const union AnimCmd *const gUnknown_08300248[] =
+static const union AnimCmd *const gUnknown_08300248[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF80C,
     gUnknown_082FF814,
 };
 
-const union AnimCmd *const gUnknown_08300254[] =
+static const union AnimCmd *const gUnknown_08300254[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF81C,
     gUnknown_082FF824,
 };
 
-const union AnimCmd *const gUnknown_08300260[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300260[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300264[] =
+static const union AnimCmd *const gUnknown_08300264[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF82C,
 };
 
-const union AnimCmd *const gUnknown_0830026C[] =
+static const union AnimCmd *const gUnknown_0830026C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF834,
     gUnknown_082FF83C,
 };
 
-const union AnimCmd *const gUnknown_08300278[] =
+static const union AnimCmd *const gUnknown_08300278[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF844,
 };
 
-const union AnimCmd *const gUnknown_08300280[] =
+static const union AnimCmd *const gUnknown_08300280[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF84C,
 };
 
-const union AnimCmd *const gUnknown_08300288[] =
+static const union AnimCmd *const gUnknown_08300288[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF854,
     gUnknown_082FF85C,
 };
 
-const union AnimCmd *const gUnknown_08300294[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300298[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830029C[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300294[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300298[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830029C[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083002A0[] =
+static const union AnimCmd *const gUnknown_083002A0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF864,
 };
 
-const union AnimCmd *const gUnknown_083002A8[] =
+static const union AnimCmd *const gUnknown_083002A8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF86C,
 };
 
-const union AnimCmd *const gUnknown_083002B0[] =
+static const union AnimCmd *const gUnknown_083002B0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF874,
 };
 
-const union AnimCmd *const gUnknown_083002B8[] =
+static const union AnimCmd *const gUnknown_083002B8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF87C,
 };
 
-const union AnimCmd *const gUnknown_083002C0[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083002C0[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083002C4[] =
+static const union AnimCmd *const gUnknown_083002C4[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF884,
 };
 
-const union AnimCmd *const gUnknown_083002CC[] =
+static const union AnimCmd *const gUnknown_083002CC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF88C,
     gUnknown_082FF894,
 };
 
-const union AnimCmd *const gUnknown_083002D8[] =
+static const union AnimCmd *const gUnknown_083002D8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF89C,
     gUnknown_082FF8A4,
 };
 
-const union AnimCmd *const gUnknown_083002E4[] =
+static const union AnimCmd *const gUnknown_083002E4[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF8AC,
     gUnknown_082FF8B4,
 };
 
-const union AnimCmd *const gUnknown_083002F0[] =
+static const union AnimCmd *const gUnknown_083002F0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF8BC,
     gUnknown_082FF8FC,
     gUnknown_082FF91C,
     gUnknown_082FF930,
 };
 
-const union AnimCmd *const gUnknown_08300304[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300304[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300308[] =
+static const union AnimCmd *const gUnknown_08300308[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF93C,
 };
 
-const union AnimCmd *const gUnknown_08300310[] =
+static const union AnimCmd *const gUnknown_08300310[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF944,
 };
 
-const union AnimCmd *const gUnknown_08300318[] =
+static const union AnimCmd *const gUnknown_08300318[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FF94C,
     gUnknown_082FF9A8,
     gUnknown_082FFA00,
     gUnknown_082FFA58,
 };
 
-const union AnimCmd *const gUnknown_0830032C[] =
+static const union AnimCmd *const gUnknown_0830032C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFA64,
 };
 
-const union AnimCmd *const gUnknown_08300334[] =
+static const union AnimCmd *const gUnknown_08300334[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFA6C,
 };
 
-const union AnimCmd *const gUnknown_0830033C[] =
+static const union AnimCmd *const gUnknown_0830033C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFA74,
 };
 
-const union AnimCmd *const gUnknown_08300344[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300344[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300348[] =
+static const union AnimCmd *const gUnknown_08300348[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFA7C,
     gUnknown_082FFA84,
 };
 
-const union AnimCmd *const gUnknown_08300354[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300358[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300354[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300358[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_0830035C[] =
+static const union AnimCmd *const gUnknown_0830035C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFA8C,
     gUnknown_082FFA94,
 };
 
-const union AnimCmd *const gUnknown_08300368[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830036C[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300368[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830036C[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300370[] =
+static const union AnimCmd *const gUnknown_08300370[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFA9C,
     gUnknown_082FFAA4,
 };
 
-const union AnimCmd *const gUnknown_0830037C[] =
+static const union AnimCmd *const gUnknown_0830037C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFAAC,
     gUnknown_082FFAB4,
 };
 
-const union AnimCmd *const gUnknown_08300388[] =
+static const union AnimCmd *const gUnknown_08300388[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFABC,
     gUnknown_082FFAC4,
 };
 
-const union AnimCmd *const gUnknown_08300394[] =
+static const union AnimCmd *const gUnknown_08300394[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFACC,
     gUnknown_082FFAD4,
 };
 
-const union AnimCmd *const gUnknown_083003A0[] =
+static const union AnimCmd *const gUnknown_083003A0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFADC,
 };
 
-const union AnimCmd *const gUnknown_083003A8[] =
+static const union AnimCmd *const gUnknown_083003A8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFAE4,
 };
 
-const union AnimCmd *const gUnknown_083003B0[] =
+static const union AnimCmd *const gUnknown_083003B0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFAEC,
 };
 
-const union AnimCmd *const gUnknown_083003B8[] =
+static const union AnimCmd *const gUnknown_083003B8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFAF4,
 };
 
-const union AnimCmd *const gUnknown_083003C0[] =
+static const union AnimCmd *const gUnknown_083003C0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFAFC,
 };
 
-const union AnimCmd *const gUnknown_083003C8[] =
+static const union AnimCmd *const gUnknown_083003C8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB04,
     gUnknown_082FFB0C,
 };
 
-const union AnimCmd *const gUnknown_083003D4[] =
+static const union AnimCmd *const gUnknown_083003D4[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB14,
 };
 
-const union AnimCmd *const gUnknown_083003DC[] =
+static const union AnimCmd *const gUnknown_083003DC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB1C,
     gUnknown_082FFB24,
 };
 
-const union AnimCmd *const gUnknown_083003E8[] =
+static const union AnimCmd *const gUnknown_083003E8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB2C,
 };
 
-const union AnimCmd *const gUnknown_083003F0[] =
+static const union AnimCmd *const gUnknown_083003F0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB34,
 };
 
-const union AnimCmd *const gUnknown_083003F8[] =
+static const union AnimCmd *const gUnknown_083003F8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB3C,
 };
 
-const union AnimCmd *const gUnknown_08300400[] =
+static const union AnimCmd *const gUnknown_08300400[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB44,
     gUnknown_082FFB60,
 };
 
-const union AnimCmd *const gUnknown_0830040C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300410[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300414[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300418[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830041C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300420[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_0830040C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300410[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300414[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300418[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830041C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300420[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300424[] =
+static const union AnimCmd *const gUnknown_08300424[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFB7C,
     gUnknown_082FFBBC,
     gUnknown_082FFBE0,
     gUnknown_082FFBF4,
 };
 
-const union AnimCmd *const gUnknown_08300438[] =
+static const union AnimCmd *const gUnknown_08300438[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFBFC,
     gUnknown_082FFC04,
 };
 
-const union AnimCmd *const gUnknown_08300444[] =
+static const union AnimCmd *const gUnknown_08300444[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC0C,
 };
 
-const union AnimCmd *const gUnknown_0830044C[] = 
+static const union AnimCmd *const gUnknown_0830044C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC14,
 };
 
-const union AnimCmd *const gUnknown_08300454[] =
+static const union AnimCmd *const gUnknown_08300454[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC1C,
 };
 
-const union AnimCmd *const gUnknown_0830045C[] =
+static const union AnimCmd *const gUnknown_0830045C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC24,
 };
 
-const union AnimCmd *const gUnknown_08300464[] =
+static const union AnimCmd *const gUnknown_08300464[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC2C,
 };
 
-const union AnimCmd *const gUnknown_0830046C[] =
+static const union AnimCmd *const gUnknown_0830046C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC34,
 };
 
-const union AnimCmd *const gUnknown_08300474[] =
+static const union AnimCmd *const gUnknown_08300474[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC3C,
     gUnknown_082FFC58,
 };
 
-const union AnimCmd *const gUnknown_08300480[] =
+static const union AnimCmd *const gUnknown_08300480[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC74,
 };
 
-const union AnimCmd *const gUnknown_08300488[] =
+static const union AnimCmd *const gUnknown_08300488[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC7C,
     gUnknown_082FFC84,
 };
 
-const union AnimCmd *const gUnknown_08300494[] =
+static const union AnimCmd *const gUnknown_08300494[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC8C,
     gUnknown_082FFC94,
 };
 
-const union AnimCmd *const gUnknown_083004A0[] =
+static const union AnimCmd *const gUnknown_083004A0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFC9C,
     gUnknown_082FFCA4,
 };
 
-const union AnimCmd *const gUnknown_083004AC[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083004AC[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083004B0[] = 
+static const union AnimCmd *const gUnknown_083004B0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCAC,
 };
 
-const union AnimCmd *const gUnknown_083004B8[] =
+static const union AnimCmd *const gUnknown_083004B8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCB4,
 };
 
-const union AnimCmd *const gUnknown_083004C0[] =
+static const union AnimCmd *const gUnknown_083004C0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCBC,
 };
 
-const union AnimCmd *const gUnknown_083004C8[] =
+static const union AnimCmd *const gUnknown_083004C8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCC4,
 };
 
-const union AnimCmd *const gUnknown_083004D0[] =
+static const union AnimCmd *const gUnknown_083004D0[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCCC,
 };
 
-const union AnimCmd *const gUnknown_083004D8[] =
+static const union AnimCmd *const gUnknown_083004D8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCD4,
 };
 
-const union AnimCmd *const gUnknown_083004E0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083004E4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083004E8[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083004E0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083004E4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083004E8[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083004EC[] =
+static const union AnimCmd *const gUnknown_083004EC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCDC,
 };
 
-const union AnimCmd *const gUnknown_083004F4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083004F8[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083004F4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083004F8[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083004FC[] =
+static const union AnimCmd *const gUnknown_083004FC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCE4,
 };
 
-const union AnimCmd *const gUnknown_08300504[] =
+static const union AnimCmd *const gUnknown_08300504[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCEC,
     gUnknown_082FFCF4,
 };
 
-const union AnimCmd *const gUnknown_08300510[] =
+static const union AnimCmd *const gUnknown_08300510[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFCFC,
 };
 
-const union AnimCmd *const gUnknown_08300518[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830051C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300520[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300518[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830051C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300520[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_08300524[] =
+static const union AnimCmd *const gUnknown_08300524[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD04,
 };
 
-const union AnimCmd *const gUnknown_0830052C[] =
+static const union AnimCmd *const gUnknown_0830052C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD0C,
 };
 
-const union AnimCmd *const gUnknown_08300534[] =
+static const union AnimCmd *const gUnknown_08300534[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD14,
 };
 
-const union AnimCmd *const gUnknown_0830053C[] =
+static const union AnimCmd *const gUnknown_0830053C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD1C,
     gUnknown_082FFD24,
     gUnknown_082FFD2C,
     gUnknown_082FFD34,
 };
 
-const union AnimCmd *const gUnknown_08300550[] =
+static const union AnimCmd *const gUnknown_08300550[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD3C,
 };
 
-const union AnimCmd *const gUnknown_08300558[] =
+static const union AnimCmd *const gUnknown_08300558[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD44,
 };
 
-const union AnimCmd *const gUnknown_08300560[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300564[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300568[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830056C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300570[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300574[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300578[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300560[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300564[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300568[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830056C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300570[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300574[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300578[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_0830057C[] =
+static const union AnimCmd *const gUnknown_0830057C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD4C,
     gUnknown_082FFD54,
 };
 
-const union AnimCmd *const gUnknown_08300588[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300588[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_0830058C[] =
+static const union AnimCmd *const gUnknown_0830058C[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD5C,
     gUnknown_082FFD64,
 };
 
-const union AnimCmd *const gUnknown_08300598[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830059C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005A0[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_08300598[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830059C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005A0[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083005A4[] =
+static const union AnimCmd *const gUnknown_083005A4[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD6C,
 };
 
-const union AnimCmd *const gUnknown_083005AC[] =
+static const union AnimCmd *const gUnknown_083005AC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD74,
 };
 
-const union AnimCmd *const gUnknown_083005B4[] =
+static const union AnimCmd *const gUnknown_083005B4[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD7C,
     gUnknown_082FFD84,
 };
 
-const union AnimCmd *const gUnknown_083005C0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005C4[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083005C0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005C4[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083005C8[] =
+static const union AnimCmd *const gUnknown_083005C8[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFD8C,
     gUnknown_082FFDA0,
 };
 
-const union AnimCmd *const gUnknown_083005D4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005D8[] = {gAnimCmd_General_Frame0};
+static const union AnimCmd *const gUnknown_083005D4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005D8[] = {sAnim_GeneralFrame0};
 
-const union AnimCmd *const gUnknown_083005DC[] =
+static const union AnimCmd *const gUnknown_083005DC[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gUnknown_082FFDC4,
 };
 
-const union AnimCmd *const gUnknown_083005E4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005E8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005EC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005F0[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005F4[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005F8[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_083005FC[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300600[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300604[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300608[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830060C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300610[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300614[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300618[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830061C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300620[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300624[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300628[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830062C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300630[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300634[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300638[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830063C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300640[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300644[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300648[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_0830064C[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300650[] = {gAnimCmd_General_Frame0};
-const union AnimCmd *const gUnknown_08300654[] = {gAnimCmd_General_Frame0};
-
-const union AnimCmd *const *const gUnusedTrainerFrontAnimsPtrTable[] =
+static const union AnimCmd *const gUnknown_083005E4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005E8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005EC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005F0[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005F4[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005F8[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_083005FC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300600[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300604[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300608[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830060C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300610[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300614[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300618[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830061C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300620[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300624[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300628[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830062C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300630[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300634[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300638[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830063C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300640[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300644[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300648[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_0830064C[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300650[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const gUnknown_08300654[] = {sAnim_GeneralFrame0};
+
+const union AnimCmd *const *const gUnknownAnimsTable[] =
 {
     gUnknown_082FFDCC,
     gUnknown_082FFDD0,
diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h
index 0cc4bb203..821039cb3 100644
--- a/src/data/trainer_graphics/back_pic_anims.h
+++ b/src/data/trainer_graphics/back_pic_anims.h
@@ -1,4 +1,4 @@
-const union AnimCmd gAnimCmd_Brendan_1[] =
+static const union AnimCmd gAnimCmd_Brendan_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -8,7 +8,7 @@ const union AnimCmd gAnimCmd_Brendan_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_May_Steven_1[] =
+static const union AnimCmd gAnimCmd_May_Steven_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -18,7 +18,7 @@ const union AnimCmd gAnimCmd_May_Steven_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Wally_1[] =
+static const union AnimCmd gAnimCmd_Wally_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -28,7 +28,7 @@ const union AnimCmd gAnimCmd_Wally_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Red_1[] =
+static const union AnimCmd gAnimCmd_Red_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(2, 6),
@@ -38,7 +38,7 @@ const union AnimCmd gAnimCmd_Red_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Leaf_1[] =
+static const union AnimCmd gAnimCmd_Leaf_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(2, 6),
@@ -48,7 +48,7 @@ const union AnimCmd gAnimCmd_Leaf_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
+static const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -58,72 +58,72 @@ const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
+static const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
-    ANIMCMD_FRAME(2, 24), 
+    ANIMCMD_FRAME(2, 24),
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(3, 50),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Brendan[] =
+static const union AnimCmd *const sBackAnims_Brendan[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_Brendan_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_May[] =
+static const union AnimCmd *const sBackAnims_May[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_May_Steven_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Red[] =
+static const union AnimCmd *const sBackAnims_Red[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gAnimCmd_Red_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Leaf[] =
+static const union AnimCmd *const sBackAnims_Leaf[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gAnimCmd_Leaf_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
+static const union AnimCmd *const sBackAnims_RubySapphireBrendan[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_RubySapphireBrendan_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
+static const union AnimCmd *const sBackAnims_RubySapphireMay[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_RubySapphireMay_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Wally[] =
+static const union AnimCmd *const sBackAnims_Wally[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_Wally_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Steven[] =
+static const union AnimCmd *const sBackAnims_Steven[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_May_Steven_1,
 };
 
 const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] =
 {
-    gTrainerBackAnims_Brendan,
-    gTrainerBackAnims_May,
-    gTrainerBackAnims_Red,
-    gTrainerBackAnims_Leaf,
-    gTrainerBackAnims_RubySapphireBrendan,
-    gTrainerBackAnims_RubySapphireMay,
-    gTrainerBackAnims_Wally,
-    gTrainerBackAnims_Steven,
+    [TRAINER_BACK_PIC_BRENDAN] = sBackAnims_Brendan,
+    [TRAINER_BACK_PIC_MAY] = sBackAnims_May,
+    [TRAINER_BACK_PIC_RED] = sBackAnims_Red,
+    [TRAINER_BACK_PIC_LEAF] = sBackAnims_Leaf,
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = sBackAnims_RubySapphireBrendan,
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = sBackAnims_RubySapphireMay,
+    [TRAINER_BACK_PIC_WALLY] = sBackAnims_Wally,
+    [TRAINER_BACK_PIC_STEVEN] = sBackAnims_Steven,
 };
diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h
index 0f6b0cb91..86efd7905 100644
--- a/src/data/trainer_graphics/back_pic_tables.h
+++ b/src/data/trainer_graphics/back_pic_tables.h
@@ -1,13 +1,13 @@
 const struct MonCoords gTrainerBackPicCoords[] =
 {
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 5},
-    {.size = 8, .y_offset = 5},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
-    {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_BRENDAN] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_MAY] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_RED] = {.size = 8, .y_offset = 5},
+    [TRAINER_BACK_PIC_LEAF] = {.size = 8, .y_offset = 5},
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_WALLY] = {.size = 8, .y_offset = 4},
+    [TRAINER_BACK_PIC_STEVEN] = {.size = 8, .y_offset = 4},
 };
 
 // this table goes functionally unused, since none of these pics are compressed
@@ -25,14 +25,14 @@ const struct CompressedSpriteSheet gTrainerBackPicTable[] =
     (const u32 *)gTrainerBackPic_Steven, 0x2000, TRAINER_BACK_PIC_STEVEN,
 };
 
-const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = 
+const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] =
 {
-    gTrainerPalette_Brendan, TRAINER_BACK_PIC_BRENDAN,
-    gTrainerPalette_May, TRAINER_BACK_PIC_MAY,
-    gTrainerBackPicPalette_Red, TRAINER_BACK_PIC_RED,
-    gTrainerBackPicPalette_Leaf, TRAINER_BACK_PIC_LEAF,
-    gTrainerPalette_RubySapphireBrendan, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN,
-    gTrainerPalette_RubySapphireMay, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY,
-    gTrainerPalette_Wally, TRAINER_BACK_PIC_WALLY,
-    gTrainerPalette_Steven, TRAINER_BACK_PIC_STEVEN,
+    TRAINER_BACK_PAL(BRENDAN, gTrainerPalette_Brendan),
+    TRAINER_BACK_PAL(MAY, gTrainerPalette_May),
+    TRAINER_BACK_PAL(RED, gTrainerBackPicPalette_Red),
+    TRAINER_BACK_PAL(LEAF, gTrainerBackPicPalette_Leaf),
+    TRAINER_BACK_PAL(RUBY_SAPPHIRE_BRENDAN, gTrainerPalette_RubySapphireBrendan),
+    TRAINER_BACK_PAL(RUBY_SAPPHIRE_MAY, gTrainerPalette_RubySapphireMay),
+    TRAINER_BACK_PAL(WALLY, gTrainerPalette_Wally),
+    TRAINER_BACK_PAL(STEVEN, gTrainerPalette_Steven),
 };
diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h
index 371e5a300..f01394532 100644
--- a/src/data/trainer_graphics/front_pic_anims.h
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -1,470 +1,468 @@
-#include "constants/trainers.h"
-
-const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Hiker[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaGruntM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaGruntM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonBreederF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonBreederF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CoolTrainerM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CoolTrainerM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BirdKeeper[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BirdKeeper[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Collector[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Collector[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaGruntF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaGruntF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmerM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmerM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaGruntM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaGruntM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ExpertM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ExpertM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaAdminM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaAdminM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BlackBelt[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BlackBelt[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaAdminF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaAdminF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AquaLeaderArchie[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AquaLeaderArchie[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_HexManiac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_HexManiac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_AromaLady[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_AromaLady[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RuinManiac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RuinManiac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Interviewer[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Interviewer[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_TuberF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_TuberF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_TuberM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_TuberM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CoolTrainerF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CoolTrainerF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Lady[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Lady[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Beauty[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Beauty[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RichBoy[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RichBoy[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ExpertF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ExpertF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Pokemaniac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Pokemaniac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaGruntF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaGruntF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Guitarist[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Guitarist[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Kindler[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Kindler[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Camper[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Camper[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Picnicker[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Picnicker[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BugManiac[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BugManiac[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonBreederM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonBreederM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PsychicM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PsychicM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PsychicF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PsychicF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Gentleman[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Gentleman[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourSidney[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourSidney[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourPhoebe[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourPhoebe[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourGlacia[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourGlacia[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_EliteFourDrake[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_EliteFourDrake[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderRoxanne[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderRoxanne[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderBrawly[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderBrawly[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderWattson[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderWattson[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderFlannery[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderFlannery[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderNorman[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderNorman[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderWinona[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderWinona[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderTateAndLiza[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderTateAndLiza[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_LeaderJuan[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_LeaderJuan[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SchoolKidM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SchoolKidM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SchoolKidF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SchoolKidF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SrAndJr[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokefanM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokefanM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokefanF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokefanF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Youngster[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Youngster[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ChampionWallace[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ChampionWallace[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Fisherman[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Fisherman[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CyclingTriathleteM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_CyclingTriathleteF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_CyclingTriathleteF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RunningTriathleteM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RunningTriathleteF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RunningTriathleteF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmingTriathleteM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmingTriathleteF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmingTriathleteF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_DragonTamer[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_DragonTamer[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_NinjaBoy[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_NinjaBoy[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BattleGirl[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BattleGirl[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ParasolLady[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ParasolLady[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SwimmerF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SwimmerF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Twins[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Twins[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Sailor[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Sailor[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaAdmin[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaAdmin[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Wally[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Wally[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Brendan[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Brendan[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_May[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_May[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_BugCatcher[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_BugCatcher[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonRangerM[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonRangerM[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PokemonRangerF[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PokemonRangerF[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_MagmaLeaderMaxie[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_MagmaLeaderMaxie[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Lass[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Lass[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_YoungCouple[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_YoungCouple[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_OldCouple[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_OldCouple[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SisAndBro[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SisAndBro[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Steven[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Steven[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_SalonMaidenAnabel[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_SalonMaidenAnabel[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_DomeAceTucker[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_DomeAceTucker[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PalaceMavenSpenser[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PalaceMavenSpenser[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_ArenaTycoonGreta[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_ArenaTycoonGreta[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_FactoryHeadNoland[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_FactoryHeadNoland[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PikeQueenLucy[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PikeQueenLucy[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_PyramidKingBrandon[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_PyramidKingBrandon[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Red[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Red[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_Leaf[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_Leaf[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RubySapphireBrendan[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RubySapphireBrendan[] ={
+    sAnim_GeneralFrame0,
 };
 
-const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={
-    gAnimCmd_General_Frame0,
+static const union AnimCmd *const sAnims_RubySapphireMay[] ={
+    sAnim_GeneralFrame0,
 };
 
 const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
 {
-    [TRAINER_PIC_HIKER] = gTrainerFrontAnims_Hiker,
-    [TRAINER_PIC_AQUA_GRUNT_M] = gTrainerFrontAnims_AquaGruntM,
-    [TRAINER_PIC_POKEMON_BREEDER_F] = gTrainerFrontAnims_PokemonBreederF,
-    [TRAINER_PIC_COOLTRAINER_M] = gTrainerFrontAnims_CoolTrainerM,
-    [TRAINER_PIC_BIRD_KEEPER] = gTrainerFrontAnims_BirdKeeper,
-    [TRAINER_PIC_COLLECTOR] = gTrainerFrontAnims_Collector,
-    [TRAINER_PIC_AQUA_GRUNT_F] = gTrainerFrontAnims_AquaGruntF,
-    [TRAINER_PIC_SWIMMER_M] = gTrainerFrontAnims_SwimmerM,
-    [TRAINER_PIC_MAGMA_GRUNT_M] = gTrainerFrontAnims_MagmaGruntM,
-    [TRAINER_PIC_EXPERT_M] = gTrainerFrontAnims_ExpertM,
-    [TRAINER_PIC_AQUA_ADMIN_M] = gTrainerFrontAnims_AquaAdminM,
-    [TRAINER_PIC_BLACK_BELT] = gTrainerFrontAnims_BlackBelt,
-    [TRAINER_PIC_AQUA_ADMIN_F] = gTrainerFrontAnims_AquaAdminF,
-    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = gTrainerFrontAnims_AquaLeaderArchie,
-    [TRAINER_PIC_HEX_MANIAC] = gTrainerFrontAnims_HexManiac,
-    [TRAINER_PIC_AROMA_LADY] = gTrainerFrontAnims_AromaLady,
-    [TRAINER_PIC_RUIN_MANIAC] = gTrainerFrontAnims_RuinManiac,
-    [TRAINER_PIC_INTERVIEWER] = gTrainerFrontAnims_Interviewer,
-    [TRAINER_PIC_TUBER_F] = gTrainerFrontAnims_TuberF,
-    [TRAINER_PIC_TUBER_M] = gTrainerFrontAnims_TuberM,
-    [TRAINER_PIC_COOLTRAINER_F] = gTrainerFrontAnims_CoolTrainerF,
-    [TRAINER_PIC_LADY] = gTrainerFrontAnims_Lady,
-    [TRAINER_PIC_BEAUTY] = gTrainerFrontAnims_Beauty,
-    [TRAINER_PIC_RICH_BOY] = gTrainerFrontAnims_RichBoy,
-    [TRAINER_PIC_EXPERT_F] = gTrainerFrontAnims_ExpertF,
-    [TRAINER_PIC_POKEMANIAC] = gTrainerFrontAnims_Pokemaniac,
-    [TRAINER_PIC_MAGMA_GRUNT_F] = gTrainerFrontAnims_MagmaGruntF,
-    [TRAINER_PIC_GUITARIST] = gTrainerFrontAnims_Guitarist,
-    [TRAINER_PIC_KINDLER] = gTrainerFrontAnims_Kindler,
-    [TRAINER_PIC_CAMPER] = gTrainerFrontAnims_Camper,
-    [TRAINER_PIC_PICNICKER] = gTrainerFrontAnims_Picnicker,
-    [TRAINER_PIC_BUG_MANIAC] = gTrainerFrontAnims_BugManiac,
-    [TRAINER_PIC_POKEMON_BREEDER_M] = gTrainerFrontAnims_PokemonBreederM,
-    [TRAINER_PIC_PSYCHIC_M] = gTrainerFrontAnims_PsychicM,
-    [TRAINER_PIC_PSYCHIC_F] = gTrainerFrontAnims_PsychicF,
-    [TRAINER_PIC_GENTLEMAN] = gTrainerFrontAnims_Gentleman,
-    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = gTrainerFrontAnims_EliteFourSidney,
-    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = gTrainerFrontAnims_EliteFourPhoebe,
-    [TRAINER_PIC_ELITE_FOUR_GLACIA] = gTrainerFrontAnims_EliteFourGlacia,
-    [TRAINER_PIC_ELITE_FOUR_DRAKE] = gTrainerFrontAnims_EliteFourDrake,
-    [TRAINER_PIC_LEADER_ROXANNE] = gTrainerFrontAnims_LeaderRoxanne,
-    [TRAINER_PIC_LEADER_BRAWLY] = gTrainerFrontAnims_LeaderBrawly,
-    [TRAINER_PIC_LEADER_WATTSON] = gTrainerFrontAnims_LeaderWattson,
-    [TRAINER_PIC_LEADER_FLANNERY] = gTrainerFrontAnims_LeaderFlannery,
-    [TRAINER_PIC_LEADER_NORMAN] = gTrainerFrontAnims_LeaderNorman,
-    [TRAINER_PIC_LEADER_WINONA] = gTrainerFrontAnims_LeaderWinona,
-    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = gTrainerFrontAnims_LeaderTateAndLiza,
-    [TRAINER_PIC_LEADER_JUAN] = gTrainerFrontAnims_LeaderJuan,
-    [TRAINER_PIC_SCHOOL_KID_M] = gTrainerFrontAnims_SchoolKidM,
-    [TRAINER_PIC_SCHOOL_KID_F] = gTrainerFrontAnims_SchoolKidF,
-    [TRAINER_PIC_SR_AND_JR] = gTrainerFrontAnims_SrAndJr,
-    [TRAINER_PIC_POKEFAN_M] = gTrainerFrontAnims_PokefanM,
-    [TRAINER_PIC_POKEFAN_F] = gTrainerFrontAnims_PokefanF,
-    [TRAINER_PIC_YOUNGSTER] = gTrainerFrontAnims_Youngster,
-    [TRAINER_PIC_CHAMPION_WALLACE] = gTrainerFrontAnims_ChampionWallace,
-    [TRAINER_PIC_FISHERMAN] = gTrainerFrontAnims_Fisherman,
-    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = gTrainerFrontAnims_CyclingTriathleteM,
-    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = gTrainerFrontAnims_CyclingTriathleteF,
-    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = gTrainerFrontAnims_RunningTriathleteM,
-    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = gTrainerFrontAnims_RunningTriathleteF,
-    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = gTrainerFrontAnims_SwimmingTriathleteM,
-    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = gTrainerFrontAnims_SwimmingTriathleteF,
-    [TRAINER_PIC_DRAGON_TAMER] = gTrainerFrontAnims_DragonTamer,
-    [TRAINER_PIC_NINJA_BOY] = gTrainerFrontAnims_NinjaBoy,
-    [TRAINER_PIC_BATTLE_GIRL] = gTrainerFrontAnims_BattleGirl,
-    [TRAINER_PIC_PARASOL_LADY] = gTrainerFrontAnims_ParasolLady,
-    [TRAINER_PIC_SWIMMER_F] = gTrainerFrontAnims_SwimmerF,
-    [TRAINER_PIC_TWINS] = gTrainerFrontAnims_Twins,
-    [TRAINER_PIC_SAILOR] = gTrainerFrontAnims_Sailor,
-    [TRAINER_PIC_MAGMA_ADMIN] = gTrainerFrontAnims_MagmaAdmin,
-    [TRAINER_PIC_WALLY] = gTrainerFrontAnims_Wally,
-    [TRAINER_PIC_BRENDAN] = gTrainerFrontAnims_Brendan,
-    [TRAINER_PIC_MAY] = gTrainerFrontAnims_May,
-    [TRAINER_PIC_BUG_CATCHER] = gTrainerFrontAnims_BugCatcher,
-    [TRAINER_PIC_POKEMON_RANGER_M] = gTrainerFrontAnims_PokemonRangerM,
-    [TRAINER_PIC_POKEMON_RANGER_F] = gTrainerFrontAnims_PokemonRangerF,
-    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = gTrainerFrontAnims_MagmaLeaderMaxie,
-    [TRAINER_PIC_LASS] = gTrainerFrontAnims_Lass,
-    [TRAINER_PIC_YOUNG_COUPLE] = gTrainerFrontAnims_YoungCouple,
-    [TRAINER_PIC_OLD_COUPLE] = gTrainerFrontAnims_OldCouple,
-    [TRAINER_PIC_SIS_AND_BRO] = gTrainerFrontAnims_SisAndBro,
-    [TRAINER_PIC_STEVEN] = gTrainerFrontAnims_Steven,
-    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = gTrainerFrontAnims_SalonMaidenAnabel,
-    [TRAINER_PIC_DOME_ACE_TUCKER] = gTrainerFrontAnims_DomeAceTucker,
-    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = gTrainerFrontAnims_PalaceMavenSpenser,
-    [TRAINER_PIC_ARENA_TYCOON_GRETA] = gTrainerFrontAnims_ArenaTycoonGreta,
-    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = gTrainerFrontAnims_FactoryHeadNoland,
-    [TRAINER_PIC_PIKE_QUEEN_LUCY] = gTrainerFrontAnims_PikeQueenLucy,
-    [TRAINER_PIC_PYRAMID_KING_BRANDON] = gTrainerFrontAnims_PyramidKingBrandon,
-    [TRAINER_PIC_RED] = gTrainerFrontAnims_Red,
-    [TRAINER_PIC_LEAF] = gTrainerFrontAnims_Leaf,
-    [TRAINER_PIC_RS_BRENDAN] = gTrainerFrontAnims_RubySapphireBrendan,
-    [TRAINER_PIC_RS_MAY] = gTrainerFrontAnims_RubySapphireMay,
+    [TRAINER_PIC_HIKER] = sAnims_Hiker,
+    [TRAINER_PIC_AQUA_GRUNT_M] = sAnims_AquaGruntM,
+    [TRAINER_PIC_POKEMON_BREEDER_F] = sAnims_PokemonBreederF,
+    [TRAINER_PIC_COOLTRAINER_M] = sAnims_CoolTrainerM,
+    [TRAINER_PIC_BIRD_KEEPER] = sAnims_BirdKeeper,
+    [TRAINER_PIC_COLLECTOR] = sAnims_Collector,
+    [TRAINER_PIC_AQUA_GRUNT_F] = sAnims_AquaGruntF,
+    [TRAINER_PIC_SWIMMER_M] = sAnims_SwimmerM,
+    [TRAINER_PIC_MAGMA_GRUNT_M] = sAnims_MagmaGruntM,
+    [TRAINER_PIC_EXPERT_M] = sAnims_ExpertM,
+    [TRAINER_PIC_AQUA_ADMIN_M] = sAnims_AquaAdminM,
+    [TRAINER_PIC_BLACK_BELT] = sAnims_BlackBelt,
+    [TRAINER_PIC_AQUA_ADMIN_F] = sAnims_AquaAdminF,
+    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = sAnims_AquaLeaderArchie,
+    [TRAINER_PIC_HEX_MANIAC] = sAnims_HexManiac,
+    [TRAINER_PIC_AROMA_LADY] = sAnims_AromaLady,
+    [TRAINER_PIC_RUIN_MANIAC] = sAnims_RuinManiac,
+    [TRAINER_PIC_INTERVIEWER] = sAnims_Interviewer,
+    [TRAINER_PIC_TUBER_F] = sAnims_TuberF,
+    [TRAINER_PIC_TUBER_M] = sAnims_TuberM,
+    [TRAINER_PIC_COOLTRAINER_F] = sAnims_CoolTrainerF,
+    [TRAINER_PIC_LADY] = sAnims_Lady,
+    [TRAINER_PIC_BEAUTY] = sAnims_Beauty,
+    [TRAINER_PIC_RICH_BOY] = sAnims_RichBoy,
+    [TRAINER_PIC_EXPERT_F] = sAnims_ExpertF,
+    [TRAINER_PIC_POKEMANIAC] = sAnims_Pokemaniac,
+    [TRAINER_PIC_MAGMA_GRUNT_F] = sAnims_MagmaGruntF,
+    [TRAINER_PIC_GUITARIST] = sAnims_Guitarist,
+    [TRAINER_PIC_KINDLER] = sAnims_Kindler,
+    [TRAINER_PIC_CAMPER] = sAnims_Camper,
+    [TRAINER_PIC_PICNICKER] = sAnims_Picnicker,
+    [TRAINER_PIC_BUG_MANIAC] = sAnims_BugManiac,
+    [TRAINER_PIC_POKEMON_BREEDER_M] = sAnims_PokemonBreederM,
+    [TRAINER_PIC_PSYCHIC_M] = sAnims_PsychicM,
+    [TRAINER_PIC_PSYCHIC_F] = sAnims_PsychicF,
+    [TRAINER_PIC_GENTLEMAN] = sAnims_Gentleman,
+    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = sAnims_EliteFourSidney,
+    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = sAnims_EliteFourPhoebe,
+    [TRAINER_PIC_ELITE_FOUR_GLACIA] = sAnims_EliteFourGlacia,
+    [TRAINER_PIC_ELITE_FOUR_DRAKE] = sAnims_EliteFourDrake,
+    [TRAINER_PIC_LEADER_ROXANNE] = sAnims_LeaderRoxanne,
+    [TRAINER_PIC_LEADER_BRAWLY] = sAnims_LeaderBrawly,
+    [TRAINER_PIC_LEADER_WATTSON] = sAnims_LeaderWattson,
+    [TRAINER_PIC_LEADER_FLANNERY] = sAnims_LeaderFlannery,
+    [TRAINER_PIC_LEADER_NORMAN] = sAnims_LeaderNorman,
+    [TRAINER_PIC_LEADER_WINONA] = sAnims_LeaderWinona,
+    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = sAnims_LeaderTateAndLiza,
+    [TRAINER_PIC_LEADER_JUAN] = sAnims_LeaderJuan,
+    [TRAINER_PIC_SCHOOL_KID_M] = sAnims_SchoolKidM,
+    [TRAINER_PIC_SCHOOL_KID_F] = sAnims_SchoolKidF,
+    [TRAINER_PIC_SR_AND_JR] = sAnims_SrAndJr,
+    [TRAINER_PIC_POKEFAN_M] = sAnims_PokefanM,
+    [TRAINER_PIC_POKEFAN_F] = sAnims_PokefanF,
+    [TRAINER_PIC_YOUNGSTER] = sAnims_Youngster,
+    [TRAINER_PIC_CHAMPION_WALLACE] = sAnims_ChampionWallace,
+    [TRAINER_PIC_FISHERMAN] = sAnims_Fisherman,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = sAnims_CyclingTriathleteM,
+    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = sAnims_CyclingTriathleteF,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = sAnims_RunningTriathleteM,
+    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = sAnims_RunningTriathleteF,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = sAnims_SwimmingTriathleteM,
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = sAnims_SwimmingTriathleteF,
+    [TRAINER_PIC_DRAGON_TAMER] = sAnims_DragonTamer,
+    [TRAINER_PIC_NINJA_BOY] = sAnims_NinjaBoy,
+    [TRAINER_PIC_BATTLE_GIRL] = sAnims_BattleGirl,
+    [TRAINER_PIC_PARASOL_LADY] = sAnims_ParasolLady,
+    [TRAINER_PIC_SWIMMER_F] = sAnims_SwimmerF,
+    [TRAINER_PIC_TWINS] = sAnims_Twins,
+    [TRAINER_PIC_SAILOR] = sAnims_Sailor,
+    [TRAINER_PIC_MAGMA_ADMIN] = sAnims_MagmaAdmin,
+    [TRAINER_PIC_WALLY] = sAnims_Wally,
+    [TRAINER_PIC_BRENDAN] = sAnims_Brendan,
+    [TRAINER_PIC_MAY] = sAnims_May,
+    [TRAINER_PIC_BUG_CATCHER] = sAnims_BugCatcher,
+    [TRAINER_PIC_POKEMON_RANGER_M] = sAnims_PokemonRangerM,
+    [TRAINER_PIC_POKEMON_RANGER_F] = sAnims_PokemonRangerF,
+    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = sAnims_MagmaLeaderMaxie,
+    [TRAINER_PIC_LASS] = sAnims_Lass,
+    [TRAINER_PIC_YOUNG_COUPLE] = sAnims_YoungCouple,
+    [TRAINER_PIC_OLD_COUPLE] = sAnims_OldCouple,
+    [TRAINER_PIC_SIS_AND_BRO] = sAnims_SisAndBro,
+    [TRAINER_PIC_STEVEN] = sAnims_Steven,
+    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = sAnims_SalonMaidenAnabel,
+    [TRAINER_PIC_DOME_ACE_TUCKER] = sAnims_DomeAceTucker,
+    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = sAnims_PalaceMavenSpenser,
+    [TRAINER_PIC_ARENA_TYCOON_GRETA] = sAnims_ArenaTycoonGreta,
+    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = sAnims_FactoryHeadNoland,
+    [TRAINER_PIC_PIKE_QUEEN_LUCY] = sAnims_PikeQueenLucy,
+    [TRAINER_PIC_PYRAMID_KING_BRANDON] = sAnims_PyramidKingBrandon,
+    [TRAINER_PIC_RED] = sAnims_Red,
+    [TRAINER_PIC_LEAF] = sAnims_Leaf,
+    [TRAINER_PIC_RS_BRENDAN] = sAnims_RubySapphireBrendan,
+    [TRAINER_PIC_RS_MAY] = sAnims_RubySapphireMay,
 };
diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h
index fc637fc6e..c3408b4c3 100644
--- a/src/data/trainer_graphics/front_pic_tables.h
+++ b/src/data/trainer_graphics/front_pic_tables.h
@@ -1,290 +1,290 @@
 const struct MonCoords gTrainerFrontPicCoords[] =
 {
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 2},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
-    {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_HIKER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_GRUNT_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_BREEDER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_COOLTRAINER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BIRD_KEEPER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_COLLECTOR] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_GRUNT_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_GRUNT_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_EXPERT_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_ADMIN_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BLACK_BELT] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_ADMIN_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AQUA_LEADER_ARCHIE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_HEX_MANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_AROMA_LADY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RUIN_MANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_INTERVIEWER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_TUBER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_TUBER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_COOLTRAINER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LADY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BEAUTY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RICH_BOY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_EXPERT_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_GRUNT_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_GUITARIST] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_KINDLER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_CAMPER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PICNICKER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BUG_MANIAC] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_BREEDER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PSYCHIC_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PSYCHIC_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_GENTLEMAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_SIDNEY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_PHOEBE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_GLACIA] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ELITE_FOUR_DRAKE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_ROXANNE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_BRAWLY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_WATTSON] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_FLANNERY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_NORMAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_WINONA] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_TATE_AND_LIZA] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEADER_JUAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SCHOOL_KID_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SCHOOL_KID_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SR_AND_JR] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_POKEFAN_M] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_POKEFAN_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_YOUNGSTER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_CHAMPION_WALLACE] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_FISHERMAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_CYCLING_TRIATHLETE_M] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_CYCLING_TRIATHLETE_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RUNNING_TRIATHLETE_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RUNNING_TRIATHLETE_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_DRAGON_TAMER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_NINJA_BOY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BATTLE_GIRL] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_PARASOL_LADY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SWIMMER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_TWINS] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SAILOR] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_ADMIN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_WALLY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BRENDAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_BUG_CATCHER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_RANGER_M] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_POKEMON_RANGER_F] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_MAGMA_LEADER_MAXIE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LASS] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_YOUNG_COUPLE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_OLD_COUPLE] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SIS_AND_BRO] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_STEVEN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_SALON_MAIDEN_ANABEL] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_DOME_ACE_TUCKER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PALACE_MAVEN_SPENSER] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_ARENA_TYCOON_GRETA] = {.size = 8, .y_offset = 2},
+    [TRAINER_PIC_FACTORY_HEAD_NOLAND] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PIKE_QUEEN_LUCY] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_PYRAMID_KING_BRANDON] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RED] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_LEAF] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RS_BRENDAN] = {.size = 8, .y_offset = 1},
+    [TRAINER_PIC_RS_MAY] = {.size = 8, .y_offset = 1},
 };
 
 const struct CompressedSpriteSheet gTrainerFrontPicTable[] =
 {
-    gTrainerFrontPic_Hiker, 0x800, 0,
-    gTrainerFrontPic_AquaGruntM, 0x800, 1,
-    gTrainerFrontPic_PokemonBreederF, 0x800, 2,
-    gTrainerFrontPic_CoolTrainerM, 0x800, 3,
-    gTrainerFrontPic_BirdKeeper, 0x800, 4,
-    gTrainerFrontPic_Collector, 0x800, 5,
-    gTrainerFrontPic_AquaGruntF, 0x800, 6,
-    gTrainerFrontPic_SwimmerM, 0x800, 7,
-    gTrainerFrontPic_MagmaGruntM, 0x800, 8,
-    gTrainerFrontPic_ExpertM, 0x800, 9,
-    gTrainerFrontPic_AquaAdminM, 0x800, 10,
-    gTrainerFrontPic_BlackBelt, 0x800, 11,
-    gTrainerFrontPic_AquaAdminF, 0x800, 12,
-    gTrainerFrontPic_AquaLeaderArchie, 0x800, 13,
-    gTrainerFrontPic_HexManiac, 0x800, 14,
-    gTrainerFrontPic_AromaLady, 0x800, 15,
-    gTrainerFrontPic_RuinManiac, 0x800, 16,
-    gTrainerFrontPic_Interviewer, 0x800, 17,
-    gTrainerFrontPic_TuberF, 0x800, 18,
-    gTrainerFrontPic_TuberM, 0x800, 19,
-    gTrainerFrontPic_CoolTrainerF, 0x800, 20,
-    gTrainerFrontPic_Lady, 0x800, 21,
-    gTrainerFrontPic_Beauty, 0x800, 22,
-    gTrainerFrontPic_RichBoy, 0x800, 23,
-    gTrainerFrontPic_ExpertF, 0x800, 24,
-    gTrainerFrontPic_Pokemaniac, 0x800, 25,
-    gTrainerFrontPic_MagmaGruntF, 0x800, 26,
-    gTrainerFrontPic_Guitarist, 0x800, 27,
-    gTrainerFrontPic_Kindler, 0x800, 28,
-    gTrainerFrontPic_Camper, 0x800, 29,
-    gTrainerFrontPic_Picnicker, 0x800, 30,
-    gTrainerFrontPic_BugManiac, 0x800, 31,
-    gTrainerFrontPic_PokemonBreederM, 0x800, 32,
-    gTrainerFrontPic_PsychicM, 0x800, 33,
-    gTrainerFrontPic_PsychicF, 0x800, 34,
-    gTrainerFrontPic_Gentleman, 0x800, 35,
-    gTrainerFrontPic_EliteFourSidney, 0x800, 36,
-    gTrainerFrontPic_EliteFourPhoebe, 0x800, 37,
-    gTrainerFrontPic_EliteFourGlacia, 0x800, 38,
-    gTrainerFrontPic_EliteFourDrake, 0x800, 39,
-    gTrainerFrontPic_LeaderRoxanne, 0x800, 40,
-    gTrainerFrontPic_LeaderBrawly, 0x800, 41,
-    gTrainerFrontPic_LeaderWattson, 0x800, 42,
-    gTrainerFrontPic_LeaderFlannery, 0x800, 43,
-    gTrainerFrontPic_LeaderNorman, 0x800, 44,
-    gTrainerFrontPic_LeaderWinona, 0x800, 45,
-    gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46,
-    gTrainerFrontPic_LeaderJuan, 0x800, 47,
-    gTrainerFrontPic_SchoolKidM, 0x800, 48,
-    gTrainerFrontPic_SchoolKidF, 0x800, 49,
-    gTrainerFrontPic_SrAndJr, 0x1000, 50,
-    gTrainerFrontPic_PokefanM, 0x1000, 51,
-    gTrainerFrontPic_PokefanF, 0x800, 52,
-    gTrainerFrontPic_Youngster, 0x800, 53,
-    gTrainerFrontPic_ChampionWallace, 0x1000, 54,
-    gTrainerFrontPic_Fisherman, 0x800, 55,
-    gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56,
-    gTrainerFrontPic_CyclingTriathleteF, 0x800, 57,
-    gTrainerFrontPic_RunningTriathleteM, 0x800, 58,
-    gTrainerFrontPic_RunningTriathleteF, 0x800, 59,
-    gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60,
-    gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61,
-    gTrainerFrontPic_DragonTamer, 0x800, 62,
-    gTrainerFrontPic_NinjaBoy, 0x800, 63,
-    gTrainerFrontPic_BattleGirl, 0x1000, 64,
-    gTrainerFrontPic_ParasolLady, 0x800, 65,
-    gTrainerFrontPic_SwimmerF, 0x800, 66,
-    gTrainerFrontPic_Twins, 0x800, 67,
-    gTrainerFrontPic_Sailor, 0x800, 68,
-    gTrainerFrontPic_MagmaAdmin, 0x800, 69,
-    gTrainerFrontPic_Wally, 0x800, 70,
-    gTrainerFrontPic_Brendan, 0x800, 71,
-    gTrainerFrontPic_May, 0x800, 72,
-    gTrainerFrontPic_BugCatcher, 0x800, 73,
-    gTrainerFrontPic_PokemonRangerM, 0x800, 74,
-    gTrainerFrontPic_PokemonRangerF, 0x800, 75,
-    gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76,
-    gTrainerFrontPic_Lass, 0x800, 77,
-    gTrainerFrontPic_YoungCouple, 0x800, 78,
-    gTrainerFrontPic_OldCouple, 0x800, 79,
-    gTrainerFrontPic_SisAndBro, 0x800, 80,
-    gTrainerFrontPic_Steven, 0x800, 81,
-    gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82,
-    gTrainerFrontPic_DomeAceTucker, 0x800, 83,
-    gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84,
-    gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85,
-    gTrainerFrontPic_FactoryHeadNoland, 0x800, 86,
-    gTrainerFrontPic_PikeQueenLucy, 0x800, 87,
-    gTrainerFrontPic_PyramidKingBrandon, 0x800, 88,
-    gTrainerFrontPic_Red, 0x800, 89,
-    gTrainerFrontPic_Leaf, 0x800, 90,
-    gTrainerFrontPic_RubySapphireBrendan, 0x800, 91,
-    gTrainerFrontPic_RubySapphireMay, 0x800, 92,
+    TRAINER_SPRITE(HIKER, gTrainerFrontPic_Hiker, 0x800),
+    TRAINER_SPRITE(AQUA_GRUNT_M, gTrainerFrontPic_AquaGruntM, 0x800),
+    TRAINER_SPRITE(POKEMON_BREEDER_F, gTrainerFrontPic_PokemonBreederF, 0x800),
+    TRAINER_SPRITE(COOLTRAINER_M, gTrainerFrontPic_CoolTrainerM, 0x800),
+    TRAINER_SPRITE(BIRD_KEEPER, gTrainerFrontPic_BirdKeeper, 0x800),
+    TRAINER_SPRITE(COLLECTOR, gTrainerFrontPic_Collector, 0x800),
+    TRAINER_SPRITE(AQUA_GRUNT_F, gTrainerFrontPic_AquaGruntF, 0x800),
+    TRAINER_SPRITE(SWIMMER_M, gTrainerFrontPic_SwimmerM, 0x800),
+    TRAINER_SPRITE(MAGMA_GRUNT_M, gTrainerFrontPic_MagmaGruntM, 0x800),
+    TRAINER_SPRITE(EXPERT_M, gTrainerFrontPic_ExpertM, 0x800),
+    TRAINER_SPRITE(AQUA_ADMIN_M, gTrainerFrontPic_AquaAdminM, 0x800),
+    TRAINER_SPRITE(BLACK_BELT, gTrainerFrontPic_BlackBelt, 0x800),
+    TRAINER_SPRITE(AQUA_ADMIN_F, gTrainerFrontPic_AquaAdminF, 0x800),
+    TRAINER_SPRITE(AQUA_LEADER_ARCHIE, gTrainerFrontPic_AquaLeaderArchie, 0x800),
+    TRAINER_SPRITE(HEX_MANIAC, gTrainerFrontPic_HexManiac, 0x800),
+    TRAINER_SPRITE(AROMA_LADY, gTrainerFrontPic_AromaLady, 0x800),
+    TRAINER_SPRITE(RUIN_MANIAC, gTrainerFrontPic_RuinManiac, 0x800),
+    TRAINER_SPRITE(INTERVIEWER, gTrainerFrontPic_Interviewer, 0x800),
+    TRAINER_SPRITE(TUBER_F, gTrainerFrontPic_TuberF, 0x800),
+    TRAINER_SPRITE(TUBER_M, gTrainerFrontPic_TuberM, 0x800),
+    TRAINER_SPRITE(COOLTRAINER_F, gTrainerFrontPic_CoolTrainerF, 0x800),
+    TRAINER_SPRITE(LADY, gTrainerFrontPic_Lady, 0x800),
+    TRAINER_SPRITE(BEAUTY, gTrainerFrontPic_Beauty, 0x800),
+    TRAINER_SPRITE(RICH_BOY, gTrainerFrontPic_RichBoy, 0x800),
+    TRAINER_SPRITE(EXPERT_F, gTrainerFrontPic_ExpertF, 0x800),
+    TRAINER_SPRITE(POKEMANIAC, gTrainerFrontPic_Pokemaniac, 0x800),
+    TRAINER_SPRITE(MAGMA_GRUNT_F, gTrainerFrontPic_MagmaGruntF, 0x800),
+    TRAINER_SPRITE(GUITARIST, gTrainerFrontPic_Guitarist, 0x800),
+    TRAINER_SPRITE(KINDLER, gTrainerFrontPic_Kindler, 0x800),
+    TRAINER_SPRITE(CAMPER, gTrainerFrontPic_Camper, 0x800),
+    TRAINER_SPRITE(PICNICKER, gTrainerFrontPic_Picnicker, 0x800),
+    TRAINER_SPRITE(BUG_MANIAC, gTrainerFrontPic_BugManiac, 0x800),
+    TRAINER_SPRITE(POKEMON_BREEDER_M, gTrainerFrontPic_PokemonBreederM, 0x800),
+    TRAINER_SPRITE(PSYCHIC_M, gTrainerFrontPic_PsychicM, 0x800),
+    TRAINER_SPRITE(PSYCHIC_F, gTrainerFrontPic_PsychicF, 0x800),
+    TRAINER_SPRITE(GENTLEMAN, gTrainerFrontPic_Gentleman, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_SIDNEY, gTrainerFrontPic_EliteFourSidney, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_PHOEBE, gTrainerFrontPic_EliteFourPhoebe, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_GLACIA, gTrainerFrontPic_EliteFourGlacia, 0x800),
+    TRAINER_SPRITE(ELITE_FOUR_DRAKE, gTrainerFrontPic_EliteFourDrake, 0x800),
+    TRAINER_SPRITE(LEADER_ROXANNE, gTrainerFrontPic_LeaderRoxanne, 0x800),
+    TRAINER_SPRITE(LEADER_BRAWLY, gTrainerFrontPic_LeaderBrawly, 0x800),
+    TRAINER_SPRITE(LEADER_WATTSON, gTrainerFrontPic_LeaderWattson, 0x800),
+    TRAINER_SPRITE(LEADER_FLANNERY, gTrainerFrontPic_LeaderFlannery, 0x800),
+    TRAINER_SPRITE(LEADER_NORMAN, gTrainerFrontPic_LeaderNorman, 0x800),
+    TRAINER_SPRITE(LEADER_WINONA, gTrainerFrontPic_LeaderWinona, 0x800),
+    TRAINER_SPRITE(LEADER_TATE_AND_LIZA, gTrainerFrontPic_LeaderTateAndLiza, 0x800),
+    TRAINER_SPRITE(LEADER_JUAN, gTrainerFrontPic_LeaderJuan, 0x800),
+    TRAINER_SPRITE(SCHOOL_KID_M, gTrainerFrontPic_SchoolKidM, 0x800),
+    TRAINER_SPRITE(SCHOOL_KID_F, gTrainerFrontPic_SchoolKidF, 0x800),
+    TRAINER_SPRITE(SR_AND_JR, gTrainerFrontPic_SrAndJr, 0x1000),
+    TRAINER_SPRITE(POKEFAN_M, gTrainerFrontPic_PokefanM, 0x1000),
+    TRAINER_SPRITE(POKEFAN_F, gTrainerFrontPic_PokefanF, 0x800),
+    TRAINER_SPRITE(YOUNGSTER, gTrainerFrontPic_Youngster, 0x800),
+    TRAINER_SPRITE(CHAMPION_WALLACE, gTrainerFrontPic_ChampionWallace, 0x1000),
+    TRAINER_SPRITE(FISHERMAN, gTrainerFrontPic_Fisherman, 0x800),
+    TRAINER_SPRITE(CYCLING_TRIATHLETE_M, gTrainerFrontPic_CyclingTriathleteM, 0x1000),
+    TRAINER_SPRITE(CYCLING_TRIATHLETE_F, gTrainerFrontPic_CyclingTriathleteF, 0x800),
+    TRAINER_SPRITE(RUNNING_TRIATHLETE_M, gTrainerFrontPic_RunningTriathleteM, 0x800),
+    TRAINER_SPRITE(RUNNING_TRIATHLETE_F, gTrainerFrontPic_RunningTriathleteF, 0x800),
+    TRAINER_SPRITE(SWIMMING_TRIATHLETE_M, gTrainerFrontPic_SwimmingTriathleteM, 0x800),
+    TRAINER_SPRITE(SWIMMING_TRIATHLETE_F, gTrainerFrontPic_SwimmingTriathleteF, 0x800),
+    TRAINER_SPRITE(DRAGON_TAMER, gTrainerFrontPic_DragonTamer, 0x800),
+    TRAINER_SPRITE(NINJA_BOY, gTrainerFrontPic_NinjaBoy, 0x800),
+    TRAINER_SPRITE(BATTLE_GIRL, gTrainerFrontPic_BattleGirl, 0x1000),
+    TRAINER_SPRITE(PARASOL_LADY, gTrainerFrontPic_ParasolLady, 0x800),
+    TRAINER_SPRITE(SWIMMER_F, gTrainerFrontPic_SwimmerF, 0x800),
+    TRAINER_SPRITE(TWINS, gTrainerFrontPic_Twins, 0x800),
+    TRAINER_SPRITE(SAILOR, gTrainerFrontPic_Sailor, 0x800),
+    TRAINER_SPRITE(MAGMA_ADMIN, gTrainerFrontPic_MagmaAdmin, 0x800),
+    TRAINER_SPRITE(WALLY, gTrainerFrontPic_Wally, 0x800),
+    TRAINER_SPRITE(BRENDAN, gTrainerFrontPic_Brendan, 0x800),
+    TRAINER_SPRITE(MAY, gTrainerFrontPic_May, 0x800),
+    TRAINER_SPRITE(BUG_CATCHER, gTrainerFrontPic_BugCatcher, 0x800),
+    TRAINER_SPRITE(POKEMON_RANGER_M, gTrainerFrontPic_PokemonRangerM, 0x800),
+    TRAINER_SPRITE(POKEMON_RANGER_F, gTrainerFrontPic_PokemonRangerF, 0x800),
+    TRAINER_SPRITE(MAGMA_LEADER_MAXIE, gTrainerFrontPic_MagmaLeaderMaxie, 0x800),
+    TRAINER_SPRITE(LASS, gTrainerFrontPic_Lass, 0x800),
+    TRAINER_SPRITE(YOUNG_COUPLE, gTrainerFrontPic_YoungCouple, 0x800),
+    TRAINER_SPRITE(OLD_COUPLE, gTrainerFrontPic_OldCouple, 0x800),
+    TRAINER_SPRITE(SIS_AND_BRO, gTrainerFrontPic_SisAndBro, 0x800),
+    TRAINER_SPRITE(STEVEN, gTrainerFrontPic_Steven, 0x800),
+    TRAINER_SPRITE(SALON_MAIDEN_ANABEL, gTrainerFrontPic_SalonMaidenAnabel, 0x800),
+    TRAINER_SPRITE(DOME_ACE_TUCKER, gTrainerFrontPic_DomeAceTucker, 0x800),
+    TRAINER_SPRITE(PALACE_MAVEN_SPENSER, gTrainerFrontPic_PalaceMavenSpenser, 0x800),
+    TRAINER_SPRITE(ARENA_TYCOON_GRETA, gTrainerFrontPic_ArenaTycoonGreta, 0x1000),
+    TRAINER_SPRITE(FACTORY_HEAD_NOLAND, gTrainerFrontPic_FactoryHeadNoland, 0x800),
+    TRAINER_SPRITE(PIKE_QUEEN_LUCY, gTrainerFrontPic_PikeQueenLucy, 0x800),
+    TRAINER_SPRITE(PYRAMID_KING_BRANDON, gTrainerFrontPic_PyramidKingBrandon, 0x800),
+    TRAINER_SPRITE(RED, gTrainerFrontPic_Red, 0x800),
+    TRAINER_SPRITE(LEAF, gTrainerFrontPic_Leaf, 0x800),
+    TRAINER_SPRITE(RS_BRENDAN, gTrainerFrontPic_RubySapphireBrendan, 0x800),
+    TRAINER_SPRITE(RS_MAY, gTrainerFrontPic_RubySapphireMay, 0x800),
 };
 
 const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] =
 {
-    gTrainerPalette_Hiker, 0,
-    gTrainerPalette_AquaGruntM, 1,
-    gTrainerPalette_PokemonBreederF, 2,
-    gTrainerPalette_CoolTrainerM, 3,
-    gTrainerPalette_BirdKeeper, 4,
-    gTrainerPalette_Collector, 5,
-    gTrainerPalette_AquaGruntF, 6,
-    gTrainerPalette_SwimmerM, 7,
-    gTrainerPalette_MagmaGruntM, 8,
-    gTrainerPalette_ExpertM, 9,
-    gTrainerPalette_AquaAdminM, 10,
-    gTrainerPalette_BlackBelt, 11,
-    gTrainerPalette_AquaAdminF, 12,
-    gTrainerPalette_AquaLeaderArchie, 13,
-    gTrainerPalette_HexManiac, 14,
-    gTrainerPalette_AromaLady, 15,
-    gTrainerPalette_RuinManiac, 16,
-    gTrainerPalette_Interviewer, 17,
-    gTrainerPalette_TuberF, 18,
-    gTrainerPalette_TuberM, 19,
-    gTrainerPalette_CoolTrainerF, 20,
-    gTrainerPalette_Lady, 21,
-    gTrainerPalette_Beauty, 22,
-    gTrainerPalette_RichBoy, 23,
-    gTrainerPalette_ExpertF, 24,
-    gTrainerPalette_Pokemaniac, 25,
-    gTrainerPalette_MagmaGruntF, 26,
-    gTrainerPalette_Guitarist, 27,
-    gTrainerPalette_Kindler, 28,
-    gTrainerPalette_Camper, 29,
-    gTrainerPalette_Picnicker, 30,
-    gTrainerPalette_BugManiac, 31,
-    gTrainerPalette_PokemonBreederM, 32,
-    gTrainerPalette_PsychicM, 33,
-    gTrainerPalette_PsychicF, 34,
-    gTrainerPalette_Gentleman, 35,
-    gTrainerPalette_EliteFourSidney, 36,
-    gTrainerPalette_EliteFourPhoebe, 37,
-    gTrainerPalette_EliteFourGlacia, 38,
-    gTrainerPalette_EliteFourDrake, 39,
-    gTrainerPalette_LeaderRoxanne, 40,
-    gTrainerPalette_LeaderBrawly, 41,
-    gTrainerPalette_LeaderWattson, 42,
-    gTrainerPalette_LeaderFlannery, 43,
-    gTrainerPalette_LeaderNorman, 44,
-    gTrainerPalette_LeaderWinona, 45,
-    gTrainerPalette_LeaderTateAndLiza, 46,
-    gTrainerPalette_LeaderJuan, 47,
-    gTrainerPalette_SchoolKidM, 48,
-    gTrainerPalette_SchoolKidF, 49,
-    gTrainerPalette_SrAndJr, 50,
-    gTrainerPalette_PokefanM, 51,
-    gTrainerPalette_PokefanF, 52,
-    gTrainerPalette_Youngster, 53,
-    gTrainerPalette_ChampionWallace, 54,
-    gTrainerPalette_Fisherman, 55,
-    gTrainerPalette_CyclingTriathleteM, 56,
-    gTrainerPalette_CyclingTriathleteF, 57,
-    gTrainerPalette_RunningTriathleteM, 58,
-    gTrainerPalette_RunningTriathleteF, 59,
-    gTrainerPalette_SwimmingTriathleteM, 60,
-    gTrainerPalette_SwimmingTriathleteF, 61,
-    gTrainerPalette_DragonTamer, 62,
-    gTrainerPalette_NinjaBoy, 63,
-    gTrainerPalette_BattleGirl, 64,
-    gTrainerPalette_ParasolLady, 65,
-    gTrainerPalette_SwimmerF, 66,
-    gTrainerPalette_Twins, 67,
-    gTrainerPalette_Sailor, 68,
-    gTrainerPalette_MagmaAdmin, 69,
-    gTrainerPalette_Wally, 70,
-    gTrainerPalette_Brendan, 71,
-    gTrainerPalette_May, 72,
-    gTrainerPalette_BugCatcher, 73,
-    gTrainerPalette_PokemonRangerM, 74,
-    gTrainerPalette_PokemonRangerF, 75,
-    gTrainerPalette_MagmaLeaderMaxie, 76,
-    gTrainerPalette_Lass, 77,
-    gTrainerPalette_YoungCouple, 78,
-    gTrainerPalette_OldCouple, 79,
-    gTrainerPalette_SisAndBro, 80,
-    gTrainerPalette_Steven, 81,
-    gTrainerPalette_SalonMaidenAnabel, 82,
-    gTrainerPalette_DomeAceTucker, 83,
-    gTrainerPalette_PalaceMavenSpenser, 84,
-    gTrainerPalette_ArenaTycoonGreta, 85,
-    gTrainerPalette_FactoryHeadNoland, 86,
-    gTrainerPalette_PikeQueenLucy, 87,
-    gTrainerPalette_PyramidKingBrandon, 88,
-    gTrainerPalette_Red, 89,
-    gTrainerPalette_Leaf, 90,
-    gTrainerPalette_RubySapphireBrendan, 91,
-    gTrainerPalette_RubySapphireMay, 92,
+    TRAINER_PAL(HIKER, gTrainerPalette_Hiker),
+    TRAINER_PAL(AQUA_GRUNT_M, gTrainerPalette_AquaGruntM),
+    TRAINER_PAL(POKEMON_BREEDER_F, gTrainerPalette_PokemonBreederF),
+    TRAINER_PAL(COOLTRAINER_M, gTrainerPalette_CoolTrainerM),
+    TRAINER_PAL(BIRD_KEEPER, gTrainerPalette_BirdKeeper),
+    TRAINER_PAL(COLLECTOR, gTrainerPalette_Collector),
+    TRAINER_PAL(AQUA_GRUNT_F, gTrainerPalette_AquaGruntF),
+    TRAINER_PAL(SWIMMER_M, gTrainerPalette_SwimmerM),
+    TRAINER_PAL(MAGMA_GRUNT_M, gTrainerPalette_MagmaGruntM),
+    TRAINER_PAL(EXPERT_M, gTrainerPalette_ExpertM),
+    TRAINER_PAL(AQUA_ADMIN_M, gTrainerPalette_AquaAdminM),
+    TRAINER_PAL(BLACK_BELT, gTrainerPalette_BlackBelt),
+    TRAINER_PAL(AQUA_ADMIN_F, gTrainerPalette_AquaAdminF),
+    TRAINER_PAL(AQUA_LEADER_ARCHIE, gTrainerPalette_AquaLeaderArchie),
+    TRAINER_PAL(HEX_MANIAC, gTrainerPalette_HexManiac),
+    TRAINER_PAL(AROMA_LADY, gTrainerPalette_AromaLady),
+    TRAINER_PAL(RUIN_MANIAC, gTrainerPalette_RuinManiac),
+    TRAINER_PAL(INTERVIEWER, gTrainerPalette_Interviewer),
+    TRAINER_PAL(TUBER_F, gTrainerPalette_TuberF),
+    TRAINER_PAL(TUBER_M, gTrainerPalette_TuberM),
+    TRAINER_PAL(COOLTRAINER_F, gTrainerPalette_CoolTrainerF),
+    TRAINER_PAL(LADY, gTrainerPalette_Lady),
+    TRAINER_PAL(BEAUTY, gTrainerPalette_Beauty),
+    TRAINER_PAL(RICH_BOY, gTrainerPalette_RichBoy),
+    TRAINER_PAL(EXPERT_F, gTrainerPalette_ExpertF),
+    TRAINER_PAL(POKEMANIAC, gTrainerPalette_Pokemaniac),
+    TRAINER_PAL(MAGMA_GRUNT_F, gTrainerPalette_MagmaGruntF),
+    TRAINER_PAL(GUITARIST, gTrainerPalette_Guitarist),
+    TRAINER_PAL(KINDLER, gTrainerPalette_Kindler),
+    TRAINER_PAL(CAMPER, gTrainerPalette_Camper),
+    TRAINER_PAL(PICNICKER, gTrainerPalette_Picnicker),
+    TRAINER_PAL(BUG_MANIAC, gTrainerPalette_BugManiac),
+    TRAINER_PAL(POKEMON_BREEDER_M, gTrainerPalette_PokemonBreederM),
+    TRAINER_PAL(PSYCHIC_M, gTrainerPalette_PsychicM),
+    TRAINER_PAL(PSYCHIC_F, gTrainerPalette_PsychicF),
+    TRAINER_PAL(GENTLEMAN, gTrainerPalette_Gentleman),
+    TRAINER_PAL(ELITE_FOUR_SIDNEY, gTrainerPalette_EliteFourSidney),
+    TRAINER_PAL(ELITE_FOUR_PHOEBE, gTrainerPalette_EliteFourPhoebe),
+    TRAINER_PAL(ELITE_FOUR_GLACIA, gTrainerPalette_EliteFourGlacia),
+    TRAINER_PAL(ELITE_FOUR_DRAKE, gTrainerPalette_EliteFourDrake),
+    TRAINER_PAL(LEADER_ROXANNE, gTrainerPalette_LeaderRoxanne),
+    TRAINER_PAL(LEADER_BRAWLY, gTrainerPalette_LeaderBrawly),
+    TRAINER_PAL(LEADER_WATTSON, gTrainerPalette_LeaderWattson),
+    TRAINER_PAL(LEADER_FLANNERY, gTrainerPalette_LeaderFlannery),
+    TRAINER_PAL(LEADER_NORMAN, gTrainerPalette_LeaderNorman),
+    TRAINER_PAL(LEADER_WINONA, gTrainerPalette_LeaderWinona),
+    TRAINER_PAL(LEADER_TATE_AND_LIZA, gTrainerPalette_LeaderTateAndLiza),
+    TRAINER_PAL(LEADER_JUAN, gTrainerPalette_LeaderJuan),
+    TRAINER_PAL(SCHOOL_KID_M, gTrainerPalette_SchoolKidM),
+    TRAINER_PAL(SCHOOL_KID_F, gTrainerPalette_SchoolKidF),
+    TRAINER_PAL(SR_AND_JR, gTrainerPalette_SrAndJr),
+    TRAINER_PAL(POKEFAN_M, gTrainerPalette_PokefanM),
+    TRAINER_PAL(POKEFAN_F, gTrainerPalette_PokefanF),
+    TRAINER_PAL(YOUNGSTER, gTrainerPalette_Youngster),
+    TRAINER_PAL(CHAMPION_WALLACE, gTrainerPalette_ChampionWallace),
+    TRAINER_PAL(FISHERMAN, gTrainerPalette_Fisherman),
+    TRAINER_PAL(CYCLING_TRIATHLETE_M, gTrainerPalette_CyclingTriathleteM),
+    TRAINER_PAL(CYCLING_TRIATHLETE_F, gTrainerPalette_CyclingTriathleteF),
+    TRAINER_PAL(RUNNING_TRIATHLETE_M, gTrainerPalette_RunningTriathleteM),
+    TRAINER_PAL(RUNNING_TRIATHLETE_F, gTrainerPalette_RunningTriathleteF),
+    TRAINER_PAL(SWIMMING_TRIATHLETE_M, gTrainerPalette_SwimmingTriathleteM),
+    TRAINER_PAL(SWIMMING_TRIATHLETE_F, gTrainerPalette_SwimmingTriathleteF),
+    TRAINER_PAL(DRAGON_TAMER, gTrainerPalette_DragonTamer),
+    TRAINER_PAL(NINJA_BOY, gTrainerPalette_NinjaBoy),
+    TRAINER_PAL(BATTLE_GIRL, gTrainerPalette_BattleGirl),
+    TRAINER_PAL(PARASOL_LADY, gTrainerPalette_ParasolLady),
+    TRAINER_PAL(SWIMMER_F, gTrainerPalette_SwimmerF),
+    TRAINER_PAL(TWINS, gTrainerPalette_Twins),
+    TRAINER_PAL(SAILOR, gTrainerPalette_Sailor),
+    TRAINER_PAL(MAGMA_ADMIN, gTrainerPalette_MagmaAdmin),
+    TRAINER_PAL(WALLY, gTrainerPalette_Wally),
+    TRAINER_PAL(BRENDAN, gTrainerPalette_Brendan),
+    TRAINER_PAL(MAY, gTrainerPalette_May),
+    TRAINER_PAL(BUG_CATCHER, gTrainerPalette_BugCatcher),
+    TRAINER_PAL(POKEMON_RANGER_M, gTrainerPalette_PokemonRangerM),
+    TRAINER_PAL(POKEMON_RANGER_F, gTrainerPalette_PokemonRangerF),
+    TRAINER_PAL(MAGMA_LEADER_MAXIE, gTrainerPalette_MagmaLeaderMaxie),
+    TRAINER_PAL(LASS, gTrainerPalette_Lass),
+    TRAINER_PAL(YOUNG_COUPLE, gTrainerPalette_YoungCouple),
+    TRAINER_PAL(OLD_COUPLE, gTrainerPalette_OldCouple),
+    TRAINER_PAL(SIS_AND_BRO, gTrainerPalette_SisAndBro),
+    TRAINER_PAL(STEVEN, gTrainerPalette_Steven),
+    TRAINER_PAL(SALON_MAIDEN_ANABEL, gTrainerPalette_SalonMaidenAnabel),
+    TRAINER_PAL(DOME_ACE_TUCKER, gTrainerPalette_DomeAceTucker),
+    TRAINER_PAL(PALACE_MAVEN_SPENSER, gTrainerPalette_PalaceMavenSpenser),
+    TRAINER_PAL(ARENA_TYCOON_GRETA, gTrainerPalette_ArenaTycoonGreta),
+    TRAINER_PAL(FACTORY_HEAD_NOLAND, gTrainerPalette_FactoryHeadNoland),
+    TRAINER_PAL(PIKE_QUEEN_LUCY, gTrainerPalette_PikeQueenLucy),
+    TRAINER_PAL(PYRAMID_KING_BRANDON, gTrainerPalette_PyramidKingBrandon),
+    TRAINER_PAL(RED, gTrainerPalette_Red),
+    TRAINER_PAL(LEAF, gTrainerPalette_Leaf),
+    TRAINER_PAL(RS_BRENDAN, gTrainerPalette_RubySapphireBrendan),
+    TRAINER_PAL(RS_MAY, gTrainerPalette_RubySapphireMay),
 };
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index b4438e5b3..252eed760 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,4 +1,4 @@
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -6,7 +6,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -14,7 +14,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -27,7 +27,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -35,7 +35,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -43,7 +43,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -51,7 +51,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -59,7 +59,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt7[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -67,7 +67,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -100,7 +100,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt8[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -108,7 +108,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcel[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Marcel[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -121,7 +121,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcel[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alberto[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alberto[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -134,7 +134,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alberto[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ed[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -147,7 +147,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ed[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt9[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -155,7 +155,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Declan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -163,7 +163,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Declan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -171,7 +171,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -184,7 +184,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -197,7 +197,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -215,7 +215,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -223,7 +223,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -236,7 +236,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -244,7 +244,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -252,7 +252,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -260,7 +260,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -273,7 +273,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -281,7 +281,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -289,7 +289,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt22[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -297,7 +297,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fredrick[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fredrick[] = {
     {
     .iv = 100,
     .lvl = 30,
@@ -310,7 +310,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fredrick[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Matt[] = {
     {
     .iv = 50,
     .lvl = 34,
@@ -323,7 +323,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Zander[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -331,7 +331,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Zander[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -344,7 +344,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelly2[] = {
     {
     .iv = 100,
     .lvl = 37,
@@ -357,7 +357,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Archie[] = {
     {
     .iv = 150,
     .lvl = 41,
@@ -375,7 +375,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leah[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Leah[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -383,7 +383,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leah[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Daisy[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -396,7 +396,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -414,7 +414,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Felix[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Felix[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -429,7 +429,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Felix[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Violet[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -442,7 +442,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rose2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -455,7 +455,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rose3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -473,7 +473,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rose4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -491,7 +491,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rose5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -509,7 +509,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Dusty1[] = {
     {
     .iv = 50,
     .lvl = 23,
@@ -518,7 +518,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Chip[] = {
     {
     .iv = 50,
     .lvl = 27,
@@ -539,7 +539,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Foster[] = {
     {
     .iv = 100,
     .lvl = 25,
@@ -554,7 +554,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Dusty2[] = {
     {
     .iv = 60,
     .lvl = 27,
@@ -563,7 +563,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Dusty3[] = {
     {
     .iv = 70,
     .lvl = 30,
@@ -572,7 +572,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Dusty4[] = {
     {
     .iv = 80,
     .lvl = 33,
@@ -581,7 +581,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Dusty5[] = {
     {
     .iv = 90,
     .lvl = 36,
@@ -590,7 +590,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy1[] = {
     {
     .iv = 50,
     .lvl = 17,
@@ -603,7 +603,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy2[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -616,7 +616,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy3[] = {
     {
     .iv = 150,
     .lvl = 30,
@@ -629,7 +629,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy4[] = {
     {
     .iv = 200,
     .lvl = 33,
@@ -642,7 +642,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy5[] = {
     {
     .iv = 250,
     .lvl = 36,
@@ -655,7 +655,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_GabbyAndTy6[] = {
     {
     .iv = 250,
     .lvl = 39,
@@ -670,7 +670,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lola1[] = {
     {
     .iv = 10,
     .lvl = 12,
@@ -683,7 +683,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austina[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Austina[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -691,7 +691,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austina[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gwen[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -699,7 +699,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lola2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -712,7 +712,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lola3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -725,7 +725,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lola4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -738,7 +738,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lola5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -751,7 +751,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Ricky1[] = {
     {
     .iv = 10,
     .lvl = 13,
@@ -760,7 +760,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Simon[] = {
     {
     .iv = 0,
     .lvl = 12,
@@ -773,7 +773,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Charlie[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -781,7 +781,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Ricky2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -790,7 +790,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Ricky3[] = {
     {
     .iv = 20,
     .lvl = 30,
@@ -799,7 +799,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Ricky4[] = {
     {
     .iv = 30,
     .lvl = 33,
@@ -808,7 +808,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Ricky5[] = {
     {
     .iv = 40,
     .lvl = 36,
@@ -817,7 +817,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Randall[] = {
+static const struct TrainerMonItemCustomMoves sParty_Randall[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -827,7 +827,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Randall[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Parker[] = {
+static const struct TrainerMonItemCustomMoves sParty_Parker[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -837,7 +837,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Parker[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_George[] = {
+static const struct TrainerMonItemCustomMoves sParty_George[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -847,7 +847,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_George[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Berke[] = {
+static const struct TrainerMonItemCustomMoves sParty_Berke[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -857,7 +857,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Berke[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Braxton[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Braxton[] = {
     {
     .iv = 100,
     .lvl = 28,
@@ -890,7 +890,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Braxton[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Vincent[] = {
     {
     .iv = 100,
     .lvl = 44,
@@ -908,7 +908,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Leroy[] = {
     {
     .iv = 100,
     .lvl = 46,
@@ -921,7 +921,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wilton1[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -939,7 +939,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edgar[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -952,7 +952,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Albert[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -965,7 +965,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Samuel[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -983,7 +983,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Vito[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1006,7 +1006,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Owen[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1024,7 +1024,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wilton2[] = {
     {
     .iv = 110,
     .lvl = 26,
@@ -1042,7 +1042,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wilton3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -1060,7 +1060,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wilton4[] = {
     {
     .iv = 130,
     .lvl = 32,
@@ -1078,7 +1078,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wilton5[] = {
     {
     .iv = 140,
     .lvl = 35,
@@ -1096,7 +1096,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Warren[] = {
     {
     .iv = 100,
     .lvl = 33,
@@ -1109,7 +1109,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Mary[] = {
+static const struct TrainerMonItemCustomMoves sParty_Mary[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -1119,7 +1119,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Mary[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Alexia[] = {
+static const struct TrainerMonItemCustomMoves sParty_Alexia[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -1129,7 +1129,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Alexia[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Jody[] = {
+static const struct TrainerMonItemCustomMoves sParty_Jody[] = {
     {
     .iv = 255,
     .lvl = 26,
@@ -1139,7 +1139,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Jody[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Wendy[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -1160,7 +1160,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keira[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Keira[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1173,7 +1173,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keira[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brooke1[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -1191,7 +1191,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jennifer[] = {
     {
     .iv = 200,
     .lvl = 30,
@@ -1199,7 +1199,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hope[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1207,7 +1207,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shannon[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1215,7 +1215,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Michelle[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1233,7 +1233,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Caroline[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -1246,7 +1246,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Julie[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1264,7 +1264,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brooke2[] = {
     {
     .iv = 110,
     .lvl = 26,
@@ -1282,7 +1282,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brooke3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -1300,7 +1300,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brooke4[] = {
     {
     .iv = 130,
     .lvl = 32,
@@ -1318,7 +1318,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brooke5[] = {
     {
     .iv = 140,
     .lvl = 34,
@@ -1336,7 +1336,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Patricia[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -1349,7 +1349,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kindra[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -1362,7 +1362,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tammy[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -1375,7 +1375,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Valerie1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -1383,7 +1383,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tasha[] = {
     {
     .iv = 50,
     .lvl = 32,
@@ -1391,7 +1391,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Valerie2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -1404,7 +1404,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Valerie3[] = {
     {
     .iv = 20,
     .lvl = 35,
@@ -1417,7 +1417,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Valerie4[] = {
     {
     .iv = 30,
     .lvl = 40,
@@ -1430,7 +1430,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Valerie5[] = {
     {
     .iv = 40,
     .lvl = 42,
@@ -1448,7 +1448,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Cindy1[] = {
     {
     .iv = 0,
     .lvl = 7,
@@ -1457,7 +1457,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Daphne[] = {
+static const struct TrainerMonItemCustomMoves sParty_Daphne[] = {
     {
     .iv = 100,
     .lvl = 39,
@@ -1474,7 +1474,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Daphne[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt23[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1492,7 +1492,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Cindy2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -1502,7 +1502,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Cindy2[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Brianna[] = {
     {
     .iv = 150,
     .lvl = 40,
@@ -1511,7 +1511,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Naomi[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Naomi[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1520,7 +1520,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Naomi[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Cindy3[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -1529,7 +1529,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Cindy4[] = {
     {
     .iv = 20,
     .lvl = 30,
@@ -1538,7 +1538,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Cindy5[] = {
     {
     .iv = 30,
     .lvl = 33,
@@ -1547,7 +1547,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = {
+static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = {
     {
     .iv = 40,
     .lvl = 36,
@@ -1557,7 +1557,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Melissa[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -1565,7 +1565,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sheila[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -1573,7 +1573,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shirley[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -1581,7 +1581,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jessica1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -1596,7 +1596,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Connie[] = {
     {
     .iv = 100,
     .lvl = 40,
@@ -1604,7 +1604,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bridget[] = {
     {
     .iv = 150,
     .lvl = 40,
@@ -1612,7 +1612,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Olivia[] = {
     {
     .iv = 100,
     .lvl = 35,
@@ -1633,7 +1633,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tiffany[] = {
     {
     .iv = 100,
     .lvl = 39,
@@ -1646,7 +1646,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = {
     {
     .iv = 10,
     .lvl = 35,
@@ -1661,7 +1661,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = {
     {
     .iv = 20,
     .lvl = 38,
@@ -1676,7 +1676,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -1691,7 +1691,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = {
     {
     .iv = 40,
     .lvl = 44,
@@ -1706,7 +1706,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = {
     {
     .iv = 0,
     .lvl = 7,
@@ -1715,7 +1715,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mollie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Mollie[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -1728,7 +1728,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mollie[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Garret[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -1737,7 +1737,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Winston2[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -1746,7 +1746,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Winston3[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -1755,7 +1755,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Winston4[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -1764,7 +1764,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Winston5[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -1774,7 +1774,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Steve1[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -1782,7 +1782,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Thalia1[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -1795,7 +1795,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -1803,7 +1803,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt24[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -1811,7 +1811,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Steve2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -1819,7 +1819,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Steve3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -1832,7 +1832,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Steve4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -1845,7 +1845,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Steve5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -1858,7 +1858,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Luis[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1866,7 +1866,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dominik[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dominik[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1874,7 +1874,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dominik[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Douglas[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -1887,7 +1887,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Darrin[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -1905,7 +1905,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tony1[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1913,7 +1913,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jerome[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1921,7 +1921,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Matthew[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1929,7 +1929,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_David[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -1942,7 +1942,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Spencer[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -1955,7 +1955,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Roland[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1963,7 +1963,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolen[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nolen[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1971,7 +1971,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolen[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Stan[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1979,7 +1979,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Barry[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1987,7 +1987,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dean[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2005,7 +2005,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rodney[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2013,7 +2013,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Richard[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2021,7 +2021,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Herman[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2034,7 +2034,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Santiago[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Santiago[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2047,7 +2047,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Santiago[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gilbert[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2055,7 +2055,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Franklin[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2063,7 +2063,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kevin[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2071,7 +2071,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jack[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2079,7 +2079,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dudley[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2097,7 +2097,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Chad[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2110,7 +2110,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tony2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -2118,7 +2118,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tony3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -2126,7 +2126,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tony4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -2139,7 +2139,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tony5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -2152,7 +2152,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takao[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Takao[] = {
     {
     .iv = 127,
     .lvl = 13,
@@ -2160,7 +2160,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takao[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hitoshi[] = {
     {
     .iv = 50,
     .lvl = 32,
@@ -2173,7 +2173,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kiyo[] = {
     {
     .iv = 100,
     .lvl = 34,
@@ -2181,7 +2181,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Koichi[] = {
     {
     .iv = 100,
     .lvl = 24,
@@ -2194,7 +2194,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nob1[] = {
     {
     .iv = 100,
     .lvl = 19,
@@ -2202,7 +2202,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nob2[] = {
     {
     .iv = 110,
     .lvl = 27,
@@ -2210,7 +2210,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nob3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -2223,7 +2223,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nob4[] = {
     {
     .iv = 130,
     .lvl = 31,
@@ -2241,7 +2241,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Nob5[] = {
     {
     .iv = 140,
     .lvl = 33,
@@ -2268,7 +2268,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Yuji[] = {
     {
     .iv = 100,
     .lvl = 26,
@@ -2281,7 +2281,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Daisuke[] = {
     {
     .iv = 100,
     .lvl = 19,
@@ -2289,7 +2289,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Atsushi[] = {
     {
     .iv = 100,
     .lvl = 32,
@@ -2297,7 +2297,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Kirk[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -2312,7 +2312,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Kirk[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2325,7 +2325,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt26[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -2333,7 +2333,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shawn[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -2346,7 +2346,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fernando1[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -2359,7 +2359,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dalton1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -2372,7 +2372,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dalton2[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -2390,7 +2390,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dalton3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -2408,7 +2408,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dalton4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -2426,7 +2426,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dalton5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -2444,7 +2444,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cole[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -2452,7 +2452,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jeff[] = {
     {
     .iv = 100,
     .lvl = 22,
@@ -2465,7 +2465,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Axle[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -2473,7 +2473,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jace[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jace[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -2481,7 +2481,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jace[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keegan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Keegan[] = {
     {
     .iv = 120,
     .lvl = 23,
@@ -2489,7 +2489,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keegan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bernie1[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2502,7 +2502,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bernie2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -2515,7 +2515,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bernie3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -2528,7 +2528,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bernie4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -2541,7 +2541,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bernie5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -2554,7 +2554,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Drew[] = {
     {
     .iv = 0,
     .lvl = 23,
@@ -2563,7 +2563,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Beau[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Beau[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -2584,7 +2584,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Beau[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Larry[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2592,7 +2592,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shane[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2605,7 +2605,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Justin[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -2613,7 +2613,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ethan1[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -2626,7 +2626,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Autumn[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Autumn[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -2634,7 +2634,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Autumn[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Travis[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2642,7 +2642,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ethan2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -2655,7 +2655,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ethan3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -2668,7 +2668,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ethan4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -2686,7 +2686,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ethan5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -2704,7 +2704,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brent[] = {
     {
     .iv = 100,
     .lvl = 26,
@@ -2712,7 +2712,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Donald[] = {
     {
     .iv = 100,
     .lvl = 24,
@@ -2730,7 +2730,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Taylor[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -2748,7 +2748,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey1[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -2766,7 +2766,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Derek[] = {
     {
     .iv = 150,
     .lvl = 16,
@@ -2779,7 +2779,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -2797,7 +2797,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey3[] = {
     {
     .iv = 20,
     .lvl = 34,
@@ -2815,7 +2815,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey4[] = {
     {
     .iv = 30,
     .lvl = 36,
@@ -2838,7 +2838,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey4[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Jeffrey5[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Jeffrey5[] = {
     {
     .iv = 40,
     .lvl = 38,
@@ -2871,7 +2871,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Jeffrey5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Edward[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -2880,7 +2880,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Preston[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -2888,7 +2888,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Virgil[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -2896,7 +2896,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Blake[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Blake[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -2904,7 +2904,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Blake[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_William[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -2922,7 +2922,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Joshua[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -2935,7 +2935,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cameron1[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2943,7 +2943,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cameron2[] = {
     {
     .iv = 10,
     .lvl = 33,
@@ -2956,7 +2956,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cameron3[] = {
     {
     .iv = 20,
     .lvl = 38,
@@ -2969,7 +2969,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cameron4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -2982,7 +2982,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cameron5[] = {
     {
     .iv = 40,
     .lvl = 45,
@@ -2995,7 +2995,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jaclyn[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -3004,7 +3004,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hannah[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -3012,7 +3012,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Samantha[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -3020,7 +3020,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maura[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -3028,7 +3028,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kayla[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -3046,7 +3046,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alexis[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -3059,7 +3059,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jacki1[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -3072,7 +3072,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jacki2[] = {
     {
     .iv = 10,
     .lvl = 34,
@@ -3085,7 +3085,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jacki3[] = {
     {
     .iv = 20,
     .lvl = 37,
@@ -3098,7 +3098,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jacki4[] = {
     {
     .iv = 30,
     .lvl = 40,
@@ -3111,7 +3111,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jacki5[] = {
     {
     .iv = 40,
     .lvl = 43,
@@ -3124,7 +3124,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Walter1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -3132,7 +3132,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Micah[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Micah[] = {
     {
     .iv = 0,
     .lvl = 44,
@@ -3145,7 +3145,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Micah[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Thomas[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -3153,7 +3153,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Walter2[] = {
     {
     .iv = 10,
     .lvl = 34,
@@ -3161,7 +3161,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Walter3[] = {
     {
     .iv = 20,
     .lvl = 36,
@@ -3176,7 +3176,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Walter4[] = {
     {
     .iv = 30,
     .lvl = 39,
@@ -3191,7 +3191,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Walter5[] = {
     {
     .iv = 40,
     .lvl = 41,
@@ -3212,7 +3212,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = {
+static const struct TrainerMonItemCustomMoves sParty_Sidney[] = {
     {
     .iv = 250,
     .lvl = 46,
@@ -3250,7 +3250,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = {
+static const struct TrainerMonItemCustomMoves sParty_Phoebe[] = {
     {
     .iv = 250,
     .lvl = 48,
@@ -3288,7 +3288,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = {
+static const struct TrainerMonItemCustomMoves sParty_Glacia[] = {
     {
     .iv = 250,
     .lvl = 50,
@@ -3326,7 +3326,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = {
+static const struct TrainerMonItemCustomMoves sParty_Drake[] = {
     {
     .iv = 250,
     .lvl = 52,
@@ -3364,7 +3364,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = {
     {
     .iv = 100,
     .lvl = 12,
@@ -3388,7 +3388,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Brawly1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = {
     {
     .iv = 100,
     .lvl = 16,
@@ -3412,7 +3412,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Brawly1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Wattson1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = {
     {
     .iv = 200,
     .lvl = 20,
@@ -3443,7 +3443,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Wattson1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Flannery1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = {
     {
     .iv = 200,
     .lvl = 24,
@@ -3474,7 +3474,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Flannery1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Norman1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Norman1[] = {
     {
     .iv = 200,
     .lvl = 27,
@@ -3505,7 +3505,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Norman1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Winona1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Winona1[] = {
     {
     .iv = 210,
     .lvl = 29,
@@ -3543,7 +3543,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Winona1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza1[] = {
+static const struct TrainerMonItemCustomMoves sParty_TateAndLiza1[] = {
     {
     .iv = 250,
     .lvl = 41,
@@ -3574,7 +3574,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Juan1[] = {
+static const struct TrainerMonItemCustomMoves sParty_Juan1[] = {
     {
     .iv = 200,
     .lvl = 41,
@@ -3612,7 +3612,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Juan1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jerry1[] = {
     {
     .iv = 10,
     .lvl = 9,
@@ -3620,7 +3620,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ted[] = {
     {
     .iv = 10,
     .lvl = 17,
@@ -3628,7 +3628,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Paul[] = {
     {
     .iv = 10,
     .lvl = 15,
@@ -3646,7 +3646,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jerry2[] = {
     {
     .iv = 20,
     .lvl = 26,
@@ -3659,7 +3659,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jerry3[] = {
     {
     .iv = 30,
     .lvl = 29,
@@ -3672,7 +3672,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jerry4[] = {
     {
     .iv = 40,
     .lvl = 32,
@@ -3685,7 +3685,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jerry5[] = {
     {
     .iv = 50,
     .lvl = 34,
@@ -3703,7 +3703,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Karen1[] = {
     {
     .iv = 10,
     .lvl = 9,
@@ -3711,7 +3711,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Georgia[] = {
     {
     .iv = 10,
     .lvl = 16,
@@ -3724,7 +3724,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Karen2[] = {
     {
     .iv = 20,
     .lvl = 26,
@@ -3737,7 +3737,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Karen3[] = {
     {
     .iv = 30,
     .lvl = 29,
@@ -3750,7 +3750,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Karen4[] = {
     {
     .iv = 40,
     .lvl = 32,
@@ -3763,7 +3763,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Karen5[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -3776,7 +3776,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_KateAndJoy[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -3791,7 +3791,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -3806,7 +3806,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -3821,7 +3821,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -3836,7 +3836,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -3851,7 +3851,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg5[] = {
     {
     .iv = 40,
     .lvl = 36,
@@ -3866,7 +3866,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Victor[] = {
     {
     .iv = 25,
     .lvl = 16,
@@ -3881,7 +3881,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Miguel1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -3890,7 +3890,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = {
+static const struct TrainerMonItemCustomMoves sParty_Colton[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -3935,7 +3935,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Miguel2[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -3944,7 +3944,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Miguel3[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -3953,7 +3953,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Miguel4[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -3962,7 +3962,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Miguel5[] = {
     {
     .iv = 0,
     .lvl = 38,
@@ -3971,7 +3971,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Victoria[] = {
     {
     .iv = 50,
     .lvl = 17,
@@ -3980,7 +3980,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Vanessa[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -3989,7 +3989,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Bethany[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Bethany[] = {
     {
     .iv = 100,
     .lvl = 35,
@@ -4010,7 +4010,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Bethany[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Isabel1[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -4025,7 +4025,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Isabel2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -4040,7 +4040,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Isabel3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -4055,7 +4055,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Isabel4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -4070,7 +4070,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Isabel5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -4085,7 +4085,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Timothy1[] = {
     {
     .iv = 200,
     .lvl = 27,
@@ -4093,7 +4093,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Timothy2[] = {
     {
     .iv = 210,
     .lvl = 33,
@@ -4102,7 +4102,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Timothy3[] = {
     {
     .iv = 220,
     .lvl = 36,
@@ -4111,7 +4111,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Timothy4[] = {
     {
     .iv = 230,
     .lvl = 39,
@@ -4120,7 +4120,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Timothy5[] = {
     {
     .iv = 240,
     .lvl = 42,
@@ -4129,7 +4129,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Vicky[] = {
     {
     .iv = 200,
     .lvl = 18,
@@ -4138,7 +4138,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelby1[] = {
     {
     .iv = 200,
     .lvl = 21,
@@ -4151,7 +4151,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelby2[] = {
     {
     .iv = 210,
     .lvl = 30,
@@ -4164,7 +4164,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelby3[] = {
     {
     .iv = 220,
     .lvl = 33,
@@ -4177,7 +4177,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelby4[] = {
     {
     .iv = 230,
     .lvl = 36,
@@ -4190,7 +4190,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shelby5[] = {
     {
     .iv = 240,
     .lvl = 39,
@@ -4203,7 +4203,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Calvin1[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4211,7 +4211,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Billy[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4224,7 +4224,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Josh[] = {
     {
     .iv = 100,
     .lvl = 10,
@@ -4233,7 +4233,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tommy[] = {
     {
     .iv = 110,
     .lvl = 8,
@@ -4246,7 +4246,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Joey[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -4254,7 +4254,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Ben[] = {
     {
     .iv = 150,
     .lvl = 17,
@@ -4269,7 +4269,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Quincy[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Quincy[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -4284,7 +4284,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Quincy[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Katelynn[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Katelynn[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -4299,7 +4299,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Katelynn[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaylen[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jaylen[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4307,7 +4307,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaylen[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dillon[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4315,7 +4315,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Calvin2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -4323,7 +4323,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Calvin3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -4336,7 +4336,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Calvin4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -4354,7 +4354,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Calvin5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -4372,7 +4372,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Eddie[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -4385,7 +4385,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Allen[] = {
     {
     .iv = 0,
     .lvl = 4,
@@ -4398,7 +4398,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Timmy[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -4411,7 +4411,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Wallace[] = {
+static const struct TrainerMonItemCustomMoves sParty_Wallace[] = {
     {
     .iv = 255,
     .lvl = 57,
@@ -4456,7 +4456,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Wallace[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andrew[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4474,7 +4474,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ivan[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4492,7 +4492,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Claude[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4510,7 +4510,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Elliot1[] = {
     {
     .iv = 0,
     .lvl = 10,
@@ -4528,7 +4528,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ned[] = {
     {
     .iv = 10,
     .lvl = 11,
@@ -4536,7 +4536,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dale[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -4559,7 +4559,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nolan[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4567,7 +4567,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Barny[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -4580,7 +4580,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wade[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4588,7 +4588,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Carter[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -4601,7 +4601,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Elliot2[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -4619,7 +4619,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Elliot3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -4642,7 +4642,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Elliot4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -4665,7 +4665,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Elliot5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -4688,7 +4688,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ronald[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4721,7 +4721,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jacob[] = {
     {
     .iv = 20,
     .lvl = 6,
@@ -4739,7 +4739,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Anthony[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -4752,7 +4752,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin1[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4760,7 +4760,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -4768,7 +4768,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -4776,7 +4776,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin4[] = {
     {
     .iv = 30,
     .lvl = 36,
@@ -4784,7 +4784,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin5[] = {
     {
     .iv = 40,
     .lvl = 39,
@@ -4792,7 +4792,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Abigail1[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4800,7 +4800,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jasmine[] = {
     {
     .iv = 80,
     .lvl = 14,
@@ -4818,7 +4818,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Abigail2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -4826,7 +4826,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Abigail3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -4834,7 +4834,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Abigail4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -4842,7 +4842,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Abigail5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -4850,7 +4850,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dylan1[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -4858,7 +4858,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dylan2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -4866,7 +4866,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dylan3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -4874,7 +4874,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dylan4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -4882,7 +4882,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dylan5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -4890,7 +4890,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maria1[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -4898,7 +4898,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maria2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -4906,7 +4906,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maria3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -4914,7 +4914,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maria4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -4922,7 +4922,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maria5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -4930,7 +4930,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camden[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Camden[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -4943,7 +4943,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camden[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Demetrius[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Demetrius[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -4956,7 +4956,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Demetrius[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah1[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -4964,7 +4964,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pablo1[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -4977,7 +4977,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Chase[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -4990,7 +4990,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah2[] = {
     {
     .iv = 10,
     .lvl = 39,
@@ -4998,7 +4998,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah3[] = {
     {
     .iv = 20,
     .lvl = 42,
@@ -5006,7 +5006,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah4[] = {
     {
     .iv = 30,
     .lvl = 45,
@@ -5014,7 +5014,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah5[] = {
     {
     .iv = 40,
     .lvl = 48,
@@ -5022,7 +5022,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isobel[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isobel[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5030,7 +5030,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isobel[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donny[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Donny[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5043,7 +5043,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donny[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Talia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Talia[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5051,7 +5051,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Talia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn1[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -5059,7 +5059,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Allison[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -5072,7 +5072,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn2[] = {
     {
     .iv = 10,
     .lvl = 39,
@@ -5080,7 +5080,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn3[] = {
     {
     .iv = 20,
     .lvl = 42,
@@ -5088,7 +5088,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn4[] = {
     {
     .iv = 30,
     .lvl = 45,
@@ -5096,7 +5096,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn5[] = {
     {
     .iv = 40,
     .lvl = 48,
@@ -5104,7 +5104,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas1[] = {
     {
     .iv = 100,
     .lvl = 37,
@@ -5117,7 +5117,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas2[] = {
     {
     .iv = 110,
     .lvl = 41,
@@ -5130,7 +5130,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas3[] = {
     {
     .iv = 120,
     .lvl = 44,
@@ -5143,7 +5143,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas4[] = {
     {
     .iv = 130,
     .lvl = 46,
@@ -5161,7 +5161,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Nicolas5[] = {
     {
     .iv = 140,
     .lvl = 49,
@@ -5182,7 +5182,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Aaron[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Aaron[] = {
     {
     .iv = 255,
     .lvl = 34,
@@ -5191,7 +5191,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Aaron[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Perry[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5199,7 +5199,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hugh[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5212,7 +5212,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Phil[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5220,7 +5220,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jared[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -5238,7 +5238,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Humberto[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Humberto[] = {
     {
     .iv = 250,
     .lvl = 30,
@@ -5246,7 +5246,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Humberto[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Presley[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Presley[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5259,7 +5259,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Presley[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwardo[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edwardo[] = {
     {
     .iv = 150,
     .lvl = 29,
@@ -5272,7 +5272,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwardo[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Colin[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -5285,7 +5285,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Robert1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -5293,7 +5293,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Benny[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -5311,7 +5311,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Chester[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5324,7 +5324,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Robert2[] = {
     {
     .iv = 10,
     .lvl = 32,
@@ -5337,7 +5337,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Robert3[] = {
     {
     .iv = 20,
     .lvl = 35,
@@ -5350,7 +5350,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Robert4[] = {
     {
     .iv = 30,
     .lvl = 38,
@@ -5363,7 +5363,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Robert5[] = {
     {
     .iv = 40,
     .lvl = 41,
@@ -5376,7 +5376,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alex[] = {
     {
     .iv = 150,
     .lvl = 33,
@@ -5389,7 +5389,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Beck[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5397,7 +5397,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Yasu[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5405,7 +5405,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Takashi[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5418,7 +5418,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Dianne[] = {
+static const struct TrainerMonItemCustomMoves sParty_Dianne[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -5435,7 +5435,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Dianne[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jani[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jani[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5443,7 +5443,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jani[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Lao1[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -5464,7 +5464,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lung[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -5477,7 +5477,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Lao2[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -5504,7 +5504,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Lao3[] = {
     {
     .iv = 20,
     .lvl = 27,
@@ -5531,7 +5531,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Lao4[] = {
     {
     .iv = 30,
     .lvl = 30,
@@ -5558,7 +5558,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Lao5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -5589,7 +5589,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jocelyn[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jocelyn[] = {
     {
     .iv = 127,
     .lvl = 13,
@@ -5597,7 +5597,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jocelyn[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Laura[] = {
     {
     .iv = 150,
     .lvl = 13,
@@ -5605,7 +5605,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy1[] = {
     {
     .iv = 100,
     .lvl = 18,
@@ -5618,7 +5618,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cora[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -5626,7 +5626,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paula[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Paula[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -5634,7 +5634,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paula[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy2[] = {
     {
     .iv = 110,
     .lvl = 26,
@@ -5647,7 +5647,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -5660,7 +5660,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy4[] = {
     {
     .iv = 130,
     .lvl = 32,
@@ -5673,7 +5673,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy5[] = {
     {
     .iv = 140,
     .lvl = 35,
@@ -5686,7 +5686,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Madeline1[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -5695,7 +5695,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Clarissa[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -5708,7 +5708,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Angelica[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Angelica[] = {
     {
     .iv = 50,
     .lvl = 30,
@@ -5717,7 +5717,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Angelica[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Madeline2[] = {
     {
     .iv = 10,
     .lvl = 29,
@@ -5726,7 +5726,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Madeline3[] = {
     {
     .iv = 20,
     .lvl = 32,
@@ -5735,7 +5735,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Madeline4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -5750,7 +5750,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Madeline5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -5765,7 +5765,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Beverly[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5778,7 +5778,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Imani[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Imani[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5786,7 +5786,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Imani[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyla[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kyla[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5794,7 +5794,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyla[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Denise[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5807,7 +5807,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Beth[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5815,7 +5815,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tara[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5828,7 +5828,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Missy[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5836,7 +5836,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alice[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -5854,7 +5854,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jenny1[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5862,7 +5862,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grace[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5870,7 +5870,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tanya[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5878,7 +5878,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sharon[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5886,7 +5886,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nikki[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5899,7 +5899,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brenda[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5907,7 +5907,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Katie[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5920,7 +5920,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Susie[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5928,7 +5928,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kara[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5936,7 +5936,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dana[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5944,7 +5944,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sienna[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sienna[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5957,7 +5957,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sienna[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Debra[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5965,7 +5965,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Linda[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5978,7 +5978,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kaylee[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5991,7 +5991,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Laurel[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6004,7 +6004,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlee[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Carlee[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -6012,7 +6012,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlee[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jenny2[] = {
     {
     .iv = 0,
     .lvl = 38,
@@ -6020,7 +6020,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jenny3[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -6028,7 +6028,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jenny4[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -6041,7 +6041,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jenny5[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -6059,7 +6059,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Heidi[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -6074,7 +6074,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Becky[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -6089,7 +6089,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Carol[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -6102,7 +6102,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nancy[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -6115,7 +6115,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Martha[] = {
     {
     .iv = 0,
     .lvl = 23,
@@ -6128,7 +6128,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Diana1[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -6146,7 +6146,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Cedric[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Cedric[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -6155,7 +6155,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Cedric[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Irene[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -6168,7 +6168,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Diana2[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -6186,7 +6186,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Diana3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -6204,7 +6204,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Diana4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -6222,7 +6222,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Diana5[] = {
     {
     .iv = 40,
     .lvl = 40,
@@ -6240,7 +6240,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -6253,7 +6253,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -6266,7 +6266,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GinaAndMia1[] = {
     {
     .iv = 0,
     .lvl = 6,
@@ -6279,7 +6279,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MiuAndYuki[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -6292,7 +6292,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv3[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -6305,7 +6305,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_GinaAndMia2[] = {
     {
     .iv = 0,
     .lvl = 10,
@@ -6320,7 +6320,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv4[] = {
     {
     .iv = 20,
     .lvl = 30,
@@ -6333,7 +6333,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv5[] = {
     {
     .iv = 30,
     .lvl = 33,
@@ -6348,7 +6348,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv6[] = {
     {
     .iv = 40,
     .lvl = 36,
@@ -6363,7 +6363,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Huey[] = {
     {
     .iv = 10,
     .lvl = 12,
@@ -6376,7 +6376,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edmond[] = {
     {
     .iv = 0,
     .lvl = 13,
@@ -6384,7 +6384,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ernest1[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6397,7 +6397,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dwayne[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -6415,7 +6415,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Phillip[] = {
     {
     .iv = 0,
     .lvl = 44,
@@ -6428,7 +6428,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Leonard[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -6446,7 +6446,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Duncan[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -6459,7 +6459,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ernest2[] = {
     {
     .iv = 10,
     .lvl = 36,
@@ -6477,7 +6477,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ernest3[] = {
     {
     .iv = 20,
     .lvl = 39,
@@ -6495,7 +6495,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ernest4[] = {
     {
     .iv = 30,
     .lvl = 42,
@@ -6513,7 +6513,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ernest5[] = {
     {
     .iv = 40,
     .lvl = 45,
@@ -6531,7 +6531,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eli[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Eli[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -6539,7 +6539,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eli[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Annika[] = {
+static const struct TrainerMonItemCustomMoves sParty_Annika[] = {
     {
     .iv = 100,
     .lvl = 39,
@@ -6556,7 +6556,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Annika[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jazmyn[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jazmyn[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -6564,7 +6564,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jazmyn[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Jonas[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Jonas[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -6573,7 +6573,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Jonas[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Kayley[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Kayley[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -6582,7 +6582,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Kayley[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Auron[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Auron[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6595,7 +6595,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Auron[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kelvin[] = {
     {
     .iv = 150,
     .lvl = 33,
@@ -6608,7 +6608,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Marley[] = {
+static const struct TrainerMonItemCustomMoves sParty_Marley[] = {
     {
     .iv = 255,
     .lvl = 34,
@@ -6618,7 +6618,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Marley[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reyna[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Reyna[] = {
     {
     .iv = 50,
     .lvl = 33,
@@ -6631,7 +6631,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reyna[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hudson[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hudson[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -6639,7 +6639,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hudson[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Conor[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Conor[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6652,7 +6652,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Conor[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edwin1[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -6665,7 +6665,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -6678,7 +6678,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha1[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -6696,7 +6696,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edwin2[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -6709,7 +6709,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edwin3[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -6722,7 +6722,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edwin4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -6735,7 +6735,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -6748,7 +6748,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Wally1[] = {
     {
     .iv = 150,
     .lvl = 44,
@@ -6781,7 +6781,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan1[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6789,7 +6789,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan2[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6807,7 +6807,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan3[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6825,7 +6825,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan4[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6833,7 +6833,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan5[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6851,7 +6851,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan6[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6869,7 +6869,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan7[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6877,7 +6877,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan8[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6895,7 +6895,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan9[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6913,7 +6913,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May1[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6921,7 +6921,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May2[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6939,7 +6939,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May3[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6957,7 +6957,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May4[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6965,7 +6965,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May5[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6983,7 +6983,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May6[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7001,7 +7001,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May7[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -7009,7 +7009,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May8[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7027,7 +7027,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May9[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7045,7 +7045,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaac1[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -7078,7 +7078,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Davis[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Davis[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -7086,7 +7086,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Davis[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Mitchell[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Mitchell[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -7101,7 +7101,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Mitchell[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaac2[] = {
     {
     .iv = 10,
     .lvl = 22,
@@ -7134,7 +7134,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaac3[] = {
     {
     .iv = 20,
     .lvl = 25,
@@ -7167,7 +7167,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaac4[] = {
     {
     .iv = 30,
     .lvl = 28,
@@ -7200,7 +7200,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isaac5[] = {
     {
     .iv = 40,
     .lvl = 31,
@@ -7233,7 +7233,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lydia1[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -7266,7 +7266,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Halle[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Halle[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -7279,7 +7279,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Halle[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Garrison[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Garrison[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -7287,7 +7287,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Garrison[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lydia2[] = {
     {
     .iv = 10,
     .lvl = 22,
@@ -7320,7 +7320,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lydia3[] = {
     {
     .iv = 20,
     .lvl = 25,
@@ -7353,7 +7353,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lydia4[] = {
     {
     .iv = 30,
     .lvl = 28,
@@ -7386,7 +7386,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lydia5[] = {
     {
     .iv = 40,
     .lvl = 31,
@@ -7419,7 +7419,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jackson1[] = {
     {
     .iv = 50,
     .lvl = 27,
@@ -7427,7 +7427,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lorenzo[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lorenzo[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -7445,7 +7445,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lorenzo[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sebastian[] = {
     {
     .iv = 50,
     .lvl = 39,
@@ -7453,7 +7453,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jackson2[] = {
     {
     .iv = 60,
     .lvl = 31,
@@ -7461,7 +7461,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jackson3[] = {
     {
     .iv = 70,
     .lvl = 34,
@@ -7469,7 +7469,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jackson4[] = {
     {
     .iv = 80,
     .lvl = 37,
@@ -7477,7 +7477,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jackson5[] = {
     {
     .iv = 90,
     .lvl = 39,
@@ -7490,7 +7490,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Catherine1[] = {
     {
     .iv = 50,
     .lvl = 26,
@@ -7503,7 +7503,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jenna[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -7521,7 +7521,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sophia[] = {
     {
     .iv = 50,
     .lvl = 38,
@@ -7534,7 +7534,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Catherine2[] = {
     {
     .iv = 60,
     .lvl = 30,
@@ -7547,7 +7547,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Catherine3[] = {
     {
     .iv = 70,
     .lvl = 33,
@@ -7560,7 +7560,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Catherine4[] = {
     {
     .iv = 80,
     .lvl = 36,
@@ -7573,7 +7573,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Catherine5[] = {
     {
     .iv = 90,
     .lvl = 39,
@@ -7586,7 +7586,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julio[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -7594,7 +7594,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julio[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -7607,7 +7607,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7620,7 +7620,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -7633,7 +7633,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt30[] = {
     {
     .iv = 50,
     .lvl = 22,
@@ -7646,7 +7646,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marc[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Marc[] = {
     {
     .iv = 120,
     .lvl = 8,
@@ -7659,7 +7659,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marc[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenden[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brenden[] = {
     {
     .iv = 100,
     .lvl = 13,
@@ -7667,7 +7667,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenden[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lilith[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lilith[] = {
     {
     .iv = 150,
     .lvl = 13,
@@ -7675,7 +7675,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lilith[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristian[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cristian[] = {
     {
     .iv = 200,
     .lvl = 13,
@@ -7683,7 +7683,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristian[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sylvia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sylvia[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -7691,7 +7691,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sylvia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonardo[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Leonardo[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -7699,7 +7699,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonardo[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Athena[] = {
+static const struct TrainerMonItemCustomMoves sParty_Athena[] = {
     {
     .iv = 100,
     .lvl = 32,
@@ -7716,7 +7716,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Athena[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harrison[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -7724,7 +7724,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harrison[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt31[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -7732,7 +7732,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarence[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Clarence[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -7740,7 +7740,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarence[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terry[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Terry[] = {
     {
     .iv = 0,
     .lvl = 37,
@@ -7748,7 +7748,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terry[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nate[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nate[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -7756,7 +7756,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nate[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kathleen[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kathleen[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -7764,7 +7764,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kathleen[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clifford[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Clifford[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -7772,7 +7772,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clifford[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicholas[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -7780,7 +7780,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicholas[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7793,7 +7793,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7801,7 +7801,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7809,7 +7809,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7817,7 +7817,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt36[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7825,7 +7825,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Macey[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Macey[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -7833,7 +7833,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Macey[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan10[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7846,7 +7846,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan11[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7859,7 +7859,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paxton[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Paxton[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -7872,7 +7872,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paxton[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabella[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -7880,7 +7880,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabella[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt37[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -7893,7 +7893,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha2[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7916,7 +7916,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonathan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jonathan[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -7929,7 +7929,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonathan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan12[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7942,7 +7942,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May10[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7955,7 +7955,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maxie1[] = {
     {
     .iv = 150,
     .lvl = 37,
@@ -7973,7 +7973,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maxie2[] = {
     {
     .iv = 150,
     .lvl = 24,
@@ -7991,7 +7991,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tiana[] = {
     {
     .iv = 0,
     .lvl = 4,
@@ -8004,7 +8004,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Haley1[] = {
     {
     .iv = 0,
     .lvl = 6,
@@ -8017,7 +8017,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Janice[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -8025,7 +8025,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Vivi[] = {
     {
     .iv = 100,
     .lvl = 15,
@@ -8043,7 +8043,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Haley2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -8056,7 +8056,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Haley3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -8069,7 +8069,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Haley4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -8082,7 +8082,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Haley5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -8100,7 +8100,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sally[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -8108,7 +8108,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Robin[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -8126,7 +8126,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andrea[] = {
     {
     .iv = 100,
     .lvl = 40,
@@ -8134,7 +8134,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Crissy[] = {
     {
     .iv = 100,
     .lvl = 39,
@@ -8147,7 +8147,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rick[] = {
     {
     .iv = 0,
     .lvl = 4,
@@ -8160,7 +8160,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lyle[] = {
     {
     .iv = 0,
     .lvl = 3,
@@ -8183,7 +8183,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jose[] = {
     {
     .iv = 50,
     .lvl = 8,
@@ -8196,7 +8196,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Doug[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -8209,7 +8209,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Greg[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8222,7 +8222,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kent[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8230,7 +8230,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_James1[] = {
     {
     .iv = 0,
     .lvl = 6,
@@ -8243,7 +8243,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_James2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -8251,7 +8251,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_James3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -8264,7 +8264,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_James4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -8282,7 +8282,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_James5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -8305,7 +8305,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brice[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -8318,7 +8318,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Trent1[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -8336,7 +8336,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lenny[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -8349,7 +8349,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lucas1[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -8362,7 +8362,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alan[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -8380,7 +8380,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Clark[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -8388,7 +8388,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Eric[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -8401,7 +8401,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Lucas2[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -8410,7 +8410,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Mike1[] = {
     {
     .iv = 0,
     .lvl = 10,
@@ -8425,7 +8425,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Mike2[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -8443,7 +8443,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Trent2[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -8466,7 +8466,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Trent3[] = {
     {
     .iv = 20,
     .lvl = 27,
@@ -8489,7 +8489,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Trent4[] = {
     {
     .iv = 30,
     .lvl = 30,
@@ -8512,7 +8512,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Trent5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -8535,7 +8535,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_DezAndLuke[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -8548,7 +8548,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LeaAndJed[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -8561,7 +8561,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan1[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8574,7 +8574,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -8587,7 +8587,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -8600,7 +8600,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan4[] = {
     {
     .iv = 30,
     .lvl = 36,
@@ -8613,7 +8613,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan5[] = {
     {
     .iv = 40,
     .lvl = 39,
@@ -8626,7 +8626,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Johanna[] = {
     {
     .iv = 0,
     .lvl = 13,
@@ -8634,7 +8634,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Gerald[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Gerald[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -8643,7 +8643,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Gerald[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Vivian[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -8658,7 +8658,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Danielle[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Danielle[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -8667,7 +8667,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Danielle[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Hideo[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8682,7 +8682,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Keigo[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -8697,7 +8697,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Riley[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Riley[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -8712,7 +8712,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Riley[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Flint[] = {
     {
     .iv = 150,
     .lvl = 29,
@@ -8725,7 +8725,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ashley[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -8743,7 +8743,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ashley[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = {
     {
     .iv = 30,
     .lvl = 16,
@@ -8751,7 +8751,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Wally3[] = {
     {
     .iv = 150,
     .lvl = 47,
@@ -8784,7 +8784,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Wally4[] = {
     {
     .iv = 150,
     .lvl = 50,
@@ -8817,7 +8817,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Wally5[] = {
     {
     .iv = 150,
     .lvl = 53,
@@ -8850,7 +8850,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Wally6[] = {
     {
     .iv = 150,
     .lvl = 56,
@@ -8883,7 +8883,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan13[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8906,7 +8906,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan13[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan14[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8929,7 +8929,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan14[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan15[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8952,7 +8952,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan15[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May11[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8975,7 +8975,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May12[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8998,7 +8998,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May13[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -9021,7 +9021,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May13[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jonah[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -9039,7 +9039,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Henry[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -9052,7 +9052,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Roger[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9070,7 +9070,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alexa[] = {
     {
     .iv = 100,
     .lvl = 34,
@@ -9083,7 +9083,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Ruben[] = {
     {
     .iv = 100,
     .lvl = 34,
@@ -9096,7 +9096,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Koji1[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -9104,7 +9104,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wayne[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -9122,7 +9122,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Aidan[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -9135,7 +9135,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Reed[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -9148,7 +9148,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tisha[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -9156,7 +9156,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_ToriAndTia[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9169,7 +9169,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_KimAndIris[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -9184,7 +9184,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_TyraAndIvy[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9199,7 +9199,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_MelAndPaul[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -9214,7 +9214,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay1[] = {
     {
     .iv = 200,
     .lvl = 39,
@@ -9229,7 +9229,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay2[] = {
     {
     .iv = 210,
     .lvl = 43,
@@ -9244,7 +9244,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay3[] = {
     {
     .iv = 220,
     .lvl = 46,
@@ -9259,7 +9259,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay4[] = {
     {
     .iv = 230,
     .lvl = 49,
@@ -9274,7 +9274,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay5[] = {
     {
     .iv = 240,
     .lvl = 52,
@@ -9289,7 +9289,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_ReliAndIan[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -9302,7 +9302,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy1[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -9315,7 +9315,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy2[] = {
     {
     .iv = 0,
     .lvl = 42,
@@ -9328,7 +9328,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy3[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -9341,7 +9341,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy4[] = {
     {
     .iv = 0,
     .lvl = 48,
@@ -9354,7 +9354,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy5[] = {
     {
     .iv = 0,
     .lvl = 51,
@@ -9367,7 +9367,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_LisaAndRay[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -9380,7 +9380,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Chris[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9403,7 +9403,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Dawson[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Dawson[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -9418,7 +9418,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Dawson[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Sarah[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Sarah[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -9433,7 +9433,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Sarah[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darian[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Darian[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -9441,7 +9441,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darian[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hailey[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hailey[] = {
     {
     .iv = 0,
     .lvl = 13,
@@ -9449,7 +9449,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hailey[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chandler[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Chandler[] = {
     {
     .iv = 0,
     .lvl = 12,
@@ -9462,7 +9462,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chandler[] = {
     }
 };
 
-const struct TrainerMonItemDefaultMoves gTrainerParty_Kaleb[] = {
+static const struct TrainerMonItemDefaultMoves sParty_Kaleb[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -9477,7 +9477,7 @@ const struct TrainerMonItemDefaultMoves gTrainerParty_Kaleb[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joseph[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Joseph[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -9490,7 +9490,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joseph[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alyssa[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alyssa[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9498,7 +9498,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alyssa[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcos[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Marcos[] = {
     {
     .iv = 100,
     .lvl = 15,
@@ -9506,7 +9506,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcos[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rhett[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rhett[] = {
     {
     .iv = 100,
     .lvl = 15,
@@ -9514,7 +9514,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rhett[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tyron[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tyron[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9522,7 +9522,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tyron[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celina[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Celina[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9530,7 +9530,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celina[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bianca[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bianca[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9538,7 +9538,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bianca[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hayden[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Hayden[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9546,7 +9546,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hayden[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sophie[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -9559,7 +9559,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Coby[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Coby[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -9572,7 +9572,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Coby[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lawrence[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lawrence[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9585,7 +9585,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lawrence[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wyatt[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Wyatt[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9598,7 +9598,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wyatt[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelina[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Angelina[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9611,7 +9611,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelina[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kai[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kai[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9619,7 +9619,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kai[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlotte[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Charlotte[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9627,7 +9627,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlotte[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Deandre[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -9645,7 +9645,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Deandre[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9653,7 +9653,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9661,7 +9661,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9669,7 +9669,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9682,7 +9682,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9695,7 +9695,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9703,7 +9703,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9711,7 +9711,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9719,7 +9719,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9727,7 +9727,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9735,7 +9735,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9743,7 +9743,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9751,7 +9751,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9759,7 +9759,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9767,7 +9767,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9775,7 +9775,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Grunt53[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9783,7 +9783,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha3[] = {
     {
     .iv = 75,
     .lvl = 26,
@@ -9806,7 +9806,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Darcy[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -9819,7 +9819,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Maxie3[] = {
     {
     .iv = 150,
     .lvl = 42,
@@ -9837,7 +9837,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pete[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pete[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9845,7 +9845,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pete[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabelle[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Isabelle[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9853,7 +9853,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabelle[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andres1[] = {
     {
     .iv = 50,
     .lvl = 25,
@@ -9866,7 +9866,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Josue[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Josue[] = {
     {
     .iv = 50,
     .lvl = 25,
@@ -9879,7 +9879,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Josue[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camron[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Camron[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -9887,7 +9887,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camron[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cory1[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -9905,7 +9905,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carolina[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Carolina[] = {
     {
     .iv = 50,
     .lvl = 24,
@@ -9923,7 +9923,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carolina[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elijah[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Elijah[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -9936,7 +9936,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elijah[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celia[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Celia[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -9949,7 +9949,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celia[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bryan[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -9962,7 +9962,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Branden[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Branden[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -9975,7 +9975,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Branden[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryant[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Bryant[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9988,7 +9988,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryant[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shayla[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Shayla[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -10001,7 +10001,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shayla[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyra[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Kyra[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10014,7 +10014,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyra[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaiden[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Jaiden[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10027,7 +10027,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaiden[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alix[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alix[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10040,7 +10040,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alix[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Helene[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Helene[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10053,7 +10053,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Helene[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marlene[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Marlene[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -10066,7 +10066,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marlene[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Devan[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Devan[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -10079,7 +10079,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Devan[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johnson[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Johnson[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -10092,7 +10092,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johnson[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melina[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Melina[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -10100,7 +10100,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melina[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandi[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brandi[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -10108,7 +10108,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandi[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aisha[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Aisha[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -10116,7 +10116,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aisha[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makayla[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Makayla[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -10129,7 +10129,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makayla[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fabian[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fabian[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10137,7 +10137,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fabian[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dayton[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Dayton[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -10150,7 +10150,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dayton[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rachel[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Rachel[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10158,7 +10158,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rachel[] = {
     }
 };
 
-const struct TrainerMonNoItemCustomMoves gTrainerParty_Leonel[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_Leonel[] = {
     {
     .iv = 100,
     .lvl = 30,
@@ -10167,7 +10167,7 @@ const struct TrainerMonNoItemCustomMoves gTrainerParty_Leonel[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Callie[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Callie[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -10180,7 +10180,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Callie[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cale[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cale[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -10193,7 +10193,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cale[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Myles[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Myles[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -10226,7 +10226,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Myles[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pat[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pat[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -10259,7 +10259,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pat[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cristin1[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -10272,7 +10272,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin1[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May14[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -10285,7 +10285,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May14[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May15[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -10298,7 +10298,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May15[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = {
     {
     .iv = 255,
     .lvl = 32,
@@ -10329,7 +10329,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = {
     {
     .iv = 255,
     .lvl = 37,
@@ -10367,7 +10367,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = {
     {
     .iv = 255,
     .lvl = 42,
@@ -10405,7 +10405,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Roxanne5[] = {
     {
     .iv = 255,
     .lvl = 47,
@@ -10450,7 +10450,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Brawly2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Brawly2[] = {
     {
     .iv = 255,
     .lvl = 33,
@@ -10481,7 +10481,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Brawly2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Brawly3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Brawly3[] = {
     {
     .iv = 255,
     .lvl = 38,
@@ -10512,7 +10512,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Brawly3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Brawly4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Brawly4[] = {
     {
     .iv = 255,
     .lvl = 40,
@@ -10550,7 +10550,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Brawly4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Brawly5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Brawly5[] = {
     {
     .iv = 255,
     .lvl = 46,
@@ -10595,7 +10595,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Brawly5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Wattson2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Wattson2[] = {
     {
     .iv = 255,
     .lvl = 36,
@@ -10626,7 +10626,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Wattson2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Wattson3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Wattson3[] = {
     {
     .iv = 255,
     .lvl = 39,
@@ -10664,7 +10664,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Wattson3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Wattson4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Wattson4[] = {
     {
     .iv = 255,
     .lvl = 44,
@@ -10702,7 +10702,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Wattson4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Wattson5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Wattson5[] = {
     {
     .iv = 255,
     .lvl = 50,
@@ -10747,7 +10747,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Wattson5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Flannery2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Flannery2[] = {
     {
     .iv = 255,
     .lvl = 38,
@@ -10778,7 +10778,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Flannery2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Flannery3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Flannery3[] = {
     {
     .iv = 255,
     .lvl = 41,
@@ -10816,7 +10816,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Flannery3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Flannery4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Flannery4[] = {
     {
     .iv = 255,
     .lvl = 46,
@@ -10861,7 +10861,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Flannery4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Flannery5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Flannery5[] = {
     {
     .iv = 255,
     .lvl = 51,
@@ -10906,7 +10906,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Flannery5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Norman2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Norman2[] = {
     {
     .iv = 255,
     .lvl = 42,
@@ -10937,7 +10937,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Norman2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Norman3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Norman3[] = {
     {
     .iv = 255,
     .lvl = 47,
@@ -10975,7 +10975,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Norman3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Norman4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Norman4[] = {
     {
     .iv = 255,
     .lvl = 52,
@@ -11013,7 +11013,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Norman4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Norman5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Norman5[] = {
     {
     .iv = 255,
     .lvl = 57,
@@ -11058,7 +11058,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Norman5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Winona2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Winona2[] = {
     {
     .iv = 255,
     .lvl = 40,
@@ -11096,7 +11096,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Winona2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Winona3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Winona3[] = {
     {
     .iv = 255,
     .lvl = 43,
@@ -11141,7 +11141,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Winona3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Winona4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Winona4[] = {
     {
     .iv = 255,
     .lvl = 48,
@@ -11186,7 +11186,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Winona4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Winona5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Winona5[] = {
     {
     .iv = 255,
     .lvl = 53,
@@ -11231,7 +11231,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Winona5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza2[] = {
+static const struct TrainerMonItemCustomMoves sParty_TateAndLiza2[] = {
     {
     .iv = 255,
     .lvl = 48,
@@ -11269,7 +11269,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza3[] = {
+static const struct TrainerMonItemCustomMoves sParty_TateAndLiza3[] = {
     {
     .iv = 255,
     .lvl = 53,
@@ -11314,7 +11314,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza4[] = {
+static const struct TrainerMonItemCustomMoves sParty_TateAndLiza4[] = {
     {
     .iv = 255,
     .lvl = 58,
@@ -11359,7 +11359,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza5[] = {
+static const struct TrainerMonItemCustomMoves sParty_TateAndLiza5[] = {
     {
     .iv = 255,
     .lvl = 63,
@@ -11404,7 +11404,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Juan2[] = {
+static const struct TrainerMonItemCustomMoves sParty_Juan2[] = {
     {
     .iv = 255,
     .lvl = 46,
@@ -11442,7 +11442,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Juan2[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Juan3[] = {
+static const struct TrainerMonItemCustomMoves sParty_Juan3[] = {
     {
     .iv = 255,
     .lvl = 50,
@@ -11480,7 +11480,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Juan3[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Juan4[] = {
+static const struct TrainerMonItemCustomMoves sParty_Juan4[] = {
     {
     .iv = 255,
     .lvl = 56,
@@ -11525,7 +11525,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Juan4[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Juan5[] = {
+static const struct TrainerMonItemCustomMoves sParty_Juan5[] = {
     {
     .iv = 255,
     .lvl = 61,
@@ -11570,7 +11570,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Juan5[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Angelo[] = {
+static const struct TrainerMonItemCustomMoves sParty_Angelo[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -11587,7 +11587,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Angelo[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darius[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Darius[] = {
     {
     .iv = 200,
     .lvl = 30,
@@ -11595,7 +11595,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darius[] = {
     }
 };
 
-const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = {
+static const struct TrainerMonItemCustomMoves sParty_Steven[] = {
     {
     .iv = 255,
     .lvl = 77,
@@ -11640,7 +11640,7 @@ const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anabel[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Anabel[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11648,7 +11648,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anabel[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Tucker[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11656,7 +11656,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spenser[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Spenser[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11664,7 +11664,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spenser[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greta[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Greta[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11672,7 +11672,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greta[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Noland[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Noland[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11680,7 +11680,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Noland[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucy[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Lucy[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11688,7 +11688,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucy[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brandon[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11696,7 +11696,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andres2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -11709,7 +11709,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andres3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -11727,7 +11727,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andres4[] = {
     {
     .iv = 30,
     .lvl = 35,
@@ -11745,7 +11745,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Andres5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -11763,7 +11763,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cory2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -11781,7 +11781,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cory3[] = {
     {
     .iv = 20,
     .lvl = 32,
@@ -11799,7 +11799,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cory4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -11817,7 +11817,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cory5[] = {
     {
     .iv = 40,
     .lvl = 36,
@@ -11835,7 +11835,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pablo2[] = {
     {
     .iv = 10,
     .lvl = 37,
@@ -11848,7 +11848,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pablo3[] = {
     {
     .iv = 20,
     .lvl = 39,
@@ -11866,7 +11866,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pablo4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -11884,7 +11884,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Pablo5[] = {
     {
     .iv = 40,
     .lvl = 43,
@@ -11902,7 +11902,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Koji2[] = {
     {
     .iv = 10,
     .lvl = 37,
@@ -11915,7 +11915,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Koji3[] = {
     {
     .iv = 20,
     .lvl = 39,
@@ -11933,7 +11933,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Koji4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -11951,7 +11951,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Koji5[] = {
     {
     .iv = 40,
     .lvl = 43,
@@ -11969,7 +11969,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cristin2[] = {
     {
     .iv = 110,
     .lvl = 35,
@@ -11982,7 +11982,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cristin3[] = {
     {
     .iv = 120,
     .lvl = 37,
@@ -12000,7 +12000,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cristin4[] = {
     {
     .iv = 130,
     .lvl = 39,
@@ -12018,7 +12018,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Cristin5[] = {
     {
     .iv = 140,
     .lvl = 41,
@@ -12036,7 +12036,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fernando2[] = {
     {
     .iv = 10,
     .lvl = 35,
@@ -12054,7 +12054,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fernando3[] = {
     {
     .iv = 20,
     .lvl = 37,
@@ -12072,7 +12072,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fernando4[] = {
     {
     .iv = 30,
     .lvl = 39,
@@ -12090,7 +12090,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Fernando5[] = {
     {
     .iv = 40,
     .lvl = 41,
@@ -12108,7 +12108,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -12121,7 +12121,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -12139,7 +12139,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer4[] = {
     {
     .iv = 30,
     .lvl = 30,
@@ -12157,7 +12157,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -12175,7 +12175,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -12208,7 +12208,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -12241,7 +12241,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle4[] = {
     {
     .iv = 30,
     .lvl = 35,
@@ -12274,7 +12274,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -12307,7 +12307,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Thalia2[] = {
     {
     .iv = 10,
     .lvl = 34,
@@ -12320,7 +12320,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia2[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Thalia3[] = {
     {
     .iv = 20,
     .lvl = 36,
@@ -12338,7 +12338,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia3[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Thalia4[] = {
     {
     .iv = 30,
     .lvl = 38,
@@ -12356,7 +12356,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia4[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Thalia5[] = {
     {
     .iv = 40,
     .lvl = 40,
@@ -12374,7 +12374,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia5[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mariela[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Mariela[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -12382,7 +12382,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mariela[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alvaro[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Alvaro[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -12395,7 +12395,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alvaro[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Everett[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Everett[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -12403,7 +12403,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Everett[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Red[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Red[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12411,7 +12411,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Red[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leaf[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Leaf[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12419,7 +12419,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leaf[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_Brendan16[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12427,7 +12427,7 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan16[] = {
     }
 };
 
-const struct TrainerMonNoItemDefaultMoves gTrainerParty_May16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_May16[] = {
     {
     .iv = 0,
     .lvl = 5,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index 7ec297eb3..5a92926cc 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -24,7 +24,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer1 }
+        .party = {.NoItemDefaultMoves = sParty_Sawyer1 }
     },
 
     [TRAINER_GRUNT_1] =
@@ -38,7 +38,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt1 }
     },
 
     [TRAINER_GRUNT_2] =
@@ -52,7 +52,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt2 }
     },
 
     [TRAINER_GRUNT_3] =
@@ -66,7 +66,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt3 }
     },
 
     [TRAINER_GRUNT_4] =
@@ -80,7 +80,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt4 }
     },
 
     [TRAINER_GRUNT_5] =
@@ -94,7 +94,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt5 }
     },
 
     [TRAINER_GRUNT_6] =
@@ -108,7 +108,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt6 }
     },
 
     [TRAINER_GRUNT_7] =
@@ -122,7 +122,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt7 }
     },
 
     [TRAINER_GABRIELLE_1] =
@@ -136,7 +136,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle1 }
+        .party = {.NoItemDefaultMoves = sParty_Gabrielle1 }
     },
 
     [TRAINER_GRUNT_8] =
@@ -150,7 +150,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt8 }
     },
 
     [TRAINER_MARCEL] =
@@ -164,7 +164,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Marcel }
+        .party = {.NoItemDefaultMoves = sParty_Marcel }
     },
 
     [TRAINER_ALBERTO] =
@@ -178,7 +178,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alberto }
+        .party = {.NoItemDefaultMoves = sParty_Alberto }
     },
 
     [TRAINER_ED] =
@@ -192,7 +192,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ed }
+        .party = {.NoItemDefaultMoves = sParty_Ed }
     },
 
     [TRAINER_GRUNT_9] =
@@ -206,7 +206,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt9 }
     },
 
     [TRAINER_DECLAN] =
@@ -220,7 +220,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Declan }
+        .party = {.NoItemDefaultMoves = sParty_Declan }
     },
 
     [TRAINER_GRUNT_10] =
@@ -234,7 +234,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt10 }
     },
 
     [TRAINER_GRUNT_11] =
@@ -248,7 +248,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt11 }
     },
 
     [TRAINER_GRUNT_12] =
@@ -262,7 +262,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt12 }
     },
 
     [TRAINER_GRUNT_13] =
@@ -276,7 +276,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt13 }
     },
 
     [TRAINER_GRUNT_14] =
@@ -290,7 +290,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt14 }
     },
 
     [TRAINER_GRUNT_15] =
@@ -304,7 +304,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt15 }
     },
 
     [TRAINER_GRUNT_16] =
@@ -318,7 +318,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt16 }
     },
 
     [TRAINER_GRUNT_17] =
@@ -332,7 +332,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt17 }
     },
 
     [TRAINER_GRUNT_18] =
@@ -346,7 +346,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt18 }
     },
 
     [TRAINER_GRUNT_19] =
@@ -360,7 +360,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt19 }
     },
 
     [TRAINER_GRUNT_20] =
@@ -374,7 +374,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt20 }
     },
 
     [TRAINER_GRUNT_21] =
@@ -388,7 +388,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt21 }
     },
 
     [TRAINER_GRUNT_22] =
@@ -402,7 +402,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt22 }
     },
 
     [TRAINER_FREDRICK] =
@@ -416,7 +416,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fredrick }
+        .party = {.NoItemDefaultMoves = sParty_Fredrick }
     },
 
     [TRAINER_MATT] =
@@ -430,7 +430,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Matt }
+        .party = {.NoItemDefaultMoves = sParty_Matt }
     },
 
     [TRAINER_ZANDER] =
@@ -444,7 +444,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Zander }
+        .party = {.NoItemDefaultMoves = sParty_Zander }
     },
 
     [TRAINER_SHELLY_1] =
@@ -458,7 +458,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 }
+        .party = {.NoItemDefaultMoves = sParty_Shelly1 }
     },
 
     [TRAINER_SHELLY_2] =
@@ -472,7 +472,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 }
+        .party = {.NoItemDefaultMoves = sParty_Shelly2 }
     },
 
     [TRAINER_ARCHIE] =
@@ -486,7 +486,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Archie }
+        .party = {.NoItemDefaultMoves = sParty_Archie }
     },
 
     [TRAINER_LEAH] =
@@ -500,7 +500,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Leah }
+        .party = {.NoItemDefaultMoves = sParty_Leah }
     },
 
     [TRAINER_DAISY] =
@@ -514,7 +514,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Daisy }
+        .party = {.NoItemDefaultMoves = sParty_Daisy }
     },
 
     [TRAINER_ROSE_1] =
@@ -528,7 +528,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 }
+        .party = {.NoItemDefaultMoves = sParty_Rose1 }
     },
 
     [TRAINER_FELIX] =
@@ -542,7 +542,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Felix }
+        .party = {.NoItemCustomMoves = sParty_Felix }
     },
 
     [TRAINER_VIOLET] =
@@ -556,7 +556,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Violet }
+        .party = {.NoItemDefaultMoves = sParty_Violet }
     },
 
     [TRAINER_ROSE_2] =
@@ -570,7 +570,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 }
+        .party = {.NoItemDefaultMoves = sParty_Rose2 }
     },
 
     [TRAINER_ROSE_3] =
@@ -584,7 +584,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 }
+        .party = {.NoItemDefaultMoves = sParty_Rose3 }
     },
 
     [TRAINER_ROSE_4] =
@@ -598,7 +598,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 }
+        .party = {.NoItemDefaultMoves = sParty_Rose4 }
     },
 
     [TRAINER_ROSE_5] =
@@ -612,7 +612,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 }
+        .party = {.NoItemDefaultMoves = sParty_Rose5 }
     },
 
     [TRAINER_DUSTY_1] =
@@ -626,7 +626,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 }
+        .party = {.NoItemCustomMoves = sParty_Dusty1 }
     },
 
     [TRAINER_CHIP] =
@@ -640,7 +640,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemCustomMoves = gTrainerParty_Chip }
+        .party = {.NoItemCustomMoves = sParty_Chip }
     },
 
     [TRAINER_FOSTER] =
@@ -654,7 +654,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Foster }
+        .party = {.NoItemCustomMoves = sParty_Foster }
     },
 
     [TRAINER_DUSTY_2] =
@@ -668,7 +668,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 }
+        .party = {.NoItemCustomMoves = sParty_Dusty2 }
     },
 
     [TRAINER_DUSTY_3] =
@@ -682,7 +682,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 }
+        .party = {.NoItemCustomMoves = sParty_Dusty3 }
     },
 
     [TRAINER_DUSTY_4] =
@@ -696,7 +696,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 }
+        .party = {.NoItemCustomMoves = sParty_Dusty4 }
     },
 
     [TRAINER_DUSTY_5] =
@@ -710,7 +710,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 }
+        .party = {.NoItemCustomMoves = sParty_Dusty5 }
     },
 
     [TRAINER_GABBY_AND_TY_1] =
@@ -724,7 +724,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 }
+        .party = {.NoItemDefaultMoves = sParty_GabbyAndTy1 }
     },
 
     [TRAINER_GABBY_AND_TY_2] =
@@ -738,7 +738,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 }
+        .party = {.NoItemDefaultMoves = sParty_GabbyAndTy2 }
     },
 
     [TRAINER_GABBY_AND_TY_3] =
@@ -752,7 +752,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 }
+        .party = {.NoItemDefaultMoves = sParty_GabbyAndTy3 }
     },
 
     [TRAINER_GABBY_AND_TY_4] =
@@ -766,7 +766,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 }
+        .party = {.NoItemDefaultMoves = sParty_GabbyAndTy4 }
     },
 
     [TRAINER_GABBY_AND_TY_5] =
@@ -780,7 +780,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 }
+        .party = {.NoItemDefaultMoves = sParty_GabbyAndTy5 }
     },
 
     [TRAINER_GABBY_AND_TY_6] =
@@ -794,7 +794,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 }
+        .party = {.NoItemCustomMoves = sParty_GabbyAndTy6 }
     },
 
     [TRAINER_LOLA_1] =
@@ -808,7 +808,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 }
+        .party = {.NoItemDefaultMoves = sParty_Lola1 }
     },
 
     [TRAINER_AUSTINA] =
@@ -822,7 +822,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Austina }
+        .party = {.NoItemDefaultMoves = sParty_Austina }
     },
 
     [TRAINER_GWEN] =
@@ -836,7 +836,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gwen }
+        .party = {.NoItemDefaultMoves = sParty_Gwen }
     },
 
     [TRAINER_LOLA_2] =
@@ -850,7 +850,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 }
+        .party = {.NoItemDefaultMoves = sParty_Lola2 }
     },
 
     [TRAINER_LOLA_3] =
@@ -864,7 +864,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 }
+        .party = {.NoItemDefaultMoves = sParty_Lola3 }
     },
 
     [TRAINER_LOLA_4] =
@@ -878,7 +878,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 }
+        .party = {.NoItemDefaultMoves = sParty_Lola4 }
     },
 
     [TRAINER_LOLA_5] =
@@ -892,7 +892,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 }
+        .party = {.NoItemDefaultMoves = sParty_Lola5 }
     },
 
     [TRAINER_RICKY_1] =
@@ -906,7 +906,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 }
+        .party = {.NoItemCustomMoves = sParty_Ricky1 }
     },
 
     [TRAINER_SIMON] =
@@ -920,7 +920,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Simon }
+        .party = {.NoItemDefaultMoves = sParty_Simon }
     },
 
     [TRAINER_CHARLIE] =
@@ -934,7 +934,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Charlie }
+        .party = {.NoItemDefaultMoves = sParty_Charlie }
     },
 
     [TRAINER_RICKY_2] =
@@ -948,7 +948,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 }
+        .party = {.NoItemCustomMoves = sParty_Ricky2 }
     },
 
     [TRAINER_RICKY_3] =
@@ -962,7 +962,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 }
+        .party = {.NoItemCustomMoves = sParty_Ricky3 }
     },
 
     [TRAINER_RICKY_4] =
@@ -976,7 +976,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 }
+        .party = {.NoItemCustomMoves = sParty_Ricky4 }
     },
 
     [TRAINER_RICKY_5] =
@@ -990,7 +990,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 }
+        .party = {.NoItemCustomMoves = sParty_Ricky5 }
     },
 
     [TRAINER_RANDALL] =
@@ -1004,7 +1004,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Randall }
+        .party = {.ItemCustomMoves = sParty_Randall }
     },
 
     [TRAINER_PARKER] =
@@ -1018,7 +1018,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Parker }
+        .party = {.ItemCustomMoves = sParty_Parker }
     },
 
     [TRAINER_GEORGE] =
@@ -1032,7 +1032,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_George }
+        .party = {.ItemCustomMoves = sParty_George }
     },
 
     [TRAINER_BERKE] =
@@ -1046,7 +1046,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Berke }
+        .party = {.ItemCustomMoves = sParty_Berke }
     },
 
     [TRAINER_BRAXTON] =
@@ -1060,7 +1060,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.NoItemCustomMoves = gTrainerParty_Braxton }
+        .party = {.NoItemCustomMoves = sParty_Braxton }
     },
 
     [TRAINER_VINCENT] =
@@ -1074,7 +1074,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Vincent }
+        .party = {.NoItemDefaultMoves = sParty_Vincent }
     },
 
     [TRAINER_LEROY] =
@@ -1088,7 +1088,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Leroy }
+        .party = {.NoItemDefaultMoves = sParty_Leroy }
     },
 
     [TRAINER_WILTON_1] =
@@ -1102,7 +1102,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 }
+        .party = {.NoItemDefaultMoves = sParty_Wilton1 }
     },
 
     [TRAINER_EDGAR] =
@@ -1116,7 +1116,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edgar }
+        .party = {.NoItemDefaultMoves = sParty_Edgar }
     },
 
     [TRAINER_ALBERT] =
@@ -1130,7 +1130,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Albert }
+        .party = {.NoItemDefaultMoves = sParty_Albert }
     },
 
     [TRAINER_SAMUEL] =
@@ -1144,7 +1144,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Samuel }
+        .party = {.NoItemDefaultMoves = sParty_Samuel }
     },
 
     [TRAINER_VITO] =
@@ -1158,7 +1158,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Vito }
+        .party = {.NoItemDefaultMoves = sParty_Vito }
     },
 
     [TRAINER_OWEN] =
@@ -1172,7 +1172,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Owen }
+        .party = {.NoItemDefaultMoves = sParty_Owen }
     },
 
     [TRAINER_WILTON_2] =
@@ -1186,7 +1186,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 }
+        .party = {.NoItemDefaultMoves = sParty_Wilton2 }
     },
 
     [TRAINER_WILTON_3] =
@@ -1200,7 +1200,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 }
+        .party = {.NoItemDefaultMoves = sParty_Wilton3 }
     },
 
     [TRAINER_WILTON_4] =
@@ -1214,7 +1214,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 }
+        .party = {.NoItemDefaultMoves = sParty_Wilton4 }
     },
 
     [TRAINER_WILTON_5] =
@@ -1228,7 +1228,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 }
+        .party = {.NoItemDefaultMoves = sParty_Wilton5 }
     },
 
     [TRAINER_WARREN] =
@@ -1242,7 +1242,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Warren }
+        .party = {.NoItemDefaultMoves = sParty_Warren }
     },
 
     [TRAINER_MARY] =
@@ -1256,7 +1256,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Mary }
+        .party = {.ItemCustomMoves = sParty_Mary }
     },
 
     [TRAINER_ALEXIA] =
@@ -1270,7 +1270,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Alexia }
+        .party = {.ItemCustomMoves = sParty_Alexia }
     },
 
     [TRAINER_JODY] =
@@ -1284,7 +1284,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Jody }
+        .party = {.ItemCustomMoves = sParty_Jody }
     },
 
     [TRAINER_WENDY] =
@@ -1298,7 +1298,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 3,
-        .party = {.NoItemCustomMoves = gTrainerParty_Wendy }
+        .party = {.NoItemCustomMoves = sParty_Wendy }
     },
 
     [TRAINER_KEIRA] =
@@ -1312,7 +1312,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Keira }
+        .party = {.NoItemDefaultMoves = sParty_Keira }
     },
 
     [TRAINER_BROOKE_1] =
@@ -1326,7 +1326,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 }
+        .party = {.NoItemDefaultMoves = sParty_Brooke1 }
     },
 
     [TRAINER_JENNIFER] =
@@ -1340,7 +1340,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer }
+        .party = {.NoItemDefaultMoves = sParty_Jennifer }
     },
 
     [TRAINER_HOPE] =
@@ -1354,7 +1354,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hope }
+        .party = {.NoItemDefaultMoves = sParty_Hope }
     },
 
     [TRAINER_SHANNON] =
@@ -1368,7 +1368,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shannon }
+        .party = {.NoItemDefaultMoves = sParty_Shannon }
     },
 
     [TRAINER_MICHELLE] =
@@ -1382,7 +1382,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Michelle }
+        .party = {.NoItemDefaultMoves = sParty_Michelle }
     },
 
     [TRAINER_CAROLINE] =
@@ -1396,7 +1396,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Caroline }
+        .party = {.NoItemDefaultMoves = sParty_Caroline }
     },
 
     [TRAINER_JULIE] =
@@ -1410,7 +1410,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Julie }
+        .party = {.NoItemDefaultMoves = sParty_Julie }
     },
 
     [TRAINER_BROOKE_2] =
@@ -1424,7 +1424,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 }
+        .party = {.NoItemDefaultMoves = sParty_Brooke2 }
     },
 
     [TRAINER_BROOKE_3] =
@@ -1438,7 +1438,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 }
+        .party = {.NoItemDefaultMoves = sParty_Brooke3 }
     },
 
     [TRAINER_BROOKE_4] =
@@ -1452,7 +1452,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 }
+        .party = {.NoItemDefaultMoves = sParty_Brooke4 }
     },
 
     [TRAINER_BROOKE_5] =
@@ -1466,7 +1466,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 }
+        .party = {.NoItemDefaultMoves = sParty_Brooke5 }
     },
 
     [TRAINER_PATRICIA] =
@@ -1480,7 +1480,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Patricia }
+        .party = {.NoItemDefaultMoves = sParty_Patricia }
     },
 
     [TRAINER_KINDRA] =
@@ -1494,7 +1494,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kindra }
+        .party = {.NoItemDefaultMoves = sParty_Kindra }
     },
 
     [TRAINER_TAMMY] =
@@ -1508,7 +1508,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tammy }
+        .party = {.NoItemDefaultMoves = sParty_Tammy }
     },
 
     [TRAINER_VALERIE_1] =
@@ -1522,7 +1522,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 }
+        .party = {.NoItemDefaultMoves = sParty_Valerie1 }
     },
 
     [TRAINER_TASHA] =
@@ -1536,7 +1536,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tasha }
+        .party = {.NoItemDefaultMoves = sParty_Tasha }
     },
 
     [TRAINER_VALERIE_2] =
@@ -1550,7 +1550,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 }
+        .party = {.NoItemDefaultMoves = sParty_Valerie2 }
     },
 
     [TRAINER_VALERIE_3] =
@@ -1564,7 +1564,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 }
+        .party = {.NoItemDefaultMoves = sParty_Valerie3 }
     },
 
     [TRAINER_VALERIE_4] =
@@ -1578,7 +1578,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 }
+        .party = {.NoItemDefaultMoves = sParty_Valerie4 }
     },
 
     [TRAINER_VALERIE_5] =
@@ -1592,7 +1592,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 }
+        .party = {.NoItemDefaultMoves = sParty_Valerie5 }
     },
 
     [TRAINER_CINDY_1] =
@@ -1606,7 +1606,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 }
+        .party = {.ItemDefaultMoves = sParty_Cindy1 }
     },
 
     [TRAINER_DAPHNE] =
@@ -1620,7 +1620,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemCustomMoves = gTrainerParty_Daphne }
+        .party = {.ItemCustomMoves = sParty_Daphne }
     },
 
     [TRAINER_GRUNT_23] =
@@ -1634,7 +1634,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt23 }
     },
 
     [TRAINER_CINDY_2] =
@@ -1648,7 +1648,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Cindy2 }
+        .party = {.ItemCustomMoves = sParty_Cindy2 }
     },
 
     [TRAINER_BRIANNA] =
@@ -1662,7 +1662,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Brianna }
+        .party = {.ItemDefaultMoves = sParty_Brianna }
     },
 
     [TRAINER_NAOMI] =
@@ -1676,7 +1676,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Naomi }
+        .party = {.ItemDefaultMoves = sParty_Naomi }
     },
 
     [TRAINER_CINDY_3] =
@@ -1690,7 +1690,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 }
+        .party = {.ItemDefaultMoves = sParty_Cindy3 }
     },
 
     [TRAINER_CINDY_4] =
@@ -1704,7 +1704,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 }
+        .party = {.ItemDefaultMoves = sParty_Cindy4 }
     },
 
     [TRAINER_CINDY_5] =
@@ -1718,7 +1718,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 }
+        .party = {.ItemDefaultMoves = sParty_Cindy5 }
     },
 
     [TRAINER_CINDY_6] =
@@ -1732,7 +1732,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Cindy6 }
+        .party = {.ItemCustomMoves = sParty_Cindy6 }
     },
 
     [TRAINER_MELISSA] =
@@ -1746,7 +1746,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Melissa }
+        .party = {.NoItemDefaultMoves = sParty_Melissa }
     },
 
     [TRAINER_SHEILA] =
@@ -1760,7 +1760,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sheila }
+        .party = {.NoItemDefaultMoves = sParty_Sheila }
     },
 
     [TRAINER_SHIRLEY] =
@@ -1774,7 +1774,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shirley }
+        .party = {.NoItemDefaultMoves = sParty_Shirley }
     },
 
     [TRAINER_JESSICA_1] =
@@ -1788,7 +1788,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 }
+        .party = {.NoItemCustomMoves = sParty_Jessica1 }
     },
 
     [TRAINER_CONNIE] =
@@ -1802,7 +1802,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Connie }
+        .party = {.NoItemDefaultMoves = sParty_Connie }
     },
 
     [TRAINER_BRIDGET] =
@@ -1816,7 +1816,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bridget }
+        .party = {.NoItemDefaultMoves = sParty_Bridget }
     },
 
     [TRAINER_OLIVIA] =
@@ -1830,7 +1830,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemCustomMoves = gTrainerParty_Olivia }
+        .party = {.NoItemCustomMoves = sParty_Olivia }
     },
 
     [TRAINER_TIFFANY] =
@@ -1844,7 +1844,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany }
+        .party = {.NoItemDefaultMoves = sParty_Tiffany }
     },
 
     [TRAINER_JESSICA_2] =
@@ -1858,7 +1858,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 }
+        .party = {.NoItemCustomMoves = sParty_Jessica2 }
     },
 
     [TRAINER_JESSICA_3] =
@@ -1872,7 +1872,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 }
+        .party = {.NoItemCustomMoves = sParty_Jessica3 }
     },
 
     [TRAINER_JESSICA_4] =
@@ -1886,7 +1886,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 }
+        .party = {.NoItemCustomMoves = sParty_Jessica4 }
     },
 
     [TRAINER_JESSICA_5] =
@@ -1900,7 +1900,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 }
+        .party = {.NoItemCustomMoves = sParty_Jessica5 }
     },
 
     [TRAINER_WINSTON_1] =
@@ -1914,7 +1914,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Winston1 }
+        .party = {.ItemDefaultMoves = sParty_Winston1 }
     },
 
     [TRAINER_MOLLIE] =
@@ -1928,7 +1928,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Mollie }
+        .party = {.NoItemDefaultMoves = sParty_Mollie }
     },
 
     [TRAINER_GARRET] =
@@ -1942,7 +1942,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Garret }
+        .party = {.ItemDefaultMoves = sParty_Garret }
     },
 
     [TRAINER_WINSTON_2] =
@@ -1956,7 +1956,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Winston2 }
+        .party = {.ItemDefaultMoves = sParty_Winston2 }
     },
 
     [TRAINER_WINSTON_3] =
@@ -1970,7 +1970,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Winston3 }
+        .party = {.ItemDefaultMoves = sParty_Winston3 }
     },
 
     [TRAINER_WINSTON_4] =
@@ -1984,7 +1984,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Winston4 }
+        .party = {.ItemDefaultMoves = sParty_Winston4 }
     },
 
     [TRAINER_WINSTON_5] =
@@ -1998,7 +1998,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Winston5 }
+        .party = {.ItemCustomMoves = sParty_Winston5 }
     },
 
     [TRAINER_STEVE_1] =
@@ -2012,7 +2012,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 }
+        .party = {.NoItemDefaultMoves = sParty_Steve1 }
     },
 
     [TRAINER_THALIA_1] =
@@ -2026,7 +2026,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Thalia1 }
+        .party = {.NoItemDefaultMoves = sParty_Thalia1 }
     },
 
     [TRAINER_MARK] =
@@ -2040,7 +2040,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Mark }
+        .party = {.NoItemDefaultMoves = sParty_Mark }
     },
 
     [TRAINER_GRUNT_24] =
@@ -2054,7 +2054,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt24 }
     },
 
     [TRAINER_STEVE_2] =
@@ -2068,7 +2068,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 }
+        .party = {.NoItemDefaultMoves = sParty_Steve2 }
     },
 
     [TRAINER_STEVE_3] =
@@ -2082,7 +2082,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 }
+        .party = {.NoItemDefaultMoves = sParty_Steve3 }
     },
 
     [TRAINER_STEVE_4] =
@@ -2096,7 +2096,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 }
+        .party = {.NoItemDefaultMoves = sParty_Steve4 }
     },
 
     [TRAINER_STEVE_5] =
@@ -2110,7 +2110,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 }
+        .party = {.NoItemDefaultMoves = sParty_Steve5 }
     },
 
     [TRAINER_LUIS] =
@@ -2124,7 +2124,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Luis }
+        .party = {.NoItemDefaultMoves = sParty_Luis }
     },
 
     [TRAINER_DOMINIK] =
@@ -2138,7 +2138,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dominik }
+        .party = {.NoItemDefaultMoves = sParty_Dominik }
     },
 
     [TRAINER_DOUGLAS] =
@@ -2152,7 +2152,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Douglas }
+        .party = {.NoItemDefaultMoves = sParty_Douglas }
     },
 
     [TRAINER_DARRIN] =
@@ -2166,7 +2166,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Darrin }
+        .party = {.NoItemDefaultMoves = sParty_Darrin }
     },
 
     [TRAINER_TONY_1] =
@@ -2180,7 +2180,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 }
+        .party = {.NoItemDefaultMoves = sParty_Tony1 }
     },
 
     [TRAINER_JEROME] =
@@ -2194,7 +2194,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jerome }
+        .party = {.NoItemDefaultMoves = sParty_Jerome }
     },
 
     [TRAINER_MATTHEW] =
@@ -2208,7 +2208,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Matthew }
+        .party = {.NoItemDefaultMoves = sParty_Matthew }
     },
 
     [TRAINER_DAVID] =
@@ -2222,7 +2222,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_David }
+        .party = {.NoItemDefaultMoves = sParty_David }
     },
 
     [TRAINER_SPENCER] =
@@ -2236,7 +2236,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Spencer }
+        .party = {.NoItemDefaultMoves = sParty_Spencer }
     },
 
     [TRAINER_ROLAND] =
@@ -2250,7 +2250,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Roland }
+        .party = {.NoItemDefaultMoves = sParty_Roland }
     },
 
     [TRAINER_NOLEN] =
@@ -2264,7 +2264,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nolen }
+        .party = {.NoItemDefaultMoves = sParty_Nolen }
     },
 
     [TRAINER_STAN] =
@@ -2278,7 +2278,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Stan }
+        .party = {.NoItemDefaultMoves = sParty_Stan }
     },
 
     [TRAINER_BARRY] =
@@ -2292,7 +2292,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Barry }
+        .party = {.NoItemDefaultMoves = sParty_Barry }
     },
 
     [TRAINER_DEAN] =
@@ -2306,7 +2306,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dean }
+        .party = {.NoItemDefaultMoves = sParty_Dean }
     },
 
     [TRAINER_RODNEY] =
@@ -2320,7 +2320,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rodney }
+        .party = {.NoItemDefaultMoves = sParty_Rodney }
     },
 
     [TRAINER_RICHARD] =
@@ -2334,7 +2334,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Richard }
+        .party = {.NoItemDefaultMoves = sParty_Richard }
     },
 
     [TRAINER_HERMAN] =
@@ -2348,7 +2348,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Herman }
+        .party = {.NoItemDefaultMoves = sParty_Herman }
     },
 
     [TRAINER_SANTIAGO] =
@@ -2362,7 +2362,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Santiago }
+        .party = {.NoItemDefaultMoves = sParty_Santiago }
     },
 
     [TRAINER_GILBERT] =
@@ -2376,7 +2376,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert }
+        .party = {.NoItemDefaultMoves = sParty_Gilbert }
     },
 
     [TRAINER_FRANKLIN] =
@@ -2390,7 +2390,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Franklin }
+        .party = {.NoItemDefaultMoves = sParty_Franklin }
     },
 
     [TRAINER_KEVIN] =
@@ -2404,7 +2404,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kevin }
+        .party = {.NoItemDefaultMoves = sParty_Kevin }
     },
 
     [TRAINER_JACK] =
@@ -2418,7 +2418,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jack }
+        .party = {.NoItemDefaultMoves = sParty_Jack }
     },
 
     [TRAINER_DUDLEY] =
@@ -2432,7 +2432,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dudley }
+        .party = {.NoItemDefaultMoves = sParty_Dudley }
     },
 
     [TRAINER_CHAD] =
@@ -2446,7 +2446,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Chad }
+        .party = {.NoItemDefaultMoves = sParty_Chad }
     },
 
     [TRAINER_TONY_2] =
@@ -2460,7 +2460,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 }
+        .party = {.NoItemDefaultMoves = sParty_Tony2 }
     },
 
     [TRAINER_TONY_3] =
@@ -2474,7 +2474,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 }
+        .party = {.NoItemDefaultMoves = sParty_Tony3 }
     },
 
     [TRAINER_TONY_4] =
@@ -2488,7 +2488,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 }
+        .party = {.NoItemDefaultMoves = sParty_Tony4 }
     },
 
     [TRAINER_TONY_5] =
@@ -2502,7 +2502,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 }
+        .party = {.NoItemDefaultMoves = sParty_Tony5 }
     },
 
     [TRAINER_TAKAO] =
@@ -2516,7 +2516,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Takao }
+        .party = {.NoItemDefaultMoves = sParty_Takao }
     },
 
     [TRAINER_HITOSHI] =
@@ -2530,7 +2530,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi }
+        .party = {.NoItemDefaultMoves = sParty_Hitoshi }
     },
 
     [TRAINER_KIYO] =
@@ -2544,7 +2544,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo }
+        .party = {.NoItemDefaultMoves = sParty_Kiyo }
     },
 
     [TRAINER_KOICHI] =
@@ -2558,7 +2558,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Koichi }
+        .party = {.NoItemDefaultMoves = sParty_Koichi }
     },
 
     [TRAINER_NOB_1] =
@@ -2572,7 +2572,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 }
+        .party = {.NoItemDefaultMoves = sParty_Nob1 }
     },
 
     [TRAINER_NOB_2] =
@@ -2586,7 +2586,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 }
+        .party = {.NoItemDefaultMoves = sParty_Nob2 }
     },
 
     [TRAINER_NOB_3] =
@@ -2600,7 +2600,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 }
+        .party = {.NoItemDefaultMoves = sParty_Nob3 }
     },
 
     [TRAINER_NOB_4] =
@@ -2614,7 +2614,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 }
+        .party = {.NoItemDefaultMoves = sParty_Nob4 }
     },
 
     [TRAINER_NOB_5] =
@@ -2628,7 +2628,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.ItemDefaultMoves = gTrainerParty_Nob5 }
+        .party = {.ItemDefaultMoves = sParty_Nob5 }
     },
 
     [TRAINER_YUJI] =
@@ -2642,7 +2642,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Yuji }
+        .party = {.NoItemDefaultMoves = sParty_Yuji }
     },
 
     [TRAINER_DAISUKE] =
@@ -2656,7 +2656,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke }
+        .party = {.NoItemDefaultMoves = sParty_Daisuke }
     },
 
     [TRAINER_ATSUSHI] =
@@ -2670,7 +2670,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi }
+        .party = {.NoItemDefaultMoves = sParty_Atsushi }
     },
 
     [TRAINER_KIRK] =
@@ -2684,7 +2684,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Kirk }
+        .party = {.NoItemCustomMoves = sParty_Kirk }
     },
 
     [TRAINER_GRUNT_25] =
@@ -2698,7 +2698,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt25 }
     },
 
     [TRAINER_GRUNT_26] =
@@ -2712,7 +2712,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt26 }
     },
 
     [TRAINER_SHAWN] =
@@ -2726,7 +2726,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shawn }
+        .party = {.NoItemDefaultMoves = sParty_Shawn }
     },
 
     [TRAINER_FERNANDO_1] =
@@ -2740,7 +2740,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fernando1 }
+        .party = {.NoItemDefaultMoves = sParty_Fernando1 }
     },
 
     [TRAINER_DALTON_1] =
@@ -2754,7 +2754,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 }
+        .party = {.NoItemDefaultMoves = sParty_Dalton1 }
     },
 
     [TRAINER_DALTON_2] =
@@ -2768,7 +2768,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 }
+        .party = {.NoItemDefaultMoves = sParty_Dalton2 }
     },
 
     [TRAINER_DALTON_3] =
@@ -2782,7 +2782,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 }
+        .party = {.NoItemDefaultMoves = sParty_Dalton3 }
     },
 
     [TRAINER_DALTON_4] =
@@ -2796,7 +2796,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 }
+        .party = {.NoItemDefaultMoves = sParty_Dalton4 }
     },
 
     [TRAINER_DALTON_5] =
@@ -2810,7 +2810,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 }
+        .party = {.NoItemDefaultMoves = sParty_Dalton5 }
     },
 
     [TRAINER_COLE] =
@@ -2824,7 +2824,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cole }
+        .party = {.NoItemDefaultMoves = sParty_Cole }
     },
 
     [TRAINER_JEFF] =
@@ -2838,7 +2838,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jeff }
+        .party = {.NoItemDefaultMoves = sParty_Jeff }
     },
 
     [TRAINER_AXLE] =
@@ -2852,7 +2852,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Axle }
+        .party = {.NoItemDefaultMoves = sParty_Axle }
     },
 
     [TRAINER_JACE] =
@@ -2866,7 +2866,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jace }
+        .party = {.NoItemDefaultMoves = sParty_Jace }
     },
 
     [TRAINER_KEEGAN] =
@@ -2880,7 +2880,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Keegan }
+        .party = {.NoItemDefaultMoves = sParty_Keegan }
     },
 
     [TRAINER_BERNIE_1] =
@@ -2894,7 +2894,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 }
+        .party = {.NoItemDefaultMoves = sParty_Bernie1 }
     },
 
     [TRAINER_BERNIE_2] =
@@ -2908,7 +2908,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 }
+        .party = {.NoItemDefaultMoves = sParty_Bernie2 }
     },
 
     [TRAINER_BERNIE_3] =
@@ -2922,7 +2922,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 }
+        .party = {.NoItemDefaultMoves = sParty_Bernie3 }
     },
 
     [TRAINER_BERNIE_4] =
@@ -2936,7 +2936,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 }
+        .party = {.NoItemDefaultMoves = sParty_Bernie4 }
     },
 
     [TRAINER_BERNIE_5] =
@@ -2950,7 +2950,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 }
+        .party = {.NoItemDefaultMoves = sParty_Bernie5 }
     },
 
     [TRAINER_DREW] =
@@ -2964,7 +2964,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Drew }
+        .party = {.NoItemCustomMoves = sParty_Drew }
     },
 
     [TRAINER_BEAU] =
@@ -2978,7 +2978,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemCustomMoves = gTrainerParty_Beau }
+        .party = {.NoItemCustomMoves = sParty_Beau }
     },
 
     [TRAINER_LARRY] =
@@ -2992,7 +2992,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Larry }
+        .party = {.NoItemDefaultMoves = sParty_Larry }
     },
 
     [TRAINER_SHANE] =
@@ -3006,7 +3006,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shane }
+        .party = {.NoItemDefaultMoves = sParty_Shane }
     },
 
     [TRAINER_JUSTIN] =
@@ -3020,7 +3020,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Justin }
+        .party = {.NoItemDefaultMoves = sParty_Justin }
     },
 
     [TRAINER_ETHAN_1] =
@@ -3034,7 +3034,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 }
+        .party = {.NoItemDefaultMoves = sParty_Ethan1 }
     },
 
     [TRAINER_AUTUMN] =
@@ -3048,7 +3048,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Autumn }
+        .party = {.NoItemDefaultMoves = sParty_Autumn }
     },
 
     [TRAINER_TRAVIS] =
@@ -3062,7 +3062,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Travis }
+        .party = {.NoItemDefaultMoves = sParty_Travis }
     },
 
     [TRAINER_ETHAN_2] =
@@ -3076,7 +3076,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 }
+        .party = {.NoItemDefaultMoves = sParty_Ethan2 }
     },
 
     [TRAINER_ETHAN_3] =
@@ -3090,7 +3090,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 }
+        .party = {.NoItemDefaultMoves = sParty_Ethan3 }
     },
 
     [TRAINER_ETHAN_4] =
@@ -3104,7 +3104,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 }
+        .party = {.NoItemDefaultMoves = sParty_Ethan4 }
     },
 
     [TRAINER_ETHAN_5] =
@@ -3118,7 +3118,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 }
+        .party = {.NoItemDefaultMoves = sParty_Ethan5 }
     },
 
     [TRAINER_BRENT] =
@@ -3132,7 +3132,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brent }
+        .party = {.NoItemDefaultMoves = sParty_Brent }
     },
 
     [TRAINER_DONALD] =
@@ -3146,7 +3146,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Donald }
+        .party = {.NoItemDefaultMoves = sParty_Donald }
     },
 
     [TRAINER_TAYLOR] =
@@ -3160,7 +3160,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Taylor }
+        .party = {.NoItemDefaultMoves = sParty_Taylor }
     },
 
     [TRAINER_JEFFREY_1] =
@@ -3174,7 +3174,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey1 }
+        .party = {.NoItemDefaultMoves = sParty_Jeffrey1 }
     },
 
     [TRAINER_DEREK] =
@@ -3188,7 +3188,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Derek }
+        .party = {.NoItemDefaultMoves = sParty_Derek }
     },
 
     [TRAINER_JEFFREY_2] =
@@ -3202,7 +3202,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey2 }
+        .party = {.NoItemDefaultMoves = sParty_Jeffrey2 }
     },
 
     [TRAINER_JEFFREY_3] =
@@ -3216,7 +3216,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey3 }
+        .party = {.NoItemDefaultMoves = sParty_Jeffrey3 }
     },
 
     [TRAINER_JEFFREY_4] =
@@ -3230,7 +3230,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey4 }
+        .party = {.NoItemDefaultMoves = sParty_Jeffrey4 }
     },
 
     [TRAINER_JEFFREY_5] =
@@ -3244,7 +3244,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 5,
-        .party = {.ItemDefaultMoves = gTrainerParty_Jeffrey5 }
+        .party = {.ItemDefaultMoves = sParty_Jeffrey5 }
     },
 
     [TRAINER_EDWARD] =
@@ -3258,7 +3258,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Edward }
+        .party = {.NoItemCustomMoves = sParty_Edward }
     },
 
     [TRAINER_PRESTON] =
@@ -3272,7 +3272,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Preston }
+        .party = {.NoItemDefaultMoves = sParty_Preston }
     },
 
     [TRAINER_VIRGIL] =
@@ -3286,7 +3286,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Virgil }
+        .party = {.NoItemDefaultMoves = sParty_Virgil }
     },
 
     [TRAINER_BLAKE] =
@@ -3300,7 +3300,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Blake }
+        .party = {.NoItemDefaultMoves = sParty_Blake }
     },
 
     [TRAINER_WILLIAM] =
@@ -3314,7 +3314,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_William }
+        .party = {.NoItemDefaultMoves = sParty_William }
     },
 
     [TRAINER_JOSHUA] =
@@ -3328,7 +3328,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Joshua }
+        .party = {.NoItemDefaultMoves = sParty_Joshua }
     },
 
     [TRAINER_CAMERON_1] =
@@ -3342,7 +3342,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 }
+        .party = {.NoItemDefaultMoves = sParty_Cameron1 }
     },
 
     [TRAINER_CAMERON_2] =
@@ -3356,7 +3356,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 }
+        .party = {.NoItemDefaultMoves = sParty_Cameron2 }
     },
 
     [TRAINER_CAMERON_3] =
@@ -3370,7 +3370,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 }
+        .party = {.NoItemDefaultMoves = sParty_Cameron3 }
     },
 
     [TRAINER_CAMERON_4] =
@@ -3384,7 +3384,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 }
+        .party = {.NoItemDefaultMoves = sParty_Cameron4 }
     },
 
     [TRAINER_CAMERON_5] =
@@ -3398,7 +3398,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 }
+        .party = {.NoItemDefaultMoves = sParty_Cameron5 }
     },
 
     [TRAINER_JACLYN] =
@@ -3412,7 +3412,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn }
+        .party = {.NoItemCustomMoves = sParty_Jaclyn }
     },
 
     [TRAINER_HANNAH] =
@@ -3426,7 +3426,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hannah }
+        .party = {.NoItemDefaultMoves = sParty_Hannah }
     },
 
     [TRAINER_SAMANTHA] =
@@ -3440,7 +3440,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Samantha }
+        .party = {.NoItemDefaultMoves = sParty_Samantha }
     },
 
     [TRAINER_MAURA] =
@@ -3454,7 +3454,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maura }
+        .party = {.NoItemDefaultMoves = sParty_Maura }
     },
 
     [TRAINER_KAYLA] =
@@ -3468,7 +3468,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kayla }
+        .party = {.NoItemDefaultMoves = sParty_Kayla }
     },
 
     [TRAINER_ALEXIS] =
@@ -3482,7 +3482,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alexis }
+        .party = {.NoItemDefaultMoves = sParty_Alexis }
     },
 
     [TRAINER_JACKI_1] =
@@ -3496,7 +3496,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 }
+        .party = {.NoItemDefaultMoves = sParty_Jacki1 }
     },
 
     [TRAINER_JACKI_2] =
@@ -3510,7 +3510,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 }
+        .party = {.NoItemDefaultMoves = sParty_Jacki2 }
     },
 
     [TRAINER_JACKI_3] =
@@ -3524,7 +3524,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 }
+        .party = {.NoItemDefaultMoves = sParty_Jacki3 }
     },
 
     [TRAINER_JACKI_4] =
@@ -3538,7 +3538,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 }
+        .party = {.NoItemDefaultMoves = sParty_Jacki4 }
     },
 
     [TRAINER_JACKI_5] =
@@ -3552,7 +3552,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 }
+        .party = {.NoItemDefaultMoves = sParty_Jacki5 }
     },
 
     [TRAINER_WALTER_1] =
@@ -3566,7 +3566,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 }
+        .party = {.NoItemDefaultMoves = sParty_Walter1 }
     },
 
     [TRAINER_MICAH] =
@@ -3580,7 +3580,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Micah }
+        .party = {.NoItemDefaultMoves = sParty_Micah }
     },
 
     [TRAINER_THOMAS] =
@@ -3594,7 +3594,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Thomas }
+        .party = {.NoItemDefaultMoves = sParty_Thomas }
     },
 
     [TRAINER_WALTER_2] =
@@ -3608,7 +3608,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 }
+        .party = {.NoItemDefaultMoves = sParty_Walter2 }
     },
 
     [TRAINER_WALTER_3] =
@@ -3622,7 +3622,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Walter3 }
+        .party = {.NoItemCustomMoves = sParty_Walter3 }
     },
 
     [TRAINER_WALTER_4] =
@@ -3636,7 +3636,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Walter4 }
+        .party = {.NoItemCustomMoves = sParty_Walter4 }
     },
 
     [TRAINER_WALTER_5] =
@@ -3650,7 +3650,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemCustomMoves = gTrainerParty_Walter5 }
+        .party = {.NoItemCustomMoves = sParty_Walter5 }
     },
 
     [TRAINER_SIDNEY] =
@@ -3664,7 +3664,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Sidney }
+        .party = {.ItemCustomMoves = sParty_Sidney }
     },
 
     [TRAINER_PHOEBE] =
@@ -3678,7 +3678,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Phoebe }
+        .party = {.ItemCustomMoves = sParty_Phoebe }
     },
 
     [TRAINER_GLACIA] =
@@ -3692,7 +3692,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Glacia }
+        .party = {.ItemCustomMoves = sParty_Glacia }
     },
 
     [TRAINER_DRAKE] =
@@ -3706,7 +3706,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Drake }
+        .party = {.ItemCustomMoves = sParty_Drake }
     },
 
     [TRAINER_ROXANNE_1] =
@@ -3720,7 +3720,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.ItemCustomMoves = gTrainerParty_Roxanne1 }
+        .party = {.ItemCustomMoves = sParty_Roxanne1 }
     },
 
     [TRAINER_BRAWLY_1] =
@@ -3734,7 +3734,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.ItemCustomMoves = gTrainerParty_Brawly1 }
+        .party = {.ItemCustomMoves = sParty_Brawly1 }
     },
 
     [TRAINER_WATTSON_1] =
@@ -3748,7 +3748,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Wattson1 }
+        .party = {.ItemCustomMoves = sParty_Wattson1 }
     },
 
     [TRAINER_FLANNERY_1] =
@@ -3762,7 +3762,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Flannery1 }
+        .party = {.ItemCustomMoves = sParty_Flannery1 }
     },
 
     [TRAINER_NORMAN_1] =
@@ -3776,7 +3776,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Norman1 }
+        .party = {.ItemCustomMoves = sParty_Norman1 }
     },
 
     [TRAINER_WINONA_1] =
@@ -3790,7 +3790,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Winona1 }
+        .party = {.ItemCustomMoves = sParty_Winona1 }
     },
 
     [TRAINER_TATE_AND_LIZA_1] =
@@ -3804,7 +3804,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza1 }
+        .party = {.ItemCustomMoves = sParty_TateAndLiza1 }
     },
 
     [TRAINER_JUAN_1] =
@@ -3818,7 +3818,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Juan1 }
+        .party = {.ItemCustomMoves = sParty_Juan1 }
     },
 
     [TRAINER_JERRY_1] =
@@ -3832,7 +3832,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 }
+        .party = {.NoItemDefaultMoves = sParty_Jerry1 }
     },
 
     [TRAINER_TED] =
@@ -3846,7 +3846,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ted }
+        .party = {.NoItemDefaultMoves = sParty_Ted }
     },
 
     [TRAINER_PAUL] =
@@ -3860,7 +3860,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Paul }
+        .party = {.NoItemDefaultMoves = sParty_Paul }
     },
 
     [TRAINER_JERRY_2] =
@@ -3874,7 +3874,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 }
+        .party = {.NoItemDefaultMoves = sParty_Jerry2 }
     },
 
     [TRAINER_JERRY_3] =
@@ -3888,7 +3888,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 }
+        .party = {.NoItemDefaultMoves = sParty_Jerry3 }
     },
 
     [TRAINER_JERRY_4] =
@@ -3902,7 +3902,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 }
+        .party = {.NoItemDefaultMoves = sParty_Jerry4 }
     },
 
     [TRAINER_JERRY_5] =
@@ -3916,7 +3916,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 }
+        .party = {.NoItemDefaultMoves = sParty_Jerry5 }
     },
 
     [TRAINER_KAREN_1] =
@@ -3930,7 +3930,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 }
+        .party = {.NoItemDefaultMoves = sParty_Karen1 }
     },
 
     [TRAINER_GEORGIA] =
@@ -3944,7 +3944,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Georgia }
+        .party = {.NoItemDefaultMoves = sParty_Georgia }
     },
 
     [TRAINER_KAREN_2] =
@@ -3958,7 +3958,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 }
+        .party = {.NoItemDefaultMoves = sParty_Karen2 }
     },
 
     [TRAINER_KAREN_3] =
@@ -3972,7 +3972,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 }
+        .party = {.NoItemDefaultMoves = sParty_Karen3 }
     },
 
     [TRAINER_KAREN_4] =
@@ -3986,7 +3986,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 }
+        .party = {.NoItemDefaultMoves = sParty_Karen4 }
     },
 
     [TRAINER_KAREN_5] =
@@ -4000,7 +4000,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 }
+        .party = {.NoItemDefaultMoves = sParty_Karen5 }
     },
 
     [TRAINER_KATE_AND_JOY] =
@@ -4014,7 +4014,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy }
+        .party = {.NoItemCustomMoves = sParty_KateAndJoy }
     },
 
     [TRAINER_ANNA_AND_MEG_1] =
@@ -4028,7 +4028,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 }
+        .party = {.NoItemCustomMoves = sParty_AnnaAndMeg1 }
     },
 
     [TRAINER_ANNA_AND_MEG_2] =
@@ -4042,7 +4042,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 }
+        .party = {.NoItemCustomMoves = sParty_AnnaAndMeg2 }
     },
 
     [TRAINER_ANNA_AND_MEG_3] =
@@ -4056,7 +4056,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 }
+        .party = {.NoItemCustomMoves = sParty_AnnaAndMeg3 }
     },
 
     [TRAINER_ANNA_AND_MEG_4] =
@@ -4070,7 +4070,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 }
+        .party = {.NoItemCustomMoves = sParty_AnnaAndMeg4 }
     },
 
     [TRAINER_ANNA_AND_MEG_5] =
@@ -4084,7 +4084,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 }
+        .party = {.NoItemCustomMoves = sParty_AnnaAndMeg5 }
     },
 
     [TRAINER_VICTOR] =
@@ -4098,7 +4098,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Victor }
+        .party = {.ItemDefaultMoves = sParty_Victor }
     },
 
     [TRAINER_MIGUEL_1] =
@@ -4112,7 +4112,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 }
+        .party = {.ItemDefaultMoves = sParty_Miguel1 }
     },
 
     [TRAINER_COLTON] =
@@ -4126,7 +4126,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Colton }
+        .party = {.ItemCustomMoves = sParty_Colton }
     },
 
     [TRAINER_MIGUEL_2] =
@@ -4140,7 +4140,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 }
+        .party = {.ItemDefaultMoves = sParty_Miguel2 }
     },
 
     [TRAINER_MIGUEL_3] =
@@ -4154,7 +4154,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 }
+        .party = {.ItemDefaultMoves = sParty_Miguel3 }
     },
 
     [TRAINER_MIGUEL_4] =
@@ -4168,7 +4168,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 }
+        .party = {.ItemDefaultMoves = sParty_Miguel4 }
     },
 
     [TRAINER_MIGUEL_5] =
@@ -4182,7 +4182,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 }
+        .party = {.ItemDefaultMoves = sParty_Miguel5 }
     },
 
     [TRAINER_VICTORIA] =
@@ -4196,7 +4196,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Victoria }
+        .party = {.ItemDefaultMoves = sParty_Victoria }
     },
 
     [TRAINER_VANESSA] =
@@ -4210,7 +4210,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.ItemDefaultMoves = gTrainerParty_Vanessa }
+        .party = {.ItemDefaultMoves = sParty_Vanessa }
     },
 
     [TRAINER_BETHANY] =
@@ -4224,7 +4224,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.ItemDefaultMoves = gTrainerParty_Bethany }
+        .party = {.ItemDefaultMoves = sParty_Bethany }
     },
 
     [TRAINER_ISABEL_1] =
@@ -4238,7 +4238,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 }
+        .party = {.ItemDefaultMoves = sParty_Isabel1 }
     },
 
     [TRAINER_ISABEL_2] =
@@ -4252,7 +4252,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 }
+        .party = {.ItemDefaultMoves = sParty_Isabel2 }
     },
 
     [TRAINER_ISABEL_3] =
@@ -4266,7 +4266,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 }
+        .party = {.ItemDefaultMoves = sParty_Isabel3 }
     },
 
     [TRAINER_ISABEL_4] =
@@ -4280,7 +4280,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 }
+        .party = {.ItemDefaultMoves = sParty_Isabel4 }
     },
 
     [TRAINER_ISABEL_5] =
@@ -4294,7 +4294,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 }
+        .party = {.ItemDefaultMoves = sParty_Isabel5 }
     },
 
     [TRAINER_TIMOTHY_1] =
@@ -4308,7 +4308,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 }
+        .party = {.NoItemDefaultMoves = sParty_Timothy1 }
     },
 
     [TRAINER_TIMOTHY_2] =
@@ -4322,7 +4322,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 }
+        .party = {.NoItemCustomMoves = sParty_Timothy2 }
     },
 
     [TRAINER_TIMOTHY_3] =
@@ -4336,7 +4336,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 }
+        .party = {.NoItemCustomMoves = sParty_Timothy3 }
     },
 
     [TRAINER_TIMOTHY_4] =
@@ -4350,7 +4350,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 }
+        .party = {.NoItemCustomMoves = sParty_Timothy4 }
     },
 
     [TRAINER_TIMOTHY_5] =
@@ -4364,7 +4364,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 }
+        .party = {.NoItemCustomMoves = sParty_Timothy5 }
     },
 
     [TRAINER_VICKY] =
@@ -4378,7 +4378,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Vicky }
+        .party = {.NoItemCustomMoves = sParty_Vicky }
     },
 
     [TRAINER_SHELBY_1] =
@@ -4392,7 +4392,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 }
+        .party = {.NoItemDefaultMoves = sParty_Shelby1 }
     },
 
     [TRAINER_SHELBY_2] =
@@ -4406,7 +4406,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 }
+        .party = {.NoItemDefaultMoves = sParty_Shelby2 }
     },
 
     [TRAINER_SHELBY_3] =
@@ -4420,7 +4420,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 }
+        .party = {.NoItemDefaultMoves = sParty_Shelby3 }
     },
 
     [TRAINER_SHELBY_4] =
@@ -4434,7 +4434,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 }
+        .party = {.NoItemDefaultMoves = sParty_Shelby4 }
     },
 
     [TRAINER_SHELBY_5] =
@@ -4448,7 +4448,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 }
+        .party = {.NoItemDefaultMoves = sParty_Shelby5 }
     },
 
     [TRAINER_CALVIN_1] =
@@ -4462,7 +4462,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 }
+        .party = {.NoItemDefaultMoves = sParty_Calvin1 }
     },
 
     [TRAINER_BILLY] =
@@ -4476,7 +4476,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Billy }
+        .party = {.NoItemDefaultMoves = sParty_Billy }
     },
 
     [TRAINER_JOSH] =
@@ -4490,7 +4490,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Josh }
+        .party = {.NoItemCustomMoves = sParty_Josh }
     },
 
     [TRAINER_TOMMY] =
@@ -4504,7 +4504,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tommy }
+        .party = {.NoItemDefaultMoves = sParty_Tommy }
     },
 
     [TRAINER_JOEY] =
@@ -4518,7 +4518,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Joey }
+        .party = {.NoItemDefaultMoves = sParty_Joey }
     },
 
     [TRAINER_BEN] =
@@ -4532,7 +4532,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Ben }
+        .party = {.NoItemCustomMoves = sParty_Ben }
     },
 
     [TRAINER_QUINCY] =
@@ -4546,7 +4546,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Quincy }
+        .party = {.NoItemCustomMoves = sParty_Quincy }
     },
 
     [TRAINER_KATELYNN] =
@@ -4560,7 +4560,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Katelynn }
+        .party = {.NoItemCustomMoves = sParty_Katelynn }
     },
 
     [TRAINER_JAYLEN] =
@@ -4574,7 +4574,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jaylen }
+        .party = {.NoItemDefaultMoves = sParty_Jaylen }
     },
 
     [TRAINER_DILLON] =
@@ -4588,7 +4588,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dillon }
+        .party = {.NoItemDefaultMoves = sParty_Dillon }
     },
 
     [TRAINER_CALVIN_2] =
@@ -4602,7 +4602,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 }
+        .party = {.NoItemDefaultMoves = sParty_Calvin2 }
     },
 
     [TRAINER_CALVIN_3] =
@@ -4616,7 +4616,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 }
+        .party = {.NoItemDefaultMoves = sParty_Calvin3 }
     },
 
     [TRAINER_CALVIN_4] =
@@ -4630,7 +4630,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 }
+        .party = {.NoItemDefaultMoves = sParty_Calvin4 }
     },
 
     [TRAINER_CALVIN_5] =
@@ -4644,7 +4644,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 }
+        .party = {.NoItemDefaultMoves = sParty_Calvin5 }
     },
 
     [TRAINER_EDDIE] =
@@ -4658,7 +4658,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Eddie }
+        .party = {.NoItemDefaultMoves = sParty_Eddie }
     },
 
     [TRAINER_ALLEN] =
@@ -4672,7 +4672,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Allen }
+        .party = {.NoItemDefaultMoves = sParty_Allen }
     },
 
     [TRAINER_TIMMY] =
@@ -4686,7 +4686,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Timmy }
+        .party = {.NoItemDefaultMoves = sParty_Timmy }
     },
 
     [TRAINER_WALLACE] =
@@ -4700,7 +4700,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Wallace }
+        .party = {.ItemCustomMoves = sParty_Wallace }
     },
 
     [TRAINER_ANDREW] =
@@ -4714,7 +4714,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andrew }
+        .party = {.NoItemDefaultMoves = sParty_Andrew }
     },
 
     [TRAINER_IVAN] =
@@ -4728,7 +4728,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ivan }
+        .party = {.NoItemDefaultMoves = sParty_Ivan }
     },
 
     [TRAINER_CLAUDE] =
@@ -4742,7 +4742,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Claude }
+        .party = {.NoItemDefaultMoves = sParty_Claude }
     },
 
     [TRAINER_ELLIOT_1] =
@@ -4756,7 +4756,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 }
+        .party = {.NoItemDefaultMoves = sParty_Elliot1 }
     },
 
     [TRAINER_NED] =
@@ -4770,7 +4770,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ned }
+        .party = {.NoItemDefaultMoves = sParty_Ned }
     },
 
     [TRAINER_DALE] =
@@ -4784,7 +4784,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dale }
+        .party = {.NoItemDefaultMoves = sParty_Dale }
     },
 
     [TRAINER_NOLAN] =
@@ -4798,7 +4798,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nolan }
+        .party = {.NoItemDefaultMoves = sParty_Nolan }
     },
 
     [TRAINER_BARNY] =
@@ -4812,7 +4812,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Barny }
+        .party = {.NoItemDefaultMoves = sParty_Barny }
     },
 
     [TRAINER_WADE] =
@@ -4826,7 +4826,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wade }
+        .party = {.NoItemDefaultMoves = sParty_Wade }
     },
 
     [TRAINER_CARTER] =
@@ -4840,7 +4840,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Carter }
+        .party = {.NoItemDefaultMoves = sParty_Carter }
     },
 
     [TRAINER_ELLIOT_2] =
@@ -4854,7 +4854,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 }
+        .party = {.NoItemDefaultMoves = sParty_Elliot2 }
     },
 
     [TRAINER_ELLIOT_3] =
@@ -4868,7 +4868,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 }
+        .party = {.NoItemDefaultMoves = sParty_Elliot3 }
     },
 
     [TRAINER_ELLIOT_4] =
@@ -4882,7 +4882,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 }
+        .party = {.NoItemDefaultMoves = sParty_Elliot4 }
     },
 
     [TRAINER_ELLIOT_5] =
@@ -4896,7 +4896,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 }
+        .party = {.NoItemDefaultMoves = sParty_Elliot5 }
     },
 
     [TRAINER_RONALD] =
@@ -4910,7 +4910,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ronald }
+        .party = {.NoItemDefaultMoves = sParty_Ronald }
     },
 
     [TRAINER_JACOB] =
@@ -4924,7 +4924,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jacob }
+        .party = {.NoItemDefaultMoves = sParty_Jacob }
     },
 
     [TRAINER_ANTHONY] =
@@ -4938,7 +4938,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Anthony }
+        .party = {.NoItemDefaultMoves = sParty_Anthony }
     },
 
     [TRAINER_BENJAMIN_1] =
@@ -4952,7 +4952,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 }
+        .party = {.NoItemDefaultMoves = sParty_Benjamin1 }
     },
 
     [TRAINER_BENJAMIN_2] =
@@ -4966,7 +4966,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 }
+        .party = {.NoItemDefaultMoves = sParty_Benjamin2 }
     },
 
     [TRAINER_BENJAMIN_3] =
@@ -4980,7 +4980,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 }
+        .party = {.NoItemDefaultMoves = sParty_Benjamin3 }
     },
 
     [TRAINER_BENJAMIN_4] =
@@ -4994,7 +4994,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 }
+        .party = {.NoItemDefaultMoves = sParty_Benjamin4 }
     },
 
     [TRAINER_BENJAMIN_5] =
@@ -5008,7 +5008,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 }
+        .party = {.NoItemDefaultMoves = sParty_Benjamin5 }
     },
 
     [TRAINER_ABIGAIL_1] =
@@ -5022,7 +5022,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 }
+        .party = {.NoItemDefaultMoves = sParty_Abigail1 }
     },
 
     [TRAINER_JASMINE] =
@@ -5036,7 +5036,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine }
+        .party = {.NoItemDefaultMoves = sParty_Jasmine }
     },
 
     [TRAINER_ABIGAIL_2] =
@@ -5050,7 +5050,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 }
+        .party = {.NoItemDefaultMoves = sParty_Abigail2 }
     },
 
     [TRAINER_ABIGAIL_3] =
@@ -5064,7 +5064,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 }
+        .party = {.NoItemDefaultMoves = sParty_Abigail3 }
     },
 
     [TRAINER_ABIGAIL_4] =
@@ -5078,7 +5078,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 }
+        .party = {.NoItemDefaultMoves = sParty_Abigail4 }
     },
 
     [TRAINER_ABIGAIL_5] =
@@ -5092,7 +5092,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 }
+        .party = {.NoItemDefaultMoves = sParty_Abigail5 }
     },
 
     [TRAINER_DYLAN_1] =
@@ -5106,7 +5106,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 }
+        .party = {.NoItemDefaultMoves = sParty_Dylan1 }
     },
 
     [TRAINER_DYLAN_2] =
@@ -5120,7 +5120,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 }
+        .party = {.NoItemDefaultMoves = sParty_Dylan2 }
     },
 
     [TRAINER_DYLAN_3] =
@@ -5134,7 +5134,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 }
+        .party = {.NoItemDefaultMoves = sParty_Dylan3 }
     },
 
     [TRAINER_DYLAN_4] =
@@ -5148,7 +5148,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 }
+        .party = {.NoItemDefaultMoves = sParty_Dylan4 }
     },
 
     [TRAINER_DYLAN_5] =
@@ -5162,7 +5162,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 }
+        .party = {.NoItemDefaultMoves = sParty_Dylan5 }
     },
 
     [TRAINER_MARIA_1] =
@@ -5176,7 +5176,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 }
+        .party = {.NoItemDefaultMoves = sParty_Maria1 }
     },
 
     [TRAINER_MARIA_2] =
@@ -5190,7 +5190,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 }
+        .party = {.NoItemDefaultMoves = sParty_Maria2 }
     },
 
     [TRAINER_MARIA_3] =
@@ -5204,7 +5204,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 }
+        .party = {.NoItemDefaultMoves = sParty_Maria3 }
     },
 
     [TRAINER_MARIA_4] =
@@ -5218,7 +5218,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 }
+        .party = {.NoItemDefaultMoves = sParty_Maria4 }
     },
 
     [TRAINER_MARIA_5] =
@@ -5232,7 +5232,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 }
+        .party = {.NoItemDefaultMoves = sParty_Maria5 }
     },
 
     [TRAINER_CAMDEN] =
@@ -5246,7 +5246,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Camden }
+        .party = {.NoItemDefaultMoves = sParty_Camden }
     },
 
     [TRAINER_DEMETRIUS] =
@@ -5260,7 +5260,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Demetrius }
+        .party = {.NoItemDefaultMoves = sParty_Demetrius }
     },
 
     [TRAINER_ISAIAH_1] =
@@ -5274,7 +5274,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 }
+        .party = {.NoItemDefaultMoves = sParty_Isaiah1 }
     },
 
     [TRAINER_PABLO_1] =
@@ -5288,7 +5288,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo1 }
+        .party = {.NoItemDefaultMoves = sParty_Pablo1 }
     },
 
     [TRAINER_CHASE] =
@@ -5302,7 +5302,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Chase }
+        .party = {.NoItemDefaultMoves = sParty_Chase }
     },
 
     [TRAINER_ISAIAH_2] =
@@ -5316,7 +5316,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 }
+        .party = {.NoItemDefaultMoves = sParty_Isaiah2 }
     },
 
     [TRAINER_ISAIAH_3] =
@@ -5330,7 +5330,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 }
+        .party = {.NoItemDefaultMoves = sParty_Isaiah3 }
     },
 
     [TRAINER_ISAIAH_4] =
@@ -5344,7 +5344,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 }
+        .party = {.NoItemDefaultMoves = sParty_Isaiah4 }
     },
 
     [TRAINER_ISAIAH_5] =
@@ -5358,7 +5358,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 }
+        .party = {.NoItemDefaultMoves = sParty_Isaiah5 }
     },
 
     [TRAINER_ISOBEL] =
@@ -5372,7 +5372,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isobel }
+        .party = {.NoItemDefaultMoves = sParty_Isobel }
     },
 
     [TRAINER_DONNY] =
@@ -5386,7 +5386,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Donny }
+        .party = {.NoItemDefaultMoves = sParty_Donny }
     },
 
     [TRAINER_TALIA] =
@@ -5400,7 +5400,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Talia }
+        .party = {.NoItemDefaultMoves = sParty_Talia }
     },
 
     [TRAINER_KATELYN_1] =
@@ -5414,7 +5414,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 }
+        .party = {.NoItemDefaultMoves = sParty_Katelyn1 }
     },
 
     [TRAINER_ALLISON] =
@@ -5428,7 +5428,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Allison }
+        .party = {.NoItemDefaultMoves = sParty_Allison }
     },
 
     [TRAINER_KATELYN_2] =
@@ -5442,7 +5442,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 }
+        .party = {.NoItemDefaultMoves = sParty_Katelyn2 }
     },
 
     [TRAINER_KATELYN_3] =
@@ -5456,7 +5456,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 }
+        .party = {.NoItemDefaultMoves = sParty_Katelyn3 }
     },
 
     [TRAINER_KATELYN_4] =
@@ -5470,7 +5470,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 }
+        .party = {.NoItemDefaultMoves = sParty_Katelyn4 }
     },
 
     [TRAINER_KATELYN_5] =
@@ -5484,7 +5484,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 }
+        .party = {.NoItemDefaultMoves = sParty_Katelyn5 }
     },
 
     [TRAINER_NICOLAS_1] =
@@ -5498,7 +5498,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 }
+        .party = {.NoItemDefaultMoves = sParty_Nicolas1 }
     },
 
     [TRAINER_NICOLAS_2] =
@@ -5512,7 +5512,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 }
+        .party = {.NoItemDefaultMoves = sParty_Nicolas2 }
     },
 
     [TRAINER_NICOLAS_3] =
@@ -5526,7 +5526,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 }
+        .party = {.NoItemDefaultMoves = sParty_Nicolas3 }
     },
 
     [TRAINER_NICOLAS_4] =
@@ -5540,7 +5540,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 }
+        .party = {.NoItemDefaultMoves = sParty_Nicolas4 }
     },
 
     [TRAINER_NICOLAS_5] =
@@ -5554,7 +5554,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 }
+        .party = {.ItemDefaultMoves = sParty_Nicolas5 }
     },
 
     [TRAINER_AARON] =
@@ -5568,7 +5568,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Aaron }
+        .party = {.NoItemCustomMoves = sParty_Aaron }
     },
 
     [TRAINER_PERRY] =
@@ -5582,7 +5582,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Perry }
+        .party = {.NoItemDefaultMoves = sParty_Perry }
     },
 
     [TRAINER_HUGH] =
@@ -5596,7 +5596,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hugh }
+        .party = {.NoItemDefaultMoves = sParty_Hugh }
     },
 
     [TRAINER_PHIL] =
@@ -5610,7 +5610,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Phil }
+        .party = {.NoItemDefaultMoves = sParty_Phil }
     },
 
     [TRAINER_JARED] =
@@ -5624,7 +5624,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jared }
+        .party = {.NoItemDefaultMoves = sParty_Jared }
     },
 
     [TRAINER_HUMBERTO] =
@@ -5638,7 +5638,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Humberto }
+        .party = {.NoItemDefaultMoves = sParty_Humberto }
     },
 
     [TRAINER_PRESLEY] =
@@ -5652,7 +5652,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Presley }
+        .party = {.NoItemDefaultMoves = sParty_Presley }
     },
 
     [TRAINER_EDWARDO] =
@@ -5666,7 +5666,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edwardo }
+        .party = {.NoItemDefaultMoves = sParty_Edwardo }
     },
 
     [TRAINER_COLIN] =
@@ -5680,7 +5680,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Colin }
+        .party = {.NoItemDefaultMoves = sParty_Colin }
     },
 
     [TRAINER_ROBERT_1] =
@@ -5694,7 +5694,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 }
+        .party = {.NoItemDefaultMoves = sParty_Robert1 }
     },
 
     [TRAINER_BENNY] =
@@ -5708,7 +5708,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Benny }
+        .party = {.NoItemDefaultMoves = sParty_Benny }
     },
 
     [TRAINER_CHESTER] =
@@ -5722,7 +5722,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Chester }
+        .party = {.NoItemDefaultMoves = sParty_Chester }
     },
 
     [TRAINER_ROBERT_2] =
@@ -5736,7 +5736,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 }
+        .party = {.NoItemDefaultMoves = sParty_Robert2 }
     },
 
     [TRAINER_ROBERT_3] =
@@ -5750,7 +5750,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 }
+        .party = {.NoItemDefaultMoves = sParty_Robert3 }
     },
 
     [TRAINER_ROBERT_4] =
@@ -5764,7 +5764,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 }
+        .party = {.NoItemDefaultMoves = sParty_Robert4 }
     },
 
     [TRAINER_ROBERT_5] =
@@ -5778,7 +5778,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 }
+        .party = {.NoItemDefaultMoves = sParty_Robert5 }
     },
 
     [TRAINER_ALEX] =
@@ -5792,7 +5792,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alex }
+        .party = {.NoItemDefaultMoves = sParty_Alex }
     },
 
     [TRAINER_BECK] =
@@ -5806,7 +5806,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Beck }
+        .party = {.NoItemDefaultMoves = sParty_Beck }
     },
 
     [TRAINER_YASU] =
@@ -5820,7 +5820,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Yasu }
+        .party = {.NoItemDefaultMoves = sParty_Yasu }
     },
 
     [TRAINER_TAKASHI] =
@@ -5834,7 +5834,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Takashi }
+        .party = {.NoItemDefaultMoves = sParty_Takashi }
     },
 
     [TRAINER_DIANNE] =
@@ -5848,7 +5848,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 2,
-        .party = {.ItemCustomMoves = gTrainerParty_Dianne }
+        .party = {.ItemCustomMoves = sParty_Dianne }
     },
 
     [TRAINER_JANI] =
@@ -5862,7 +5862,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jani }
+        .party = {.NoItemDefaultMoves = sParty_Jani }
     },
 
     [TRAINER_LAO_1] =
@@ -5876,7 +5876,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 3,
-        .party = {.NoItemCustomMoves = gTrainerParty_Lao1 }
+        .party = {.NoItemCustomMoves = sParty_Lao1 }
     },
 
     [TRAINER_LUNG] =
@@ -5890,7 +5890,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lung }
+        .party = {.NoItemDefaultMoves = sParty_Lung }
     },
 
     [TRAINER_LAO_2] =
@@ -5904,7 +5904,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 4,
-        .party = {.NoItemCustomMoves = gTrainerParty_Lao2 }
+        .party = {.NoItemCustomMoves = sParty_Lao2 }
     },
 
     [TRAINER_LAO_3] =
@@ -5918,7 +5918,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 4,
-        .party = {.NoItemCustomMoves = gTrainerParty_Lao3 }
+        .party = {.NoItemCustomMoves = sParty_Lao3 }
     },
 
     [TRAINER_LAO_4] =
@@ -5932,7 +5932,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 4,
-        .party = {.NoItemCustomMoves = gTrainerParty_Lao4 }
+        .party = {.NoItemCustomMoves = sParty_Lao4 }
     },
 
     [TRAINER_LAO_5] =
@@ -5946,7 +5946,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Lao5 }
+        .party = {.ItemCustomMoves = sParty_Lao5 }
     },
 
     [TRAINER_JOCELYN] =
@@ -5960,7 +5960,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jocelyn }
+        .party = {.NoItemDefaultMoves = sParty_Jocelyn }
     },
 
     [TRAINER_LAURA] =
@@ -5974,7 +5974,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Laura }
+        .party = {.NoItemDefaultMoves = sParty_Laura }
     },
 
     [TRAINER_CYNDY_1] =
@@ -5988,7 +5988,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 }
+        .party = {.NoItemDefaultMoves = sParty_Cyndy1 }
     },
 
     [TRAINER_CORA] =
@@ -6002,7 +6002,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cora }
+        .party = {.NoItemDefaultMoves = sParty_Cora }
     },
 
     [TRAINER_PAULA] =
@@ -6016,7 +6016,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Paula }
+        .party = {.NoItemDefaultMoves = sParty_Paula }
     },
 
     [TRAINER_CYNDY_2] =
@@ -6030,7 +6030,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 }
+        .party = {.NoItemDefaultMoves = sParty_Cyndy2 }
     },
 
     [TRAINER_CYNDY_3] =
@@ -6044,7 +6044,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 }
+        .party = {.NoItemDefaultMoves = sParty_Cyndy3 }
     },
 
     [TRAINER_CYNDY_4] =
@@ -6058,7 +6058,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 }
+        .party = {.NoItemDefaultMoves = sParty_Cyndy4 }
     },
 
     [TRAINER_CYNDY_5] =
@@ -6072,7 +6072,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 }
+        .party = {.NoItemDefaultMoves = sParty_Cyndy5 }
     },
 
     [TRAINER_MADELINE_1] =
@@ -6086,7 +6086,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 }
+        .party = {.NoItemCustomMoves = sParty_Madeline1 }
     },
 
     [TRAINER_CLARISSA] =
@@ -6100,7 +6100,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa }
+        .party = {.NoItemDefaultMoves = sParty_Clarissa }
     },
 
     [TRAINER_ANGELICA] =
@@ -6114,7 +6114,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Angelica }
+        .party = {.NoItemCustomMoves = sParty_Angelica }
     },
 
     [TRAINER_MADELINE_2] =
@@ -6128,7 +6128,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 }
+        .party = {.NoItemCustomMoves = sParty_Madeline2 }
     },
 
     [TRAINER_MADELINE_3] =
@@ -6142,7 +6142,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 }
+        .party = {.NoItemCustomMoves = sParty_Madeline3 }
     },
 
     [TRAINER_MADELINE_4] =
@@ -6156,7 +6156,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 }
+        .party = {.NoItemCustomMoves = sParty_Madeline4 }
     },
 
     [TRAINER_MADELINE_5] =
@@ -6170,7 +6170,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 }
+        .party = {.NoItemCustomMoves = sParty_Madeline5 }
     },
 
     [TRAINER_BEVERLY] =
@@ -6184,7 +6184,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Beverly }
+        .party = {.NoItemDefaultMoves = sParty_Beverly }
     },
 
     [TRAINER_IMANI] =
@@ -6198,7 +6198,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Imani }
+        .party = {.NoItemDefaultMoves = sParty_Imani }
     },
 
     [TRAINER_KYLA] =
@@ -6212,7 +6212,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kyla }
+        .party = {.NoItemDefaultMoves = sParty_Kyla }
     },
 
     [TRAINER_DENISE] =
@@ -6226,7 +6226,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Denise }
+        .party = {.NoItemDefaultMoves = sParty_Denise }
     },
 
     [TRAINER_BETH] =
@@ -6240,7 +6240,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Beth }
+        .party = {.NoItemDefaultMoves = sParty_Beth }
     },
 
     [TRAINER_TARA] =
@@ -6254,7 +6254,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tara }
+        .party = {.NoItemDefaultMoves = sParty_Tara }
     },
 
     [TRAINER_MISSY] =
@@ -6268,7 +6268,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Missy }
+        .party = {.NoItemDefaultMoves = sParty_Missy }
     },
 
     [TRAINER_ALICE] =
@@ -6282,7 +6282,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alice }
+        .party = {.NoItemDefaultMoves = sParty_Alice }
     },
 
     [TRAINER_JENNY_1] =
@@ -6296,7 +6296,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 }
+        .party = {.NoItemDefaultMoves = sParty_Jenny1 }
     },
 
     [TRAINER_GRACE] =
@@ -6310,7 +6310,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grace }
+        .party = {.NoItemDefaultMoves = sParty_Grace }
     },
 
     [TRAINER_TANYA] =
@@ -6324,7 +6324,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tanya }
+        .party = {.NoItemDefaultMoves = sParty_Tanya }
     },
 
     [TRAINER_SHARON] =
@@ -6338,7 +6338,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sharon }
+        .party = {.NoItemDefaultMoves = sParty_Sharon }
     },
 
     [TRAINER_NIKKI] =
@@ -6352,7 +6352,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nikki }
+        .party = {.NoItemDefaultMoves = sParty_Nikki }
     },
 
     [TRAINER_BRENDA] =
@@ -6366,7 +6366,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brenda }
+        .party = {.NoItemDefaultMoves = sParty_Brenda }
     },
 
     [TRAINER_KATIE] =
@@ -6380,7 +6380,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Katie }
+        .party = {.NoItemDefaultMoves = sParty_Katie }
     },
 
     [TRAINER_SUSIE] =
@@ -6394,7 +6394,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Susie }
+        .party = {.NoItemDefaultMoves = sParty_Susie }
     },
 
     [TRAINER_KARA] =
@@ -6408,7 +6408,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kara }
+        .party = {.NoItemDefaultMoves = sParty_Kara }
     },
 
     [TRAINER_DANA] =
@@ -6422,7 +6422,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dana }
+        .party = {.NoItemDefaultMoves = sParty_Dana }
     },
 
     [TRAINER_SIENNA] =
@@ -6436,7 +6436,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sienna }
+        .party = {.NoItemDefaultMoves = sParty_Sienna }
     },
 
     [TRAINER_DEBRA] =
@@ -6450,7 +6450,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Debra }
+        .party = {.NoItemDefaultMoves = sParty_Debra }
     },
 
     [TRAINER_LINDA] =
@@ -6464,7 +6464,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Linda }
+        .party = {.NoItemDefaultMoves = sParty_Linda }
     },
 
     [TRAINER_KAYLEE] =
@@ -6478,7 +6478,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee }
+        .party = {.NoItemDefaultMoves = sParty_Kaylee }
     },
 
     [TRAINER_LAUREL] =
@@ -6492,7 +6492,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Laurel }
+        .party = {.NoItemDefaultMoves = sParty_Laurel }
     },
 
     [TRAINER_CARLEE] =
@@ -6506,7 +6506,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Carlee }
+        .party = {.NoItemDefaultMoves = sParty_Carlee }
     },
 
     [TRAINER_JENNY_2] =
@@ -6520,7 +6520,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 }
+        .party = {.NoItemDefaultMoves = sParty_Jenny2 }
     },
 
     [TRAINER_JENNY_3] =
@@ -6534,7 +6534,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 }
+        .party = {.NoItemDefaultMoves = sParty_Jenny3 }
     },
 
     [TRAINER_JENNY_4] =
@@ -6548,7 +6548,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 }
+        .party = {.NoItemDefaultMoves = sParty_Jenny4 }
     },
 
     [TRAINER_JENNY_5] =
@@ -6562,7 +6562,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 }
+        .party = {.NoItemDefaultMoves = sParty_Jenny5 }
     },
 
     [TRAINER_HEIDI] =
@@ -6576,7 +6576,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Heidi }
+        .party = {.NoItemCustomMoves = sParty_Heidi }
     },
 
     [TRAINER_BECKY] =
@@ -6590,7 +6590,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Becky }
+        .party = {.NoItemCustomMoves = sParty_Becky }
     },
 
     [TRAINER_CAROL] =
@@ -6604,7 +6604,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Carol }
+        .party = {.NoItemDefaultMoves = sParty_Carol }
     },
 
     [TRAINER_NANCY] =
@@ -6618,7 +6618,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nancy }
+        .party = {.NoItemDefaultMoves = sParty_Nancy }
     },
 
     [TRAINER_MARTHA] =
@@ -6632,7 +6632,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Martha }
+        .party = {.NoItemDefaultMoves = sParty_Martha }
     },
 
     [TRAINER_DIANA_1] =
@@ -6646,7 +6646,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 }
+        .party = {.NoItemDefaultMoves = sParty_Diana1 }
     },
 
     [TRAINER_CEDRIC] =
@@ -6660,7 +6660,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Cedric }
+        .party = {.NoItemCustomMoves = sParty_Cedric }
     },
 
     [TRAINER_IRENE] =
@@ -6674,7 +6674,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Irene }
+        .party = {.NoItemDefaultMoves = sParty_Irene }
     },
 
     [TRAINER_DIANA_2] =
@@ -6688,7 +6688,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 }
+        .party = {.NoItemDefaultMoves = sParty_Diana2 }
     },
 
     [TRAINER_DIANA_3] =
@@ -6702,7 +6702,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 }
+        .party = {.NoItemDefaultMoves = sParty_Diana3 }
     },
 
     [TRAINER_DIANA_4] =
@@ -6716,7 +6716,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 }
+        .party = {.NoItemDefaultMoves = sParty_Diana4 }
     },
 
     [TRAINER_DIANA_5] =
@@ -6730,7 +6730,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 }
+        .party = {.NoItemDefaultMoves = sParty_Diana5 }
     },
 
     [TRAINER_AMY_AND_LIV_1] =
@@ -6744,7 +6744,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 }
+        .party = {.NoItemDefaultMoves = sParty_AmyAndLiv1 }
     },
 
     [TRAINER_AMY_AND_LIV_2] =
@@ -6758,7 +6758,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 }
+        .party = {.NoItemDefaultMoves = sParty_AmyAndLiv2 }
     },
 
     [TRAINER_GINA_AND_MIA_1] =
@@ -6772,7 +6772,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 }
+        .party = {.NoItemDefaultMoves = sParty_GinaAndMia1 }
     },
 
     [TRAINER_MIU_AND_YUKI] =
@@ -6786,7 +6786,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki }
+        .party = {.NoItemDefaultMoves = sParty_MiuAndYuki }
     },
 
     [TRAINER_AMY_AND_LIV_3] =
@@ -6800,7 +6800,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 }
+        .party = {.NoItemDefaultMoves = sParty_AmyAndLiv3 }
     },
 
     [TRAINER_GINA_AND_MIA_2] =
@@ -6814,7 +6814,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 }
+        .party = {.NoItemCustomMoves = sParty_GinaAndMia2 }
     },
 
     [TRAINER_AMY_AND_LIV_4] =
@@ -6828,7 +6828,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 }
+        .party = {.NoItemDefaultMoves = sParty_AmyAndLiv4 }
     },
 
     [TRAINER_AMY_AND_LIV_5] =
@@ -6842,7 +6842,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 }
+        .party = {.NoItemCustomMoves = sParty_AmyAndLiv5 }
     },
 
     [TRAINER_AMY_AND_LIV_6] =
@@ -6856,7 +6856,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 }
+        .party = {.NoItemCustomMoves = sParty_AmyAndLiv6 }
     },
 
     [TRAINER_HUEY] =
@@ -6870,7 +6870,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Huey }
+        .party = {.NoItemDefaultMoves = sParty_Huey }
     },
 
     [TRAINER_EDMOND] =
@@ -6884,7 +6884,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edmond }
+        .party = {.NoItemDefaultMoves = sParty_Edmond }
     },
 
     [TRAINER_ERNEST_1] =
@@ -6898,7 +6898,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 }
+        .party = {.NoItemDefaultMoves = sParty_Ernest1 }
     },
 
     [TRAINER_DWAYNE] =
@@ -6912,7 +6912,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne }
+        .party = {.NoItemDefaultMoves = sParty_Dwayne }
     },
 
     [TRAINER_PHILLIP] =
@@ -6926,7 +6926,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Phillip }
+        .party = {.NoItemDefaultMoves = sParty_Phillip }
     },
 
     [TRAINER_LEONARD] =
@@ -6940,7 +6940,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Leonard }
+        .party = {.NoItemDefaultMoves = sParty_Leonard }
     },
 
     [TRAINER_DUNCAN] =
@@ -6954,7 +6954,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Duncan }
+        .party = {.NoItemDefaultMoves = sParty_Duncan }
     },
 
     [TRAINER_ERNEST_2] =
@@ -6968,7 +6968,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 }
+        .party = {.NoItemDefaultMoves = sParty_Ernest2 }
     },
 
     [TRAINER_ERNEST_3] =
@@ -6982,7 +6982,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 }
+        .party = {.NoItemDefaultMoves = sParty_Ernest3 }
     },
 
     [TRAINER_ERNEST_4] =
@@ -6996,7 +6996,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 }
+        .party = {.NoItemDefaultMoves = sParty_Ernest4 }
     },
 
     [TRAINER_ERNEST_5] =
@@ -7010,7 +7010,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 }
+        .party = {.NoItemDefaultMoves = sParty_Ernest5 }
     },
 
     [TRAINER_ELI] =
@@ -7024,7 +7024,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Eli }
+        .party = {.NoItemDefaultMoves = sParty_Eli }
     },
 
     [TRAINER_ANNIKA] =
@@ -7038,7 +7038,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemCustomMoves = gTrainerParty_Annika }
+        .party = {.ItemCustomMoves = sParty_Annika }
     },
 
     [TRAINER_JAZMYN] =
@@ -7052,7 +7052,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jazmyn }
+        .party = {.NoItemDefaultMoves = sParty_Jazmyn }
     },
 
     [TRAINER_JONAS] =
@@ -7066,7 +7066,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Jonas }
+        .party = {.NoItemCustomMoves = sParty_Jonas }
     },
 
     [TRAINER_KAYLEY] =
@@ -7080,7 +7080,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Kayley }
+        .party = {.NoItemCustomMoves = sParty_Kayley }
     },
 
     [TRAINER_AURON] =
@@ -7094,7 +7094,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Auron }
+        .party = {.NoItemDefaultMoves = sParty_Auron }
     },
 
     [TRAINER_KELVIN] =
@@ -7108,7 +7108,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin }
+        .party = {.NoItemDefaultMoves = sParty_Kelvin }
     },
 
     [TRAINER_MARLEY] =
@@ -7122,7 +7122,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.ItemCustomMoves = gTrainerParty_Marley }
+        .party = {.ItemCustomMoves = sParty_Marley }
     },
 
     [TRAINER_REYNA] =
@@ -7136,7 +7136,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Reyna }
+        .party = {.NoItemDefaultMoves = sParty_Reyna }
     },
 
     [TRAINER_HUDSON] =
@@ -7150,7 +7150,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hudson }
+        .party = {.NoItemDefaultMoves = sParty_Hudson }
     },
 
     [TRAINER_CONOR] =
@@ -7164,7 +7164,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Conor }
+        .party = {.NoItemDefaultMoves = sParty_Conor }
     },
 
     [TRAINER_EDWIN_1] =
@@ -7178,7 +7178,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 }
+        .party = {.NoItemDefaultMoves = sParty_Edwin1 }
     },
 
     [TRAINER_HECTOR] =
@@ -7192,7 +7192,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hector }
+        .party = {.NoItemDefaultMoves = sParty_Hector }
     },
 
     [TRAINER_TABITHA_1] =
@@ -7206,7 +7206,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 }
+        .party = {.NoItemDefaultMoves = sParty_Tabitha1 }
     },
 
     [TRAINER_EDWIN_2] =
@@ -7220,7 +7220,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 }
+        .party = {.NoItemDefaultMoves = sParty_Edwin2 }
     },
 
     [TRAINER_EDWIN_3] =
@@ -7234,7 +7234,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 }
+        .party = {.NoItemDefaultMoves = sParty_Edwin3 }
     },
 
     [TRAINER_EDWIN_4] =
@@ -7248,7 +7248,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 }
+        .party = {.NoItemDefaultMoves = sParty_Edwin4 }
     },
 
     [TRAINER_EDWIN_5] =
@@ -7262,7 +7262,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 }
+        .party = {.NoItemDefaultMoves = sParty_Edwin5 }
     },
 
     [TRAINER_WALLY_1] =
@@ -7276,7 +7276,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.NoItemCustomMoves = gTrainerParty_Wally1 }
+        .party = {.NoItemCustomMoves = sParty_Wally1 }
     },
 
     [TRAINER_BRENDAN_1] =
@@ -7290,7 +7290,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan1 }
     },
 
     [TRAINER_BRENDAN_2] =
@@ -7304,7 +7304,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan2 }
     },
 
     [TRAINER_BRENDAN_3] =
@@ -7318,7 +7318,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan3 }
     },
 
     [TRAINER_BRENDAN_4] =
@@ -7332,7 +7332,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan4 }
     },
 
     [TRAINER_BRENDAN_5] =
@@ -7346,7 +7346,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan5 }
     },
 
     [TRAINER_BRENDAN_6] =
@@ -7360,7 +7360,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan6 }
     },
 
     [TRAINER_BRENDAN_7] =
@@ -7374,7 +7374,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan7 }
     },
 
     [TRAINER_BRENDAN_8] =
@@ -7388,7 +7388,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan8 }
     },
 
     [TRAINER_BRENDAN_9] =
@@ -7402,7 +7402,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan9 }
     },
 
     [TRAINER_MAY_1] =
@@ -7416,7 +7416,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May1 }
+        .party = {.NoItemDefaultMoves = sParty_May1 }
     },
 
     [TRAINER_MAY_2] =
@@ -7430,7 +7430,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May2 }
+        .party = {.NoItemDefaultMoves = sParty_May2 }
     },
 
     [TRAINER_MAY_3] =
@@ -7444,7 +7444,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May3 }
+        .party = {.NoItemDefaultMoves = sParty_May3 }
     },
 
     [TRAINER_MAY_4] =
@@ -7458,7 +7458,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May4 }
+        .party = {.NoItemDefaultMoves = sParty_May4 }
     },
 
     [TRAINER_MAY_5] =
@@ -7472,7 +7472,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May5 }
+        .party = {.NoItemDefaultMoves = sParty_May5 }
     },
 
     [TRAINER_MAY_6] =
@@ -7486,7 +7486,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May6 }
+        .party = {.NoItemDefaultMoves = sParty_May6 }
     },
 
     [TRAINER_MAY_7] =
@@ -7500,7 +7500,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May7 }
+        .party = {.NoItemDefaultMoves = sParty_May7 }
     },
 
     [TRAINER_MAY_8] =
@@ -7514,7 +7514,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May8 }
+        .party = {.NoItemDefaultMoves = sParty_May8 }
     },
 
     [TRAINER_MAY_9] =
@@ -7528,7 +7528,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May9 }
+        .party = {.NoItemDefaultMoves = sParty_May9 }
     },
 
     [TRAINER_ISAAC_1] =
@@ -7542,7 +7542,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 }
+        .party = {.NoItemDefaultMoves = sParty_Isaac1 }
     },
 
     [TRAINER_DAVIS] =
@@ -7556,7 +7556,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Davis }
+        .party = {.NoItemDefaultMoves = sParty_Davis }
     },
 
     [TRAINER_MITCHELL] =
@@ -7570,7 +7570,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Mitchell }
+        .party = {.NoItemCustomMoves = sParty_Mitchell }
     },
 
     [TRAINER_ISAAC_2] =
@@ -7584,7 +7584,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 }
+        .party = {.NoItemDefaultMoves = sParty_Isaac2 }
     },
 
     [TRAINER_ISAAC_3] =
@@ -7598,7 +7598,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 }
+        .party = {.NoItemDefaultMoves = sParty_Isaac3 }
     },
 
     [TRAINER_ISAAC_4] =
@@ -7612,7 +7612,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 }
+        .party = {.NoItemDefaultMoves = sParty_Isaac4 }
     },
 
     [TRAINER_ISAAC_5] =
@@ -7626,7 +7626,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 }
+        .party = {.NoItemDefaultMoves = sParty_Isaac5 }
     },
 
     [TRAINER_LYDIA_1] =
@@ -7640,7 +7640,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 }
+        .party = {.NoItemDefaultMoves = sParty_Lydia1 }
     },
 
     [TRAINER_HALLE] =
@@ -7654,7 +7654,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Halle }
+        .party = {.NoItemDefaultMoves = sParty_Halle }
     },
 
     [TRAINER_GARRISON] =
@@ -7668,7 +7668,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Garrison }
+        .party = {.NoItemDefaultMoves = sParty_Garrison }
     },
 
     [TRAINER_LYDIA_2] =
@@ -7682,7 +7682,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 }
+        .party = {.NoItemDefaultMoves = sParty_Lydia2 }
     },
 
     [TRAINER_LYDIA_3] =
@@ -7696,7 +7696,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 }
+        .party = {.NoItemDefaultMoves = sParty_Lydia3 }
     },
 
     [TRAINER_LYDIA_4] =
@@ -7710,7 +7710,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 }
+        .party = {.NoItemDefaultMoves = sParty_Lydia4 }
     },
 
     [TRAINER_LYDIA_5] =
@@ -7724,7 +7724,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 }
+        .party = {.NoItemDefaultMoves = sParty_Lydia5 }
     },
 
     [TRAINER_JACKSON_1] =
@@ -7738,7 +7738,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 }
+        .party = {.NoItemDefaultMoves = sParty_Jackson1 }
     },
 
     [TRAINER_LORENZO] =
@@ -7752,7 +7752,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lorenzo }
+        .party = {.NoItemDefaultMoves = sParty_Lorenzo }
     },
 
     [TRAINER_SEBASTIAN] =
@@ -7766,7 +7766,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian }
+        .party = {.NoItemDefaultMoves = sParty_Sebastian }
     },
 
     [TRAINER_JACKSON_2] =
@@ -7780,7 +7780,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 }
+        .party = {.NoItemDefaultMoves = sParty_Jackson2 }
     },
 
     [TRAINER_JACKSON_3] =
@@ -7794,7 +7794,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 }
+        .party = {.NoItemDefaultMoves = sParty_Jackson3 }
     },
 
     [TRAINER_JACKSON_4] =
@@ -7808,7 +7808,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 }
+        .party = {.NoItemDefaultMoves = sParty_Jackson4 }
     },
 
     [TRAINER_JACKSON_5] =
@@ -7822,7 +7822,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 }
+        .party = {.NoItemDefaultMoves = sParty_Jackson5 }
     },
 
     [TRAINER_CATHERINE_1] =
@@ -7836,7 +7836,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 }
+        .party = {.NoItemDefaultMoves = sParty_Catherine1 }
     },
 
     [TRAINER_JENNA] =
@@ -7850,7 +7850,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jenna }
+        .party = {.NoItemDefaultMoves = sParty_Jenna }
     },
 
     [TRAINER_SOPHIA] =
@@ -7864,7 +7864,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sophia }
+        .party = {.NoItemDefaultMoves = sParty_Sophia }
     },
 
     [TRAINER_CATHERINE_2] =
@@ -7878,7 +7878,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 }
+        .party = {.NoItemDefaultMoves = sParty_Catherine2 }
     },
 
     [TRAINER_CATHERINE_3] =
@@ -7892,7 +7892,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 }
+        .party = {.NoItemDefaultMoves = sParty_Catherine3 }
     },
 
     [TRAINER_CATHERINE_4] =
@@ -7906,7 +7906,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 }
+        .party = {.NoItemDefaultMoves = sParty_Catherine4 }
     },
 
     [TRAINER_CATHERINE_5] =
@@ -7920,7 +7920,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 }
+        .party = {.NoItemDefaultMoves = sParty_Catherine5 }
     },
 
     [TRAINER_JULIO] =
@@ -7934,7 +7934,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Julio }
+        .party = {.NoItemDefaultMoves = sParty_Julio }
     },
 
     [TRAINER_GRUNT_27] =
@@ -7948,7 +7948,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt27 }
     },
 
     [TRAINER_GRUNT_28] =
@@ -7962,7 +7962,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt28 }
     },
 
     [TRAINER_GRUNT_29] =
@@ -7976,7 +7976,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt29 }
     },
 
     [TRAINER_GRUNT_30] =
@@ -7990,7 +7990,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt30 }
     },
 
     [TRAINER_MARC] =
@@ -8004,7 +8004,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Marc }
+        .party = {.NoItemDefaultMoves = sParty_Marc }
     },
 
     [TRAINER_BRENDEN] =
@@ -8018,7 +8018,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brenden }
+        .party = {.NoItemDefaultMoves = sParty_Brenden }
     },
 
     [TRAINER_LILITH] =
@@ -8032,7 +8032,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lilith }
+        .party = {.NoItemDefaultMoves = sParty_Lilith }
     },
 
     [TRAINER_CRISTIAN] =
@@ -8046,7 +8046,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cristian }
+        .party = {.NoItemDefaultMoves = sParty_Cristian }
     },
 
     [TRAINER_SYLVIA] =
@@ -8060,7 +8060,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sylvia }
+        .party = {.NoItemDefaultMoves = sParty_Sylvia }
     },
 
     [TRAINER_LEONARDO] =
@@ -8074,7 +8074,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Leonardo }
+        .party = {.NoItemDefaultMoves = sParty_Leonardo }
     },
 
     [TRAINER_ATHENA] =
@@ -8088,7 +8088,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.ItemCustomMoves = gTrainerParty_Athena }
+        .party = {.ItemCustomMoves = sParty_Athena }
     },
 
     [TRAINER_HARRISON] =
@@ -8102,7 +8102,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Harrison }
+        .party = {.NoItemDefaultMoves = sParty_Harrison }
     },
 
     [TRAINER_GRUNT_31] =
@@ -8116,7 +8116,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt31 }
     },
 
     [TRAINER_CLARENCE] =
@@ -8130,7 +8130,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Clarence }
+        .party = {.NoItemDefaultMoves = sParty_Clarence }
     },
 
     [TRAINER_TERRY] =
@@ -8144,7 +8144,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Terry }
+        .party = {.NoItemDefaultMoves = sParty_Terry }
     },
 
     [TRAINER_NATE] =
@@ -8158,7 +8158,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nate }
+        .party = {.NoItemDefaultMoves = sParty_Nate }
     },
 
     [TRAINER_KATHLEEN] =
@@ -8172,7 +8172,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kathleen }
+        .party = {.NoItemDefaultMoves = sParty_Kathleen }
     },
 
     [TRAINER_CLIFFORD] =
@@ -8186,7 +8186,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Clifford }
+        .party = {.NoItemDefaultMoves = sParty_Clifford }
     },
 
     [TRAINER_NICHOLAS] =
@@ -8200,7 +8200,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Nicholas }
+        .party = {.NoItemDefaultMoves = sParty_Nicholas }
     },
 
     [TRAINER_GRUNT_32] =
@@ -8214,7 +8214,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt32 }
     },
 
     [TRAINER_GRUNT_33] =
@@ -8228,7 +8228,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt33 }
     },
 
     [TRAINER_GRUNT_34] =
@@ -8242,7 +8242,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt34 }
     },
 
     [TRAINER_GRUNT_35] =
@@ -8256,7 +8256,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt35 }
     },
 
     [TRAINER_GRUNT_36] =
@@ -8270,7 +8270,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt36 }
     },
 
     [TRAINER_MACEY] =
@@ -8284,7 +8284,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Macey }
+        .party = {.NoItemDefaultMoves = sParty_Macey }
     },
 
     [TRAINER_BRENDAN_10] =
@@ -8298,7 +8298,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan10 }
     },
 
     [TRAINER_BRENDAN_11] =
@@ -8312,7 +8312,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan11 }
     },
 
     [TRAINER_PAXTON] =
@@ -8326,7 +8326,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Paxton }
+        .party = {.NoItemDefaultMoves = sParty_Paxton }
     },
 
     [TRAINER_ISABELLA] =
@@ -8340,7 +8340,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isabella }
+        .party = {.NoItemDefaultMoves = sParty_Isabella }
     },
 
     [TRAINER_GRUNT_37] =
@@ -8354,7 +8354,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt37 }
     },
 
     [TRAINER_TABITHA_2] =
@@ -8368,7 +8368,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 }
+        .party = {.NoItemDefaultMoves = sParty_Tabitha2 }
     },
 
     [TRAINER_JONATHAN] =
@@ -8382,7 +8382,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jonathan }
+        .party = {.NoItemDefaultMoves = sParty_Jonathan }
     },
 
     [TRAINER_BRENDAN_12] =
@@ -8396,7 +8396,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan12 }
     },
 
     [TRAINER_MAY_10] =
@@ -8410,7 +8410,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May10 }
+        .party = {.NoItemDefaultMoves = sParty_May10 }
     },
 
     [TRAINER_MAXIE_1] =
@@ -8424,7 +8424,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 }
+        .party = {.NoItemDefaultMoves = sParty_Maxie1 }
     },
 
     [TRAINER_MAXIE_2] =
@@ -8438,7 +8438,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 }
+        .party = {.NoItemDefaultMoves = sParty_Maxie2 }
     },
 
     [TRAINER_TIANA] =
@@ -8452,7 +8452,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tiana }
+        .party = {.NoItemDefaultMoves = sParty_Tiana }
     },
 
     [TRAINER_HALEY_1] =
@@ -8466,7 +8466,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 }
+        .party = {.NoItemDefaultMoves = sParty_Haley1 }
     },
 
     [TRAINER_JANICE] =
@@ -8480,7 +8480,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Janice }
+        .party = {.NoItemDefaultMoves = sParty_Janice }
     },
 
     [TRAINER_VIVI] =
@@ -8494,7 +8494,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Vivi }
+        .party = {.NoItemDefaultMoves = sParty_Vivi }
     },
 
     [TRAINER_HALEY_2] =
@@ -8508,7 +8508,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 }
+        .party = {.NoItemDefaultMoves = sParty_Haley2 }
     },
 
     [TRAINER_HALEY_3] =
@@ -8522,7 +8522,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 }
+        .party = {.NoItemDefaultMoves = sParty_Haley3 }
     },
 
     [TRAINER_HALEY_4] =
@@ -8536,7 +8536,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 }
+        .party = {.NoItemDefaultMoves = sParty_Haley4 }
     },
 
     [TRAINER_HALEY_5] =
@@ -8550,7 +8550,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 }
+        .party = {.NoItemDefaultMoves = sParty_Haley5 }
     },
 
     [TRAINER_SALLY] =
@@ -8564,7 +8564,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sally }
+        .party = {.NoItemDefaultMoves = sParty_Sally }
     },
 
     [TRAINER_ROBIN] =
@@ -8578,7 +8578,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Robin }
+        .party = {.NoItemDefaultMoves = sParty_Robin }
     },
 
     [TRAINER_ANDREA] =
@@ -8592,7 +8592,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andrea }
+        .party = {.NoItemDefaultMoves = sParty_Andrea }
     },
 
     [TRAINER_CRISSY] =
@@ -8606,7 +8606,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Crissy }
+        .party = {.NoItemDefaultMoves = sParty_Crissy }
     },
 
     [TRAINER_RICK] =
@@ -8620,7 +8620,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rick }
+        .party = {.NoItemDefaultMoves = sParty_Rick }
     },
 
     [TRAINER_LYLE] =
@@ -8634,7 +8634,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lyle }
+        .party = {.NoItemDefaultMoves = sParty_Lyle }
     },
 
     [TRAINER_JOSE] =
@@ -8648,7 +8648,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jose }
+        .party = {.NoItemDefaultMoves = sParty_Jose }
     },
 
     [TRAINER_DOUG] =
@@ -8662,7 +8662,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Doug }
+        .party = {.NoItemDefaultMoves = sParty_Doug }
     },
 
     [TRAINER_GREG] =
@@ -8676,7 +8676,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Greg }
+        .party = {.NoItemDefaultMoves = sParty_Greg }
     },
 
     [TRAINER_KENT] =
@@ -8690,7 +8690,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kent }
+        .party = {.NoItemDefaultMoves = sParty_Kent }
     },
 
     [TRAINER_JAMES_1] =
@@ -8704,7 +8704,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_James1 }
+        .party = {.NoItemDefaultMoves = sParty_James1 }
     },
 
     [TRAINER_JAMES_2] =
@@ -8718,7 +8718,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_James2 }
+        .party = {.NoItemDefaultMoves = sParty_James2 }
     },
 
     [TRAINER_JAMES_3] =
@@ -8732,7 +8732,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_James3 }
+        .party = {.NoItemDefaultMoves = sParty_James3 }
     },
 
     [TRAINER_JAMES_4] =
@@ -8746,7 +8746,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_James4 }
+        .party = {.NoItemDefaultMoves = sParty_James4 }
     },
 
     [TRAINER_JAMES_5] =
@@ -8760,7 +8760,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_James5 }
+        .party = {.NoItemDefaultMoves = sParty_James5 }
     },
 
     [TRAINER_BRICE] =
@@ -8774,7 +8774,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brice }
+        .party = {.NoItemDefaultMoves = sParty_Brice }
     },
 
     [TRAINER_TRENT_1] =
@@ -8788,7 +8788,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 }
+        .party = {.NoItemDefaultMoves = sParty_Trent1 }
     },
 
     [TRAINER_LENNY] =
@@ -8802,7 +8802,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lenny }
+        .party = {.NoItemDefaultMoves = sParty_Lenny }
     },
 
     [TRAINER_LUCAS_1] =
@@ -8816,7 +8816,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 }
+        .party = {.NoItemDefaultMoves = sParty_Lucas1 }
     },
 
     [TRAINER_ALAN] =
@@ -8830,7 +8830,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alan }
+        .party = {.NoItemDefaultMoves = sParty_Alan }
     },
 
     [TRAINER_CLARK] =
@@ -8844,7 +8844,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Clark }
+        .party = {.NoItemDefaultMoves = sParty_Clark }
     },
 
     [TRAINER_ERIC] =
@@ -8858,7 +8858,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Eric }
+        .party = {.NoItemDefaultMoves = sParty_Eric }
     },
 
     [TRAINER_LUCAS_2] =
@@ -8872,7 +8872,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 }
+        .party = {.NoItemCustomMoves = sParty_Lucas2 }
     },
 
     [TRAINER_MIKE_1] =
@@ -8886,7 +8886,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Mike1 }
+        .party = {.NoItemCustomMoves = sParty_Mike1 }
     },
 
     [TRAINER_MIKE_2] =
@@ -8900,7 +8900,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 }
+        .party = {.NoItemDefaultMoves = sParty_Mike2 }
     },
 
     [TRAINER_TRENT_2] =
@@ -8914,7 +8914,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 }
+        .party = {.NoItemDefaultMoves = sParty_Trent2 }
     },
 
     [TRAINER_TRENT_3] =
@@ -8928,7 +8928,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 }
+        .party = {.NoItemDefaultMoves = sParty_Trent3 }
     },
 
     [TRAINER_TRENT_4] =
@@ -8942,7 +8942,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 }
+        .party = {.NoItemDefaultMoves = sParty_Trent4 }
     },
 
     [TRAINER_TRENT_5] =
@@ -8956,7 +8956,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 }
+        .party = {.NoItemDefaultMoves = sParty_Trent5 }
     },
 
     [TRAINER_DEZ_AND_LUKE] =
@@ -8970,7 +8970,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke }
+        .party = {.NoItemDefaultMoves = sParty_DezAndLuke }
     },
 
     [TRAINER_LEA_AND_JED] =
@@ -8984,7 +8984,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed }
+        .party = {.NoItemDefaultMoves = sParty_LeaAndJed }
     },
 
     [TRAINER_KIRA_AND_DAN_1] =
@@ -8998,7 +8998,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan1 }
+        .party = {.NoItemDefaultMoves = sParty_KiraAndDan1 }
     },
 
     [TRAINER_KIRA_AND_DAN_2] =
@@ -9012,7 +9012,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan2 }
+        .party = {.NoItemDefaultMoves = sParty_KiraAndDan2 }
     },
 
     [TRAINER_KIRA_AND_DAN_3] =
@@ -9026,7 +9026,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan3 }
+        .party = {.NoItemDefaultMoves = sParty_KiraAndDan3 }
     },
 
     [TRAINER_KIRA_AND_DAN_4] =
@@ -9040,7 +9040,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan4 }
+        .party = {.NoItemDefaultMoves = sParty_KiraAndDan4 }
     },
 
     [TRAINER_KIRA_AND_DAN_5] =
@@ -9054,7 +9054,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan5 }
+        .party = {.NoItemDefaultMoves = sParty_KiraAndDan5 }
     },
 
     [TRAINER_JOHANNA] =
@@ -9068,7 +9068,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Johanna }
+        .party = {.NoItemDefaultMoves = sParty_Johanna }
     },
 
     [TRAINER_GERALD] =
@@ -9082,7 +9082,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Gerald }
+        .party = {.NoItemCustomMoves = sParty_Gerald }
     },
 
     [TRAINER_VIVIAN] =
@@ -9096,7 +9096,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Vivian }
+        .party = {.NoItemCustomMoves = sParty_Vivian }
     },
 
     [TRAINER_DANIELLE] =
@@ -9110,7 +9110,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Danielle }
+        .party = {.NoItemCustomMoves = sParty_Danielle }
     },
 
     [TRAINER_HIDEO] =
@@ -9124,7 +9124,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Hideo }
+        .party = {.NoItemCustomMoves = sParty_Hideo }
     },
 
     [TRAINER_KEIGO] =
@@ -9138,7 +9138,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Keigo }
+        .party = {.NoItemCustomMoves = sParty_Keigo }
     },
 
     [TRAINER_RILEY] =
@@ -9152,7 +9152,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_Riley }
+        .party = {.NoItemCustomMoves = sParty_Riley }
     },
 
     [TRAINER_FLINT] =
@@ -9166,7 +9166,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Flint }
+        .party = {.NoItemDefaultMoves = sParty_Flint }
     },
 
     [TRAINER_ASHLEY] =
@@ -9180,7 +9180,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ashley }
+        .party = {.NoItemDefaultMoves = sParty_Ashley }
     },
 
     [TRAINER_WALLY_2] =
@@ -9194,7 +9194,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 }
+        .party = {.NoItemDefaultMoves = sParty_Wally2 }
     },
 
     [TRAINER_WALLY_3] =
@@ -9208,7 +9208,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.NoItemCustomMoves = gTrainerParty_Wally3 }
+        .party = {.NoItemCustomMoves = sParty_Wally3 }
     },
 
     [TRAINER_WALLY_4] =
@@ -9222,7 +9222,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.NoItemCustomMoves = gTrainerParty_Wally4 }
+        .party = {.NoItemCustomMoves = sParty_Wally4 }
     },
 
     [TRAINER_WALLY_5] =
@@ -9236,7 +9236,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.NoItemCustomMoves = gTrainerParty_Wally5 }
+        .party = {.NoItemCustomMoves = sParty_Wally5 }
     },
 
     [TRAINER_WALLY_6] =
@@ -9250,7 +9250,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.NoItemCustomMoves = gTrainerParty_Wally6 }
+        .party = {.NoItemCustomMoves = sParty_Wally6 }
     },
 
     [TRAINER_BRENDAN_13] =
@@ -9264,7 +9264,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan13 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan13 }
     },
 
     [TRAINER_BRENDAN_14] =
@@ -9278,7 +9278,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan14 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan14 }
     },
 
     [TRAINER_BRENDAN_15] =
@@ -9292,7 +9292,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan15 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan15 }
     },
 
     [TRAINER_MAY_11] =
@@ -9306,7 +9306,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May11 }
+        .party = {.NoItemDefaultMoves = sParty_May11 }
     },
 
     [TRAINER_MAY_12] =
@@ -9320,7 +9320,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May12 }
+        .party = {.NoItemDefaultMoves = sParty_May12 }
     },
 
     [TRAINER_MAY_13] =
@@ -9334,7 +9334,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May13 }
+        .party = {.NoItemDefaultMoves = sParty_May13 }
     },
 
     [TRAINER_JONAH] =
@@ -9348,7 +9348,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jonah }
+        .party = {.NoItemDefaultMoves = sParty_Jonah }
     },
 
     [TRAINER_HENRY] =
@@ -9362,7 +9362,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Henry }
+        .party = {.NoItemDefaultMoves = sParty_Henry }
     },
 
     [TRAINER_ROGER] =
@@ -9376,7 +9376,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Roger }
+        .party = {.NoItemDefaultMoves = sParty_Roger }
     },
 
     [TRAINER_ALEXA] =
@@ -9390,7 +9390,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alexa }
+        .party = {.NoItemDefaultMoves = sParty_Alexa }
     },
 
     [TRAINER_RUBEN] =
@@ -9404,7 +9404,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Ruben }
+        .party = {.NoItemDefaultMoves = sParty_Ruben }
     },
 
     [TRAINER_KOJI_1] =
@@ -9418,7 +9418,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Koji1 }
+        .party = {.NoItemDefaultMoves = sParty_Koji1 }
     },
 
     [TRAINER_WAYNE] =
@@ -9432,7 +9432,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wayne }
+        .party = {.NoItemDefaultMoves = sParty_Wayne }
     },
 
     [TRAINER_AIDAN] =
@@ -9446,7 +9446,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Aidan }
+        .party = {.NoItemDefaultMoves = sParty_Aidan }
     },
 
     [TRAINER_REED] =
@@ -9460,7 +9460,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Reed }
+        .party = {.NoItemDefaultMoves = sParty_Reed }
     },
 
     [TRAINER_TISHA] =
@@ -9474,7 +9474,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tisha }
+        .party = {.NoItemDefaultMoves = sParty_Tisha }
     },
 
     [TRAINER_TORI_AND_TIA] =
@@ -9488,7 +9488,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia }
+        .party = {.NoItemDefaultMoves = sParty_ToriAndTia }
     },
 
     [TRAINER_KIM_AND_IRIS] =
@@ -9502,7 +9502,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris }
+        .party = {.NoItemCustomMoves = sParty_KimAndIris }
     },
 
     [TRAINER_TYRA_AND_IVY] =
@@ -9516,7 +9516,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy }
+        .party = {.NoItemCustomMoves = sParty_TyraAndIvy }
     },
 
     [TRAINER_MEL_AND_PAUL] =
@@ -9530,7 +9530,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul }
+        .party = {.NoItemCustomMoves = sParty_MelAndPaul }
     },
 
     [TRAINER_JOHN_AND_JAY_1] =
@@ -9544,7 +9544,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 }
+        .party = {.NoItemCustomMoves = sParty_JohnAndJay1 }
     },
 
     [TRAINER_JOHN_AND_JAY_2] =
@@ -9558,7 +9558,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 }
+        .party = {.NoItemCustomMoves = sParty_JohnAndJay2 }
     },
 
     [TRAINER_JOHN_AND_JAY_3] =
@@ -9572,7 +9572,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 }
+        .party = {.NoItemCustomMoves = sParty_JohnAndJay3 }
     },
 
     [TRAINER_JOHN_AND_JAY_4] =
@@ -9586,7 +9586,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 }
+        .party = {.NoItemCustomMoves = sParty_JohnAndJay4 }
     },
 
     [TRAINER_JOHN_AND_JAY_5] =
@@ -9600,7 +9600,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 }
+        .party = {.NoItemCustomMoves = sParty_JohnAndJay5 }
     },
 
     [TRAINER_RELI_AND_IAN] =
@@ -9614,7 +9614,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan }
+        .party = {.NoItemDefaultMoves = sParty_ReliAndIan }
     },
 
     [TRAINER_LILA_AND_ROY_1] =
@@ -9628,7 +9628,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy1 }
+        .party = {.NoItemDefaultMoves = sParty_LilaAndRoy1 }
     },
 
     [TRAINER_LILA_AND_ROY_2] =
@@ -9642,7 +9642,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy2 }
+        .party = {.NoItemDefaultMoves = sParty_LilaAndRoy2 }
     },
 
     [TRAINER_LILA_AND_ROY_3] =
@@ -9656,7 +9656,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy3 }
+        .party = {.NoItemDefaultMoves = sParty_LilaAndRoy3 }
     },
 
     [TRAINER_LILA_AND_ROY_4] =
@@ -9670,7 +9670,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy4 }
+        .party = {.NoItemDefaultMoves = sParty_LilaAndRoy4 }
     },
 
     [TRAINER_LILA_AND_ROY_5] =
@@ -9684,7 +9684,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy5 }
+        .party = {.NoItemDefaultMoves = sParty_LilaAndRoy5 }
     },
 
     [TRAINER_LISA_AND_RAY] =
@@ -9698,7 +9698,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay }
+        .party = {.NoItemDefaultMoves = sParty_LisaAndRay }
     },
 
     [TRAINER_CHRIS] =
@@ -9712,7 +9712,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Chris }
+        .party = {.NoItemDefaultMoves = sParty_Chris }
     },
 
     [TRAINER_DAWSON] =
@@ -9726,7 +9726,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Dawson }
+        .party = {.ItemDefaultMoves = sParty_Dawson }
     },
 
     [TRAINER_SARAH] =
@@ -9740,7 +9740,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Sarah }
+        .party = {.ItemDefaultMoves = sParty_Sarah }
     },
 
     [TRAINER_DARIAN] =
@@ -9754,7 +9754,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Darian }
+        .party = {.NoItemDefaultMoves = sParty_Darian }
     },
 
     [TRAINER_HAILEY] =
@@ -9768,7 +9768,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hailey }
+        .party = {.NoItemDefaultMoves = sParty_Hailey }
     },
 
     [TRAINER_CHANDLER] =
@@ -9782,7 +9782,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Chandler }
+        .party = {.NoItemDefaultMoves = sParty_Chandler }
     },
 
     [TRAINER_KALEB] =
@@ -9796,7 +9796,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.ItemDefaultMoves = gTrainerParty_Kaleb }
+        .party = {.ItemDefaultMoves = sParty_Kaleb }
     },
 
     [TRAINER_JOSEPH] =
@@ -9810,7 +9810,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Joseph }
+        .party = {.NoItemDefaultMoves = sParty_Joseph }
     },
 
     [TRAINER_ALYSSA] =
@@ -9824,7 +9824,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alyssa }
+        .party = {.NoItemDefaultMoves = sParty_Alyssa }
     },
 
     [TRAINER_MARCOS] =
@@ -9838,7 +9838,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Marcos }
+        .party = {.NoItemDefaultMoves = sParty_Marcos }
     },
 
     [TRAINER_RHETT] =
@@ -9852,7 +9852,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rhett }
+        .party = {.NoItemDefaultMoves = sParty_Rhett }
     },
 
     [TRAINER_TYRON] =
@@ -9866,7 +9866,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tyron }
+        .party = {.NoItemDefaultMoves = sParty_Tyron }
     },
 
     [TRAINER_CELINA] =
@@ -9880,7 +9880,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Celina }
+        .party = {.NoItemDefaultMoves = sParty_Celina }
     },
 
     [TRAINER_BIANCA] =
@@ -9894,7 +9894,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bianca }
+        .party = {.NoItemDefaultMoves = sParty_Bianca }
     },
 
     [TRAINER_HAYDEN] =
@@ -9908,7 +9908,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Hayden }
+        .party = {.NoItemDefaultMoves = sParty_Hayden }
     },
 
     [TRAINER_SOPHIE] =
@@ -9922,7 +9922,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sophie }
+        .party = {.NoItemDefaultMoves = sParty_Sophie }
     },
 
     [TRAINER_COBY] =
@@ -9936,7 +9936,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Coby }
+        .party = {.NoItemDefaultMoves = sParty_Coby }
     },
 
     [TRAINER_LAWRENCE] =
@@ -9950,7 +9950,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lawrence }
+        .party = {.NoItemDefaultMoves = sParty_Lawrence }
     },
 
     [TRAINER_WYATT] =
@@ -9964,7 +9964,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Wyatt }
+        .party = {.NoItemDefaultMoves = sParty_Wyatt }
     },
 
     [TRAINER_ANGELINA] =
@@ -9978,7 +9978,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Angelina }
+        .party = {.NoItemDefaultMoves = sParty_Angelina }
     },
 
     [TRAINER_KAI] =
@@ -9992,7 +9992,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kai }
+        .party = {.NoItemDefaultMoves = sParty_Kai }
     },
 
     [TRAINER_CHARLOTTE] =
@@ -10006,7 +10006,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Charlotte }
+        .party = {.NoItemDefaultMoves = sParty_Charlotte }
     },
 
     [TRAINER_DEANDRE] =
@@ -10020,7 +10020,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Deandre }
+        .party = {.NoItemDefaultMoves = sParty_Deandre }
     },
 
     [TRAINER_GRUNT_38] =
@@ -10034,7 +10034,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt38 }
     },
 
     [TRAINER_GRUNT_39] =
@@ -10048,7 +10048,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt39 }
     },
 
     [TRAINER_GRUNT_40] =
@@ -10062,7 +10062,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt40 }
     },
 
     [TRAINER_GRUNT_41] =
@@ -10076,7 +10076,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt41 }
     },
 
     [TRAINER_GRUNT_42] =
@@ -10090,7 +10090,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt42 }
     },
 
     [TRAINER_GRUNT_43] =
@@ -10104,7 +10104,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt43 }
     },
 
     [TRAINER_GRUNT_44] =
@@ -10118,7 +10118,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt44 }
     },
 
     [TRAINER_GRUNT_45] =
@@ -10132,7 +10132,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt45 }
     },
 
     [TRAINER_GRUNT_46] =
@@ -10146,7 +10146,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt46 }
     },
 
     [TRAINER_GRUNT_47] =
@@ -10160,7 +10160,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt47 }
     },
 
     [TRAINER_GRUNT_48] =
@@ -10174,7 +10174,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt48 }
     },
 
     [TRAINER_GRUNT_49] =
@@ -10188,7 +10188,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt49 }
     },
 
     [TRAINER_GRUNT_50] =
@@ -10202,7 +10202,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt50 }
     },
 
     [TRAINER_GRUNT_51] =
@@ -10216,7 +10216,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt51 }
     },
 
     [TRAINER_GRUNT_52] =
@@ -10230,7 +10230,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt52 }
     },
 
     [TRAINER_GRUNT_53] =
@@ -10244,7 +10244,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 }
+        .party = {.NoItemDefaultMoves = sParty_Grunt53 }
     },
 
     [TRAINER_TABITHA_3] =
@@ -10258,7 +10258,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 4,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha3 }
+        .party = {.NoItemDefaultMoves = sParty_Tabitha3 }
     },
 
     [TRAINER_DARCY] =
@@ -10272,7 +10272,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Darcy }
+        .party = {.NoItemDefaultMoves = sParty_Darcy }
     },
 
     [TRAINER_MAXIE_3] =
@@ -10286,7 +10286,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 }
+        .party = {.NoItemDefaultMoves = sParty_Maxie3 }
     },
 
     [TRAINER_PETE] =
@@ -10300,7 +10300,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pete }
+        .party = {.NoItemDefaultMoves = sParty_Pete }
     },
 
     [TRAINER_ISABELLE] =
@@ -10314,7 +10314,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Isabelle }
+        .party = {.NoItemDefaultMoves = sParty_Isabelle }
     },
 
     [TRAINER_ANDRES_1] =
@@ -10328,7 +10328,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andres1 }
+        .party = {.NoItemDefaultMoves = sParty_Andres1 }
     },
 
     [TRAINER_JOSUE] =
@@ -10342,7 +10342,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Josue }
+        .party = {.NoItemDefaultMoves = sParty_Josue }
     },
 
     [TRAINER_CAMRON] =
@@ -10356,7 +10356,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Camron }
+        .party = {.NoItemDefaultMoves = sParty_Camron }
     },
 
     [TRAINER_CORY_1] =
@@ -10370,7 +10370,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cory1 }
+        .party = {.NoItemDefaultMoves = sParty_Cory1 }
     },
 
     [TRAINER_CAROLINA] =
@@ -10384,7 +10384,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Carolina }
+        .party = {.NoItemDefaultMoves = sParty_Carolina }
     },
 
     [TRAINER_ELIJAH] =
@@ -10398,7 +10398,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Elijah }
+        .party = {.NoItemDefaultMoves = sParty_Elijah }
     },
 
     [TRAINER_CELIA] =
@@ -10412,7 +10412,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Celia }
+        .party = {.NoItemDefaultMoves = sParty_Celia }
     },
 
     [TRAINER_BRYAN] =
@@ -10426,7 +10426,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bryan }
+        .party = {.NoItemDefaultMoves = sParty_Bryan }
     },
 
     [TRAINER_BRANDEN] =
@@ -10440,7 +10440,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Branden }
+        .party = {.NoItemDefaultMoves = sParty_Branden }
     },
 
     [TRAINER_BRYANT] =
@@ -10454,7 +10454,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Bryant }
+        .party = {.NoItemDefaultMoves = sParty_Bryant }
     },
 
     [TRAINER_SHAYLA] =
@@ -10468,7 +10468,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Shayla }
+        .party = {.NoItemDefaultMoves = sParty_Shayla }
     },
 
     [TRAINER_KYRA] =
@@ -10482,7 +10482,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Kyra }
+        .party = {.NoItemDefaultMoves = sParty_Kyra }
     },
 
     [TRAINER_JAIDEN] =
@@ -10496,7 +10496,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Jaiden }
+        .party = {.NoItemDefaultMoves = sParty_Jaiden }
     },
 
     [TRAINER_ALIX] =
@@ -10510,7 +10510,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alix }
+        .party = {.NoItemDefaultMoves = sParty_Alix }
     },
 
     [TRAINER_HELENE] =
@@ -10524,7 +10524,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Helene }
+        .party = {.NoItemDefaultMoves = sParty_Helene }
     },
 
     [TRAINER_MARLENE] =
@@ -10538,7 +10538,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Marlene }
+        .party = {.NoItemDefaultMoves = sParty_Marlene }
     },
 
     [TRAINER_DEVAN] =
@@ -10552,7 +10552,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Devan }
+        .party = {.NoItemDefaultMoves = sParty_Devan }
     },
 
     [TRAINER_JOHNSON] =
@@ -10566,7 +10566,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Johnson }
+        .party = {.NoItemDefaultMoves = sParty_Johnson }
     },
 
     [TRAINER_MELINA] =
@@ -10580,7 +10580,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Melina }
+        .party = {.NoItemDefaultMoves = sParty_Melina }
     },
 
     [TRAINER_BRANDI] =
@@ -10594,7 +10594,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brandi }
+        .party = {.NoItemDefaultMoves = sParty_Brandi }
     },
 
     [TRAINER_AISHA] =
@@ -10608,7 +10608,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Aisha }
+        .party = {.NoItemDefaultMoves = sParty_Aisha }
     },
 
     [TRAINER_MAKAYLA] =
@@ -10622,7 +10622,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Makayla }
+        .party = {.NoItemDefaultMoves = sParty_Makayla }
     },
 
     [TRAINER_FABIAN] =
@@ -10636,7 +10636,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fabian }
+        .party = {.NoItemDefaultMoves = sParty_Fabian }
     },
 
     [TRAINER_DAYTON] =
@@ -10650,7 +10650,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Dayton }
+        .party = {.NoItemDefaultMoves = sParty_Dayton }
     },
 
     [TRAINER_RACHEL] =
@@ -10664,7 +10664,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Rachel }
+        .party = {.NoItemDefaultMoves = sParty_Rachel }
     },
 
     [TRAINER_LEONEL] =
@@ -10678,7 +10678,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemCustomMoves = gTrainerParty_Leonel }
+        .party = {.NoItemCustomMoves = sParty_Leonel }
     },
 
     [TRAINER_CALLIE] =
@@ -10692,7 +10692,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Callie }
+        .party = {.NoItemDefaultMoves = sParty_Callie }
     },
 
     [TRAINER_CALE] =
@@ -10706,7 +10706,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cale }
+        .party = {.NoItemDefaultMoves = sParty_Cale }
     },
 
     [TRAINER_MYLES] =
@@ -10720,7 +10720,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Myles }
+        .party = {.NoItemDefaultMoves = sParty_Myles }
     },
 
     [TRAINER_PAT] =
@@ -10734,7 +10734,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pat }
+        .party = {.NoItemDefaultMoves = sParty_Pat }
     },
 
     [TRAINER_CRISTIN_1] =
@@ -10748,7 +10748,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cristin1 }
+        .party = {.NoItemDefaultMoves = sParty_Cristin1 }
     },
 
     [TRAINER_MAY_14] =
@@ -10762,7 +10762,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May14 }
+        .party = {.NoItemDefaultMoves = sParty_May14 }
     },
 
     [TRAINER_MAY_15] =
@@ -10776,7 +10776,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May15 }
+        .party = {.NoItemDefaultMoves = sParty_May15 }
     },
 
     [TRAINER_ROXANNE_2] =
@@ -10790,7 +10790,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Roxanne2 }
+        .party = {.ItemCustomMoves = sParty_Roxanne2 }
     },
 
     [TRAINER_ROXANNE_3] =
@@ -10804,7 +10804,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Roxanne3 }
+        .party = {.ItemCustomMoves = sParty_Roxanne3 }
     },
 
     [TRAINER_ROXANNE_4] =
@@ -10818,7 +10818,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Roxanne4 }
+        .party = {.ItemCustomMoves = sParty_Roxanne4 }
     },
 
     [TRAINER_ROXANNE_5] =
@@ -10832,7 +10832,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Roxanne5 }
+        .party = {.ItemCustomMoves = sParty_Roxanne5 }
     },
 
     [TRAINER_BRAWLY_2] =
@@ -10846,7 +10846,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Brawly2 }
+        .party = {.ItemCustomMoves = sParty_Brawly2 }
     },
 
     [TRAINER_BRAWLY_3] =
@@ -10860,7 +10860,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Brawly3 }
+        .party = {.ItemCustomMoves = sParty_Brawly3 }
     },
 
     [TRAINER_BRAWLY_4] =
@@ -10874,7 +10874,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Brawly4 }
+        .party = {.ItemCustomMoves = sParty_Brawly4 }
     },
 
     [TRAINER_BRAWLY_5] =
@@ -10888,7 +10888,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Brawly5 }
+        .party = {.ItemCustomMoves = sParty_Brawly5 }
     },
 
     [TRAINER_WATTSON_2] =
@@ -10902,7 +10902,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Wattson2 }
+        .party = {.ItemCustomMoves = sParty_Wattson2 }
     },
 
     [TRAINER_WATTSON_3] =
@@ -10916,7 +10916,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Wattson3 }
+        .party = {.ItemCustomMoves = sParty_Wattson3 }
     },
 
     [TRAINER_WATTSON_4] =
@@ -10930,7 +10930,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Wattson4 }
+        .party = {.ItemCustomMoves = sParty_Wattson4 }
     },
 
     [TRAINER_WATTSON_5] =
@@ -10944,7 +10944,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Wattson5 }
+        .party = {.ItemCustomMoves = sParty_Wattson5 }
     },
 
     [TRAINER_FLANNERY_2] =
@@ -10958,7 +10958,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Flannery2 }
+        .party = {.ItemCustomMoves = sParty_Flannery2 }
     },
 
     [TRAINER_FLANNERY_3] =
@@ -10972,7 +10972,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Flannery3 }
+        .party = {.ItemCustomMoves = sParty_Flannery3 }
     },
 
     [TRAINER_FLANNERY_4] =
@@ -10986,7 +10986,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Flannery4 }
+        .party = {.ItemCustomMoves = sParty_Flannery4 }
     },
 
     [TRAINER_FLANNERY_5] =
@@ -11000,7 +11000,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Flannery5 }
+        .party = {.ItemCustomMoves = sParty_Flannery5 }
     },
 
     [TRAINER_NORMAN_2] =
@@ -11014,7 +11014,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 4,
-        .party = {.ItemCustomMoves = gTrainerParty_Norman2 }
+        .party = {.ItemCustomMoves = sParty_Norman2 }
     },
 
     [TRAINER_NORMAN_3] =
@@ -11028,7 +11028,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Norman3 }
+        .party = {.ItemCustomMoves = sParty_Norman3 }
     },
 
     [TRAINER_NORMAN_4] =
@@ -11042,7 +11042,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Norman4 }
+        .party = {.ItemCustomMoves = sParty_Norman4 }
     },
 
     [TRAINER_NORMAN_5] =
@@ -11056,7 +11056,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Norman5 }
+        .party = {.ItemCustomMoves = sParty_Norman5 }
     },
 
     [TRAINER_WINONA_2] =
@@ -11070,7 +11070,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Winona2 }
+        .party = {.ItemCustomMoves = sParty_Winona2 }
     },
 
     [TRAINER_WINONA_3] =
@@ -11084,7 +11084,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Winona3 }
+        .party = {.ItemCustomMoves = sParty_Winona3 }
     },
 
     [TRAINER_WINONA_4] =
@@ -11098,7 +11098,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Winona4 }
+        .party = {.ItemCustomMoves = sParty_Winona4 }
     },
 
     [TRAINER_WINONA_5] =
@@ -11112,7 +11112,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Winona5 }
+        .party = {.ItemCustomMoves = sParty_Winona5 }
     },
 
     [TRAINER_TATE_AND_LIZA_2] =
@@ -11126,7 +11126,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza2 }
+        .party = {.ItemCustomMoves = sParty_TateAndLiza2 }
     },
 
     [TRAINER_TATE_AND_LIZA_3] =
@@ -11140,7 +11140,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza3 }
+        .party = {.ItemCustomMoves = sParty_TateAndLiza3 }
     },
 
     [TRAINER_TATE_AND_LIZA_4] =
@@ -11154,7 +11154,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza4 }
+        .party = {.ItemCustomMoves = sParty_TateAndLiza4 }
     },
 
     [TRAINER_TATE_AND_LIZA_5] =
@@ -11168,7 +11168,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza5 }
+        .party = {.ItemCustomMoves = sParty_TateAndLiza5 }
     },
 
     [TRAINER_JUAN_2] =
@@ -11182,7 +11182,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Juan2 }
+        .party = {.ItemCustomMoves = sParty_Juan2 }
     },
 
     [TRAINER_JUAN_3] =
@@ -11196,7 +11196,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 5,
-        .party = {.ItemCustomMoves = gTrainerParty_Juan3 }
+        .party = {.ItemCustomMoves = sParty_Juan3 }
     },
 
     [TRAINER_JUAN_4] =
@@ -11210,7 +11210,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Juan4 }
+        .party = {.ItemCustomMoves = sParty_Juan4 }
     },
 
     [TRAINER_JUAN_5] =
@@ -11224,7 +11224,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Juan5 }
+        .party = {.ItemCustomMoves = sParty_Juan5 }
     },
 
     [TRAINER_ANGELO] =
@@ -11238,7 +11238,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.ItemCustomMoves = gTrainerParty_Angelo }
+        .party = {.ItemCustomMoves = sParty_Angelo }
     },
 
     [TRAINER_DARIUS] =
@@ -11252,7 +11252,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Darius }
+        .party = {.NoItemDefaultMoves = sParty_Darius }
     },
 
     [TRAINER_STEVEN] =
@@ -11266,7 +11266,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 6,
-        .party = {.ItemCustomMoves = gTrainerParty_Steven }
+        .party = {.ItemCustomMoves = sParty_Steven }
     },
 
     [TRAINER_ANABEL] =
@@ -11280,7 +11280,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Anabel }
+        .party = {.NoItemDefaultMoves = sParty_Anabel }
     },
 
     [TRAINER_TUCKER] =
@@ -11294,7 +11294,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Tucker }
+        .party = {.NoItemDefaultMoves = sParty_Tucker }
     },
 
     [TRAINER_SPENSER] =
@@ -11308,7 +11308,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Spenser }
+        .party = {.NoItemDefaultMoves = sParty_Spenser }
     },
 
     [TRAINER_GRETA] =
@@ -11322,7 +11322,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Greta }
+        .party = {.NoItemDefaultMoves = sParty_Greta }
     },
 
     [TRAINER_NOLAND] =
@@ -11336,7 +11336,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Noland }
+        .party = {.NoItemDefaultMoves = sParty_Noland }
     },
 
     [TRAINER_LUCY] =
@@ -11350,7 +11350,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Lucy }
+        .party = {.NoItemDefaultMoves = sParty_Lucy }
     },
 
     [TRAINER_BRANDON] =
@@ -11364,7 +11364,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon }
+        .party = {.NoItemDefaultMoves = sParty_Brandon }
     },
 
     [TRAINER_ANDRES_2] =
@@ -11378,7 +11378,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andres2 }
+        .party = {.NoItemDefaultMoves = sParty_Andres2 }
     },
 
     [TRAINER_ANDRES_3] =
@@ -11392,7 +11392,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andres3 }
+        .party = {.NoItemDefaultMoves = sParty_Andres3 }
     },
 
     [TRAINER_ANDRES_4] =
@@ -11406,7 +11406,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andres4 }
+        .party = {.NoItemDefaultMoves = sParty_Andres4 }
     },
 
     [TRAINER_ANDRES_5] =
@@ -11420,7 +11420,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Andres5 }
+        .party = {.NoItemDefaultMoves = sParty_Andres5 }
     },
 
     [TRAINER_CORY_2] =
@@ -11434,7 +11434,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cory2 }
+        .party = {.NoItemDefaultMoves = sParty_Cory2 }
     },
 
     [TRAINER_CORY_3] =
@@ -11448,7 +11448,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cory3 }
+        .party = {.NoItemDefaultMoves = sParty_Cory3 }
     },
 
     [TRAINER_CORY_4] =
@@ -11462,7 +11462,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cory4 }
+        .party = {.NoItemDefaultMoves = sParty_Cory4 }
     },
 
     [TRAINER_CORY_5] =
@@ -11476,7 +11476,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cory5 }
+        .party = {.NoItemDefaultMoves = sParty_Cory5 }
     },
 
     [TRAINER_PABLO_2] =
@@ -11490,7 +11490,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo2 }
+        .party = {.NoItemDefaultMoves = sParty_Pablo2 }
     },
 
     [TRAINER_PABLO_3] =
@@ -11504,7 +11504,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo3 }
+        .party = {.NoItemDefaultMoves = sParty_Pablo3 }
     },
 
     [TRAINER_PABLO_4] =
@@ -11518,7 +11518,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo4 }
+        .party = {.NoItemDefaultMoves = sParty_Pablo4 }
     },
 
     [TRAINER_PABLO_5] =
@@ -11532,7 +11532,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo5 }
+        .party = {.NoItemDefaultMoves = sParty_Pablo5 }
     },
 
     [TRAINER_KOJI_2] =
@@ -11546,7 +11546,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Koji2 }
+        .party = {.NoItemDefaultMoves = sParty_Koji2 }
     },
 
     [TRAINER_KOJI_3] =
@@ -11560,7 +11560,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Koji3 }
+        .party = {.NoItemDefaultMoves = sParty_Koji3 }
     },
 
     [TRAINER_KOJI_4] =
@@ -11574,7 +11574,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Koji4 }
+        .party = {.NoItemDefaultMoves = sParty_Koji4 }
     },
 
     [TRAINER_KOJI_5] =
@@ -11588,7 +11588,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Koji5 }
+        .party = {.NoItemDefaultMoves = sParty_Koji5 }
     },
 
     [TRAINER_CRISTIN_2] =
@@ -11602,7 +11602,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cristin2 }
+        .party = {.NoItemDefaultMoves = sParty_Cristin2 }
     },
 
     [TRAINER_CRISTIN_3] =
@@ -11616,7 +11616,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cristin3 }
+        .party = {.NoItemDefaultMoves = sParty_Cristin3 }
     },
 
     [TRAINER_CRISTIN_4] =
@@ -11630,7 +11630,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cristin4 }
+        .party = {.NoItemDefaultMoves = sParty_Cristin4 }
     },
 
     [TRAINER_CRISTIN_5] =
@@ -11644,7 +11644,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Cristin5 }
+        .party = {.NoItemDefaultMoves = sParty_Cristin5 }
     },
 
     [TRAINER_FERNANDO_2] =
@@ -11658,7 +11658,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fernando2 }
+        .party = {.NoItemDefaultMoves = sParty_Fernando2 }
     },
 
     [TRAINER_FERNANDO_3] =
@@ -11672,7 +11672,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fernando3 }
+        .party = {.NoItemDefaultMoves = sParty_Fernando3 }
     },
 
     [TRAINER_FERNANDO_4] =
@@ -11686,7 +11686,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fernando4 }
+        .party = {.NoItemDefaultMoves = sParty_Fernando4 }
     },
 
     [TRAINER_FERNANDO_5] =
@@ -11700,7 +11700,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Fernando5 }
+        .party = {.NoItemDefaultMoves = sParty_Fernando5 }
     },
 
     [TRAINER_SAWYER_2] =
@@ -11714,7 +11714,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer2 }
+        .party = {.NoItemDefaultMoves = sParty_Sawyer2 }
     },
 
     [TRAINER_SAWYER_3] =
@@ -11728,7 +11728,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer3 }
+        .party = {.NoItemDefaultMoves = sParty_Sawyer3 }
     },
 
     [TRAINER_SAWYER_4] =
@@ -11742,7 +11742,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer4 }
+        .party = {.NoItemDefaultMoves = sParty_Sawyer4 }
     },
 
     [TRAINER_SAWYER_5] =
@@ -11756,7 +11756,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer5 }
+        .party = {.NoItemDefaultMoves = sParty_Sawyer5 }
     },
 
     [TRAINER_GABRIELLE_2] =
@@ -11770,7 +11770,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle2 }
+        .party = {.NoItemDefaultMoves = sParty_Gabrielle2 }
     },
 
     [TRAINER_GABRIELLE_3] =
@@ -11784,7 +11784,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle3 }
+        .party = {.NoItemDefaultMoves = sParty_Gabrielle3 }
     },
 
     [TRAINER_GABRIELLE_4] =
@@ -11798,7 +11798,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle4 }
+        .party = {.NoItemDefaultMoves = sParty_Gabrielle4 }
     },
 
     [TRAINER_GABRIELLE_5] =
@@ -11812,7 +11812,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 6,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle5 }
+        .party = {.NoItemDefaultMoves = sParty_Gabrielle5 }
     },
 
     [TRAINER_THALIA_2] =
@@ -11826,7 +11826,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Thalia2 }
+        .party = {.NoItemDefaultMoves = sParty_Thalia2 }
     },
 
     [TRAINER_THALIA_3] =
@@ -11840,7 +11840,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Thalia3 }
+        .party = {.NoItemDefaultMoves = sParty_Thalia3 }
     },
 
     [TRAINER_THALIA_4] =
@@ -11854,7 +11854,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Thalia4 }
+        .party = {.NoItemDefaultMoves = sParty_Thalia4 }
     },
 
     [TRAINER_THALIA_5] =
@@ -11868,7 +11868,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
         .partySize = 3,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Thalia5 }
+        .party = {.NoItemDefaultMoves = sParty_Thalia5 }
     },
 
     [TRAINER_MARIELA] =
@@ -11882,7 +11882,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Mariela }
+        .party = {.NoItemDefaultMoves = sParty_Mariela }
     },
 
     [TRAINER_ALVARO] =
@@ -11896,7 +11896,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 2,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Alvaro }
+        .party = {.NoItemDefaultMoves = sParty_Alvaro }
     },
 
     [TRAINER_EVERETT] =
@@ -11910,7 +11910,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Everett }
+        .party = {.NoItemDefaultMoves = sParty_Everett }
     },
 
     [TRAINER_RED] =
@@ -11924,7 +11924,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Red }
+        .party = {.NoItemDefaultMoves = sParty_Red }
     },
 
     [TRAINER_LEAF] =
@@ -11938,7 +11938,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Leaf }
+        .party = {.NoItemDefaultMoves = sParty_Leaf }
     },
 
     [TRAINER_BRENDAN_16] =
@@ -11952,7 +11952,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan16 }
+        .party = {.NoItemDefaultMoves = sParty_Brendan16 }
     },
 
     [TRAINER_MAY_16] =
@@ -11966,6 +11966,6 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 1,
-        .party = {.NoItemDefaultMoves = gTrainerParty_May16 }
+        .party = {.NoItemDefaultMoves = sParty_May16 }
     },
 };
diff --git a/src/decompress.c b/src/decompress.c
index 949b96990..46e4ef614 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,15 +1,13 @@
 #include "global.h"
-#include "decompress.h"
-#include "constants/species.h"
-#include "text.h"
 #include "alloc.h"
+#include "data.h"
+#include "decompress.h"
 #include "pokemon.h"
+#include "text.h"
+#include "constants/species.h"
 
 EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
-
 static void DuplicateDeoxysTiles(void *pointer, s32 species);
 
 void LZDecompressWram(const u32 *src, void *dest)
diff --git a/src/decoration.c b/src/decoration.c
index 3c8809c6a..0f6dd082b 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,84 +1,83 @@
 #include "global.h"
-#include "constants/decorations.h"
-#include "decompress.h"
 #include "alloc.h"
-#include "text.h"
-#include "string_util.h"
-#include "international_string_util.h"
-#include "script.h"
-#include "task.h"
-#include "main.h"
-#include "palette.h"
-#include "constants/songs.h"
-#include "overworld.h"
-#include "fieldmap.h"
-#include "metatile_behavior.h"
-#include "field_weather.h"
-#include "field_player_avatar.h"
+#include "decompress.h"
+#include "decoration.h"
+#include "decoration_inventory.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "event_scripts.h"
 #include "field_camera.h"
+#include "field_player_avatar.h"
 #include "field_screen_effect.h"
-#include "event_object_movement.h"
+#include "field_weather.h"
+#include "fieldmap.h"
+#include "graphics.h"
+#include "international_string_util.h"
+#include "item_icon.h"
 #include "list_menu.h"
-#include "menu_helpers.h"
+#include "main.h"
 #include "menu.h"
-#include "sound.h"
-#include "event_scripts.h"
-#include "event_data.h"
-#include "constants/region_map_sections.h"
+#include "menu_helpers.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "palette.h"
 #include "player_pc.h"
-#include "strings.h"
-#include "tv.h"
+#include "script.h"
 #include "secret_base.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "text.h"
 #include "tilesets.h"
-#include "item_icon.h"
 #include "trader.h"
+#include "tv.h"
+#include "constants/decorations.h"
 #include "constants/event_objects.h"
-#include "decoration_inventory.h"
-#include "decoration.h"
-#include "graphics.h"
-
-// Static type declarations
+#include "constants/songs.h"
+#include "constants/region_map_sections.h"
 
-#define OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG 0xbe5
-#define OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG 0x008
+#define PLACE_DECORATION_SELECTOR_TAG 0xbe5
+#define PLACE_DECORATION_PLAYER_TAG   0x008
 
-struct DecorPCBuffer {
+struct DecorationItemsMenu
+{
     struct ListMenuItem items[41];
     u8 names[41][24];
-    u8 unk_520;
-    u8 unk_521;
-    u8 unk_522;
+    u8 numMenuItems;
+    u8 maxShownItems;
+    u8 scrollIndicatorsTaskId;
 };
 
-struct PlaceDecorationGraphicsDataBuffer {
-    /*0x000; 0x0203a190*/ const struct Decoration *decoration;
-    /*0x004; 0x0203a194*/ u16 tiles[0x40];
-    /*0x084; 0x0203a214*/ u8 image[0x800];
-    /*0x884; 0x0203aa14*/ u16 palette[16];
+struct PlaceDecorationGraphicsDataBuffer
+{
+    const struct Decoration *decoration;
+    u16 tiles[0x40];
+    u8 image[0x800];
+    u16 palette[16];
 };
 
-struct DecorRearrangementDataBuffer {
+struct DecorRearrangementDataBuffer
+{
     u8 idx;
     u8 width;
     u8 height;
     u16 flagId;
 };
 
-// Static RAM declarations
-
-EWRAM_DATA u8 *gCurDecorInventoryItems = NULL;
-EWRAM_DATA static u8 sSecretBasePCMenuCursorPos = 0;
-EWRAM_DATA static u8 sCurDecorCatCount = 0;
+EWRAM_DATA u8 *gCurDecorationItems = NULL;
+EWRAM_DATA static u8 sDecorationActionsCursorPos = 0;
+EWRAM_DATA static u8 sNumOwnedDecorationsInCurCategory = 0;
 EWRAM_DATA static u8 sSecretBaseItemsIndicesBuffer[16] = {};
 EWRAM_DATA static u8 sPlayerRoomItemsIndicesBuffer[12] = {};
-EWRAM_DATA static u16 sSecretBasePCSelectDecorLineNo = 0;
-EWRAM_DATA static u16 sSecretBasePCSelectDecorPageNo = 0;
+EWRAM_DATA static u16 sDecorationsCursorPos = 0;
+EWRAM_DATA static u16 sDecorationsScrollOffset = 0;
 EWRAM_DATA u8 gCurDecorationIndex = 0;
 EWRAM_DATA static u8 sCurDecorationCategory = DECORCAT_DESK;
 EWRAM_DATA static u32 filler_0203a174[2] = {};
-EWRAM_DATA struct DecorPCPointers gUnknown_0203A17C = {};
-EWRAM_DATA static u8 sDecorMenuWindowIndices[4] = {};
-EWRAM_DATA struct DecorPCBuffer *sDecorPCBuffer = NULL;
+EWRAM_DATA struct DecorationPCContext gDecorationContext = {};
+EWRAM_DATA static u8 sDecorMenuWindowIds[4] = {};
+EWRAM_DATA static struct DecorationItemsMenu *sDecorationItemsMenu = NULL;
 EWRAM_DATA struct PlaceDecorationGraphicsDataBuffer sPlaceDecorationGraphicsDataBuffer = {};
 EWRAM_DATA static u16 sCurDecorMapX = 0;
 EWRAM_DATA static u16 sCurDecorMapY = 0;
@@ -89,38 +88,36 @@ EWRAM_DATA static struct OamData sDecorSelectorOam = {};
 EWRAM_DATA static struct DecorRearrangementDataBuffer sDecorRearrangementDataBuffer[16] = {};
 EWRAM_DATA static u8 sCurDecorSelectedInRearrangement = 0;
 
-// Static ROM declarations
-
-void sub_8126B80(u8 taskId);
-void sub_8126C08(void);
-void SecretBasePC_Decorate(u8 taskId);
-void SecretBasePC_PutAway(u8 taskId);
-void SecretBasePC_Toss(u8 taskId);
-void sub_8126DA4(u8 taskId);
-void SecretBasePC_Cancel(u8 taskId);
-void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId);
-void sub_8126DFC(u8 taskId);
-void sub_8126E8C(u8 taskId);
-void sub_8126F68(u8 winid, u8 decorCat, u8 x, u8 y, bool8 flag, u8 speed);
-void sub_8127058(u8 *str, bool8 flag);
-void sub_8127088(u8 taskId);
-void sub_81270E8(u8 taskId);
-void sub_8127180(u8 taskId);
-void sub_812719C(u8 taskId);
-void sub_81271CC(u8 taskId);
-void sub_8127268(u8 taskId);
-void sub_8127454(u8 *dest, u16 decorId);
-void sub_8127480(s32 a0, bool8 flag, struct ListMenu *menu);
+static void HandleDecorationActionsMenuInput(u8 taskId);
+static void PrintCurMainMenuDescription(void);
+static void DecorationMenuAction_Decorate(u8 taskId);
+static void DecorationMenuAction_PutAway(u8 taskId);
+static void DecorationMenuAction_Toss(u8 taskId);
+static void DecorationMenuAction_Cancel(u8 taskId);
+static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId);
+static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId);
+static void InitDecorationCategoriesWindow(u8 taskId);
+static void PrintDecorationCategoryMenuItems(u8 taskId);
+static void PrintDecorationCategoryMenuItem(u8 winid, u8 category, u8 x, u8 y, bool8 disabled, u8 speed);
+static void ColorMenuItemString(u8 *str, bool8 disabled);
+static void HandleDecorationCategoriesMenuInput(u8 taskId);
+static void SelectDecorationCategory(u8 taskId);
+static void ReturnToDecorationCategoriesAfterInvalidSelection(u8 taskId);
+static void ExitDecorationCategoriesMenu(u8 taskId);
+static void ReturnToActionsMenuFromCategories(u8 taskId);
+static void ExitTraderDecorationMenu(u8 taskId);
+static void CopyDecorationMenuItemName(u8 *dest, u16 decoration);
+static void DecorationItemsMenu_OnCursorMove(s32 itemIndex, bool8 flag, struct ListMenu *menu);
 void sub_81274A0(u8 a0, s32 a1, u8 a2);
-void sub_8127620(u8 taskId);
-void sub_812764C(u8 taskId);
-void sub_8127744(u32 a0);
-void sub_81277A8(void);
+static void ShowDecorationItemsWindow(u8 taskId);
+static void HandleDecorationItemsMenuInput(u8 taskId);
+static void PrintDecorationItemDescription(u32 itemIndex);
+static void RemoveDecorationItemsOtherWindows(void);
 bool8 sub_81277BC(u8 idx);
 bool8 sub_81277E8(u8 idx);
-void IdentifyOwnedDecorationsCurrentlyInUse(u8 taskId);
-void sub_812759C(u8 taskId);
-void sub_8127718(u8 decorCat);
+static void IdentifyOwnedDecorationsCurrentlyInUse(u8 taskId);
+static void InitDecorationItemsWindow(u8 taskId);
+static void ShowDecorationCategorySummaryWindow(u8 category);
 void sub_8127A30(u8 taskId);
 void sub_8127A8C(u8 taskId);
 void sub_8127F68(u8 taskId);
@@ -168,13 +165,12 @@ void sub_812A3D4(u8 taskId);
 void sub_812A458(u8 taskId);
 void sub_812A478(u8 taskId);
 
-// .rodata
-
 #include "data/decoration/tiles.h"
 #include "data/decoration/description.h"
 #include "data/decoration/header.h"
 
-const u8 *const sDecorCatNames[] = {
+static const u8 *const sDecorationCategoryNames[] =
+{
     gText_Desk,
     gText_Chair,
     gText_Plant,
@@ -185,36 +181,42 @@ const u8 *const sDecorCatNames[] = {
     gText_Cushion
 };
 
-const struct MenuAction sSecretBasePCMenuActions[] = {
+static const struct MenuAction sDecorationMainMenuActions[] =
+{
     {
-        gText_Decorate, {.void_u8=SecretBasePC_Decorate}
-    }, {
-        gText_PutAway, {.void_u8=SecretBasePC_PutAway}
-    }, {
-        gText_Toss2, {.void_u8=SecretBasePC_Toss}
-    }, {
-        gText_Cancel, {.void_u8=SecretBasePC_Cancel}
-    }
+        .text = gText_Decorate,
+        .func = { .void_u8 = DecorationMenuAction_Decorate },
+    },
+    {
+        .text = gText_PutAway,
+        .func = { .void_u8 = DecorationMenuAction_PutAway },
+    },
+    {
+        .text = gText_Toss2,
+        .func = { .void_u8 = DecorationMenuAction_Toss },
+    },
+    {
+        .text = gText_Cancel,
+        .func = { .void_u8 = DecorationMenuAction_Cancel },
+    },
 };
 
-const u8 *const sSecretBasePCMenuItemDescriptions[] = {
+static const u8 *const sSecretBasePCMenuItemDescriptions[] =
+{
     gText_PutOutSelectedDecorItem,
     gText_StoreChosenDecorInPC,
     gText_ThrowAwayUnwantedDecors,
     gText_GoBackPrevMenu
 };
 
-void (*const SecretBasePC_SelectedDecorActions[][2])(u8 taskId) = {
-   {
-        sub_8127F68, sub_8127A8C
-   }, {
-        sub_812A3D4, sub_8127A8C
-   }, {
-        sub_8133DA0, sub_8127A8C
-   }
+static const TaskFunc sSecretBasePC_SelectedDecorationActions[][2] =
+{
+   { sub_8127F68, sub_8127A8C },
+   { sub_812A3D4, sub_8127A8C },
+   { sub_8133DA0, sub_8127A8C },
 };
 
-const struct WindowTemplate gUnknown_085A6B90[4] =
+static const struct WindowTemplate sDecorationWindowTemplates[4] =
 {
     {
         .bg = 0,
@@ -254,12 +256,12 @@ const struct WindowTemplate gUnknown_085A6B90[4] =
     }
 };
 
-const u16 gUnknown_085A6BB0[] = INCBIN_U16("graphics/decorations/unk_85a6bb0.gbapal");
+static const u16 sDecorationMenuPalette[] = INCBIN_U16("graphics/decorations/decoration_menu.gbapal");
 
-const struct ListMenuTemplate gUnknown_085A6BD0 =
+static const struct ListMenuTemplate sDecorationItemsListMenuTemplate =
 {
     .items = NULL,
-    .moveCursorFunc = sub_8127480,
+    .moveCursorFunc = DecorationItemsMenu_OnCursorMove,
     .itemPrintFunc = sub_81274A0,
     .totalItems = 0,
     .maxShowed = 0,
@@ -280,281 +282,310 @@ const struct ListMenuTemplate gUnknown_085A6BD0 =
 #include "data/decoration/icon.h"
 #include "data/decoration/tilemaps.h"
 
-const struct {
+static const struct {
     u8 shape;
     u8 size;
-    u8 x;
-    u8 y;
-} gUnknown_085A7250[] = {
-    {0, 1, 0x78, 0x4e},
-    {1, 2, 0x80, 0x4e},
-    {1, 3, 0x90, 0x56},
-    {1, 3, 0x90, 0x46},
-    {0, 2, 0x80, 0x46},
-    {2, 2, 0x78, 0x46},
-    {2, 3, 0x80, 0x56},
-    {2, 3, 0x80, 0x36},
-    {0, 3, 0x90, 0x46},
-    {1, 3, 0x90, 0x46}
+    u8 cameraX;
+    u8 cameraY;
+} sDecorationMovementInfo[] =
+{
+    [DECORSHAPE_1x1] = {SPRITE_SHAPE(16x16), SPRITE_SIZE(16x16), 120, 78},
+    [DECORSHAPE_2x1] = {SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), 128, 78},
+    [DECORSHAPE_3x1] = {SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), 144, 86},
+    [DECORSHAPE_4x2] = {SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), 144, 70},
+    [DECORSHAPE_2x2] = {SPRITE_SHAPE(32x32), SPRITE_SIZE(32x32), 128, 70},
+    [DECORSHAPE_1x2] = {SPRITE_SHAPE(16x32), SPRITE_SIZE(16x32), 120, 70},
+    [DECORSHAPE_1x3] = {SPRITE_SHAPE(32x64), SPRITE_SIZE(32x64), 128, 86},
+    [DECORSHAPE_2x4] = {SPRITE_SHAPE(32x64), SPRITE_SIZE(32x64), 128, 54},
+    [DECORSHAPE_3x3] = {SPRITE_SHAPE(64x64), SPRITE_SIZE(64x64), 144, 70},
+    [DECORSHAPE_3x2] = {SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), 144, 70},
 };
 
-const union AnimCmd gUnknown_085A7278[] = {
+static const union AnimCmd sDecorSelectorAnimCmd0[] =
+{
     ANIMCMD_FRAME(0, 0, FALSE, FALSE),
     ANIMCMD_END
 };
 
-const union AnimCmd *const sDecorSelectorAnims[] = {
-    gUnknown_085A7278
-};
+static const union AnimCmd *const sDecorSelectorAnimCmds[] = { sDecorSelectorAnimCmd0 };
 
-const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = {
-    (const u8 *)&sPlaceDecorationGraphicsDataBuffer.image, 0x800
+static const struct SpriteFrameImage sDecorSelectorSpriteFrameImages =
+{
+    .data = (const u8 *)&sPlaceDecorationGraphicsDataBuffer.image,
+    .size = 0x800,
 };
 
-const struct SpriteTemplate sDecorSelectorSpriteTemplate = {
+static const struct SpriteTemplate sDecorationSelectorSpriteTemplate =
+{
     0xFFFF,
-    OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG,
+    PLACE_DECORATION_SELECTOR_TAG,
     &sDecorSelectorOam,
-    sDecorSelectorAnims,
+    sDecorSelectorAnimCmds,
     &sDecorSelectorSpriteFrameImages,
     gDummySpriteAffineAnimTable,
     SpriteCallbackDummy
 };
 
-const struct SpriteTemplate sDecorWhilePlacingSpriteTemplate = {
+const struct SpriteTemplate sDecorWhilePlacingSpriteTemplate =
+{
     0x0000,
     0x0000,
     &sDecorSelectorOam,
-    sDecorSelectorAnims,
+    sDecorSelectorAnimCmds,
     NULL,
     gDummySpriteAffineAnimTable,
     SpriteCallbackDummy
 };
 
-const struct SpritePalette gUnknown_085A72BC = {
-    (const u16 *)&sPlaceDecorationGraphicsDataBuffer.palette, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG
+const struct SpritePalette gUnknown_085A72BC =
+{
+    .data = (const u16 *)&sPlaceDecorationGraphicsDataBuffer.palette,
+    .tag = PLACE_DECORATION_SELECTOR_TAG,
 };
 
-const struct YesNoFuncTable gUnknown_085A72C4 = {
-    sub_81289F0,
-    sub_8128FD8
+const struct YesNoFuncTable gUnknown_085A72C4 =
+{
+    .yesFunc = sub_81289F0,
+    .noFunc = sub_8128FD8,
 };
 
-const struct YesNoFuncTable gUnknown_085A72CC = {
-    sub_8128BA0,
-    sub_8128FD8
+const struct YesNoFuncTable gUnknown_085A72CC =
+{
+    .yesFunc = sub_8128BA0,
+    .noFunc = sub_8128FD8,
 };
 
-const struct YesNoFuncTable gUnknown_085A72D4[] = {
+const struct YesNoFuncTable gUnknown_085A72D4[] =
+{
+    {
+        .yesFunc = sub_81283BC,
+        .noFunc = sub_8128414,
+    },
     {
-        sub_81283BC,
-        sub_8128414
-    }, {
-        sub_8129BCC,
-        sub_8129BF8
+        .yesFunc = sub_8129BCC,
+        .noFunc = sub_8129BF8,
     }
 };
 
-const u8 gUnknown_085A72E4[] = {
-    0x04, 0x04, 0x04, 0x04, 0x00, 0x03, 0x03, 0x00
+static const u8 sDecorationStandElevations[] =
+{
+    4, 4, 4, 4,
+    0, 3, 3, 0
 };
 
-const u8 gUnknown_085A72EC[] = {
-    0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x03, 0x00
+static const u8 sDecorationSlideElevation[] =
+{
+    4, 4,
+    4, 4,
+    0, 4,
+    3, 0,
 };
 
 const u16 gUnknown_085A72F4[] = {
     0x04, 0x08, 0x10, 0x20, 0x10, 0x08, 0x10, 0x20, 0x40, 0x20
 };
 
-const u16 Unknown_085A7308[] = INCBIN_U16("graphics/decorations/unk_85a7308.gbapal");
+const u16 gUnknown_085A7308[] = INCBIN_U16("graphics/decorations/unk_85a7308.gbapal");
 
-const u16 Unknown_085A7328[] = INCBIN_U16("graphics/decorations/unk_85a7328.gbapal");
+const u16 gUnknown_085A7328[] = INCBIN_U16("graphics/decorations/unk_85a7328.gbapal");
 
-const struct YesNoFuncTable gUnknown_085A7348 = {
-    sub_812A1C0,
-    sub_8129B34
+const struct YesNoFuncTable gUnknown_085A7348 =
+{
+    .yesFunc = sub_812A1C0,
+    .noFunc = sub_8129B34,
 };
 
-const struct YesNoFuncTable gUnknown_085A7350 = {
-    sub_812A210,
-    sub_8129B34
+const struct YesNoFuncTable gUnknown_085A7350 =
+{
+    .yesFunc = sub_812A210,
+    .noFunc = sub_8129B34,
 };
 
-const u8 Unknown_085A7358[] = INCBIN_U8("graphics/misc/decoration_unk_85a7358.4bpp");
+const u8 gUnknown_085A7358[] = INCBIN_U8("graphics/misc/decoration_unk_85a7358.4bpp");
 
-const struct SpritePalette gUnknown_085A73D8 = {
-    Unknown_085A7308, OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG
+const struct SpritePalette gUnknown_085A73D8 =
+{
+    .data = gUnknown_085A7308,
+    .tag = PLACE_DECORATION_PLAYER_TAG,
 };
 
-const struct SpritePalette gUnknown_085A73E0 = {
-    Unknown_085A7328, OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG
+const struct SpritePalette gUnknown_085A73E0 =
+{
+    .data = gUnknown_085A7328,
+    .tag = PLACE_DECORATION_PLAYER_TAG,
 };
 
-const struct OamData Unknown_085A73E8 = {
+const struct OamData gUnknown_085A73E8 =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
     .size = SPRITE_SIZE(16x16),
-    .priority = 1
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
 };
 
-const union AnimCmd Unknown_085A73F0[] = {
+const union AnimCmd gUnknown_085A73F0[] =
+{
     ANIMCMD_FRAME(0, 0, 0),
     ANIMCMD_END
 };
 
-const union AnimCmd *const Unknown_085A73F8[] = {
-    Unknown_085A73F0
+const union AnimCmd *const gUnknown_085A73F8[] =
+{
+    gUnknown_085A73F0,
 };
 
-const struct SpriteFrameImage Unknown_085A73FC = {
-    Unknown_085A7358, 0x80
+const struct SpriteFrameImage gUnknown_085A73FC =
+{
+    .data = gUnknown_085A7358,
+    .size = 0x80,
 };
 
-const struct SpriteTemplate gUnknown_085A7404 = {
+const struct SpriteTemplate gUnknown_085A7404 =
+{
     0xFFFF,
-    OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG,
-    &Unknown_085A73E8,
-    Unknown_085A73F8,
-    &Unknown_085A73FC,
+    PLACE_DECORATION_PLAYER_TAG,
+    &gUnknown_085A73E8,
+    gUnknown_085A73F8,
+    &gUnknown_085A73FC,
     gDummySpriteAffineAnimTable,
     sub_812A36C
 };
 
-const struct YesNoFuncTable gUnknown_085A741C = {
-    sub_812A478,
-    sub_8127A30
+const struct YesNoFuncTable gUnknown_085A741C =
+{
+    .yesFunc = sub_812A478,
+    .noFunc = sub_8127A30,
 };
 
-// .text
 
-void sub_8126968(void)
+void InitDecorationContextItems(void)
 {
-    if (sCurDecorationCategory < 8)
-    {
-        gCurDecorInventoryItems = gDecorationInventories[sCurDecorationCategory].items;
-    }
-    if (gUnknown_0203A17C.isPlayerRoom == FALSE)
+    if (sCurDecorationCategory < DECORCAT_COUNT)
+        gCurDecorationItems = gDecorationInventories[sCurDecorationCategory].items;
+
+    if (gDecorationContext.isPlayerRoom == FALSE)
     {
-        gUnknown_0203A17C.items = gSaveBlock1Ptr->secretBases[0].decorations;
-        gUnknown_0203A17C.pos = gSaveBlock1Ptr->secretBases[0].decorationPos;
+        gDecorationContext.items = gSaveBlock1Ptr->secretBases[0].decorations;
+        gDecorationContext.pos = gSaveBlock1Ptr->secretBases[0].decorationPositions;
     }
-    if (gUnknown_0203A17C.isPlayerRoom == TRUE)
+
+    if (gDecorationContext.isPlayerRoom == TRUE)
     {
-        gUnknown_0203A17C.items = gSaveBlock1Ptr->playerRoomDecor;
-        gUnknown_0203A17C.pos = gSaveBlock1Ptr->playerRoomDecorPos;
+        gDecorationContext.items = gSaveBlock1Ptr->playerRoomDecor;
+        gDecorationContext.pos = gSaveBlock1Ptr->playerRoomDecorPos;
     }
 }
 
-u8 sub_81269D4(u8 idx)
+static u8 AddDecorationWindow(u8 windowIndex)
 {
-    u8 *winidx;
+    u8 *windowId;
     struct WindowTemplate template;
 
-    winidx = &sDecorMenuWindowIndices[idx];
-    if (idx == 0)
+    windowId = &sDecorMenuWindowIds[windowIndex];
+    if (windowIndex == 0)
     {
-        template = gUnknown_085A6B90[0];
-        template.width = GetMaxWidthInMenuTable(sSecretBasePCMenuActions, 4);
+        template = sDecorationWindowTemplates[0];
+        template.width = GetMaxWidthInMenuTable(sDecorationMainMenuActions, ARRAY_COUNT(sDecorationMainMenuActions));
         if (template.width > 18)
-        {
             template.width = 18;
-        }
-        *winidx = AddWindow(&template);
+
+        *windowId = AddWindow(&template);
     }
     else
     {
-        *winidx = AddWindow(&gUnknown_085A6B90[idx]);
+        *windowId = AddWindow(&sDecorationWindowTemplates[windowIndex]);
     }
-    DrawStdFrameWithCustomTileAndPalette(*winidx, 0, 0x214, 0xe);
+
+    DrawStdFrameWithCustomTileAndPalette(*windowId, FALSE, 0x214, 14);
     schedule_bg_copy_tilemap_to_vram(0);
-    return *winidx;
+    return *windowId;
 }
 
-void sub_8126A58(u8 idx)
+static void RemoveDecorationWindow(u8 windowIndex)
 {
-    ClearStdWindowAndFrameToTransparent(sDecorMenuWindowIndices[idx], FALSE);
-    ClearWindowTilemap(sDecorMenuWindowIndices[idx]);
-    RemoveWindow(sDecorMenuWindowIndices[idx]);
+    ClearStdWindowAndFrameToTransparent(sDecorMenuWindowIds[windowIndex], FALSE);
+    ClearWindowTilemap(sDecorMenuWindowIds[windowIndex]);
+    RemoveWindow(sDecorMenuWindowIds[windowIndex]);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-void sub_8126A88(void)
+static void AddDecorationActionsWindow(void)
 {
-    u8 idx;
-
-    idx = sub_81269D4(0);
-    PrintMenuTable(idx, 4, sSecretBasePCMenuActions);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(idx, 4, sSecretBasePCMenuCursorPos);
+    u8 windowId = AddDecorationWindow(0);
+    PrintMenuTable(windowId, 4, sDecorationMainMenuActions);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, 4, sDecorationActionsCursorPos);
 }
 
-void sub_8126ABC(void)
+static void InitDecorationActionsWindow(void)
 {
-    sSecretBasePCMenuCursorPos = 0;
+    sDecorationActionsCursorPos = 0;
     ScriptContext2_Enable();
-    sub_8126A88();
-    sub_8126C08();
+    AddDecorationActionsWindow();
+    PrintCurMainMenuDescription();
 }
 
-void sub_8126AD8(u8 taskId)
+void DoSecretBaseDecorationMenu(u8 taskId)
 {
-    sub_8126ABC();
-    gUnknown_0203A17C.items = gSaveBlock1Ptr->secretBases[0].decorations;
-    gUnknown_0203A17C.pos = gSaveBlock1Ptr->secretBases[0].decorationPos;
-    gUnknown_0203A17C.size = sizeof(gSaveBlock1Ptr->secretBases[0].decorations);
-    gUnknown_0203A17C.isPlayerRoom = FALSE;
-    gTasks[taskId].func = sub_8126B80;
+    InitDecorationActionsWindow();
+    gDecorationContext.items = gSaveBlock1Ptr->secretBases[0].decorations;
+    gDecorationContext.pos = gSaveBlock1Ptr->secretBases[0].decorationPositions;
+    gDecorationContext.size = sizeof(gSaveBlock1Ptr->secretBases[0].decorations);
+    gDecorationContext.isPlayerRoom = FALSE;
+    gTasks[taskId].func = HandleDecorationActionsMenuInput;
 }
 
-void sub_8126B2C(u8 taskId)
+void DoPlayerRoomDecorationMenu(u8 taskId)
 {
-    sub_8126ABC();
-    gUnknown_0203A17C.items = gSaveBlock1Ptr->playerRoomDecor;
-    gUnknown_0203A17C.pos = gSaveBlock1Ptr->playerRoomDecorPos;
-    gUnknown_0203A17C.size = sizeof(gSaveBlock1Ptr->playerRoomDecor);
-    gUnknown_0203A17C.isPlayerRoom = TRUE;
-    gTasks[taskId].func = sub_8126B80;
+    InitDecorationActionsWindow();
+    gDecorationContext.items = gSaveBlock1Ptr->playerRoomDecor;
+    gDecorationContext.pos = gSaveBlock1Ptr->playerRoomDecorPos;
+    gDecorationContext.size = sizeof(gSaveBlock1Ptr->playerRoomDecor);
+    gDecorationContext.isPlayerRoom = TRUE;
+    gTasks[taskId].func = HandleDecorationActionsMenuInput;
 }
 
-void sub_8126B80(u8 taskId)
+static void HandleDecorationActionsMenuInput(u8 taskId)
 {
-    u8 menuPos;
-
     if (!gPaletteFade.active)
     {
-        menuPos = Menu_GetCursorPos();
+        s8 menuPos = Menu_GetCursorPos();
         switch (Menu_ProcessInput())
         {
-            default:
-                PlaySE(SE_SELECT);
-                sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId);
-                break;
-            case MENU_NOTHING_CHOSEN:
-                sSecretBasePCMenuCursorPos = Menu_GetCursorPos();
-                if ((s8)menuPos != sSecretBasePCMenuCursorPos)
-                {
-                    sub_8126C08();
-                }
-                break;
-            case MENU_B_PRESSED:
-                PlaySE(SE_SELECT);
-                SecretBasePC_Cancel(taskId);
-                break;
+        default:
+            PlaySE(SE_SELECT);
+            sDecorationMainMenuActions[sDecorationActionsCursorPos].func.void_u8(taskId);
+            break;
+        case MENU_NOTHING_CHOSEN:
+            sDecorationActionsCursorPos = Menu_GetCursorPos();
+            if (menuPos != sDecorationActionsCursorPos)
+                PrintCurMainMenuDescription();
+            break;
+        case MENU_B_PRESSED:
+            PlaySE(SE_SELECT);
+            DecorationMenuAction_Cancel(taskId);
+            break;
         }
     }
 }
 
-void sub_8126C08(void)
+static void PrintCurMainMenuDescription(void)
 {
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
-    AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
+    AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sDecorationActionsCursorPos], 0, 0, 2, 1, 3);
 }
 
-void SecretBasePC_Decorate(u8 taskId)
+static void DecorationMenuAction_Decorate(u8 taskId)
 {
-    if (CountDecorations() == 0)
+    if (GetNumOwnedDecorations() == 0)
     {
         StringExpandPlaceholders(gStringVar4, gText_NoDecorations);
-        DisplayItemMessageOnField(taskId, gStringVar4, sub_8126DA4);
+        DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationActionsAfterInvalidSelection);
     }
     else
     {
@@ -564,16 +595,16 @@ void SecretBasePC_Decorate(u8 taskId)
     }
 }
 
-void SecretBasePC_PutAway(u8 taskId)
+static void DecorationMenuAction_PutAway(u8 taskId)
 {
     if (!sub_81299AC(taskId))
     {
         StringExpandPlaceholders(gStringVar4, gText_NoDecorationsInUse);
-        DisplayItemMessageOnField(taskId, gStringVar4, sub_8126DA4);
+        DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationActionsAfterInvalidSelection);
     }
     else
     {
-        sub_8126A58(0);
+        RemoveDecorationWindow(0);
         ClearDialogWindowAndFrame(0, 0);
         FadeScreen(1, 0);
         gTasks[taskId].data[2] = 0;
@@ -581,12 +612,12 @@ void SecretBasePC_PutAway(u8 taskId)
     }
 }
 
-void SecretBasePC_Toss(u8 taskId)
+static void DecorationMenuAction_Toss(u8 taskId)
 {
-    if (CountDecorations() == 0)
+    if (GetNumOwnedDecorations() == 0)
     {
         StringExpandPlaceholders(gStringVar4, gText_NoDecorations);
-        DisplayItemMessageOnField(taskId, gStringVar4, sub_8126DA4);
+        DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationActionsAfterInvalidSelection);
     }
     else
     {
@@ -596,10 +627,10 @@ void SecretBasePC_Toss(u8 taskId)
     }
 }
 
-void SecretBasePC_Cancel(u8 taskId)
+static void DecorationMenuAction_Cancel(u8 taskId)
 {
-    sub_8126A58(0);
-    if (!gUnknown_0203A17C.isPlayerRoom)
+    RemoveDecorationWindow(0);
+    if (!gDecorationContext.isPlayerRoom)
     {
         ScriptContext1_SetupScript(gUnknown_0823B4E8);
         DestroyTask(taskId);
@@ -610,260 +641,237 @@ void SecretBasePC_Cancel(u8 taskId)
     }
 }
 
-void sub_8126DA4(u8 taskId)
+static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId)
 {
-    sub_8126C08();
-    gTasks[taskId].func = sub_8126B80;
+    PrintCurMainMenuDescription();
+    gTasks[taskId].func = HandleDecorationActionsMenuInput;
 }
 
-void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId)
+static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId)
 {
-    LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20);
+    LoadPalette(sDecorationMenuPalette, 0xd0, 0x20);
     ClearDialogWindowAndFrame(0, 0);
-    sub_8126A58(0);
-    sub_8126DFC(taskId);
+    RemoveDecorationWindow(0);
+    InitDecorationCategoriesWindow(taskId);
 }
 
-void sub_8126DFC(u8 taskId)
+static void InitDecorationCategoriesWindow(u8 taskId)
 {
-    u8 winIdx;
-
-    winIdx = sub_81269D4(1);
-    sub_8126E8C(taskId);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(winIdx, 9, sCurDecorationCategory);
-    gTasks[taskId].func = sub_8127088;
+    u8 windowId = AddDecorationWindow(1);
+    PrintDecorationCategoryMenuItems(taskId);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, DECORCAT_COUNT + 1, sCurDecorationCategory);
+    gTasks[taskId].func = HandleDecorationCategoriesMenuInput;
 }
 
-void sub_8126E44(u8 taskId)
+static void sub_8126E44(u8 taskId)
 {
-    FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PIXEL_FILL(1));
-    sub_8126E8C(taskId);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIndices[1], 9, sCurDecorationCategory);
-    gTasks[taskId].func = sub_8127088;
+    FillWindowPixelBuffer(sDecorMenuWindowIds[1], PIXEL_FILL(1));
+    PrintDecorationCategoryMenuItems(taskId);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIds[1], DECORCAT_COUNT + 1, sCurDecorationCategory);
+    gTasks[taskId].func = HandleDecorationCategoriesMenuInput;
 }
 
-void sub_8126E8C(u8 taskId)
+static void PrintDecorationCategoryMenuItems(u8 taskId)
 {
-    s16 *data;
-    u8 r5;
-    bool8 r8;
     u8 i;
-    bool8 fl;
-
-    data = gTasks[taskId].data;
-    r5 = sDecorMenuWindowIndices[1];
-    fl = gUnknown_0203A17C.isPlayerRoom;
-    r8 = FALSE;
-    if (fl == TRUE && data[11] == 0)
-    {
-        r8 = TRUE;
-    }
-    for (i = 0; i < 8; i ++)
-    {
-        if (r8 == TRUE && i != DECORCAT_DOLL && i != DECORCAT_CUSHION)
-        {
-            sub_8126F68(r5, i, 8, i << 4, TRUE, 0xFF);
-        }
+    s16 *data = gTasks[taskId].data;
+    u8 windowId = sDecorMenuWindowIds[1];
+    bool8 isPlayerRoom = gDecorationContext.isPlayerRoom;
+    bool8 shouldDisable = FALSE;
+    if (isPlayerRoom == TRUE && data[11] == 0)
+        shouldDisable = TRUE;
+
+    for (i = 0; i < DECORCAT_COUNT; i++)
+    {
+        // Only DOLL and CUSHION decorations are enabled when decorating the player's room.
+        if (shouldDisable == TRUE && i != DECORCAT_DOLL && i != DECORCAT_CUSHION)
+            PrintDecorationCategoryMenuItem(windowId, i, 8, i * 16, TRUE, TEXT_SPEED_FF);
         else
-        {
-            sub_8126F68(r5, i, 8, i << 4, FALSE, 0xFF);
-        }
+            PrintDecorationCategoryMenuItem(windowId, i, 8, i * 16, FALSE, TEXT_SPEED_FF);
     }
-    AddTextPrinterParameterized(r5, 1, gTasks[taskId].data[11] == 2 ? gText_Exit : gText_Cancel, 8, (i << 4) + 1, 0, 0);
+
+    AddTextPrinterParameterized(windowId, 1, gTasks[taskId].data[11] == 2 ? gText_Exit : gText_Cancel, 8, i * 16 + 1, 0, NULL);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-void sub_8126F68(u8 winid, u8 decorCat, u8 x, u8 y, bool8 flag, u8 speed)
+static void PrintDecorationCategoryMenuItem(u8 winid, u8 category, u8 x, u8 y, bool8 disabled, u8 speed)
 {
     u8 width;
-    u8 *strbuf;
+    u8 *str;
 
-    width = x == 8 ? 0x68 : 0x60;
-    y ++;
-    sub_8127058(gStringVar4, flag);
-    strbuf = StringLength(gStringVar4) + gStringVar4;
-    StringCopy(strbuf, sDecorCatNames[decorCat]);
+    width = x == 8 ? 104 : 96;
+    y++;
+    ColorMenuItemString(gStringVar4, disabled);
+    str = StringLength(gStringVar4) + gStringVar4;
+    StringCopy(str, sDecorationCategoryNames[category]);
     AddTextPrinterParameterized(winid, 1, gStringVar4, x, y, speed, NULL);
-    strbuf = ConvertIntToDecimalStringN(strbuf, CountDecorationCategoryN(decorCat), STR_CONV_MODE_RIGHT_ALIGN, 2);
-    *strbuf++ = CHAR_SLASH;
-    ConvertIntToDecimalStringN(strbuf, gDecorationInventories[decorCat].size, STR_CONV_MODE_RIGHT_ALIGN, 2);
+    str = ConvertIntToDecimalStringN(str, GetNumOwnedDecorationsInCategory(category), STR_CONV_MODE_RIGHT_ALIGN, 2);
+    *(str++) = CHAR_SLASH;
+    ConvertIntToDecimalStringN(str, gDecorationInventories[category].size, STR_CONV_MODE_RIGHT_ALIGN, 2);
     x = GetStringRightAlignXOffset(1, gStringVar4, width);
     AddTextPrinterParameterized(winid, 1, gStringVar4, x, y, speed, NULL);
 }
 
-void sub_8127058(u8 *str, bool8 flag)
+static void ColorMenuItemString(u8 *str, bool8 disabled)
 {
     StringCopy(str, gText_Color161Shadow161);
-    if (flag == TRUE)
+    if (disabled == TRUE)
     {
-        str[2] = 0x04; // RED
-        str[5] = 0x05; // LIGHT_RED
+        str[2] = 4;
+        str[5] = 5;
     }
     else
     {
-        str[2] = 0x02; // DARK_GREY
-        str[5] = 0x03; // LIGHT_GREY
+        str[2] = 2;
+        str[5] = 3;
     }
 }
 
-void sub_8127088(u8 taskId)
+static void HandleDecorationCategoriesMenuInput(u8 taskId)
 {
-    s8 input;
-
     if (!gPaletteFade.active)
     {
-        input = Menu_ProcessInput();
+        s8 input = Menu_ProcessInput();
         switch (input)
         {
-            case MENU_B_PRESSED:
-            case 8:
-                PlaySE(SE_SELECT);
-                sub_812719C(taskId);
-                break;
-            case MENU_NOTHING_CHOSEN:
-                break;
-            default:
-                PlaySE(SE_SELECT);
-                sCurDecorationCategory = input;
-                sub_81270E8(taskId);
-                break;
+        case MENU_B_PRESSED:
+        case DECORCAT_COUNT: // CANCEL
+            PlaySE(SE_SELECT);
+            ExitDecorationCategoriesMenu(taskId);
+            break;
+        case MENU_NOTHING_CHOSEN:
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            sCurDecorationCategory = input;
+            SelectDecorationCategory(taskId);
+            break;
         }
     }
 }
 
-void sub_81270E8(u8 taskId)
+static void SelectDecorationCategory(u8 taskId)
 {
-    sCurDecorCatCount = CountDecorationCategoryN(sCurDecorationCategory);
-    if (sCurDecorCatCount != 0)
+    sNumOwnedDecorationsInCurCategory = GetNumOwnedDecorationsInCategory(sCurDecorationCategory);
+    if (sNumOwnedDecorationsInCurCategory != 0)
     {
-        CondenseDecorationCategoryN(sCurDecorationCategory);
-        gCurDecorInventoryItems = gDecorationInventories[sCurDecorationCategory].items;
+        CondenseDecorationsInCategory(sCurDecorationCategory);
+        gCurDecorationItems = gDecorationInventories[sCurDecorationCategory].items;
         IdentifyOwnedDecorationsCurrentlyInUse(taskId);
-        sSecretBasePCSelectDecorPageNo = 0;
-        sSecretBasePCSelectDecorLineNo = 0;
-        gTasks[taskId].func = sub_8127620;
+        sDecorationsScrollOffset = 0;
+        sDecorationsCursorPos = 0;
+        gTasks[taskId].func = ShowDecorationItemsWindow;
     }
     else
     {
-        sub_8126A58(1);
+        RemoveDecorationWindow(1);
         StringExpandPlaceholders(gStringVar4, gText_NoDecorations);
-        DisplayItemMessageOnField(taskId, gStringVar4, sub_8127180);
+        DisplayItemMessageOnField(taskId, gStringVar4, ReturnToDecorationCategoriesAfterInvalidSelection);
     }
 }
 
-void sub_8127180(u8 taskId)
+static void ReturnToDecorationCategoriesAfterInvalidSelection(u8 taskId)
 {
     ClearDialogWindowAndFrame(0, 0);
-    sub_8126DFC(taskId);
+    InitDecorationCategoriesWindow(taskId);
 }
 
-void sub_812719C(u8 taskId)
+static void ExitDecorationCategoriesMenu(u8 taskId)
 {
     if (gTasks[taskId].data[11] != 2)
-    {
-        sub_81271CC(taskId);
-    }
+        ReturnToActionsMenuFromCategories(taskId);
     else
-    {
-        sub_8127268(taskId);
-    }
+        ExitTraderDecorationMenu(taskId);
 }
 
-void sub_81271CC(u8 taskId)
+static void ReturnToActionsMenuFromCategories(u8 taskId)
 {
-    sub_8126A58(1);
-    sub_8126A88();
+    RemoveDecorationWindow(1);
+    AddDecorationActionsWindow();
     DrawDialogueFrame(0, 0);
-    sub_8126C08();
-    gTasks[taskId].func = sub_8126B80;
+    PrintCurMainMenuDescription();
+    gTasks[taskId].func = HandleDecorationActionsMenuInput;
 }
 
-void sub_8127208(u8 taskId)
+void ShowDecorationCategoriesWindow(u8 taskId)
 {
-    LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20);
+    LoadPalette(sDecorationMenuPalette, 0xd0, 0x20);
     ClearDialogWindowAndFrame(0, 0);
     gTasks[taskId].data[11] = 2;
     sCurDecorationCategory = DECORCAT_DESK;
-    sub_8126DFC(taskId);
+    InitDecorationCategoriesWindow(taskId);
 }
 
-void sub_8127250(u8 *dest, u8 decorCat)
+void CopyDecorationCategoryName(u8 *dest, u8 category)
 {
-    StringCopy(dest, sDecorCatNames[decorCat]);
+    StringCopy(dest, sDecorationCategoryNames[category]);
 }
 
-void sub_8127268(u8 taskId)
+static void ExitTraderDecorationMenu(u8 taskId)
 {
-    sub_8126A58(1);
-    sub_8133E1C(taskId);
+    RemoveDecorationWindow(1);
+    ExitTraderMenu(taskId);
 }
 
-void sub_8127284(void)
+static void InitDecorationItemsMenuLimits(void)
 {
-    sDecorPCBuffer->unk_520 = sCurDecorCatCount + 1;
-    if (sDecorPCBuffer->unk_520 > 8)
-    {
-        sDecorPCBuffer->unk_521 = 8;
-    }
+    sDecorationItemsMenu->numMenuItems = sNumOwnedDecorationsInCurCategory + 1;
+    if (sDecorationItemsMenu->numMenuItems > 8)
+        sDecorationItemsMenu->maxShownItems = 8;
     else
-    {
-        sDecorPCBuffer->unk_521 = sDecorPCBuffer->unk_520;
-    }
+        sDecorationItemsMenu->maxShownItems = sDecorationItemsMenu->numMenuItems;
 }
 
-void sub_81272C8(void)
+static void sub_81272C8(void)
 {
-    sub_812225C(&sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo, sDecorPCBuffer->unk_521, sDecorPCBuffer->unk_520);
+    sub_812225C(&sDecorationsScrollOffset, &sDecorationsCursorPos, sDecorationItemsMenu->maxShownItems, sDecorationItemsMenu->numMenuItems);
 }
 
-void sub_81272F8(void)
+static void sub_81272F8(void)
 {
-    sub_8122298(&sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo, sDecorPCBuffer->unk_521, sDecorPCBuffer->unk_520, 8);
+    sub_8122298(&sDecorationsScrollOffset, &sDecorationsCursorPos, sDecorationItemsMenu->maxShownItems, sDecorationItemsMenu->numMenuItems, 8);
 }
 
-void sub_8127330(u8 taskId)
+static void PrintDecorationItemMenuItems(u8 taskId)
 {
     s16 *data;
     u16 i;
 
     data = gTasks[taskId].data;
-    if ((sCurDecorationCategory < DECORCAT_DOLL || sCurDecorationCategory > DECORCAT_CUSHION) && gUnknown_0203A17C.isPlayerRoom == TRUE && data[11] == 0)
-    {
-        sub_8127058(gStringVar1, TRUE);
-    }
+    if ((sCurDecorationCategory < DECORCAT_DOLL || sCurDecorationCategory > DECORCAT_CUSHION) && gDecorationContext.isPlayerRoom == TRUE && data[11] == 0)
+        ColorMenuItemString(gStringVar1, TRUE);
     else
+        ColorMenuItemString(gStringVar1, FALSE);
+
+    for (i = 0; i < sDecorationItemsMenu->numMenuItems - 1; i++)
     {
-        sub_8127058(gStringVar1, FALSE);
-    }
-    for (i = 0; i < sDecorPCBuffer->unk_520 - 1; i ++)
-    {
-        sub_8127454(sDecorPCBuffer->names[i], gCurDecorInventoryItems[i]);
-        sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
-        sDecorPCBuffer->items[i].id = i;
+        CopyDecorationMenuItemName(sDecorationItemsMenu->names[i], gCurDecorationItems[i]);
+        sDecorationItemsMenu->items[i].name = sDecorationItemsMenu->names[i];
+        sDecorationItemsMenu->items[i].id = i;
     }
-    StringCopy(sDecorPCBuffer->names[i], gText_Cancel);
-    sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
-    sDecorPCBuffer->items[i].id = -2;
-    gMultiuseListMenuTemplate = gUnknown_085A6BD0;
-    gMultiuseListMenuTemplate.windowId = sDecorMenuWindowIndices[1];
-    gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520;
-    gMultiuseListMenuTemplate.items = sDecorPCBuffer->items;
-    gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521;
+
+    StringCopy(sDecorationItemsMenu->names[i], gText_Cancel);
+    sDecorationItemsMenu->items[i].name = sDecorationItemsMenu->names[i];
+    sDecorationItemsMenu->items[i].id = -2;
+    gMultiuseListMenuTemplate = sDecorationItemsListMenuTemplate;
+    gMultiuseListMenuTemplate.windowId = sDecorMenuWindowIds[1];
+    gMultiuseListMenuTemplate.totalItems = sDecorationItemsMenu->numMenuItems;
+    gMultiuseListMenuTemplate.items = sDecorationItemsMenu->items;
+    gMultiuseListMenuTemplate.maxShowed = sDecorationItemsMenu->maxShownItems;
 }
 
-void sub_8127454(u8 *dest, u16 decorId)
+static void CopyDecorationMenuItemName(u8 *dest, u16 decoration)
 {
     StringCopy(dest, gStringVar1);
-    StringAppend(dest, gDecorations[decorId].name);
+    StringAppend(dest, gDecorations[decoration].name);
 }
 
-void sub_8127480(s32 a0, bool8 flag, struct ListMenu *menu)
+static void DecorationItemsMenu_OnCursorMove(s32 itemIndex, bool8 flag, struct ListMenu *menu)
 {
     if (flag != TRUE)
-    {
         PlaySE(SE_SELECT);
-    }
-    sub_8127744(a0);
+
+    PrintDecorationItemDescription(itemIndex);
 }
 
 void sub_81274A0(u8 a0, s32 a1, u8 a2)
@@ -881,53 +889,59 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2)
     }
 }
 
-void sub_8127500(void)
+static void AddDecorationItemsScrollIndicators(void)
 {
-    if (sDecorPCBuffer->unk_522 == 0xFF)
+    if (sDecorationItemsMenu->scrollIndicatorsTaskId == 0xFF)
     {
-        sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo);
+        sDecorationItemsMenu->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(
+            SCROLL_ARROW_UP,
+            0x3c,
+            0x0c,
+            0x94,
+            sDecorationItemsMenu->numMenuItems - sDecorationItemsMenu->maxShownItems,
+            0x6e,
+            0x6e,
+            &sDecorationsScrollOffset);
     }
 }
 
-void sub_8127554(void)
+static void RemoveDecorationItemsScrollIndicators(void)
 {
-    if (sDecorPCBuffer->unk_522 != 0xFF)
+    if (sDecorationItemsMenu->scrollIndicatorsTaskId != 0xFF)
     {
-        RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522);
-        sDecorPCBuffer->unk_522 = 0xFF;
+        RemoveScrollIndicatorArrowPair(sDecorationItemsMenu->scrollIndicatorsTaskId);
+        sDecorationItemsMenu->scrollIndicatorsTaskId = 0xFF;
     }
 }
 
 void sub_8127580(u8 taskId)
 {
-    sub_81269D4(1);
-    sub_812759C(taskId);
+    AddDecorationWindow(1);
+    InitDecorationItemsWindow(taskId);
 }
 
-void sub_812759C(u8 taskId)
+static void InitDecorationItemsWindow(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
-    sub_81269D4(3);
-    sub_8127718(sCurDecorationCategory);
-    sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer));
-    sDecorPCBuffer->unk_522 = 0xFF;
-    sub_8127284();
+    s16 *data = gTasks[taskId].data;
+    AddDecorationWindow(3);
+    ShowDecorationCategorySummaryWindow(sCurDecorationCategory);
+    sDecorationItemsMenu = AllocZeroed(sizeof(*sDecorationItemsMenu));
+    sDecorationItemsMenu->scrollIndicatorsTaskId = 0xFF;
+    InitDecorationItemsMenuLimits();
     sub_81272C8();
     sub_81272F8();
-    sub_8127330(taskId);
-    data[13] = ListMenuInit(&gMultiuseListMenuTemplate, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
-    sub_8127500();
+    PrintDecorationItemMenuItems(taskId);
+    data[13] = ListMenuInit(&gMultiuseListMenuTemplate, sDecorationsScrollOffset, sDecorationsCursorPos);
+    AddDecorationItemsScrollIndicators();
 }
 
-void sub_8127620(u8 taskId)
+static void ShowDecorationItemsWindow(u8 taskId)
 {
-    sub_812759C(taskId);
-    gTasks[taskId].func = sub_812764C;
+    InitDecorationItemsWindow(taskId);
+    gTasks[taskId].func = HandleDecorationItemsMenuInput;
 }
 
-void sub_812764C(u8 taskId)
+static void HandleDecorationItemsMenuInput(u8 taskId)
 {
     s16 *data;
     s32 input;
@@ -936,129 +950,125 @@ void sub_812764C(u8 taskId)
     if (!gPaletteFade.active)
     {
         input = ListMenu_ProcessInput(data[13]);
-        ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
+        ListMenuGetScrollAndRow(data[13], &sDecorationsScrollOffset, &sDecorationsCursorPos);
         switch (input)
         {
-            case LIST_NOTHING_CHOSEN:
-                break;
-            case LIST_CANCEL:
-                PlaySE(SE_SELECT);
-                SecretBasePC_SelectedDecorActions[data[11]][1](taskId);
-                break;
-            default:
-                PlaySE(SE_SELECT);
-                gCurDecorationIndex = input;
-                sub_8127554();
-                DestroyListMenuTask(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
-                sub_8126A58(1);
-                sub_81277A8();
-                free(sDecorPCBuffer);
-                SecretBasePC_SelectedDecorActions[data[11]][0](taskId);
-                break;
+        case LIST_NOTHING_CHOSEN:
+            break;
+        case LIST_CANCEL:
+            PlaySE(SE_SELECT);
+            sSecretBasePC_SelectedDecorationActions[data[11]][1](taskId);
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            gCurDecorationIndex = input;
+            RemoveDecorationItemsScrollIndicators();
+            DestroyListMenuTask(data[13], &sDecorationsScrollOffset, &sDecorationsCursorPos);
+            RemoveDecorationWindow(1);
+            RemoveDecorationItemsOtherWindows();
+            free(sDecorationItemsMenu);
+            sSecretBasePC_SelectedDecorationActions[data[11]][0](taskId);
+            break;
         }
     }
 }
 
-void sub_8127718(u8 decorCat)
+static void ShowDecorationCategorySummaryWindow(u8 category)
 {
-    sub_8126F68(sub_81269D4(2), decorCat, 0, 0, 0, 0);
+    PrintDecorationCategoryMenuItem(AddDecorationWindow(2), category, 0, 0, 0, 0);
 }
 
-void sub_8127744(u32 a0)
+static void PrintDecorationItemDescription(u32 itemIndex)
 {
-    u8 winidx;
-    const u8 *txt;
+    u8 windowId;
+    const u8 *str;
 
-    winidx = sDecorMenuWindowIndices[3];
-    FillWindowPixelBuffer(winidx, PIXEL_FILL(1));
-    if (a0 >= sCurDecorCatCount)
-    {
-        txt = gText_GoBackPrevMenu;
-    }
+    windowId = sDecorMenuWindowIds[3];
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
+    if (itemIndex >= sNumOwnedDecorationsInCurCategory)
+        str = gText_GoBackPrevMenu;
     else
-    {
-        txt = gDecorations[gCurDecorInventoryItems[a0]].description;
-    }
-    AddTextPrinterParameterized(winidx, 1, txt, 0, 1, 0, 0);
+        str = gDecorations[gCurDecorationItems[itemIndex]].description;
+
+    AddTextPrinterParameterized(windowId, 1, str, 0, 1, 0, 0);
 }
 
-void sub_81277A8(void)
+static void RemoveDecorationItemsOtherWindows(void)
 {
-    sub_8126A58(3);
-    sub_8126A58(2);
+    // Remove description and category summary windows
+    RemoveDecorationWindow(3);
+    RemoveDecorationWindow(2);
 }
 
 bool8 sub_81277BC(u8 idx)
 {
     u8 i;
-
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < ARRAY_COUNT(sSecretBaseItemsIndicesBuffer); i++)
     {
         if (sSecretBaseItemsIndicesBuffer[i] == idx)
-        {
             return TRUE;
-        }
     }
+
     return FALSE;
 }
 
 bool8 sub_81277E8(u8 idx)
 {
     u8 i;
-
-    for (i = 0; i < 12; i ++)
+    for (i = 0; i < ARRAY_COUNT(sPlayerRoomItemsIndicesBuffer); i++)
     {
         if (sPlayerRoomItemsIndicesBuffer[i] == idx)
-        {
             return TRUE;
-        }
     }
+
     return FALSE;
 }
 
-void IdentifyOwnedDecorationsCurrentlyInUseInternal(u8 taskId)
+static void IdentifyOwnedDecorationsCurrentlyInUseInternal(u8 taskId)
 {
-    u16 i;
-    u16 j;
-    u16 k;
-    u16 cnt;
+    u16 i, j, k;
+    u16 count;
+
+    count = 0;
+    memset(sSecretBaseItemsIndicesBuffer, 0, sizeof(sSecretBaseItemsIndicesBuffer));
+    memset(sPlayerRoomItemsIndicesBuffer, 0, sizeof(sPlayerRoomItemsIndicesBuffer));
 
-    cnt = 0;
-    memset(sSecretBaseItemsIndicesBuffer, 0, 16);
-    memset(sPlayerRoomItemsIndicesBuffer, 0, 12);
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < ARRAY_COUNT(sSecretBaseItemsIndicesBuffer); i++)
     {
         if (gSaveBlock1Ptr->secretBases[0].decorations[i] != DECOR_NONE)
         {
-            for (j = 0; j < gDecorationInventories[sCurDecorationCategory].size; j ++)
+            for (j = 0; j < gDecorationInventories[sCurDecorationCategory].size; j++)
             {
-                if (gCurDecorInventoryItems[j] == gSaveBlock1Ptr->secretBases[0].decorations[i])
+                if (gCurDecorationItems[j] == gSaveBlock1Ptr->secretBases[0].decorations[i])
                 {
-                    for (k = 0; k < cnt && sSecretBaseItemsIndicesBuffer[k] != j + 1; k ++);
-                    if (k == cnt)
+                    for (k = 0; k < count && sSecretBaseItemsIndicesBuffer[k] != j + 1; k++)
+                        ;
+
+                    if (k == count)
                     {
-                        sSecretBaseItemsIndicesBuffer[cnt] = j + 1;
-                        cnt ++;
+                        sSecretBaseItemsIndicesBuffer[count] = j + 1;
+                        count++;
                         break;
                     }
                 }
             }
         }
     }
-    cnt = 0;
-    for (i = 0; i < 12; i ++)
+
+    count = 0;
+    for (i = 0; i < ARRAY_COUNT(sPlayerRoomItemsIndicesBuffer); i++)
     {
         if (gSaveBlock1Ptr->playerRoomDecor[i] != DECOR_NONE)
         {
-            for (j = 0; j < gDecorationInventories[sCurDecorationCategory].size; j ++)
+            for (j = 0; j < gDecorationInventories[sCurDecorationCategory].size; j++)
             {
-                if (gCurDecorInventoryItems[j] == gSaveBlock1Ptr->playerRoomDecor[i] && sub_81277BC(j + 1) != TRUE)
+                if (gCurDecorationItems[j] == gSaveBlock1Ptr->playerRoomDecor[i] && sub_81277BC(j + 1) != TRUE)
                 {
-                    for (k = 0; k < cnt && sPlayerRoomItemsIndicesBuffer[k] != j + 1; k ++);
-                    if (k == cnt)
+                    for (k = 0; k < count && sPlayerRoomItemsIndicesBuffer[k] != j + 1; k++);
+                    if (k == count)
                     {
-                        sPlayerRoomItemsIndicesBuffer[cnt] = j + 1;
-                        cnt ++;
+                        sPlayerRoomItemsIndicesBuffer[count] = j + 1;
+                        count++;
                         break;
                     }
                 }
@@ -1067,7 +1077,7 @@ void IdentifyOwnedDecorationsCurrentlyInUseInternal(u8 taskId)
     }
 }
 
-void IdentifyOwnedDecorationsCurrentlyInUse(u8 taskId)
+static void IdentifyOwnedDecorationsCurrentlyInUse(u8 taskId)
 {
     IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId);
 }
@@ -1075,24 +1085,25 @@ void IdentifyOwnedDecorationsCurrentlyInUse(u8 taskId)
 bool8 IsSelectedDecorInThePC(void)
 {
     u16 i;
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < ARRAY_COUNT(sSecretBaseItemsIndicesBuffer); i++)
     {
-        if (sSecretBaseItemsIndicesBuffer[i] == sSecretBasePCSelectDecorPageNo + sSecretBasePCSelectDecorLineNo + 1)
-        {
+        if (sSecretBaseItemsIndicesBuffer[i] == sDecorationsScrollOffset + sDecorationsCursorPos + 1)
             return FALSE;
-        }
-        if (i < 12 && sPlayerRoomItemsIndicesBuffer[i] == sSecretBasePCSelectDecorPageNo + sSecretBasePCSelectDecorLineNo + 1)
+
+        if (i < ARRAY_COUNT(sPlayerRoomItemsIndicesBuffer)
+         && sPlayerRoomItemsIndicesBuffer[i] == sDecorationsScrollOffset + sDecorationsCursorPos + 1)
         {
             return FALSE;
         }
     }
+
     return TRUE;
 }
 
-void sub_8127A14(u8 taskId)
+static void sub_8127A14(u8 taskId)
 {
-    sub_81269D4(1);
-    sub_8127620(taskId);
+    AddDecorationWindow(1);
+    ShowDecorationItemsWindow(taskId);
 }
 
 void sub_8127A30(u8 taskId)
@@ -1106,20 +1117,18 @@ void sub_8127A5C(u8 taskId)
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
         ClearDialogWindowAndFrame(0, 0);
-        sub_81269D4(1);
-        sub_8127620(taskId);
+        AddDecorationWindow(1);
+        ShowDecorationItemsWindow(taskId);
     }
 }
 
 void sub_8127A8C(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
-    sub_8127554();
-    sub_81277A8();
+    s16 *data = gTasks[taskId].data;
+    RemoveDecorationItemsScrollIndicators();
+    RemoveDecorationItemsOtherWindows();
     DestroyListMenuTask(data[13], NULL, NULL);
-    free(sDecorPCBuffer);
+    free(sDecorationItemsMenu);
     sub_8126E44(taskId);
 }
 
@@ -1137,105 +1146,91 @@ void sub_8127B04(u8 taskId)
     WarpIntoMap();
 }
 
-u16 sub_8127B54(u8 decor, u8 a1)
+static u16 GetDecorationElevation(u8 decoration, u8 tileIndex)
 {
-    u16 resp;
-
-    resp = -1;
-    switch (decor)
+    u16 elevation = -1;
+    switch (decoration)
     {
-        case DECOR_STAND:
-            resp = gUnknown_085A72E4[a1] << 12;
-            return resp;
-        case DECOR_SLIDE:
-            resp = gUnknown_085A72EC[a1] << 12;
-            return resp;
-        default:
-            return resp;
+    case DECOR_STAND:
+        elevation = sDecorationStandElevations[tileIndex] << 12;
+        return elevation;
+    case DECOR_SLIDE:
+        elevation = sDecorationSlideElevation[tileIndex] << 12;
+        return elevation;
+    default:
+        return elevation;
     }
 }
 
-void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
+static void ShowDecorationOnMap_(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decoration)
 {
-    u16 i;
-    u16 j;
+    u16 i, j;
+    s16 x, y;
     u16 behavior;
     u16 impassableFlag;
-    u16 v0;
-    u16 v1;
-    s16 decLeft;
-    s16 decBottom;
+    u16 posterSide;
+    u16 elevation;
 
-    for (i = 0; i < decHeight; i ++)
+    for (j = 0; j < decHeight; j++)
     {
-        decBottom = mapY - decHeight + 1 + i;
-        for (j = 0; j < decWidth; j ++)
+        y = mapY - decHeight + 1 + j;
+        for (i = 0; i < decWidth; i++)
         {
-            decLeft = mapX + j;
-            behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decor].tiles[i * decWidth + j]);
-            if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decor].permission != DECORPERM_PASS_FLOOR && (behavior >> 12)))
-            {
+            x = mapX + i;
+            behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decoration].tiles[j * decWidth + i]);
+            if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decoration].permission != DECORPERM_PASS_FLOOR && (behavior >> 12)))
                 impassableFlag = METATILE_COLLISION_MASK;
-            }
             else
-            {
-                impassableFlag = 0x000;
-            }
-            if (gDecorations[decor].permission != DECORPERM_NA_WALL && MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(decLeft, decBottom)) == TRUE)
-            {
-                v0 = 1;
-            }
+                impassableFlag = 0;
+
+            if (gDecorations[decoration].permission != DECORPERM_NA_WALL && MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
+                posterSide = 1;
             else
-            {
-                v0 = 0;
-            }
-            v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j);
-            if (v1 != 0xFFFF)
-            {
-                MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag | v1);
-            }
+                posterSide = 0;
+
+            elevation = GetDecorationElevation(gDecorations[decoration].id, j * decWidth + i);
+            if (elevation != 0xFFFF)
+                MapGridSetMetatileEntryAt(x, y, (gDecorations[decoration].tiles[j * decWidth + i] + (0x200 | posterSide)) | impassableFlag | elevation);
             else
-            {
-                MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag);
-            }
+                MapGridSetMetatileIdAt(x, y, (gDecorations[decoration].tiles[j * decWidth + i] + (0x200 | posterSide)) | impassableFlag);
         }
     }
 }
 
-void sub_8127D38(u16 mapX, u16 mapY, u16 decor)
-{
-    switch (gDecorations[decor].shape)
-    {
-        case DECORSHAPE_1x1:
-            sub_8127B90(mapX, mapY, 1, 1, decor);
-            break;
-        case DECORSHAPE_2x1:
-            sub_8127B90(mapX, mapY, 2, 1, decor);
-            break;
-        case DECORSHAPE_3x1: // unused
-            sub_8127B90(mapX, mapY, 3, 1, decor);
-            break;
-        case DECORSHAPE_4x2:
-            sub_8127B90(mapX, mapY, 4, 2, decor);
-            break;
-        case DECORSHAPE_2x2:
-            sub_8127B90(mapX, mapY, 2, 2, decor);
-            break;
-        case DECORSHAPE_1x2:
-            sub_8127B90(mapX, mapY, 1, 2, decor);
-            break;
-        case DECORSHAPE_1x3: // unused
-            sub_8127B90(mapX, mapY, 1, 3, decor);
-            break;
-        case DECORSHAPE_2x4:
-            sub_8127B90(mapX, mapY, 2, 4, decor);
-            break;
-        case DECORSHAPE_3x3:
-            sub_8127B90(mapX, mapY, 3, 3, decor);
-            break;
-        case DECORSHAPE_3x2:
-            sub_8127B90(mapX, mapY, 3, 2, decor);
-            break;
+void ShowDecorationOnMap(u16 mapX, u16 mapY, u16 decoration)
+{
+    switch (gDecorations[decoration].shape)
+    {
+    case DECORSHAPE_1x1:
+        ShowDecorationOnMap_(mapX, mapY, 1, 1, decoration);
+        break;
+    case DECORSHAPE_2x1:
+        ShowDecorationOnMap_(mapX, mapY, 2, 1, decoration);
+        break;
+    case DECORSHAPE_3x1: // unused
+        ShowDecorationOnMap_(mapX, mapY, 3, 1, decoration);
+        break;
+    case DECORSHAPE_4x2:
+        ShowDecorationOnMap_(mapX, mapY, 4, 2, decoration);
+        break;
+    case DECORSHAPE_2x2:
+        ShowDecorationOnMap_(mapX, mapY, 2, 2, decoration);
+        break;
+    case DECORSHAPE_1x2:
+        ShowDecorationOnMap_(mapX, mapY, 1, 2, decoration);
+        break;
+    case DECORSHAPE_1x3: // unused
+        ShowDecorationOnMap_(mapX, mapY, 1, 3, decoration);
+        break;
+    case DECORSHAPE_2x4:
+        ShowDecorationOnMap_(mapX, mapY, 2, 4, decoration);
+        break;
+    case DECORSHAPE_3x3:
+        ShowDecorationOnMap_(mapX, mapY, 3, 3, decoration);
+        break;
+    case DECORSHAPE_3x2:
+        ShowDecorationOnMap_(mapX, mapY, 3, 2, decoration);
+        break;
     }
 }
 
@@ -1244,25 +1239,27 @@ void sub_8127E18(void)
     u8 i;
     u8 j;
 
-    for (i = 0; i < 14; i ++)
+    for (i = 0; i < 14; i++)
     {
         if (FlagGet(FLAG_DECORATION_1 + i) == TRUE)
         {
             FlagClear(FLAG_DECORATION_1 + i);
-            for (j = 0; j < gMapHeader.events->eventObjectCount; j ++)
+            for (j = 0; j < gMapHeader.events->eventObjectCount; j++)
             {
                 if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i)
-                {
                     break;
-                }
             }
-            VarSet(UNKNOWN_VAR_OFFSET_3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
+
+            VarSet(
+                VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[j].graphicsId - EVENT_OBJ_GFX_VAR_0),
+                sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
+
             gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId;
             gSpecialVar_0x8006 = sCurDecorMapX;
             gSpecialVar_0x8007 = sCurDecorMapY;
-            show_sprite(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-            sub_808EBA8(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-            sub_808F254(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+            TrySpawnEventObject(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+            TryMoveEventObjectToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
+            TryOverrideEventObjectTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
             break;
         }
     }
@@ -1272,9 +1269,9 @@ bool8 sub_8127F38(void)
 {
     u16 i;
 
-    for (i = 0; i < gUnknown_0203A17C.size; i ++)
+    for (i = 0; i < gDecorationContext.size; i++)
     {
-        if (gUnknown_0203A17C.items[i] == DECOR_NONE)
+        if (gDecorationContext.items[i] == DECOR_NONE)
         {
             return TRUE;
         }
@@ -1284,7 +1281,7 @@ bool8 sub_8127F38(void)
 
 void sub_8127F68(u8 taskId)
 {
-    if (gUnknown_0203A17C.isPlayerRoom == TRUE && sCurDecorationCategory != DECORCAT_DOLL && sCurDecorationCategory != DECORCAT_CUSHION)
+    if (gDecorationContext.isPlayerRoom == TRUE && sCurDecorationCategory != DECORCAT_DOLL && sCurDecorationCategory != DECORCAT_CUSHION)
     {
         StringExpandPlaceholders(gStringVar4, gText_CantPlaceInRoom);
         DisplayItemMessageOnField(taskId, gStringVar4, sub_8127A5C);
@@ -1299,8 +1296,8 @@ void sub_8127F68(u8 taskId)
         }
         else
         {
-            ConvertIntToDecimalStringN(gStringVar1, gUnknown_0203A17C.size, STR_CONV_MODE_RIGHT_ALIGN, 2);
-            if (gUnknown_0203A17C.isPlayerRoom == FALSE) {
+            ConvertIntToDecimalStringN(gStringVar1, gDecorationContext.size, STR_CONV_MODE_RIGHT_ALIGN, 2);
+            if (gDecorationContext.isPlayerRoom == FALSE) {
                 StringExpandPlaceholders(gStringVar4, gText_NoMoreDecorations);
             }
             else
@@ -1330,7 +1327,7 @@ void sub_8128060(u8 taskId)
             break;
         case 1:
             gPaletteFade.bufferTransferDisabled = TRUE;
-            ConfigureCameraObjectForPlacingDecoration(&sPlaceDecorationGraphicsDataBuffer, gCurDecorInventoryItems[gCurDecorationIndex]);
+            ConfigureCameraObjectForPlacingDecoration(&sPlaceDecorationGraphicsDataBuffer, gCurDecorationItems[gCurDecorationIndex]);
             sub_812826C(taskId);
             SetUpPlacingDecorationPlayerAvatar(taskId, &sPlaceDecorationGraphicsDataBuffer);
             pal_fill_black();
@@ -1353,27 +1350,23 @@ void ConfigureCameraObjectForPlacingDecoration(struct PlaceDecorationGraphicsDat
     gFieldCamera.spriteId = gpu_pal_decompress_alloc_tag_and_upload(data, decor);
     gSprites[gFieldCamera.spriteId].oam.priority = 1;
     gSprites[gFieldCamera.spriteId].callback = sub_81292D0;
-    gSprites[gFieldCamera.spriteId].pos1.x = gUnknown_085A7250[data->decoration->shape].x;
-    gSprites[gFieldCamera.spriteId].pos1.y = gUnknown_085A7250[data->decoration->shape].y;
+    gSprites[gFieldCamera.spriteId].pos1.x = sDecorationMovementInfo[data->decoration->shape].cameraX;
+    gSprites[gFieldCamera.spriteId].pos1.y = sDecorationMovementInfo[data->decoration->shape].cameraY;
 }
 
 void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphicsDataBuffer *data)
 {
-    u8 v0;
+    u8 x;
 
-    v0 = 16 * (u8)gTasks[taskId].data[5] + gUnknown_085A7250[data->decoration->shape].x - 8 * ((u8)gTasks[taskId].data[5] - 1);
+    x = 16 * (u8)gTasks[taskId].data[5] + sDecorationMovementInfo[data->decoration->shape].cameraX - 8 * ((u8)gTasks[taskId].data[5] - 1);
     if (data->decoration->shape == DECORSHAPE_3x1 || data->decoration->shape == DECORSHAPE_3x3 || data->decoration->shape == DECORSHAPE_3x2)
-    {
-        v0 -= 8;
-    }
+        x -= 8;
+
     if (gSaveBlock2Ptr->playerGender == MALE)
-    {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC1, SpriteCallbackDummy, v0, 0x48, 0);
-    }
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0);
     else
-    {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC2, SpriteCallbackDummy, v0, 0x48, 0);
-    }
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0);
+
     gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1;
     DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]);
     sDecor_CameraSpriteObjectIdx1 = gFieldCamera.spriteId;
@@ -1381,7 +1374,7 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic
 
 void sub_812826C(u8 taskId)
 {
-    switch (gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].shape)
+    switch (gDecorations[gCurDecorationItems[gCurDecorationIndex]].shape)
     {
         case DECORSHAPE_1x1:
             gTasks[taskId].data[5] = 1;
@@ -1469,14 +1462,12 @@ bool8 sub_81284F4(u16 behaviorAt, const struct Decoration *decoration)
     if (MetatileBehavior_IsBlockDecoration(behaviorAt) != TRUE)
     {
         if (decoration->id == DECOR_SOLID_BOARD && MetatileBehavior_IsSecretBaseHole(behaviorAt) == TRUE)
-        {
             return TRUE;
-        }
+
         if (MetatileBehavior_IsNormal(behaviorAt))
-        {
             return TRUE;
-        }
     }
+
     return FALSE;
 }
 
@@ -1495,127 +1486,108 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
 
     switch (decoration->permission)
     {
-        case DECORPERM_SOLID_FLOOR:
-        case DECORPERM_PASS_FLOOR:
-            for (i=0; i<mapY; i++)
-            {
-                curY = gTasks[taskId].data[1] - i;
-                for (j=0; j<mapX; j++)
-                {
-                    curX = gTasks[taskId].data[0] + j;
-                    behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                    behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
-                    if (!sub_81284F4(behaviorAt, decoration))
-                    {
-                        return FALSE;
-                    }
-                    if (!sub_81284AC(taskId, curX, curY, behaviorBy))
-                    {
-                        return FALSE;
-                    }
-                    behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
-                    if (behaviorAt != 0 && behaviorAt != 16)
-                    {
-                        return FALSE;
-                    }
-                }
-            }
-            break;
-        case DECORPERM_BEHIND_FLOOR:
-            for (i=0; i<mapY-1; i++)
-            {
-                curY = gTasks[taskId].data[1] - i;
-                for (j=0; j<mapX; j++)
-                {
-                    curX = gTasks[taskId].data[0] + j;
-                    behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                    behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
-                    if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_8128484(behaviorAt, behaviorBy))
-                    {
-                        return FALSE;
-                    }
-                    if (!sub_81284AC(taskId, curX, curY, behaviorBy))
-                    {
-                        return FALSE;
-                    }
-                    if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
-                    {
-                        return FALSE;
-                    }
-                }
-            }
-            curY = gTasks[taskId].data[1] - mapY + 1;
-            for (j=0; j<mapX; j++)
+    case DECORPERM_SOLID_FLOOR:
+    case DECORPERM_PASS_FLOOR:
+        for (i = 0; i < mapY; i++)
+        {
+            curY = gTasks[taskId].data[1] - i;
+            for (j = 0; j < mapX; j++)
             {
                 curX = gTasks[taskId].data[0] + j;
                 behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & METATILE_ELEVATION_MASK;
-                if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt))
-                {
+                behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
+                if (!sub_81284F4(behaviorAt, decoration))
                     return FALSE;
-                }
+
                 if (!sub_81284AC(taskId, curX, curY, behaviorBy))
-                {
                     return FALSE;
-                }
+
                 behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
                 if (behaviorAt != 0 && behaviorAt != 16)
-                {
                     return FALSE;
-                }
             }
-            break;
-        case DECORPERM_NA_WALL:
-            for (i=0; i<mapY; i++)
-            {
-                curY = gTasks[taskId].data[1] - i;
-                for (j=0; j<mapX; j++)
-                {
-                    curX = gTasks[taskId].data[0] + j;
-                    if (!MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(curX, curY)))
-                    {
-                        return FALSE;
-                    }
-                    if (MapGridGetMetatileIdAt(curX, curY + 1) == 0x28c)
-                    {
-                        return FALSE;
-                    }
-                }
-            }
-            break;
-        case DECORPERM_SOLID_MAT:
-            curY = gTasks[taskId].data[1];
-            for (j=0; j<mapX; j++)
+        }
+        break;
+    case DECORPERM_BEHIND_FLOOR:
+        for (i = 0; i < mapY - 1; i++)
+        {
+            curY = gTasks[taskId].data[1] - i;
+            for (j = 0; j < mapX; j++)
             {
                 curX = gTasks[taskId].data[0] + j;
                 behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                if (decoration->shape == DECORSHAPE_1x2)
-                {
-                    if (!MetatileBehavior_IsLargeMatCenter(behaviorAt))
-                    {
-                        return FALSE;
-                    }
-                }
-                else if (!MetatileBehavior_IsSecretBaseLargeMatEdge(behaviorAt))
-                {
-                    if (!MetatileBehavior_IsLargeMatCenter(behaviorAt))
-                    {
-                        return FALSE;
-                    }
-                }
+                behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
+                if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_8128484(behaviorAt, behaviorBy))
+                    return FALSE;
+
+                if (!sub_81284AC(taskId, curX, curY, behaviorBy))
+                    return FALSE;
+
                 if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
-                {
                     return FALSE;
-                }
             }
-            break;
+        }
+
+        curY = gTasks[taskId].data[1] - mapY + 1;
+        for (j = 0; j < mapX; j++)
+        {
+            curX = gTasks[taskId].data[0] + j;
+            behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
+            behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & METATILE_ELEVATION_MASK;
+            if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt))
+                return FALSE;
+
+            if (!sub_81284AC(taskId, curX, curY, behaviorBy))
+                return FALSE;
+
+            behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
+            if (behaviorAt != 0 && behaviorAt != 16)
+                return FALSE;
+        }
+        break;
+    case DECORPERM_NA_WALL:
+        for (i = 0; i < mapY; i++)
+        {
+            curY = gTasks[taskId].data[1] - i;
+            for (j = 0; j < mapX; j++)
+            {
+                curX = gTasks[taskId].data[0] + j;
+                if (!MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(curX, curY)))
+                    return FALSE;
+
+                if (MapGridGetMetatileIdAt(curX, curY + 1) == 0x28c)
+                    return FALSE;
+            }
+        }
+        break;
+    case DECORPERM_SPRITE:
+        curY = gTasks[taskId].data[1];
+        for (j = 0; j < mapX; j++)
+        {
+            curX = gTasks[taskId].data[0] + j;
+            behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
+            if (decoration->shape == DECORSHAPE_1x2)
+            {
+                if (!MetatileBehavior_HoldsLargeDecoration(behaviorAt))
+                    return FALSE;
+            }
+            else if (!MetatileBehavior_HoldsSmallDecoration(behaviorAt))
+            {
+                if (!MetatileBehavior_HoldsLargeDecoration(behaviorAt))
+                    return FALSE;
+            }
+
+            if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
+                return FALSE;
+        }
+        break;
     }
     return TRUE;
 }
 
 void sub_8128950(u8 taskId)
 {
-    if (sub_812853C(taskId, &gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]]) == TRUE)
+    if (sub_812853C(taskId, &gDecorations[gCurDecorationItems[gCurDecorationIndex]]) == TRUE)
     {
         StringExpandPlaceholders(gStringVar4, gText_PlaceItHere);
         DisplayItemMessageOnField(taskId, gStringVar4, sub_81289D0);
@@ -1638,9 +1610,9 @@ void sub_81289F0(u8 taskId)
 {
     ClearDialogWindowAndFrame(0, 0);
     sub_8128AAC(taskId);
-    if (gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].permission != DECORPERM_SOLID_MAT)
+    if (gDecorations[gCurDecorationItems[gCurDecorationIndex]].permission != DECORPERM_SPRITE)
     {
-        sub_8127D38(gTasks[taskId].data[0], gTasks[taskId].data[1], gCurDecorInventoryItems[gCurDecorationIndex]);
+        ShowDecorationOnMap(gTasks[taskId].data[0], gTasks[taskId].data[1], gCurDecorationItems[gCurDecorationIndex]);
     }
     else
     {
@@ -1648,11 +1620,11 @@ void sub_81289F0(u8 taskId)
         sCurDecorMapY = gTasks[taskId].data[1] - 7;
         ScriptContext1_SetupScript(EventScript_275D1F);
     }
+
     gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
     if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
-    {
         TV_PutSecretBaseVisitOnTheAir();
-    }
+
     sub_8128BBC(taskId);
 }
 
@@ -1660,18 +1632,19 @@ void sub_8128AAC(u8 taskId)
 {
     u16 i;
 
-    for (i = 0; i < gUnknown_0203A17C.size; i ++)
+    for (i = 0; i < gDecorationContext.size; i++)
     {
-        if (gUnknown_0203A17C.items[i] == DECOR_NONE)
+        if (gDecorationContext.items[i] == DECOR_NONE)
         {
-            gUnknown_0203A17C.items[i] = gCurDecorInventoryItems[gCurDecorationIndex];
-            gUnknown_0203A17C.pos[i] = ((gTasks[taskId].data[0] - 7) << 4) + (gTasks[taskId].data[1] - 7);
+            gDecorationContext.items[i] = gCurDecorationItems[gCurDecorationIndex];
+            gDecorationContext.pos[i] = ((gTasks[taskId].data[0] - 7) << 4) + (gTasks[taskId].data[1] - 7);
             break;
         }
     }
-    if (!gUnknown_0203A17C.isPlayerRoom)
+
+    if (!gDecorationContext.isPlayerRoom)
     {
-        for (i = 0; i < 16; i ++)
+        for (i = 0; i < 16; i++)
         {
             if (sSecretBaseItemsIndicesBuffer[i] == 0)
             {
@@ -1682,7 +1655,7 @@ void sub_8128AAC(u8 taskId)
     }
     else
     {
-        for (i = 0; i < 12; i ++)
+        for (i = 0; i < 12; i++)
         {
             if (sPlayerRoomItemsIndicesBuffer[i] == 0)
             {
@@ -1716,49 +1689,45 @@ void c1_overworld_prev_quest(u8 taskId)
 {
     switch (gTasks[taskId].data[2])
     {
-        case 0:
-            ScriptContext2_Enable();
-            if (!gPaletteFade.active)
-            {
-                sub_8127B04(taskId);
-                gTasks[taskId].data[2] = 1;
-            }
-            break;
-        case 1:
-            sub_812A3C8();
-            FreeSpritePaletteByTag(OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG);
-            gFieldCallback = sub_8128CD4;
-            SetMainCallback2(CB2_ReturnToField);
-            DestroyTask(taskId);
-            break;
+    case 0:
+        ScriptContext2_Enable();
+        if (!gPaletteFade.active)
+        {
+            sub_8127B04(taskId);
+            gTasks[taskId].data[2] = 1;
+        }
+        break;
+    case 1:
+        sub_812A3C8();
+        FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG);
+        gFieldCallback = sub_8128CD4;
+        SetMainCallback2(CB2_ReturnToField);
+        DestroyTask(taskId);
+        break;
     }
 }
 
 void sub_8128C64(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     switch (data[2])
     {
-        case 0:
-            sub_80E9578();
-            data[2] ++;
-            break;
-        case 1:
-            ScriptContext1_SetupScript(EventScript_275D0C);
-            data[2] ++;
-            break;
-        case 2:
-            ScriptContext2_Enable();
-            data[2] ++;
-            break;
-        case 3:
-            if (IsWeatherNotFadingIn() == TRUE)
-            {
-                gTasks[taskId].func = sub_812764C;
-            }
-            break;
+    case 0:
+        HideSecretBaseDecorationSprites();
+        data[2]++;
+        break;
+    case 1:
+        ScriptContext1_SetupScript(EventScript_275D0C);
+        data[2]++;
+        break;
+    case 2:
+        ScriptContext2_Enable();
+        data[2]++;
+        break;
+    case 3:
+        if (IsWeatherNotFadingIn() == TRUE)
+            gTasks[taskId].func = HandleDecorationItemsMenuInput;
+        break;
     }
 }
 
@@ -1775,41 +1744,40 @@ void sub_8128CD4(void)
 
 bool8 sub_8128D10(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (sDecorationLastDirectionMoved == DIR_SOUTH && data[1] - data[6] - 6 < 0)
     {
-        data[1] ++;
+        data[1]++;
         return FALSE;
     }
+
     if (sDecorationLastDirectionMoved == DIR_NORTH && data[1] - 7 >= gMapHeader.mapLayout->height)
     {
-        data[1] --;
+        data[1]--;
         return FALSE;
     }
+
     if (sDecorationLastDirectionMoved == DIR_WEST && data[0] - 7 < 0)
     {
-        data[0] ++;
+        data[0]++;
         return FALSE;
     }
+
     if (sDecorationLastDirectionMoved == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapLayout->width)
     {
-        data[0] --;
+        data[0]--;
         return FALSE;
     }
+
     return TRUE;
 }
 
 bool8 sub_8128DB4(void)
 {
-    u16 heldKeys;
-
-    heldKeys = gMain.heldKeys & 0x0F0;
+    u16 heldKeys = gMain.heldKeys & DPAD_ANY;
     if (heldKeys != DPAD_UP && heldKeys != DPAD_DOWN && heldKeys != DPAD_LEFT && heldKeys != DPAD_RIGHT)
-    {
         return FALSE;
-    }
+
     return TRUE;
 }
 
@@ -1822,68 +1790,69 @@ void sub_8128DE0(void)
 
 void sub_8128E18(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (!gSprites[sDecor_CameraSpriteObjectIdx1].data[4])
     {
         if (data[10] == 1)
         {
             gUnknown_085A72D4[data[12]].yesFunc(taskId);
             return;
-        } else if (data[10] == 2)
+        }
+        else if (data[10] == 2)
         {
             gUnknown_085A72D4[data[12]].noFunc(taskId);
             return;
         }
-        if ((gMain.heldKeys & 0x0F0) == DPAD_UP)
+
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_UP)
         {
             sDecorationLastDirectionMoved = DIR_SOUTH;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[2] =  0;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[3] = -2;
             data[1]--;
         }
-        if ((gMain.heldKeys & 0x0F0) == DPAD_DOWN)
+
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_DOWN)
         {
             sDecorationLastDirectionMoved = DIR_NORTH;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[2] =  0;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[3] =  2;
             data[1]++;
         }
-        if ((gMain.heldKeys & 0x0F0) == DPAD_LEFT)
+
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_LEFT)
         {
             sDecorationLastDirectionMoved = DIR_WEST;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = -2;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[3] =  0;
             data[0]--;
         }
-        if ((gMain.heldKeys & 0x0F0) == DPAD_RIGHT)
+
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_RIGHT)
         {
             sDecorationLastDirectionMoved = DIR_EAST;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[2] =  2;
             gSprites[sDecor_CameraSpriteObjectIdx1].data[3] =  0;
             data[0]++;
         }
+
         if (!sub_8128DB4() || !sub_8128D10(taskId))
-        {
             sub_8128DE0();
-        }
     }
+
     if (sDecorationLastDirectionMoved)
     {
         gSprites[sDecor_CameraSpriteObjectIdx1].data[4]++;
         gSprites[sDecor_CameraSpriteObjectIdx1].data[4] &= 7;
     }
+
     if (!data[10])
     {
         if (gMain.newKeys & A_BUTTON)
-        {
             data[10] = A_BUTTON;
-        }
+
         if (gMain.newKeys & B_BUTTON)
-        {
             data[10] = B_BUTTON;
-        }
     }
 }
 
@@ -1898,9 +1867,7 @@ void sub_8128FD8(u8 taskId)
 void sub_8129020(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
-    {
         sub_8128FD8(taskId);
-    }
 }
 
 void sub_8129048(struct PlaceDecorationGraphicsDataBuffer *data)
@@ -1921,49 +1888,46 @@ void sub_8129088(u8 *dest, u16 tile)
 
     mode = tile >> 10;
     if (tile != 0)
-    {
         tile &= 0x03FF;
-    }
+
     CpuFastCopy(&((u8 *)gTilesetPointer_SecretBase->tiles)[tile << 5], buffer, 32);
     switch (mode)
     {
-        case 0:
-            CpuFastCopy(buffer, dest, 32);
-            break;
-        case 1:
-            for (i = 0; i < 8; i ++)
-            {
-                dest[4 * i] = (buffer[4 * (i + 1) - 1] >> 4) + ((buffer[4 * (i + 1) - 1] & 0x0F) << 4);
-                dest[4 * i + 1] = (buffer[4 * (i + 1) - 2] >> 4) + ((buffer[4 * (i + 1) - 2] & 0x0F) << 4);
-                dest[4 * i + 2] = (buffer[4 * (i + 1) - 3] >> 4) + ((buffer[4 * (i + 1) - 3] & 0x0F) << 4);
-                dest[4 * i + 3] = (buffer[4 * (i + 1) - 4] >> 4) + ((buffer[4 * (i + 1) - 4] & 0x0F) << 4);
-            }
-            break;
-        case 2:
-            for (i = 0; i < 8; i ++)
-            {
-                dest[4 * i] = buffer[4 * (7 - i)];
-                dest[4 * i + 1] = buffer[4 * (7 - i) + 1];
-                dest[4 * i + 2] = buffer[4 * (7 - i) + 2];
-                dest[4 * i + 3] = buffer[4 * (7 - i) + 3];
-            }
-            break;
-        case 3:
-            for (i = 0; i < 32; i ++)
-            {
-                dest[i] = (buffer[31 - i] >> 4) + ((buffer[31 - i] & 0x0F) << 4);
-            }
-            break;
+    case 0:
+        CpuFastCopy(buffer, dest, 32);
+        break;
+    case 1:
+        for (i = 0; i < 8; i++)
+        {
+            dest[4 * i] = (buffer[4 * (i + 1) - 1] >> 4) + ((buffer[4 * (i + 1) - 1] & 0x0F) << 4);
+            dest[4 * i + 1] = (buffer[4 * (i + 1) - 2] >> 4) + ((buffer[4 * (i + 1) - 2] & 0x0F) << 4);
+            dest[4 * i + 2] = (buffer[4 * (i + 1) - 3] >> 4) + ((buffer[4 * (i + 1) - 3] & 0x0F) << 4);
+            dest[4 * i + 3] = (buffer[4 * (i + 1) - 4] >> 4) + ((buffer[4 * (i + 1) - 4] & 0x0F) << 4);
+        }
+        break;
+    case 2:
+        for (i = 0; i < 8; i++)
+        {
+            dest[4 * i] = buffer[4 * (7 - i)];
+            dest[4 * i + 1] = buffer[4 * (7 - i) + 1];
+            dest[4 * i + 2] = buffer[4 * (7 - i) + 2];
+            dest[4 * i + 3] = buffer[4 * (7 - i) + 3];
+        }
+        break;
+    case 3:
+        for (i = 0; i < 32; i++)
+        {
+            dest[i] = (buffer[31 - i] >> 4) + ((buffer[31 - i] & 0x0F) << 4);
+        }
+        break;
     }
 }
 
 void sub_81291A4(struct PlaceDecorationGraphicsDataBuffer *data)
 {
     u16 i;
-    for (i = 0; i < 64; i ++)
-    {
+    for (i = 0; i < 64; i++)
         sub_8129088(&data->image[i * 32], data->tiles[i]);
-    }
 }
 
 u16 sub_81291CC(u16 tile)
@@ -1977,7 +1941,7 @@ void sub_81291E8(struct PlaceDecorationGraphicsDataBuffer *data)
     u8 shape;
 
     shape = data->decoration->shape;
-    for (i = 0; i < gUnknown_085A71B0[shape].size; i ++)
+    for (i = 0; i < gUnknown_085A71B0[shape].size; i++)
     {
         data->tiles[gUnknown_085A71B0[shape].tiles[i]] = sub_81291CC(data->decoration->tiles[gUnknown_085A71B0[shape].y[i]] * 8 + gUnknown_085A71B0[shape].x[i]);
     }
@@ -1990,10 +1954,10 @@ void SetDecorSelectionBoxOamAttributes(u8 decorShape)
     sDecorSelectorOam.objMode = ST_OAM_OBJ_NORMAL;
     sDecorSelectorOam.mosaic = 0;
     sDecorSelectorOam.bpp = ST_OAM_4BPP;
-    sDecorSelectorOam.shape = gUnknown_085A7250[decorShape].shape;
+    sDecorSelectorOam.shape = sDecorationMovementInfo[decorShape].shape;
     sDecorSelectorOam.x = 0;
     sDecorSelectorOam.matrixNum = 0;
-    sDecorSelectorOam.size = gUnknown_085A7250[decorShape].size;
+    sDecorSelectorOam.size = sDecorationMovementInfo[decorShape].size;
     sDecorSelectorOam.tileNum = 0;
     sDecorSelectorOam.priority = 0;
     sDecorSelectorOam.paletteNum = 0;
@@ -2015,14 +1979,11 @@ void sub_81292E8(struct Sprite *sprite)
     if (sprite->data[7] == 0)
     {
         if (sprite->data[6] < 15)
-        {
-            sprite->invisible = FALSE;
-        }
+            sprite->invisible = 0;
         else
-        {
-            sprite->invisible = TRUE;
-        }
-        sprite->data[6] ++;
+            sprite->invisible = 1;
+
+        sprite->data[6]++;
         sprite->data[6] &= 0x1F;
     }
     else
@@ -2035,17 +1996,16 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf
 {
     sub_8129048(data);
     data->decoration = &gDecorations[decor];
-    if (data->decoration->permission == DECORPERM_SOLID_MAT)
-    {
+    if (data->decoration->permission == DECORPERM_SPRITE)
         return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1);
-    }
-    FreeSpritePaletteByTag(OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG);
+
+    FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG);
     sub_81291E8(data);
     SetDecorSelectionBoxOamAttributes(data->decoration->shape);
     sub_81291A4(data);
     sub_8129068(data->palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(data->decoration->tiles[0] * 8) + 7] >> 12);
     LoadSpritePalette(&gUnknown_085A72BC);
-    return CreateSprite(&sDecorSelectorSpriteTemplate, 0, 0, 0);
+    return CreateSprite(&sDecorationSelectorSpriteTemplate, 0, 0, 0);
 }
 
 u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decor)
@@ -2056,9 +2016,8 @@ u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decor)
     u8 spriteId;
 
     if (!AllocItemIconTemporaryBuffers())
-    {
         return MAX_SPRITES;
-    }
+
     LZDecompressWram(GetDecorationIconPicOrPalette(decor, 0), gItemIconDecompressionBuffer);
     CopyItemIconPicTo4x4Buffer(gItemIconDecompressionBuffer, gItemIcon4x4Buffer);
     sheet.data = gItemIcon4x4Buffer;
@@ -2080,10 +2039,9 @@ u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decor)
 
 const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode)
 {
-    if (decor > 120)
-    {
+    if (decor > NUM_DECORATIONS)
         decor = DECOR_NONE;
-    }
+
     return gUnknown_085A6BE8[decor][mode];
 }
 
@@ -2096,7 +2054,7 @@ u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor
 
     sub_8129048(&sPlaceDecorationGraphicsDataBuffer);
     sPlaceDecorationGraphicsDataBuffer.decoration = &gDecorations[decor];
-    if (sPlaceDecorationGraphicsDataBuffer.decoration->permission != DECORPERM_SOLID_MAT)
+    if (sPlaceDecorationGraphicsDataBuffer.decoration->permission != DECORPERM_SPRITE)
     {
         sub_81291E8(&sPlaceDecorationGraphicsDataBuffer);
         SetDecorSelectionBoxOamAttributes(sPlaceDecorationGraphicsDataBuffer.decoration->shape);
@@ -2127,13 +2085,12 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
 {
     u8 spriteId;
 
-    if (decor > 120)
+    if (decor > NUM_DECORATIONS)
     {
         spriteId = AddDecorationIconObjectFromIconTable(tilesTag, paletteTag, DECOR_NONE);
         if (spriteId == MAX_SPRITES)
-        {
             return MAX_SPRITES;
-        }
+
         gSprites[spriteId].pos2.x = x + 4;
         gSprites[spriteId].pos2.y = y + 4;
     }
@@ -2141,37 +2098,32 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
     {
         spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor);
         if (spriteId == MAX_SPRITES)
-        {
             return MAX_SPRITES;
-        }
+
         gSprites[spriteId].pos2.x = x;
         if (decor == DECOR_SILVER_SHIELD || decor == DECOR_GOLD_SHIELD)
-        {
             gSprites[spriteId].pos2.y = y - 4;
-        }
         else
-        {
             gSprites[spriteId].pos2.y = y;
-        }
     }
     else
     {
         spriteId = AddDecorationIconObjectFromIconTable(tilesTag, paletteTag, decor);
         if (spriteId == MAX_SPRITES)
-        {
             return MAX_SPRITES;
-        }
+
         gSprites[spriteId].pos2.x = x + 4;
         gSprites[spriteId].pos2.y = y + 4;
     }
+
     gSprites[spriteId].oam.priority = priority;
     return spriteId;
 }
 
 void sub_81296EC(u8 idx)
 {
-    gUnknown_0203A17C.items[idx] = 0;
-    gUnknown_0203A17C.pos[idx] = 0;
+    gDecorationContext.items[idx] = 0;
+    gDecorationContext.pos[idx] = 0;
 }
 
 void sub_8129708(void)
@@ -2184,11 +2136,11 @@ void sub_8129708(void)
     {
         gSpecialVar_Result = 1;
     }
-    else if (gDecorations[gUnknown_0203A17C.items[sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx]].permission == DECORPERM_SOLID_MAT)
+    else if (gDecorations[gDecorationContext.items[sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx]].permission == DECORPERM_SPRITE)
     {
         gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId;
         sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx);
-        for (i = 0; i < gMapHeader.events->eventObjectCount; i ++)
+        for (i = 0; i < gMapHeader.events->eventObjectCount; i++)
         {
             if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005)
             {
@@ -2203,7 +2155,7 @@ void sub_81297AC(void)
 {
     u8 i;
 
-    for (i = 0; i < gMapHeader.events->eventObjectCount; i ++)
+    for (i = 0; i < gMapHeader.events->eventObjectCount; i++)
     {
         if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004)
         {
@@ -2222,20 +2174,21 @@ void sub_81297F8(void)
     int posY;
     u8 perm;
 
-    for (i = 0; i < sCurDecorSelectedInRearrangement; i ++)
+    for (i = 0; i < sCurDecorSelectedInRearrangement; i++)
     {
-        perm = gDecorations[gUnknown_0203A17C.items[sDecorRearrangementDataBuffer[i].idx]].permission;
-        posX = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[i].idx] >> 4;
-        posY = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[i].idx] & 0x0F;
-        if (perm != DECORPERM_SOLID_MAT)
+        perm = gDecorations[gDecorationContext.items[sDecorRearrangementDataBuffer[i].idx]].permission;
+        posX = gDecorationContext.pos[sDecorRearrangementDataBuffer[i].idx] >> 4;
+        posY = gDecorationContext.pos[sDecorRearrangementDataBuffer[i].idx] & 0x0F;
+        if (perm != DECORPERM_SPRITE)
         {
-            for (y = 0; y < sDecorRearrangementDataBuffer[i].height; y ++)
+            for (y = 0; y < sDecorRearrangementDataBuffer[i].height; y++)
             {
-                for (x = 0; x < sDecorRearrangementDataBuffer[i].width; x ++)
+                for (x = 0; x < sDecorRearrangementDataBuffer[i].width; x++)
                 {
                     MapGridSetMetatileEntryAt(posX + 7 + x, posY + 7 - y, gMapHeader.mapLayout->map[posX + x + gMapHeader.mapLayout->width * (posY - y)] | 0x3000);
                 }
             }
+
             sub_81296EC(sDecorRearrangementDataBuffer[i].idx);
         }
     }
@@ -2245,35 +2198,33 @@ void sub_81298EC(u8 taskId)
 {
     switch (gTasks[taskId].data[2])
     {
-        case 0:
-            sub_81297F8();
-            gTasks[taskId].data[2] = 1;
-            break;
-        case 1:
-            if (!gPaletteFade.active) {
-                DrawWholeMapView();
-                ScriptContext1_SetupScript(EventScript_275D2E);
-                ClearDialogWindowAndFrame(0, 1);
-                gTasks[taskId].data[2] = 2;
-            }
-            break;
-        case 2:
-            ScriptContext2_Enable();
-            IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId);
-            pal_fill_black();
-            gTasks[taskId].data[2] = 3;
-            break;
-        case 3:
-            if (IsWeatherNotFadingIn() == TRUE)
-            {
-                StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC);
-                DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64);
-                if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
-                {
-                    TV_PutSecretBaseVisitOnTheAir();
-                }
-            }
-            break;
+    case 0:
+        sub_81297F8();
+        gTasks[taskId].data[2] = 1;
+        break;
+    case 1:
+        if (!gPaletteFade.active) {
+            DrawWholeMapView();
+            ScriptContext1_SetupScript(EventScript_275D2E);
+            ClearDialogWindowAndFrame(0, 1);
+            gTasks[taskId].data[2] = 2;
+        }
+        break;
+    case 2:
+        ScriptContext2_Enable();
+        IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId);
+        pal_fill_black();
+        gTasks[taskId].data[2] = 3;
+        break;
+    case 3:
+        if (IsWeatherNotFadingIn() == TRUE)
+        {
+            StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC);
+            DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64);
+            if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
+                TV_PutSecretBaseVisitOnTheAir();
+        }
+        break;
     }
 }
 
@@ -2281,14 +2232,12 @@ void sub_81298EC(u8 taskId)
 bool8 sub_81299AC(u8 taskId)
 {
     u16 i;
-
-    for (i = 0; i < gUnknown_0203A17C.size; i ++)
+    for (i = 0; i < gDecorationContext.size; i++)
     {
-        if (gUnknown_0203A17C.items[i] != DECOR_NONE)
-        {
+        if (gDecorationContext.items[i] != DECOR_NONE)
             return TRUE;
-        }
     }
+
     return FALSE;
 }
 
@@ -2297,15 +2246,12 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void)
     GetPlayerFacingDirection();
     sDecor_CameraSpriteObjectIdx1 = gSprites[gFieldCamera.spriteId].data[0];
     sub_812A39C();
-    gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 0x78, 0x50, 0);
+    gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0);
     if (gSaveBlock2Ptr->playerGender == MALE)
-    {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC1, SpriteCallbackDummy, 0x88, 0x48, 0);
-    }
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0);
     else
-    {
-        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(0xC2, SpriteCallbackDummy, 0x88, 0x48, 0);
-    }
+        sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0);
+
     gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1;
     DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]);
     sDecor_CameraSpriteObjectIdx1 = gFieldCamera.spriteId;
@@ -2319,27 +2265,27 @@ void sub_8129ABC(u8 taskId)
     data = gTasks[taskId].data;
     switch (data[2])
     {
-        case 0:
-            if (!gPaletteFade.active)
-            {
-                sub_8127ACC(taskId);
-                data[2] = 1;
-                data[6] = 1;
-                data[5] = 1;
-            }
-            break;
-        case 1:
-            SetUpPuttingAwayDecorationPlayerAvatar();
-            pal_fill_black();
-            data[2] = 2;
-            break;
-        case 2:
-            if (IsWeatherNotFadingIn() == TRUE)
-            {
-                data[12] = 1;
-                sub_8129B34(taskId);
-            }
-            break;
+    case 0:
+        if (!gPaletteFade.active)
+        {
+            sub_8127ACC(taskId);
+            data[2] = 1;
+            data[6] = 1;
+            data[5] = 1;
+        }
+        break;
+    case 1:
+        SetUpPuttingAwayDecorationPlayerAvatar();
+        pal_fill_black();
+        data[2] = 2;
+        break;
+    case 2:
+        if (IsWeatherNotFadingIn() == TRUE)
+        {
+            data[12] = 1;
+            sub_8129B34(taskId);
+        }
+        break;
     }
 }
 
@@ -2349,8 +2295,8 @@ void sub_8129B34(u8 taskId)
     gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
     gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE;
     gSprites[sDecor_CameraSpriteObjectIdx1].callback = sub_812A36C;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = 0x88;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.y = 0x48;
+    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = 136;
+    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.y = 72;
     gTasks[taskId].data[10] = 0;
     gTasks[taskId].func = sub_8128E18;
 }
@@ -2405,9 +2351,7 @@ void sub_8129C74(u8 taskId)
 void sub_8129D64(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
-    {
         sub_8129B34(taskId);
-    }
 }
 
 void sub_8129D8C(u8 decor, struct DecorRearrangementDataBuffer *data)
@@ -2416,39 +2360,48 @@ void sub_8129D8C(u8 decor, struct DecorRearrangementDataBuffer *data)
     {
         data->width = 1;
         data->height = 1;
-    } else if (gDecorations[decor].shape == DECORSHAPE_2x1)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_2x1)
     {
         data->width = 2;
         data->height = 1;
-    } else if (gDecorations[decor].shape == DECORSHAPE_3x1)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_3x1)
     {
         data->width = 3;
         data->height = 1;
-    } else if (gDecorations[decor].shape == DECORSHAPE_4x2)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_4x2)
     {
         data->width = 4;
         data->height = 2;
-    } else if (gDecorations[decor].shape == DECORSHAPE_2x2)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_2x2)
     {
         data->width = 2;
         data->height = 2;
-    } else if (gDecorations[decor].shape == DECORSHAPE_1x2)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_1x2)
     {
         data->width = 1;
         data->height = 2;
-    } else if (gDecorations[decor].shape == DECORSHAPE_1x3)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_1x3)
     {
         data->width = 1;
         data->height = 3;
-    } else if (gDecorations[decor].shape == DECORSHAPE_2x4)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_2x4)
     {
         data->width = 2;
         data->height = 4;
-    } else if (gDecorations[decor].shape == DECORSHAPE_3x3)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_3x3)
     {
         data->width = 3;
         data->height = 3;
-    } else if (gDecorations[decor].shape == DECORSHAPE_3x2)
+    }
+    else if (gDecorations[decor].shape == DECORSHAPE_3x2)
     {
         data->width = 3;
         data->height = 2;
@@ -2459,8 +2412,8 @@ void sub_8129E0C(u8 x, u8 y)
 {
     gSprites[sDecor_CameraSpriteObjectIdx1].invisible = TRUE;
     gSprites[sDecor_CameraSpriteObjectIdx1].callback = SpriteCallbackDummy;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = (x << 4) + 0x88;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.y = (y << 4) + 0x48;
+    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = (x << 4) + 136;
+    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.y = (y << 4) + 72;
 }
 
 bool8 sub_8129E74(u8 taskId, u8 idx, struct DecorRearrangementDataBuffer *data)
@@ -2473,18 +2426,18 @@ bool8 sub_8129E74(u8 taskId, u8 idx, struct DecorRearrangementDataBuffer *data)
 
     x = gTasks[taskId].data[0] - 7;
     y = gTasks[taskId].data[1] - 7;
-    xOff = gUnknown_0203A17C.pos[idx] >> 4;
-    yOff = gUnknown_0203A17C.pos[idx] & 0x0F;
+    xOff = gDecorationContext.pos[idx] >> 4;
+    yOff = gDecorationContext.pos[idx] & 0x0F;
     ht = data->height;
-    if (gUnknown_0203A17C.items[idx] == DECOR_SAND_ORNAMENT && MapGridGetMetatileIdAt(xOff + 7, yOff + 7) == 0x28C)
-    {
-        ht --;
-    }
+    if (gDecorationContext.items[idx] == DECOR_SAND_ORNAMENT && MapGridGetMetatileIdAt(xOff + 7, yOff + 7) == 0x28C)
+        ht--;
+
     if (x >= xOff && x < xOff + data->width && y > yOff - ht && y <= yOff)
     {
         sub_8129E0C(data->width - (x - xOff + 1), yOff - y);
         return TRUE;
     }
+
     return FALSE;
 }
 
@@ -2494,9 +2447,9 @@ void sub_8129F20(void)
     u8 yOff;
     u16 i;
 
-    xOff = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] >> 4;
-    yOff = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F;
-    for (i = 0; i < 0x40; i ++)
+    xOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] >> 4;
+    yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F;
+    for (i = 0; i < 0x40; i++)
     {
         if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId))
         {
@@ -2510,13 +2463,13 @@ bool8 sub_8129FC8(u8 taskId)
 {
     u16 i;
 
-    for (i = 0; i < gUnknown_0203A17C.size; i ++)
+    for (i = 0; i < gDecorationContext.size; i++)
     {
-        if (gUnknown_0203A17C.items[i] != 0)
+        if (gDecorationContext.items[i] != 0)
         {
-            if (gDecorations[gUnknown_0203A17C.items[i]].permission == DECORPERM_SOLID_MAT)
+            if (gDecorations[gDecorationContext.items[i]].permission == DECORPERM_SPRITE)
             {
-                sub_8129D8C(gUnknown_0203A17C.items[i], sDecorRearrangementDataBuffer);
+                sub_8129D8C(gDecorationContext.items[i], sDecorRearrangementDataBuffer);
                 if (sub_8129E74(taskId, i, sDecorRearrangementDataBuffer) == TRUE)
                 {
                     sDecorRearrangementDataBuffer->idx = i;
@@ -2537,12 +2490,12 @@ void sub_812A040(u8 left, u8 top, u8 right, u8 bottom)
     u8 yOff;
     u8 decorIdx;
 
-    for (i = 0; i < gUnknown_0203A17C.size; i ++)
+    for (i = 0; i < gDecorationContext.size; i++)
     {
-        decorIdx = gUnknown_0203A17C.items[i];
-        xOff = gUnknown_0203A17C.pos[i] >> 4;
-        yOff = gUnknown_0203A17C.pos[i] & 0x0F;
-        if (decorIdx != 0 && gDecorations[decorIdx].permission == DECORPERM_SOLID_MAT && left <= xOff && top <= yOff && right >= xOff && bottom >= yOff)
+        decorIdx = gDecorationContext.items[i];
+        xOff = gDecorationContext.pos[i] >> 4;
+        yOff = gDecorationContext.pos[i] & 0x0F;
+        if (decorIdx != 0 && gDecorations[decorIdx].permission == DECORPERM_SPRITE && left <= xOff && top <= yOff && right >= xOff && bottom >= yOff)
         {
             sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx = i;
             sub_8129F20();
@@ -2562,9 +2515,9 @@ void sub_812A0E8(u8 taskId)
     sCurDecorSelectedInRearrangement = 0;
     if (sub_8129FC8(taskId) != TRUE)
     {
-        for (i = 0; i < gUnknown_0203A17C.size; i++)
+        for (i = 0; i < gDecorationContext.size; i++)
         {
-            var1 = gUnknown_0203A17C.items[i];
+            var1 = gDecorationContext.items[i];
             if (var1 != DECOR_NONE)
             {
                 sub_8129D8C(var1, &sDecorRearrangementDataBuffer[0]);
@@ -2578,8 +2531,8 @@ void sub_812A0E8(u8 taskId)
         }
         if (sCurDecorSelectedInRearrangement != 0)
         {
-            xOff = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[0].idx] >> 4;
-            yOff = gUnknown_0203A17C.pos[sDecorRearrangementDataBuffer[0].idx] & 0x0F;
+            xOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[0].idx] >> 4;
+            yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[0].idx] & 0x0F;
             var1 = yOff - sDecorRearrangementDataBuffer[0].height + 1;
             var2 = sDecorRearrangementDataBuffer[0].width + xOff - 1;
 
@@ -2624,47 +2577,43 @@ void sub_812A25C(u8 taskId)
 {
     switch (gTasks[taskId].data[2])
     {
-        case 0:
-            if (!gPaletteFade.active)
-            {
-                sub_8127B04(taskId);
-                gTasks[taskId].data[2] = 1;
-            }
-            break;
-        case 1:
-            sub_812A3C8();
-            gFieldCallback = sub_812A334;
-            SetMainCallback2(CB2_ReturnToField);
-            DestroyTask(taskId);
-            break;
+    case 0:
+        if (!gPaletteFade.active)
+        {
+            sub_8127B04(taskId);
+            gTasks[taskId].data[2] = 1;
+        }
+        break;
+    case 1:
+        sub_812A3C8();
+        gFieldCallback = sub_812A334;
+        SetMainCallback2(CB2_ReturnToField);
+        DestroyTask(taskId);
+        break;
     }
 }
 
 void sub_812A2C4(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     switch (data[2])
     {
-        case 0:
-            sub_80E9578();
-            data[2] ++;
-            break;
-        case 1:
-            ScriptContext1_SetupScript(EventScript_275D0C);
-            data[2] ++;
-            break;
-        case 2:
-            ScriptContext2_Enable();
-            data[2] ++;
-            break;
-        case 3:
-            if (IsWeatherNotFadingIn() == TRUE)
-            {
-                gTasks[taskId].func = sub_8126B80;
-            }
-            break;
+    case 0:
+        HideSecretBaseDecorationSprites();
+        data[2]++;
+        break;
+    case 1:
+        ScriptContext1_SetupScript(EventScript_275D0C);
+        data[2]++;
+        break;
+    case 2:
+        ScriptContext2_Enable();
+        data[2]++;
+        break;
+    case 3:
+        if (IsWeatherNotFadingIn() == TRUE)
+            gTasks[taskId].func = HandleDecorationActionsMenuInput;
+        break;
     }
 }
 
@@ -2674,47 +2623,39 @@ void sub_812A334(void)
 
     pal_fill_black();
     DrawDialogueFrame(0, 1);
-    sub_8126ABC();
+    InitDecorationActionsWindow();
     taskId = CreateTask(sub_812A2C4, 8);
     gTasks[taskId].data[2] = 0;
 }
 
 void sub_812A36C(struct Sprite *sprite)
 {
-    sprite->data[0] ++;
+    sprite->data[0]++;
     sprite->data[0] &= 0x1F;
     if (sprite->data[0] > 15)
-    {
         sprite->invisible = TRUE;
-    }
     else
-    {
         sprite->invisible = FALSE;
-    }
 }
 
 void sub_812A39C(void)
 {
     if (gSaveBlock2Ptr->playerGender == MALE)
-    {
         LoadSpritePalette(&gUnknown_085A73D8);
-    }
     else
-    {
         LoadSpritePalette(&gUnknown_085A73E0);
-    }
 }
 
 void sub_812A3C8(void)
 {
-    FreeSpritePaletteByTag(OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG);
+    FreeSpritePaletteByTag(PLACE_DECORATION_PLAYER_TAG);
 }
 
 void sub_812A3D4(u8 taskId)
 {
     if (IsSelectedDecorInThePC() == TRUE)
     {
-        StringCopy(gStringVar1, gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].name);
+        StringCopy(gStringVar1, gDecorations[gCurDecorationItems[gCurDecorationIndex]].name);
         StringExpandPlaceholders(gStringVar4, gText_DecorationWillBeDiscarded);
         DisplayItemMessageOnField(taskId, gStringVar4, sub_812A458);
     }
@@ -2733,10 +2674,11 @@ void sub_812A458(u8 taskId)
 
 void sub_812A478(u8 taskId)
 {
-    gCurDecorInventoryItems[gCurDecorationIndex] = DECOR_NONE;
-    sCurDecorCatCount = CountDecorationCategoryN(sCurDecorationCategory);
-    CondenseDecorationCategoryN(sCurDecorationCategory);
+    gCurDecorationItems[gCurDecorationIndex] = DECOR_NONE;
+    sNumOwnedDecorationsInCurCategory = GetNumOwnedDecorationsInCategory(sCurDecorationCategory);
+    CondenseDecorationsInCategory(sCurDecorationCategory);
     IdentifyOwnedDecorationsCurrentlyInUseInternal(taskId);
     StringExpandPlaceholders(gStringVar4, gText_DecorationThrownAway);
     DisplayItemMessageOnField(taskId, gStringVar4, sub_8127A5C);
 }
+
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
index 308320206..80646c69c 100644
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -32,7 +32,7 @@ void SetDecorationInventoriesPointers(void)
     SET_DECOR_INV(5, gSaveBlock1Ptr->decorPoster);
     SET_DECOR_INV(6, gSaveBlock1Ptr->decorDoll);
     SET_DECOR_INV(7, gSaveBlock1Ptr->decorCushion);
-    sub_8126968();
+    InitDecorationContextItems();
 }
 
 static void ClearDecorationInventory(u8 idx)
@@ -120,7 +120,7 @@ bool8 DecorationCheckSpace(u8 decor)
 s8 DecorationRemove(u8 decor)
 {
     u8 i;
-    u8 idx;
+    u8 category;
 
     i = 0;
     if (decor == DECOR_NONE)
@@ -129,38 +129,38 @@ s8 DecorationRemove(u8 decor)
     }
     for (i = 0; i < gDecorationInventories[gDecorations[decor].category].size; i ++)
     {
-        idx = gDecorations[decor].category;
-        if (gDecorationInventories[idx].items[i] == decor)
+        category = gDecorations[decor].category;
+        if (gDecorationInventories[category].items[i] == decor)
         {
-            gDecorationInventories[idx].items[i] = DECOR_NONE;
-            CondenseDecorationCategoryN(idx);
+            gDecorationInventories[category].items[i] = DECOR_NONE;
+            CondenseDecorationsInCategory(category);
             return 1;
         }
     }
     return 0;
 }
 
-void CondenseDecorationCategoryN(u8 idx)
+void CondenseDecorationsInCategory(u8 category)
 {
     u8 i;
     u8 j;
     u8 tmp;
 
-    for (i = 0; i < gDecorationInventories[idx].size; i ++)
+    for (i = 0; i < gDecorationInventories[category].size; i ++)
     {
-        for (j = i + 1; j < gDecorationInventories[idx].size; j ++)
+        for (j = i + 1; j < gDecorationInventories[category].size; j ++)
         {
-            if (gDecorationInventories[idx].items[j] != DECOR_NONE && (gDecorationInventories[idx].items[i] == DECOR_NONE || gDecorationInventories[idx].items[i] > gDecorationInventories[idx].items[j]))
+            if (gDecorationInventories[category].items[j] != DECOR_NONE && (gDecorationInventories[category].items[i] == DECOR_NONE || gDecorationInventories[category].items[i] > gDecorationInventories[category].items[j]))
             {
-                tmp = gDecorationInventories[idx].items[i];
-                gDecorationInventories[idx].items[i] = gDecorationInventories[idx].items[j];
-                gDecorationInventories[idx].items[j] = tmp;
+                tmp = gDecorationInventories[category].items[i];
+                gDecorationInventories[category].items[i] = gDecorationInventories[category].items[j];
+                gDecorationInventories[category].items[j] = tmp;
             }
         }
     }
 }
 
-u8 CountDecorationCategoryN(u8 idx)
+u8 GetNumOwnedDecorationsInCategory(u8 idx)
 {
     u8 i;
     u8 ct;
@@ -176,15 +176,14 @@ u8 CountDecorationCategoryN(u8 idx)
     return ct;
 }
 
-u8 CountDecorations(void)
+u8 GetNumOwnedDecorations(void)
 {
-    u8 idx;
-    u8 ct;
+    u8 category;
+    u8 count;
 
-    ct = 0;
-    for (idx = 0; idx < 8; idx ++)
-    {
-        ct += CountDecorationCategoryN(idx);
-    }
-    return ct;
+    count = 0;
+    for (category = 0; category < DECORCAT_COUNT; category++)
+        count += GetNumOwnedDecorationsInCategory(category);
+
+    return count;
 }
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 239ada5df..93456631a 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -2,7 +2,7 @@
 #include "alloc.h"
 #include "bard_music.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dewford_trend.h"
 #include "dynamic_placeholder_text_util.h"
@@ -4883,7 +4883,7 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
     {
     case EC_GROUP_POKEMON:
     case EC_GROUP_POKEMON_2:
-        numWordsInGroup = gUnknown_085F5490;
+        numWordsInGroup = gNumSpeciesNames;
         break;
     case EC_GROUP_MOVE_1:
     case EC_GROUP_MOVE_2:
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index dd1ae6bcd..605cd0366 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -33,6 +33,7 @@
 #include "naming_screen.h"
 #include "pokemon_storage_system.h"
 #include "field_screen_effect.h"
+#include "data.h"
 #include "battle.h" // to get rid of later
 #include "constants/rgb.h"
 
@@ -53,7 +54,6 @@ struct EggHatchData
     u8 textColor[3];
 };
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
 extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NickHatchPrompt[];
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index cdb829ac8..cd64afe0e 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -26,149 +26,139 @@ static void sub_81D414C(void);
 static void sub_81D3F1C(u32, u32*, u32*);
 static void sub_81D3F68(void);
 
-extern struct Unknown030012C8 gUnknown_030012C8;
-extern u16 gUnknown_030012E0;
-extern u16 gUnknown_030012E2;
-extern u16 gUnknown_030012E4;
-extern u16 gUnknown_030012E6;
-extern u32 gUnknown_030012E8;
-extern u16 gUnknown_030012EC;
-extern u16 gUnknown_030012EE;
-extern u16 gUnknown_030012F0;
-extern u16 gUnknown_030012F2;
-extern u16 gUnknown_030012F4;
-
-extern const u8 gUnknown_08625B6C[];
+IWRAM_DATA struct Unknown030012C8 gUnknown_030012C8;
+IWRAM_DATA u16 gUnknown_030012E0;
+IWRAM_DATA u16 gUnknown_030012E2;
+IWRAM_DATA u16 gUnknown_030012E4;
+IWRAM_DATA u16 gUnknown_030012E6;
+IWRAM_DATA u32 gUnknown_030012E8;
+IWRAM_DATA u16 gUnknown_030012EC;
+IWRAM_DATA u16 gUnknown_030012EE;
+IWRAM_DATA u16 gUnknown_030012F0;
+IWRAM_DATA u16 gUnknown_030012F2;
+IWRAM_DATA u16 gUnknown_030012F4;
+
+extern const u8 gUnknown_08625B6C[][0x148];
 
 static u8 sub_81D38D4(void)
 {
     return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256;
 }
 
-static bool32 sub_81D38FC(struct Unk81D38FC *arg0)
+static bool32 Struct_Unk81D38FC_ValidateChecksum(struct Unk81D38FC *arg0)
 {
-    int checksum = CalcByteArraySum(arg0->unk0, 0x270);
+    int checksum = CalcByteArraySum((u8 *)arg0, 0x270);
     if (checksum != arg0->checksum)
         return FALSE;
 
     return TRUE;
 }
 
-bool8 sub_81D3920(u8 *buffer)
+bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer)
 {
     u32 i;
     u32 checksum;
-    int var0 = buffer[0];
+    int var0 = buffer->unk_0;
     if (var0 < 1 || var0 > 8)
         return FALSE;
 
     for (i = 0; i < var0; i++)
     {
-        struct Unk81D38FC *var1 = (struct Unk81D38FC *)(&buffer[i * (sizeof(struct Unk81D38FC)) + 8]);
-        if (!sub_81D38FC(var1))
+        if (!Struct_Unk81D38FC_ValidateChecksum(&buffer->unk_8[i]))
             return FALSE;
     }
 
-    checksum = CalcByteArraySum(buffer + 8, var0 * 0x274);
-    if (checksum != ((int *)buffer)[1])
+    checksum = CalcByteArraySum((u8 *)buffer->unk_8, var0 * sizeof(struct Unk81D38FC));
+    if (checksum != buffer->checksum)
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 sub_81D396C(u8 *buffer)
+static bool32 TrainerHill_VerifyChecksum(struct EReaderTrainerHillSet *buffer)
 {
     u32 checksum;
-    int var0 = buffer[0];
+    int var0 = buffer->unk_0;
     if (var0 < 1 || var0 > 8)
         return FALSE;
 
-    checksum = CalcByteArraySum(buffer + 8, 0xEE0);
-    if (checksum != ((int *)buffer)[1])
+    checksum = CalcByteArraySum((u8 *)buffer->unk_8, sizeof(struct EReaderTrainerHillSet) - offsetof(struct EReaderTrainerHillSet, unk_8));
+    if (checksum != buffer->checksum)
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 sub_81D3998(struct Unk81D38FC *arg0, u8 *buffer2)
+static bool32 TryWriteTrainerHill_r(struct EReaderTrainerHillSet *arg0, struct Unk81D3998 *buffer2)
 {
     int i;
-    const u8 *ereaderVals;
 
     memset(buffer2, 0, 0x1000);
-    buffer2[0] = arg0->unk0[0];
-    buffer2[1] = sub_81D38D4();
-    buffer2[2] = (arg0->unk0[0] + 1) / 2;
+    buffer2->unk_000 = arg0->unk_0;
+    buffer2->unk_001 = sub_81D38D4();
+    buffer2->unk_002 = (arg0->unk_0 + 1) / 2;
 
-    for (i = 0; i < arg0->unk0[0]; i++)
+    for (i = 0; i < arg0->unk_0; i++)
     {
         if (!(i & 1))
         {
-            u8 *var0 = &buffer2[(i / 2) * 0x3B8];
-            u8 *var1 = arg0[i].unk0;
-            var0[8] = var1[8];
-            memcpy(&var0[0x29C], &var1[0x154], 0x124);
-            var0 += 0xC;
-            var1 += 0xC;
-            memcpy(var0, var1, 0x148);
+            buffer2->unk_008[i / 2].unk_000[0] = arg0->unk_8[i].unk0;
+            memcpy(buffer2->unk_008[i / 2].unk_294, arg0->unk_8[i].unk14C, 0x124);
+            memcpy(buffer2->unk_008[i / 2].unk_004, arg0->unk_8[i].unk4, 0x148);
         }
         else
         {
-            u8 *var0 = &buffer2[(i / 2) * 0x3B8];
-            u8 *var1 = arg0[i].unk0;
-            var0[9] = var1[8];
-            memcpy(&var0[0x154], &var1[0xC], 0x148);
+            buffer2->unk_008[i / 2].unk_000[1] = arg0->unk_8[i].unk0;
+            memcpy(buffer2->unk_008[i / 2].unk_14C, arg0->unk_8[i].unk4, 0x148);
         }
     }
 
     if (i & 1)
     {
-        u8 *var0 = &buffer2[(i / 2) * 0x3B8];
-        var0 += 0x154;
-
-        ereaderVals = gUnknown_08625B6C;
-        memcpy(var0, &ereaderVals[(i / 2) * 0x148], 0x148);
+        u8 * dest = buffer2->unk_008[i / 2].unk_14C;
+        const u8 (* src)[0x148] = gUnknown_08625B6C;
+        memcpy(dest, src[i / 2], 0x148);
     }
 
-    ((int *)buffer2)[1] = CalcByteArraySum(buffer2 + 8, 0xEE0);
-    if (sub_8153634(SECTOR_ID_TRAINER_HILL, buffer2) != 1)
+    buffer2->checksum = CalcByteArraySum((u8 *)buffer2->unk_008, sizeof(struct Unk81D3998) - offsetof(struct Unk81D3998, unk_008));
+    if (TryWriteSpecialSaveSection(SECTOR_ID_TRAINER_HILL, (u8 *)buffer2) != 1)
         return FALSE;
 
     return TRUE;
 }
 
-bool32 sub_81D3AB0(struct Unk81D38FC *arg0)
+bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0)
 {
-    u8 *var0 = AllocZeroed(0x1000);
-    bool32 result = sub_81D3998(arg0, var0);
+    struct Unk81D3998 *var0 = AllocZeroed(0x1000);
+    bool32 result = TryWriteTrainerHill_r(arg0, var0);
     Free(var0);
     return result;
 }
 
-static bool32 sub_81D3AD8(u8 *arg0, u8 *arg1)
+static bool32 TryReadTrainerHill_r(struct EReaderTrainerHillSet *arg0, u8 *arg1)
 {
-    if (TryCopySpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1)
+    if (TryReadSpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1)
         return FALSE;
 
-    memcpy(arg0, arg1, 0xEE8);
-    if (!sub_81D396C(arg0))
+    memcpy(arg0, arg1, sizeof(struct EReaderTrainerHillSet));
+    if (!TrainerHill_VerifyChecksum(arg0))
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 sub_81D3B0C(u8 *arg0)
+static bool32 TryReadTrainerHill(struct EReaderTrainerHillSet *arg0)
 {
     u8 *var0 = AllocZeroed(0x1000);
-    bool32 result = sub_81D3AD8(arg0, var0);
+    bool32 result = TryReadTrainerHill_r(arg0, var0);
     Free(var0);
     return result;
 }
 
-bool32 sub_81D3B34(void)
+bool32 ReadTrainerHillAndValidate(void)
 {
-    u8 *var0 = AllocZeroed(0x1000);
-    bool32 result = sub_81D3B0C(var0);
+    struct EReaderTrainerHillSet *var0 = AllocZeroed(0x1000);
+    bool32 result = TryReadTrainerHill(var0);
     Free(var0);
     return result;
 }
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index bac29cd42..f74efa32b 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -402,7 +402,7 @@ static void sub_81D5084(u8 taskId)
         }
         break;
     case 15:
-        data->unkE = sub_81D3920(gDecompressionBuffer);
+        data->unkE = EReader_IsReceivedDataValid((struct EReaderTrainerHillSet *)gDecompressionBuffer);
         sub_800ABF4(data->unkE);
         data->unk8 = 16;
         break;
@@ -416,7 +416,7 @@ static void sub_81D5084(u8 taskId)
         }
         break;
     case 17:
-        if (sub_81D3AB0((struct Unk81D38FC *)&gDecompressionBuffer))
+        if (TryWriteTrainerHill((struct EReaderTrainerHillSet *)&gDecompressionBuffer))
         {
             AddTextPrinterToWindow1(gUnknown_085EE0FA);
             sub_81D505C(&data->unk0);
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 30dffd8d7..3e5362de4 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1534,10 +1534,10 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
         paletteSlot -= 16;
         sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot);
     }
+
     if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE)
-    {
         eventObject->invisible = TRUE;
-    }
+
     *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
     spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
     if (spriteId == MAX_SPRITES)
@@ -1545,6 +1545,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
         gEventObjects[eventObjectId].active = FALSE;
         return EVENT_OBJECTS_COUNT;
     }
+
     sprite = &gSprites[spriteId];
     sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
@@ -1557,15 +1558,14 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl
     eventObject->spriteId = spriteId;
     eventObject->inanimate = graphicsInfo->inanimate;
     if (!eventObject->inanimate)
-    {
         StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection));
-    }
+
     SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
     UpdateEventObjectVisibility(eventObject, sprite);
     return eventObjectId;
 }
 
-static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
+static u8 TrySpawnEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY)
 {
     u8 eventObjectId;
     struct SpriteTemplate spriteTemplate;
@@ -1579,14 +1579,12 @@ static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u
     spriteTemplate.images = &spriteFrameImage;
     eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY);
     if (eventObjectId == EVENT_OBJECTS_COUNT)
-    {
         return EVENT_OBJECTS_COUNT;
-    }
+
     gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images;
-    if (subspriteTables != NULL)
-    {
+    if (subspriteTables)
         SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables);
-    }
+
     return eventObjectId;
 }
 
@@ -1596,7 +1594,7 @@ u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate)
     s16 cameraY;
 
     GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
-    return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+    return TrySpawnEventObjectTemplate(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
 }
 
 u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
@@ -1619,19 +1617,17 @@ u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 l
     return SpawnSpecialEventObject(&eventObjectTemplate);
 }
 
-u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup)
+u8 TrySpawnEventObject(u8 localId, u8 mapNum, u8 mapGroup)
 {
     struct EventObjectTemplate *eventObjectTemplate;
-    s16 cameraX;
-    s16 cameraY;
+    s16 cameraX, cameraY;
 
     eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
-    if (eventObjectTemplate == NULL)
-    {
+    if (!eventObjectTemplate)
         return EVENT_OBJECTS_COUNT;
-    }
+
     GetEventObjectMovingCameraOffset(&cameraX, &cameraY);
-    return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
+    return TrySpawnEventObjectTemplate(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY);
 }
 
 static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables)
@@ -1765,7 +1761,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY)
 
             if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX
                 && !FlagGet(template->flagId))
-                TrySpawnEventObject(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
+                TrySpawnEventObjectTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
         }
     }
 }
@@ -1949,7 +1945,7 @@ void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId)
     sprite->oam.paletteNum = paletteSlot;
     eventObject->inanimate = graphicsInfo->inanimate;
     eventObject->graphicsId = graphicsId;
-    sub_8093038(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
     sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
     sprite->pos1.x += 8;
@@ -2245,7 +2241,7 @@ static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y)
     eventObject->currentCoords.y = y;
 }
 
-void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y)
+void MoveEventObjectToMapCoords(struct EventObject *eventObject, s16 x, s16 y)
 {
     struct Sprite *sprite;
     const struct EventObjectGraphicsInfo *graphicsInfo;
@@ -2253,27 +2249,24 @@ void sub_808EB08(struct EventObject *eventObject, s16 x, s16 y)
     sprite = &gSprites[eventObject->spriteId];
     graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     SetEventObjectCoords(eventObject, x, y);
-    sub_8093038(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
     sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
     sprite->pos1.x += 8;
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
     sub_808E38C(eventObject);
     if (eventObject->trackedByCamera)
-    {
         CameraObjectReset1();
-    }
 }
 
-void sub_808EBA8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
+void TryMoveEventObjectToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
     u8 eventObjectId;
-
     if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         x += 7;
         y += 7;
-        sub_808EB08(&gEventObjects[eventObjectId], x, y);
+        MoveEventObjectToMapCoords(&gEventObjects[eventObjectId], x, y);
     }
 }
 
@@ -2604,15 +2597,13 @@ void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject)
     }
 }
 
-void OverrideMovementTypeForEventObject(const struct EventObject *eventObject, const u8 *script)
+static void OverrideEventObjectTemplateScript(const struct EventObject *eventObject, const u8 *script)
 {
     struct EventObjectTemplate *eventObjectTemplate;
 
     eventObjectTemplate = GetBaseTemplateForEventObject(eventObject);
-    if (eventObjectTemplate != NULL)
-    {
+    if (eventObjectTemplate)
         eventObjectTemplate->script = script;
-    }
 }
 
 void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType)
@@ -2626,30 +2617,26 @@ void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObje
     }
 }
 
-void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup)
+void TryOverrideEventObjectTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup)
 {
     u8 eventObjectId;
-
     if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
-    {
         OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]);
-    }
 }
 
-void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
+void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorationCategory)
 {
     u8 eventObjectId;
-
     if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        switch (decorCat)
+        switch (decorationCategory)
         {
-            case DECORCAT_DOLL:
-                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_SecretPower1);
-                break;
-            case DECORCAT_CUSHION:
-                OverrideMovementTypeForEventObject(&gEventObjects[eventObjectId], EventScript_SecretPower2);
-                break;
+        case DECORCAT_DOLL:
+            OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_DollInteract);
+            break;
+        case DECORCAT_CUSHION:
+            OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_CushionInteract);
+            break;
         }
     }
 }
@@ -4414,8 +4401,8 @@ bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sp
     direction = playerDirection;
     if (EventObjectIsFarawayIslandMew(eventObject))
     {
-        direction = sub_81D427C();
-        if (direction == 0)
+        direction = GetMewMoveDirection();
+        if (direction == DIR_NONE)
         {
             direction = playerDirection;
             direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
@@ -5024,44 +5011,37 @@ static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 delta
         *y -= dy2;
 }
 
-void sub_8092FF0(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
+void sub_8092FF0(s16 x, s16 y, s16 *destX, s16 *destY)
 {
-    *dest_x = (x - gSaveBlock1Ptr->pos.x) << 4;
-    *dest_y = (y - gSaveBlock1Ptr->pos.y) << 4;
-    *dest_x -= gTotalCameraPixelOffsetX;
-    *dest_y -= gTotalCameraPixelOffsetY;
+    *destX = (x - gSaveBlock1Ptr->pos.x) << 4;
+    *destY = (y - gSaveBlock1Ptr->pos.y) << 4;
+    *destX -= gTotalCameraPixelOffsetX;
+    *destY -= gTotalCameraPixelOffsetY;
 }
 
-void sub_8093038(s16 x, s16 y, s16 *dest_x, s16 *dest_y)
+void SetSpritePosToMapCoords(s16 mapX, s16 mapY, s16 *destX, s16 *destY)
 {
-    s16 dx;
-    s16 dy;
-
-    dx = -gTotalCameraPixelOffsetX - gFieldCamera.x;
-    dy = -gTotalCameraPixelOffsetY - gFieldCamera.y;
+    s16 dx = -gTotalCameraPixelOffsetX - gFieldCamera.x;
+    s16 dy = -gTotalCameraPixelOffsetY - gFieldCamera.y;
     if (gFieldCamera.x > 0)
-    {
-        dx += 0x10;
-    }
+        dx += 1 << 4;
+
     if (gFieldCamera.x < 0)
-    {
-        dx -= 0x10;
-    }
+        dx -= 1 << 4;
+
     if (gFieldCamera.y > 0)
-    {
-        dy += 0x10;
-    }
+        dy += 1 << 4;
+
     if (gFieldCamera.y < 0)
-    {
-        dy -= 0x10;
-    }
-    *dest_x = ((x - gSaveBlock1Ptr->pos.x) << 4) + dx;
-    *dest_y = ((y - gSaveBlock1Ptr->pos.y) << 4) + dy;
+        dy -= 1 << 4;
+
+    *destX = ((mapX - gSaveBlock1Ptr->pos.x) << 4) + dx;
+    *destY = ((mapY - gSaveBlock1Ptr->pos.y) << 4) + dy;
 }
 
 void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy)
 {
-    sub_8093038(*x, *y, x, y);
+    SetSpritePosToMapCoords(*x, *y, x, y);
     *x += dx;
     *y += dy;
 }
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index a7c786e69..1e120bc90 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
@@ -53,8 +53,6 @@ void (*gCB2_AfterEvolution)(void);
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
 #define sEvoGraphicsTaskID      gBattleCommunication[2]
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-
 // this file's functions
 static void Task_EvolutionScene(u8 taskID);
 static void Task_TradeEvolutionScene(u8 taskID);
diff --git a/src/faraway_island.c b/src/faraway_island.c
index 1c8dff14e..6a835a02b 100755
--- a/src/faraway_island.c
+++ b/src/faraway_island.c
@@ -17,12 +17,13 @@ static u8 sub_81D4C9C(struct EventObject*, u8);
 static u8 sub_81D4C58(struct EventObject*, u8);
 static u8 sub_81D4CE0(struct EventObject*, u8);
 static u8 sub_81D4D24(u8);
-static bool8 sub_81D4834(s16, s16);
+static bool8 CanMewWalkToCoords(s16, s16);
 
-extern u8 gUnknown_0203CF50;
-extern s16 gUnknown_030012F8;
-extern s16 gUnknown_030012FA;
-extern u8 gUnknown_030012FC[4];
+static EWRAM_DATA u8 sUnknown_0203CF50 = 0;
+
+static s16 sPlayerToMewDeltaX;
+static s16 sPlayerToMewDeltaY;
+static u8 sMewDirectionCandidates[4];
 
 extern const struct SpritePalette gFieldEffectObjectPaletteInfo1;
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
@@ -35,23 +36,23 @@ static const s16 sFarawayIslandRockCoords[4][2] =
     {20, 20},
 };
 
-static u8 sub_81D4258(void)
+static u8 GetMewEventObjectId(void)
 {
     u8 eventObjectId;
     TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId);
     return eventObjectId;
 }
 
-u32 sub_81D427C(void)
+u32 GetMewMoveDirection(void)
 {
     u8 i;
     int skip;
-    struct EventObject *mew = &gEventObjects[sub_81D4258()];
+    struct EventObject *mew = &gEventObjects[GetMewEventObjectId()];
 
-    gUnknown_030012F8 = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x;
-    gUnknown_030012FA = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y;
-    for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++)
-        gUnknown_030012FC[i] = DIR_NONE;
+    sPlayerToMewDeltaX = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x;
+    sPlayerToMewDeltaY = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y;
+    for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++)
+        sMewDirectionCandidates[i] = DIR_NONE;
 
     if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x
      && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y)
@@ -85,33 +86,33 @@ u32 sub_81D427C(void)
 
             if (!skip)
             {
-                if (gUnknown_030012F8 > 0)
+                if (sPlayerToMewDeltaX > 0)
                 {
                     if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x)
                     {
-                        if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y))
+                        if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
                             return DIR_EAST;
                     }
                 }
-                else if (gUnknown_030012F8 < 0)
+                else if (sPlayerToMewDeltaX < 0)
                 {
                     if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x)
                     {
-                        if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y))
+                        if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
                             return DIR_WEST;
                     }
                 }
 
                 if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x)
                 {
-                    if (gUnknown_030012FA > 0)
+                    if (sPlayerToMewDeltaY > 0)
                     {
-                        if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1))
+                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
                             return DIR_NORTH;
                     }
                     else
                     {
-                        if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1))
+                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
                             return DIR_SOUTH;
                     }
                 }
@@ -134,33 +135,33 @@ u32 sub_81D427C(void)
 
             if (!skip)
             {
-                if (gUnknown_030012FA > 0)
+                if (sPlayerToMewDeltaY > 0)
                 {
                     if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y)
                     {
-                        if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1))
+                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
                             return DIR_SOUTH;
                     }
                 }
-                else if (gUnknown_030012FA < 0)
+                else if (sPlayerToMewDeltaY < 0)
                 {
                     if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y)
                     {
-                        if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1))
+                        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
                             return DIR_NORTH;
                     }
                 }
 
                 if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y)
                 {
-                    if (gUnknown_030012F8 > 0)
+                    if (sPlayerToMewDeltaX > 0)
                     {
-                        if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y))
+                        if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
                             return DIR_WEST;
                     }
                     else
                     {
-                        if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y))
+                        if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
                             return DIR_EAST;
                     }
                 }
@@ -208,52 +209,52 @@ u32 sub_81D427C(void)
             return DIR_WEST;
     }
 
-    if (gUnknown_030012FA == 0)
+    if (sPlayerToMewDeltaY == 0)
     {
         if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y)
         {
-            if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1))
+            if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
                 return DIR_NORTH;
         }
 
         if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y)
         {
-            if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1))
+            if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
                 return DIR_SOUTH;
         }
 
-        if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1))
+        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
             return DIR_NORTH;
 
-        if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1))
+        if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
             return DIR_SOUTH;
     }
 
-    if (gUnknown_030012F8 == 0)
+    if (sPlayerToMewDeltaX == 0)
     {
         if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x)
         {
-            if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y))
+            if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
                 return DIR_WEST;
         }
 
         if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x)
         {
-            if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y))
+            if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
                 return DIR_EAST;
         }
 
-        if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y))
+        if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
             return DIR_EAST;
 
-        if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y))
+        if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
             return DIR_WEST;
     }
 
     return sub_81D4890(DIR_NONE);
 }
 
-static bool8 sub_81D4834(s16 x, s16 y)
+static bool8 CanMewWalkToCoords(s16 x, s16 y)
 {
     if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x
      && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y)
@@ -268,39 +269,39 @@ static u8 sub_81D4890(u8 ignoredDir)
 {
     u8 i;
     u8 count = 0;
-    struct EventObject *mew = &gEventObjects[sub_81D4258()];
+    struct EventObject *mew = &gEventObjects[GetMewEventObjectId()];
 
-    for (i = 0; i < ARRAY_COUNT(gUnknown_030012FC); i++)
-        gUnknown_030012FC[i] = DIR_NONE;
+    for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++)
+        sMewDirectionCandidates[i] = DIR_NONE;
 
-    if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH)
+    if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH)
     {
-        gUnknown_030012FC[count] = DIR_NORTH;
+        sMewDirectionCandidates[count] = DIR_NORTH;
         count++;
     }
 
-    if (sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST)
+    if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST)
     {
-        gUnknown_030012FC[count] = DIR_EAST;
+        sMewDirectionCandidates[count] = DIR_EAST;
         count++;
     }
 
-    if (sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH)
+    if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH)
     {
-        gUnknown_030012FC[count] = DIR_SOUTH;
+        sMewDirectionCandidates[count] = DIR_SOUTH;
         count++;
     }
 
-    if (sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST)
+    if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST)
     {
-        gUnknown_030012FC[count] = DIR_WEST;
+        sMewDirectionCandidates[count] = DIR_WEST;
         count++;
     }
 
     if (count > 1)
-        return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count];
+        return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count];
     else
-        return gUnknown_030012FC[0];
+        return sMewDirectionCandidates[0];
 }
 
 void UpdateFarawayIslandStepCounter(void)
@@ -355,7 +356,7 @@ void sub_81D4A90(void)
     s16 x;
     s16 y;
     u8 spriteId;
-    struct EventObject *mew = &gEventObjects[sub_81D4258()];
+    struct EventObject *mew = &gEventObjects[GetMewEventObjectId()];
 
     mew->invisible = 0;
     if (gSpecialVar_0x8004 == 1)
@@ -378,10 +379,10 @@ void sub_81D4A90(void)
         x = mew->currentCoords.x;
         y = mew->currentCoords.y;
         sub_80930E0(&x, &y, 8, 8);
-        gUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1);
-        if (gUnknown_0203CF50 != MAX_SPRITES)
+        sUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[15], x, y, gSprites[mew->spriteId].subpriority - 1);
+        if (sUnknown_0203CF50 != MAX_SPRITES)
         {
-            struct Sprite *sprite = &gSprites[gUnknown_0203CF50];
+            struct Sprite *sprite = &gSprites[sUnknown_0203CF50];
             sprite->coordOffsetEnabled = 1;
             sprite->oam.priority = 2;
             sprite->callback = SpriteCallbackDummy;
@@ -391,15 +392,15 @@ void sub_81D4A90(void)
 
 void sub_81D4BEC(void)
 {
-    if (gUnknown_0203CF50 != MAX_SPRITES)
-        DestroySprite(&gSprites[gUnknown_0203CF50]);
+    if (sUnknown_0203CF50 != MAX_SPRITES)
+        DestroySprite(&gSprites[sUnknown_0203CF50]);
 }
 
 static bool8 sub_81D4C14(struct EventObject *mew, u8 index)
 {
-    if (gUnknown_030012FA > 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y - 1))
+    if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1))
     {
-        gUnknown_030012FC[index] = DIR_NORTH;
+        sMewDirectionCandidates[index] = DIR_NORTH;
         return TRUE;
     }
 
@@ -408,9 +409,9 @@ static bool8 sub_81D4C14(struct EventObject *mew, u8 index)
 
 static u8 sub_81D4C58(struct EventObject *mew, u8 index)
 {
-    if (gUnknown_030012F8 < 0 && sub_81D4834(mew->currentCoords.x + 1, mew->currentCoords.y))
+    if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y))
     {
-        gUnknown_030012FC[index] = DIR_EAST;
+        sMewDirectionCandidates[index] = DIR_EAST;
         return TRUE;
     }
 
@@ -419,9 +420,9 @@ static u8 sub_81D4C58(struct EventObject *mew, u8 index)
 
 static u8 sub_81D4C9C(struct EventObject *mew, u8 index)
 {
-    if (gUnknown_030012FA < 0 && sub_81D4834(mew->currentCoords.x, mew->currentCoords.y + 1))
+    if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1))
     {
-        gUnknown_030012FC[index] = DIR_SOUTH;
+        sMewDirectionCandidates[index] = DIR_SOUTH;
         return TRUE;
     }
 
@@ -430,9 +431,9 @@ static u8 sub_81D4C9C(struct EventObject *mew, u8 index)
 
 static u8 sub_81D4CE0(struct EventObject *mew, u8 index)
 {
-    if (gUnknown_030012F8 > 0 && sub_81D4834(mew->currentCoords.x - 1, mew->currentCoords.y))
+    if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y))
     {
-        gUnknown_030012FC[index] = DIR_WEST;
+        sMewDirectionCandidates[index] = DIR_WEST;
         return TRUE;
     }
 
@@ -441,5 +442,5 @@ static u8 sub_81D4CE0(struct EventObject *mew, u8 index)
 
 static u8 sub_81D4D24(u8 mod)
 {
-    return gUnknown_030012FC[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod];
+    return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod];
 }
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 5b685173e..455c38deb 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -16,6 +16,7 @@
 #include "fldeff_misc.h"
 #include "item_menu.h"
 #include "link.h"
+#include "match_call.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "pokemon.h"
@@ -32,7 +33,6 @@
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
-#include "match_call.h"
 
 static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
 static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
@@ -227,8 +227,8 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
      && script != EventScript_PlayerPCFemale
      && script != EventScript_SecretBasePC
      && script != EventScript_RecordMixingSecretBasePC
-     && script != EventScript_SecretPower1
-     && script != EventScript_SecretPower2
+     && script != SecretBase_EventScript_DollInteract
+     && script != SecretBase_EventScript_CushionInteract
      && script != EventScript_PC)
         PlaySE(SE_SELECT);
 
@@ -354,7 +354,7 @@ static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *position
         if (direction == DIR_NORTH)
         {
             gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId;
-            if (sub_80E9680())
+            if (TrySetCurSecretBase())
                 return EventScript_2759F1;
         }
         return NULL;
@@ -421,23 +421,23 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
             return EventScript_SecretBaseShieldOrToyTV;
         if (MetatileBehavior_IsMB_C6(metatileBehavior) == TRUE)
         {
-            sub_80EB56C();
+            SetSecretBaseSecretsTvFlags_MiscFurnature();
             return NULL;
         }
-        if (MetatileBehavior_IsLargeMatCenter(metatileBehavior) == TRUE)
+        if (MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE)
         {
-            sub_80EB9E0();
+            SetSecretBaseSecretsTvFlags_LargeDecorationSpot();
             return NULL;
         }
-        if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatileBehavior) == TRUE)
+        if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE)
         {
-            sub_80EBB28();
+            SetSecretBaseSecretsTvFlags_SmallDecorationSpot();
             return NULL;
         }
     }
     else if (MetatileBehavior_IsSecretBasePoster(metatileBehavior) == TRUE)
     {
-        sub_80EB498();
+        SetSecretBaseSecretsTvFlags_Poster();
         return NULL;
     }
 
diff --git a/src/field_effect.c b/src/field_effect.c
index 825efc380..22bf44f28 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -33,8 +33,6 @@
 
 #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
 
-extern struct CompressedSpritePalette gMonPaletteTable[]; // GF made a mistake and did not extern it as const.
-
 EWRAM_DATA s32 gFieldEffectArguments[8] = {0};
 
 // Static type declarations
@@ -237,7 +235,9 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId);
 static IWRAM_DATA u8 sActiveList[32];
 
 // External declarations
-
+extern struct CompressedSpritePalette gMonPaletteTable[]; // GF made a mistake and did not extern it as const.
+extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern u8 *gFieldEffectScriptPointers[];
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
@@ -284,20 +284,44 @@ bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) =
 
 const struct OamData gNewGameBirchOamAttributes =
 {
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
-    .size = SPRITE_SIZE(64x64)
+    .x = 0,
+    .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
 };
 
 const struct OamData gOamData_855C218 =
 {
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
-    .size = SPRITE_SIZE(8x8)
+    .x = 0,
+    .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
 };
 
 const struct OamData gOamData_855C220 =
 {
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
-    .size = SPRITE_SIZE(16x16)
+    .x = 0,
+    .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
 };
 
 const struct SpriteFrameImage gNewGameBirchPicTable[] =
@@ -347,8 +371,16 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo5 =
 
 const struct OamData gOamData_855C26C =
 {
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
-    .size = SPRITE_SIZE(32x16)
+    .x = 0,
+    .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
 };
 
 const struct SpriteFrameImage gSpriteImageTable_855C274[] =
@@ -3453,7 +3485,7 @@ static void sub_80B9978(struct Task *task)
         eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
         sprite = &gSprites[eventObject->spriteId];
         eventObject->inanimate = 0;
-        sub_808EB08(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
+        MoveEventObjectToMapCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->coordOffsetEnabled = 1;
@@ -3759,3 +3791,4 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId)
             break;
     }
 }
+
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 3f75fbb84..c715da25d 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -191,7 +191,7 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y)
     sprite = &gSprites[spriteId];
     if (sprite->invisible || sprite->data[0] != x || sprite->data[1] != y)
     {
-        sub_8093038(x, y, &x2, &y2);
+        SetSpritePosToMapCoords(x, y, &x2, &y2);
         sprite = &gSprites[spriteId];
         sprite->pos1.x = x2 + 8;
         sprite->pos1.y = y2 + 8;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index a070fe0e1..ab2667c8c 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1188,9 +1188,9 @@ u8 PlayerGetZCoord(void)
     return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation;
 }
 
-void sub_808BC90(s16 a, s16 b)
+void sub_808BC90(s16 x, s16 y)
 {
-    sub_808EB08(&gEventObjects[gPlayerAvatar.eventObjectId], a, b);
+    MoveEventObjectToMapCoords(&gEventObjects[gPlayerAvatar.eventObjectId], x, y);
 }
 
 u8 TestPlayerAvatarFlags(u8 a)
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 5769f44af..9a5d47156 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -1132,7 +1132,7 @@ static void sub_80B0318(u8 taskId)
         data[0] = 1;
         break;
     case 1:
-        sub_8199DF0(0, 17, 0, 1);
+        sub_8199DF0(0, PIXEL_FILL(1), 0, 1);
         sub_80B028C(data[1]);
         sub_80B003C(data[2], data[3], 1, 160, 1, 2);
         data[0] = 2;
@@ -1179,7 +1179,7 @@ static void sub_80B0318(u8 taskId)
             if (sub_80B02C8(data[5]) == TRUE)
             {
                 data[0] = 5;
-                sub_8199DF0(0, 0, 0, 1);
+                sub_8199DF0(0, PIXEL_FILL(0), 0, 1);
             }
         }
         break;
diff --git a/src/field_specials.c b/src/field_specials.c
index 20c2e6173..8bd990063 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "battle_tower.h"
 #include "cable_club.h"
-#include "data2.h"
+#include "data.h"
 #include "decoration.h"
 #include "diploma.h"
 #include "event_data.h"
@@ -59,20 +59,20 @@
 
 EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
 EWRAM_DATA u8 gBikeCollisions = 0;
-EWRAM_DATA u32 gBikeCyclingTimer = 0;
-EWRAM_DATA u8 gUnknown_0203AB5C = 0;
-EWRAM_DATA u8 gUnknown_0203AB5D = 0;
-EWRAM_DATA u8 gUnknown_0203AB5E = 0;
-EWRAM_DATA u16 gUnknown_0203AB60 = 0;
-EWRAM_DATA u16 gUnknown_0203AB62 = 0;
-EWRAM_DATA struct ListMenuItem *gUnknown_0203AB64 = NULL;
-EWRAM_DATA u16 gUnknown_0203AB68 = 0;
-EWRAM_DATA u16 gUnknown_0203AB6A = 0;
-EWRAM_DATA u8 gUnknown_0203AB6C = 0;
-EWRAM_DATA u8 gUnknown_0203AB6D = 0;
-EWRAM_DATA u8 gUnknown_0203AB6E = 0;
-EWRAM_DATA u8 gUnknown_0203AB6F = 0;
-EWRAM_DATA u32 gUnknown_0203AB70 = 0;
+static EWRAM_DATA u32 gBikeCyclingTimer = 0;
+static EWRAM_DATA u8 gUnknown_0203AB5C = 0;
+static EWRAM_DATA u8 gUnknown_0203AB5D = 0;
+static EWRAM_DATA u8 gUnknown_0203AB5E = 0;
+static EWRAM_DATA u16 gUnknown_0203AB60 = 0;
+static EWRAM_DATA u16 gUnknown_0203AB62 = 0;
+static EWRAM_DATA struct ListMenuItem *gUnknown_0203AB64 = NULL;
+static EWRAM_DATA u16 gUnknown_0203AB68 = 0;
+static EWRAM_DATA u16 gUnknown_0203AB6A = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6C = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6D = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6E = 0;
+static EWRAM_DATA u8 gUnknown_0203AB6F = 0;
+static EWRAM_DATA u32 gUnknown_0203AB70 = 0;
 
 struct ListMenuTemplate gUnknown_030061D0;
 
diff --git a/src/field_weather.c b/src/field_weather.c
index 9913e9a61..814e85ef4 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -91,7 +91,7 @@ static const struct WeatherCallbacks sWeatherFuncs[] =
 {
     {None_Init,          None_Main,      None_Init,         None_Finish},
     {Clouds_InitVars,    Clouds_Main,    Clouds_InitAll,    Clouds_Finish},
-    {Weather2_InitVars,  Weather2_Main,  Weather2_InitAll,  Weather2_Finish},
+    {Sunny_InitVars,     Sunny_Main,     Sunny_InitAll,     Sunny_Finish},
     {LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish},
     {Snow_InitVars,      Snow_Main,      Snow_InitAll,      Snow_Finish},
     {MedRain_InitVars,   Rain_Main,      MedRain_InitAll,   Rain_Finish},
@@ -167,15 +167,15 @@ void StartWeather(void)
         gWeatherPtr->altGammaSpritePalIndex = index;
         gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(0x1201);
         gWeatherPtr->rainSpriteCount = 0;
-        gWeatherPtr->unknown_6D8 = 0;
+        gWeatherPtr->curRainSpriteIndex = 0;
         gWeatherPtr->cloudSpritesCreated = 0;
         gWeatherPtr->snowflakeSpriteCount = 0;
         gWeatherPtr->ashSpritesCreated = 0;
         gWeatherPtr->fog1SpritesCreated = 0;
         gWeatherPtr->fog2SpritesCreated = 0;
-        gWeatherPtr->sandstormSprites1Created = 0;
-        gWeatherPtr->sandstormSprites2Created = 0;
-        gWeatherPtr->unknown_72E = 0;
+        gWeatherPtr->sandstormSpritesCreated = 0;
+        gWeatherPtr->sandstormSwirlSpritesCreated = 0;
+        gWeatherPtr->bubblesSpritesCreated = 0;
         gWeatherPtr->lightenedFogSpritePalsCount = 0;
         Weather_SetBlendCoeffs(16, 0);
         gWeatherPtr->currWeather = 0;
@@ -234,7 +234,8 @@ static void Task_WeatherMain(u8 taskId)
 {
     if (gWeatherPtr->currWeather != gWeatherPtr->nextWeather)
     {
-        if (!sWeatherFuncs[gWeatherPtr->currWeather].finish() && gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
+        if (!sWeatherFuncs[gWeatherPtr->currWeather].finish()
+            && gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
         {
             // Finished cleaning up previous weather. Now transition to next weather.
             sWeatherFuncs[gWeatherPtr->nextWeather].initVars();
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 6ec83f1a0..8fca02707 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "battle_anim.h"
 #include "event_object_movement.h"
 #include "field_weather.h"
 #include "overworld.h"
@@ -12,16 +13,13 @@
 #include "trig.h"
 #include "gpu_regs.h"
 
-// This file's functions.
-void sub_80AC6B4(struct Sprite *);
-
 // EWRAM
 EWRAM_DATA static u8 gCurrentAlternatingWeather = 0;
 EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
 
 // CONST
-const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal");
-const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal");
+const u16 gCloudsWeatherPalette[] = INCBIN_U16("graphics/weather/cloud.gbapal");
+const u16 gSandstormWeatherPalette[] = INCBIN_U16("graphics/weather/sandstorm.gbapal");
 const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp");
 const u8 gWeatherFog1Tiles[] = INCBIN_U8("graphics/weather/fog1.4bpp");
 const u8 gWeatherCloudTiles[] = INCBIN_U8("graphics/weather/cloud.4bpp");
@@ -32,20 +30,35 @@ const u8 gWeatherAshTiles[] = INCBIN_U8("graphics/weather/ash.4bpp");
 const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp");
 const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp");
 
-static const struct Coords16 gUnknown_0854FB50[] =
+//------------------------------------------------------------------------------
+// Clouds
+//------------------------------------------------------------------------------
+
+static void CreateCloudSprites(void);
+static void DestroyCloudSprites(void);
+static void UpdateCloudSprite(struct Sprite *);
+
+// The clouds are positioned on the map's grid.
+// These coordinates are for the lower half of Route 120.
+static const struct Coords16 sCloudSpriteMapCoords[] =
 {
     { 0, 66},
     { 5, 73},
     {10, 78},
 };
 
-static const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200};
+static const struct SpriteSheet sCloudSpriteSheet =
+{
+    .data = gWeatherCloudTiles,
+    .size = sizeof(gWeatherCloudTiles),
+    .tag = 0x1200
+};
 
-static const struct OamData gOamData_839A9DC =
+static const struct OamData sCloudSpriteOamData =
 {
     .y = 0,
     .affineMode = 0,
-    .objMode = 1,
+    .objMode = ST_OAM_OBJ_BLEND,
     .mosaic = 0,
     .bpp = 0,
     .shape = SPRITE_SHAPE(64x64),
@@ -58,32 +71,28 @@ static const struct OamData gOamData_839A9DC =
     .affineParam = 0,
 };
 
-static const union AnimCmd gSpriteAnim_839A9E4[] =
+static const union AnimCmd sCloudSpriteAnimCmd[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const gSpriteAnimTable_839A9EC[] =
+static const union AnimCmd *const sCloudSpriteAnimCmds[] =
 {
-    gSpriteAnim_839A9E4,
+    sCloudSpriteAnimCmd,
 };
 
 static const struct SpriteTemplate sCloudSpriteTemplate =
 {
-    .tileTag = 4608,
-    .paletteTag = 4609,
-    .oam = &gOamData_839A9DC,
-    .anims = gSpriteAnimTable_839A9EC,
+    .tileTag = 0x1200,
+    .paletteTag = 0x1201,
+    .oam = &sCloudSpriteOamData,
+    .anims = sCloudSpriteAnimCmds,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_80AC6B4,
+    .callback = UpdateCloudSprite,
 };
 
-//------------------------------------------------------------------------------
-// Clouds
-//------------------------------------------------------------------------------
-
 void Clouds_InitVars(void)
 {
     gWeatherPtr->gammaTargetIndex = 0;
@@ -101,8 +110,6 @@ void Clouds_InitAll(void)
         Clouds_Main();
 }
 
-void CreateCloudSprites(void);
-
 void Clouds_Main(void)
 {
     switch (gWeatherPtr->initStep)
@@ -125,8 +132,6 @@ void Clouds_Main(void)
     }
 }
 
-void sub_807E0A0(void);
-
 bool8 Clouds_Finish(void)
 {
     switch (gWeatherPtr->finishStep)
@@ -138,7 +143,7 @@ bool8 Clouds_Finish(void)
     case 1:
         if (Weather_UpdateBlend())
         {
-            sub_807E0A0();
+            DestroyCloudSprites();
             gWeatherPtr->finishStep++;
         }
         return TRUE;
@@ -146,49 +151,45 @@ bool8 Clouds_Finish(void)
     return FALSE;
 }
 
-//------------------------------------------------------------------------------
-// Weather 2
-//------------------------------------------------------------------------------
-
-void Weather2_InitVars(void)
+void Sunny_InitVars(void)
 {
     gWeatherPtr->gammaTargetIndex = 0;
     gWeatherPtr->gammaStepDelay = 20;
 }
 
-void Weather2_InitAll(void)
+void Sunny_InitAll(void)
 {
-    Weather2_InitVars();
+    Sunny_InitVars();
 }
 
-void Weather2_Main(void)
+void Sunny_Main(void)
 {
 }
 
-bool8 Weather2_Finish(void)
+bool8 Sunny_Finish(void)
 {
-    return 0;
+    return FALSE;
 }
 
-void CreateCloudSprites(void)
+static void CreateCloudSprites(void)
 {
     u16 i;
+    u8 spriteId;
+    struct Sprite *sprite;
 
     if (gWeatherPtr->cloudSpritesCreated == TRUE)
         return;
+
     LoadSpriteSheet(&sCloudSpriteSheet);
-    LoadCustomWeatherSpritePalette(gUnknown_0854C290);
-    for (i = 0; i < 3; i++)
+    LoadCustomWeatherSpritePalette(gCloudsWeatherPalette);
+    for (i = 0; i < NUM_CLOUD_SPRITES; i++)
     {
-        u8 spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF);
-
+        spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF);
         if (spriteId != MAX_SPRITES)
         {
-            struct Sprite *sprite;
-
             gWeatherPtr->sprites.s1.cloudSprites[i] = &gSprites[spriteId];
             sprite = gWeatherPtr->sprites.s1.cloudSprites[i];
-            sub_8093038(gUnknown_0854FB50[i].x + 7, gUnknown_0854FB50[i].y + 7, &sprite->pos1.x, &sprite->pos1.y);
+            SetSpritePosToMapCoords(sCloudSpriteMapCoords[i].x + 7, sCloudSpriteMapCoords[i].y + 7, &sprite->pos1.x, &sprite->pos1.y);
             sprite->coordOffsetEnabled = TRUE;
         }
         else
@@ -196,28 +197,32 @@ void CreateCloudSprites(void)
             gWeatherPtr->sprites.s1.cloudSprites[i] = NULL;
         }
     }
+
     gWeatherPtr->cloudSpritesCreated = TRUE;
 }
 
-void sub_807E0A0(void)
+static void DestroyCloudSprites(void)
 {
     u16 i;
 
-    if (gWeatherPtr->cloudSpritesCreated == FALSE)
+    if (!gWeatherPtr->cloudSpritesCreated)
         return;
-    for (i = 0; i < 3; i++)
+
+    for (i = 0; i < NUM_CLOUD_SPRITES; i++)
     {
         if (gWeatherPtr->sprites.s1.cloudSprites[i] != NULL)
             DestroySprite(gWeatherPtr->sprites.s1.cloudSprites[i]);
     }
+
     FreeSpriteTilesByTag(0x1200);
     gWeatherPtr->cloudSpritesCreated = FALSE;
 }
 
-void sub_80AC6B4(struct Sprite *sprite)
+static void UpdateCloudSprite(struct Sprite *sprite)
 {
+    // Move 1 pixel left every 2 frames.
     sprite->data[0] = (sprite->data[0] + 1) & 1;
-    if (sprite->data[0] != 0)
+    if (sprite->data[0])
         sprite->pos1.x--;
 }
 
@@ -225,6 +230,8 @@ void sub_80AC6B4(struct Sprite *sprite)
 // Drought
 //------------------------------------------------------------------------------
 
+static void UpdateDroughtBlend(u8);
+
 void Drought_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
@@ -276,14 +283,12 @@ void Drought_Main(void)
 
 bool8 Drought_Finish(void)
 {
-    return 0;
+    return FALSE;
 }
 
-void task50_0807B6D4(u8);
-
-void sub_80AC81C(void)
+void StartDroughtWeatherBlend(void)
 {
-    CreateTask(task50_0807B6D4, 0x50);
+    CreateTask(UpdateDroughtBlend, 0x50);
 }
 
 #define tState      data[0]
@@ -291,7 +296,7 @@ void sub_80AC81C(void)
 #define tBlendDelay data[2]
 #define tWinRange   data[3]
 
-void task50_0807B6D4(u8 taskId)
+static void UpdateDroughtBlend(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -350,14 +355,128 @@ void task50_0807B6D4(u8 taskId)
 // Light Rain
 //------------------------------------------------------------------------------
 
+static void LoadRainSpriteSheet(void);
+static bool8 CreateRainSprite(void);
+static void UpdateRainSprite(struct Sprite *sprite);
+static bool8 UpdateVisibleRainSprites(void);
+static void DestroyRainSprites(void);
+
+static const struct Coords16 sRainSpriteCoords[] =
+{
+    {  0,   0},
+    {  0, 160},
+    {  0,  64},
+    {144, 224},
+    {144, 128},
+    { 32,  32},
+    { 32, 192},
+    { 32,  96},
+    { 72, 128},
+    { 72,  32},
+    { 72, 192},
+    {216,  96},
+    {216,   0},
+    {104, 160},
+    {104,  64},
+    {104, 224},
+    {144,   0},
+    {144, 160},
+    {144,  64},
+    { 32, 224},
+    { 32, 128},
+    { 72,  32},
+    { 72, 192},
+    { 48,  96},
+};
+
+static const struct OamData sRainSpriteOamData =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(16x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(16x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 2,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sRainSpriteFallAnimCmd[] =
+{
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sRainSpriteSplashAnimCmd[] =
+{
+    ANIMCMD_FRAME(8, 3),
+    ANIMCMD_FRAME(32, 2),
+    ANIMCMD_FRAME(40, 2),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sRainSpriteHeavySplashAnimCmd[] =
+{
+    ANIMCMD_FRAME(8, 3),
+    ANIMCMD_FRAME(16, 3),
+    ANIMCMD_FRAME(24, 4),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sRainSpriteAnimCmds[] =
+{
+    sRainSpriteFallAnimCmd,
+    sRainSpriteSplashAnimCmd,
+    sRainSpriteHeavySplashAnimCmd,
+};
+
+static const struct SpriteTemplate sRainSpriteTemplate =
+{
+    .tileTag = 4614,
+    .paletteTag = 0x1200,
+    .oam = &sRainSpriteOamData,
+    .anims = sRainSpriteAnimCmds,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateRainSprite,
+};
+
+// Q28.4 fixed-point format values
+static const s16 sRainSpriteMovement[][2] =
+{
+    {-0x68,  0xD0},
+    {-0xA0, 0x140},
+};
+
+// First byte is the number of frames a raindrop falls before it splashes.
+// Second byte is the maximum number of frames a raindrop can "wait" before
+// it appears and starts falling. (This is only for the initial raindrop spawn.)
+static const u16 sRainSpriteFallingDurations[][2] =
+{
+    {18, 7},
+    {12, 10},
+};
+
+static const struct SpriteSheet sRainSpriteSheet =
+{
+    .data = gWeatherRainTiles,
+    .size = sizeof(gWeatherRainTiles),
+    .tag = 0x1206,
+};
+
 void LightRain_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
-    gWeatherPtr->unknown_6D6 = 0;
-    gWeatherPtr->unknown_6DB = 8;
-    gWeatherPtr->unknown_6DC = 0;
-    gWeatherPtr->unknown_6D9 = 10;
+    gWeatherPtr->rainSpriteVisibleCounter = 0;
+    gWeatherPtr->rainSpriteVisibleDelay = 8;
+    gWeatherPtr->isHeavyRain = 0;
+    gWeatherPtr->targetRainSpriteCount = 10;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
     SetRainStrengthFromSoundEffect(SE_T_KOAME);
@@ -366,14 +485,10 @@ void LightRain_InitVars(void)
 void LightRain_InitAll(void)
 {
     LightRain_InitVars();
-    while (gWeatherPtr->weatherGfxLoaded == FALSE)
+    while (!gWeatherPtr->weatherGfxLoaded)
         LightRain_Main();
 }
 
-void LoadRainSpriteSheet(void);
-u8 CreateRainSprite(void);
-u8 sub_807E8E8(void);
-
 void LightRain_Main(void)
 {
     switch (gWeatherPtr->initStep)
@@ -383,11 +498,11 @@ void LightRain_Main(void)
         gWeatherPtr->initStep++;
         break;
     case 1:
-        if (CreateRainSprite() == 0)
+        if (!CreateRainSprite())
             gWeatherPtr->initStep++;
         break;
     case 2:
-        if (sub_807E8E8() == FALSE)
+        if (!UpdateVisibleRainSprites())
         {
             gWeatherPtr->weatherGfxLoaded = TRUE;
             gWeatherPtr->initStep++;
@@ -396,8 +511,6 @@ void LightRain_Main(void)
     }
 }
 
-void DestroyRainSprites(void);
-
 bool8 LightRain_Finish(void)
 {
     switch (gWeatherPtr->finishStep)
@@ -412,12 +525,12 @@ bool8 LightRain_Finish(void)
         }
         else
         {
-            gWeatherPtr->unknown_6D9 = 0;
+            gWeatherPtr->targetRainSpriteCount = 0;
             gWeatherPtr->finishStep++;
         }
         // fall through
     case 1:
-        if (sub_807E8E8() == FALSE)
+        if (!UpdateVisibleRainSprites())
         {
             DestroyRainSprites();
             gWeatherPtr->finishStep++;
@@ -428,66 +541,74 @@ bool8 LightRain_Finish(void)
     return FALSE;
 }
 
-// defined below
-extern const s16 gUnknown_0839AABC[][2];
-extern const u16 gUnknown_0839AAC4[][2];
+#define tCounter data[0]
+#define tRandom  data[1]
+#define tPosX    data[2]
+#define tPosY    data[3]
+#define tState   data[4]
+#define tActive  data[5]
+#define tWaiting data[6]
 
-void sub_807E4EC(struct Sprite *sprite)
+static void StartRainSpriteFall(struct Sprite *sprite)
 {
-    u32 randVal;
-    u16 r6;
-    s32 r4;
-    s32 r0;
+    u32 rand;
+    u16 numFallingFrames;
+    int tileX;
+    int tileY;
 
-    if (sprite->data[1] == 0)
-        sprite->data[1] = 361;
-    randVal = sprite->data[1] * 1103515245 + 12345;
-    sprite->data[1] = ((randVal & 0x7FFF0000) >> 16) % 600;
+    if (sprite->tRandom == 0)
+        sprite->tRandom = 361;
 
-    r6 = gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][0];
+    // Standard RNG sequence.
+    rand = sprite->tRandom * 1103515245 + 12345;
+    sprite->tRandom = ((rand & 0x7FFF0000) >> 16) % 600;
 
-    r4 = sprite->data[1] % 30;
-    sprite->data[2] = r4 * 8;  // useless assignment
+    numFallingFrames = sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][0];
 
-    r0 = sprite->data[1] / 30;
-    sprite->data[3] = r0 * 8;  // useless assignment
+    tileX = sprite->tRandom % 30;
+    sprite->tPosX = tileX * 8; // Useless assignment, leftover from before fixed-point values were used
 
-    sprite->data[2] = r4;
-    sprite->data[2] <<= 7;
+    tileY = sprite->tRandom / 30;
+    sprite->tPosY = tileY * 8; // Useless assignment, leftover from before fixed-point values were used
 
-    sprite->data[3] = r0;
-    sprite->data[3] <<= 7;
+    sprite->tPosX = tileX;
+    sprite->tPosX <<= 7; // This is tileX * 8, using a fixed-point value with 4 decimal places
 
-    sprite->data[2] -= gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0] * r6;
-    sprite->data[3] -= gUnknown_0839AABC[gWeatherPtr->unknown_6DC][1] * r6;
+    sprite->tPosY = tileY;
+    sprite->tPosY <<= 7; // This is tileX * 8, using a fixed-point value with 4 decimal places
+
+    // "Rewind" the rain sprites, from their ending position.
+    sprite->tPosX -= sRainSpriteMovement[gWeatherPtr->isHeavyRain][0] * numFallingFrames;
+    sprite->tPosY -= sRainSpriteMovement[gWeatherPtr->isHeavyRain][1] * numFallingFrames;
 
     StartSpriteAnim(sprite, 0);
-    sprite->data[4] = 0;
+    sprite->tState = 0;
     sprite->coordOffsetEnabled = FALSE;
-    sprite->data[0] = r6;
+    sprite->tCounter = numFallingFrames;
 }
 
-void sub_807E5C0(struct Sprite *sprite)
+static void UpdateRainSprite(struct Sprite *sprite)
 {
-    if (sprite->data[4] == 0)
+    if (sprite->tState == 0)
     {
-        sprite->data[2] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0];
-        sprite->data[3] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][1];
-        sprite->pos1.x = sprite->data[2] >> 4;
-        sprite->pos1.y = sprite->data[3] >> 4;
+        // Raindrop is in its "falling" motion.
+        sprite->tPosX += sRainSpriteMovement[gWeatherPtr->isHeavyRain][0];
+        sprite->tPosY += sRainSpriteMovement[gWeatherPtr->isHeavyRain][1];
+        sprite->pos1.x = sprite->tPosX >> 4;
+        sprite->pos1.y = sprite->tPosY >> 4;
 
-        if (sprite->data[5] != 0
+        if (sprite->tActive
          && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248)
          && sprite->pos1.y >= -16 && sprite->pos1.y <= 176)
             sprite->invisible = FALSE;
         else
             sprite->invisible = TRUE;
 
-        sprite->data[0]--;
-        if (sprite->data[0] == 0)
+        if (--sprite->tCounter == 0)
         {
-            StartSpriteAnim(sprite, gWeatherPtr->unknown_6DC + 1);
-            sprite->data[4] = 1;
+            // Make raindrop splash on the ground
+            StartSpriteAnim(sprite, gWeatherPtr->isHeavyRain + 1);
+            sprite->tState = 1;
             sprite->pos1.x -= gSpriteCoordOffsetX;
             sprite->pos1.y -= gSpriteCoordOffsetY;
             sprite->coordOffsetEnabled = TRUE;
@@ -495,363 +616,126 @@ void sub_807E5C0(struct Sprite *sprite)
     }
     else if (sprite->animEnded)
     {
+        // The splashing animation ended.
         sprite->invisible = TRUE;
-        sub_807E4EC(sprite);
+        StartRainSpriteFall(sprite);
     }
 }
 
-void sub_807E6C4(struct Sprite *sprite)
+static void WaitRainSprite(struct Sprite *sprite)
 {
-    if (sprite->data[0] == 0)
+    if (sprite->tCounter == 0)
     {
-        sub_807E4EC(sprite);
-        sprite->callback = sub_807E5C0;
+        StartRainSpriteFall(sprite);
+        sprite->callback = UpdateRainSprite;
     }
     else
     {
-        sprite->data[0]--;
+        sprite->tCounter--;
     }
 }
 
-void sub_807E6F0(struct Sprite *sprite, u16 b)
+static void InitRainSpriteMovement(struct Sprite *sprite, u16 val)
 {
-    u16 r8 = gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][0];
-    u16 r6 = b / (gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][1] + r8);
-    u16 r4 = b % (gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][1] + r8);
+    u16 numFallingFrames = sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][0];
+    u16 numAdvanceRng = val / (sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][1] + numFallingFrames);
+    u16 frameVal = val % (sRainSpriteFallingDurations[gWeatherPtr->isHeavyRain][1] + numFallingFrames);
+
+    while (--numAdvanceRng != 0xFFFF)
+        StartRainSpriteFall(sprite);
 
-    while (--r6 != 0xFFFF)
-        sub_807E4EC(sprite);
-    if (r4 < r8)
+    if (frameVal < numFallingFrames)
     {
-        while (--r4 != 0xFFFF)
-            sub_807E5C0(sprite);
-        sprite->data[6] = 0;
+        while (--frameVal != 0xFFFF)
+            UpdateRainSprite(sprite);
+
+        sprite->tWaiting = 0;
     }
     else
     {
-        sprite->data[0] = r4 - r8;
+        sprite->tCounter = frameVal - numFallingFrames;
         sprite->invisible = TRUE;
-        sprite->data[6] = 1;
+        sprite->tWaiting = 1;
     }
 }
 
-extern const struct SpriteSheet sRainSpriteSheet;  // defined below
-
-void LoadRainSpriteSheet(void)
+static void LoadRainSpriteSheet(void)
 {
     LoadSpriteSheet(&sRainSpriteSheet);
 }
 
-static const struct Coords16 sRainSpriteCoords[] =
-{
-    {  0,   0},
-    {  0, 160},
-    {  0,  64},
-    {144, 224},
-    {144, 128},
-    { 32,  32},
-    { 32, 192},
-    { 32,  96},
-    { 72, 128},
-    { 72,  32},
-    { 72, 192},
-    {216,  96},
-    {216,   0},
-    {104, 160},
-    {104,  64},
-    {104, 224},
-    {144,   0},
-    {144, 160},
-    {144,  64},
-    { 32, 224},
-    { 32, 128},
-    { 72,  32},
-    { 72, 192},
-    { 48,  96},
-};
-
-static const struct OamData gOamData_839AA68 =
+static bool8 CreateRainSprite(void)
 {
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(16x32),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(16x32),
-    .tileNum = 0,
-    .priority = 1,
-    .paletteNum = 2,
-    .affineParam = 0,
-};
-
-static const union AnimCmd gSpriteAnim_839AA70[] =
-{
-    ANIMCMD_FRAME(0, 16),
-    ANIMCMD_JUMP(0),
-};
-
-static const union AnimCmd gSpriteAnim_839AA78[] =
-{
-    ANIMCMD_FRAME(8, 3),
-    ANIMCMD_FRAME(32, 2),
-    ANIMCMD_FRAME(40, 2),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AA88[] =
-{
-    ANIMCMD_FRAME(8, 3),
-    ANIMCMD_FRAME(16, 3),
-    ANIMCMD_FRAME(24, 4),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd *const gSpriteAnimTable_839AA98[] =
-{
-    gSpriteAnim_839AA70,
-    gSpriteAnim_839AA78,
-    gSpriteAnim_839AA88,
-};
-
-static const struct SpriteTemplate sRainSpriteTemplate =
-{
-    .tileTag = 4614,
-    .paletteTag = 4608,
-    .oam = &gOamData_839AA68,
-    .anims = gSpriteAnimTable_839AA98,
-    .images = NULL,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_807E5C0,
-};
-
-const s16 gUnknown_0839AABC[][2] =
-{
-	{-104, 208},
-	{-160, 320},
-};
-
-const u16 gUnknown_0839AAC4[][2] =
-{
-    {18, 7},
-    {12, 10},
-};
-
-static const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206};
-
-static const struct OamData gOamData_839AAD4 =
-{
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(8x8),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(8x8),
-    .tileNum = 0,
-    .priority = 1,
-    .paletteNum = 0,
-    .affineParam = 0,
-};
-
-static const struct SpriteFrameImage gSpriteImageTable_839AADC[] =
-{
-    {gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)},
-    {gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)},
-};
-
-static const union AnimCmd gSpriteAnim_839AAEC[] =
-{
-    ANIMCMD_FRAME(0, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AAF4[] =
-{
-    ANIMCMD_FRAME(1, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd *const gSpriteAnimTable_839AAFC[] =
-{
-    gSpriteAnim_839AAEC,
-    gSpriteAnim_839AAF4,
-};
-
-void sub_807ED48(struct Sprite *);
-static const struct SpriteTemplate sSnowflakeSpriteTemplate =
-{
-    .tileTag = 0xFFFF,
-    .paletteTag = 4608,
-    .oam = &gOamData_839AAD4,
-    .anims = gSpriteAnimTable_839AAFC,
-    .images = gSpriteImageTable_839AADC,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_807ED48,
-};
-
-// unused data
-static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300};
-
-static const struct OamData gOamData_839AB2C =
-{
-    .y = 0,
-    .affineMode = 0,
-    .objMode = 1,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = SPRITE_SHAPE(64x64),
-    .x = 0,
-    .matrixNum = 0,
-    .size = SPRITE_SIZE(64x64),
-    .tileNum = 0,
-    .priority = 2,
-    .paletteNum = 0,
-    .affineParam = 0,
-};
-
-static const union AnimCmd gSpriteAnim_839AB34[] =
-{
-    ANIMCMD_FRAME(0, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AB3C[] =
-{
-    ANIMCMD_FRAME(32, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AB44[] =
-{
-    ANIMCMD_FRAME(64, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AB4C[] =
-{
-    ANIMCMD_FRAME(96, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AB54[] =
-{
-    ANIMCMD_FRAME(128, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd gSpriteAnim_839AB5C[] =
-{
-    ANIMCMD_FRAME(160, 16),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd *const gSpriteAnimTable_839AB64[] =
-{
-    gSpriteAnim_839AB34,
-    gSpriteAnim_839AB3C,
-    gSpriteAnim_839AB44,
-    gSpriteAnim_839AB4C,
-    gSpriteAnim_839AB54,
-    gSpriteAnim_839AB5C,
-};
-
-static const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] =
-{
-    AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
-    AFFINEANIMCMD_END,
-};
-
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] =
-{
-    gSpriteAffineAnim_839AB7C,
-};
-
-static void Fog1SpriteCallback(struct Sprite *);
-static const struct SpriteTemplate sFog1SpriteTemplate =
-{
-    .tileTag = 4609,
-    .paletteTag = 4608,
-    .oam = &gOamData_839AB2C,
-    .anims = gSpriteAnimTable_839AB64,
-    .images = NULL,
-    .affineAnims = gSpriteAffineAnimTable_839AB8C,
-    .callback = Fog1SpriteCallback,
-};
-
-bool8 CreateRainSprite(void)
-{
-    u8 spriteNum;
+    u8 spriteIndex;
     u8 spriteId;
 
-    if (gWeatherPtr->rainSpriteCount == 24)
+    if (gWeatherPtr->rainSpriteCount == MAX_RAIN_SPRITES)
         return FALSE;
 
-    spriteNum = gWeatherPtr->rainSpriteCount;
+    spriteIndex = gWeatherPtr->rainSpriteCount;
     spriteId = CreateSpriteAtEnd(&sRainSpriteTemplate,
-      sRainSpriteCoords[spriteNum].x, sRainSpriteCoords[spriteNum].y, 78);
+      sRainSpriteCoords[spriteIndex].x, sRainSpriteCoords[spriteIndex].y, 78);
+
     if (spriteId != MAX_SPRITES)
     {
-        gSprites[spriteId].data[5] = 0;
-        gSprites[spriteId].data[1] = spriteNum * 145;
-        while (gSprites[spriteId].data[1] >= 600)
-            gSprites[spriteId].data[1] -= 600;
-        sub_807E4EC(&gSprites[spriteId]);
-        sub_807E6F0(&gSprites[spriteId], spriteNum * 9);
+        gSprites[spriteId].tActive = 0;
+        gSprites[spriteId].tRandom = spriteIndex * 145;
+        while (gSprites[spriteId].tRandom >= 600)
+            gSprites[spriteId].tRandom -= 600;
+
+        StartRainSpriteFall(&gSprites[spriteId]);
+        InitRainSpriteMovement(&gSprites[spriteId], spriteIndex * 9);
         gSprites[spriteId].invisible = TRUE;
-        gWeatherPtr->sprites.s1.rainSprites[spriteNum] = &gSprites[spriteId];
+        gWeatherPtr->sprites.s1.rainSprites[spriteIndex] = &gSprites[spriteId];
     }
     else
     {
-        gWeatherPtr->sprites.s1.rainSprites[spriteNum] = NULL;
+        gWeatherPtr->sprites.s1.rainSprites[spriteIndex] = NULL;
     }
 
-    if (++gWeatherPtr->rainSpriteCount == 24)
+    if (++gWeatherPtr->rainSpriteCount == MAX_RAIN_SPRITES)
     {
         u16 i;
-
-        for (i = 0; i < 24; i++)
+        for (i = 0; i < MAX_RAIN_SPRITES; i++)
         {
-            if (gWeatherPtr->sprites.s1.rainSprites[i] != NULL)
+            if (gWeatherPtr->sprites.s1.rainSprites[i])
             {
-                if (gWeatherPtr->sprites.s1.rainSprites[i]->data[6] == 0)
-                    gWeatherPtr->sprites.s1.rainSprites[i]->callback = sub_807E5C0;
+                if (!gWeatherPtr->sprites.s1.rainSprites[i]->tWaiting)
+                    gWeatherPtr->sprites.s1.rainSprites[i]->callback = UpdateRainSprite;
                 else
-                    gWeatherPtr->sprites.s1.rainSprites[i]->callback = sub_807E6C4;
+                    gWeatherPtr->sprites.s1.rainSprites[i]->callback = WaitRainSprite;
             }
         }
+
         return FALSE;
     }
+
     return TRUE;
 }
 
-bool8 sub_807E8E8(void)
+static bool8 UpdateVisibleRainSprites(void)
 {
-    if (gWeatherPtr->unknown_6D8 == gWeatherPtr->unknown_6D9)
+    if (gWeatherPtr->curRainSpriteIndex == gWeatherPtr->targetRainSpriteCount)
         return FALSE;
 
-    if (++gWeatherPtr->unknown_6D6 > gWeatherPtr->unknown_6DB)
+    if (++gWeatherPtr->rainSpriteVisibleCounter > gWeatherPtr->rainSpriteVisibleDelay)
     {
-        gWeatherPtr->unknown_6D6 = 0;
-        if (gWeatherPtr->unknown_6D8 < gWeatherPtr->unknown_6D9)
+        gWeatherPtr->rainSpriteVisibleCounter = 0;
+        if (gWeatherPtr->curRainSpriteIndex < gWeatherPtr->targetRainSpriteCount)
         {
-            gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8++]->data[5] = 1;
+            gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->curRainSpriteIndex++]->tActive = 1;
         }
         else
         {
-            gWeatherPtr->unknown_6D8--;
-            gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8]->data[5] = 0;
-            gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8]->invisible = TRUE;
+            gWeatherPtr->curRainSpriteIndex--;
+            gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->curRainSpriteIndex]->tActive = 0;
+            gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->curRainSpriteIndex]->invisible = TRUE;
         }
     }
     return TRUE;
 }
 
-void DestroyRainSprites(void)
+static void DestroyRainSprites(void)
 {
     u16 i;
 
@@ -864,43 +748,50 @@ void DestroyRainSprites(void)
     FreeSpriteTilesByTag(0x1206);
 }
 
+#undef tCounter
+#undef tRandom
+#undef tPosX
+#undef tPosY
+#undef tState
+#undef tActive
+#undef tWaiting
+
 //------------------------------------------------------------------------------
 // Snow
 //------------------------------------------------------------------------------
 
+static void UpdateSnowflakeSprite(struct Sprite *);
+static bool8 UpdateVisibleSnowflakeSprites(void);
+static bool8 CreateSnowflakeSprite(void);
+static bool8 DestroySnowflakeSprite(void);
+static void InitSnowflakeSpriteMovement(struct Sprite *);
+
 void Snow_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
-    gWeatherPtr->unknown_6E5 = 16;
-    gWeatherPtr->unknown_6E0 = 0;
+    gWeatherPtr->targetSnowflakeSpriteCount = 16;
+    gWeatherPtr->snowflakeVisibleCounter = 0;
 }
 
-void Snow_Main(void);
-void sub_807ED48(struct Sprite *);
-
 void Snow_InitAll(void)
 {
+    u16 i;
+
     Snow_InitVars();
     while (gWeatherPtr->weatherGfxLoaded == FALSE)
     {
-        u16 i;
-
         Snow_Main();
         for (i = 0; i < gWeatherPtr->snowflakeSpriteCount; i++)
-        {
-            sub_807ED48(gWeatherPtr->sprites.s1.snowflakeSprites[i]);
-        }
+            UpdateSnowflakeSprite(gWeatherPtr->sprites.s1.snowflakeSprites[i]);
     }
 }
 
-u8 snowflakes_progress(void);
-
 void Snow_Main(void)
 {
-    if (gWeatherPtr->initStep == 0 && snowflakes_progress() == FALSE)
+    if (gWeatherPtr->initStep == 0 && !UpdateVisibleSnowflakeSprites())
     {
         gWeatherPtr->weatherGfxLoaded = TRUE;
         gWeatherPtr->initStep++;
@@ -912,143 +803,211 @@ bool8 Snow_Finish(void)
     switch (gWeatherPtr->finishStep)
     {
     case 0:
-        gWeatherPtr->unknown_6E5 = 0;
-        gWeatherPtr->unknown_6E0 = 0;
+        gWeatherPtr->targetSnowflakeSpriteCount = 0;
+        gWeatherPtr->snowflakeVisibleCounter = 0;
         gWeatherPtr->finishStep++;
         // fall through
     case 1:
-        if (snowflakes_progress() == FALSE)
+        if (!UpdateVisibleSnowflakeSprites())
         {
             gWeatherPtr->finishStep++;
             return FALSE;
         }
         return TRUE;
     }
+
     return FALSE;
 }
 
-bool8 CreateSnowflakeSprite(void);
-bool8 RemoveSnowflakeSprite(void);
-
-bool8 snowflakes_progress(void)
+static bool8 UpdateVisibleSnowflakeSprites(void)
 {
-    if (gWeatherPtr->snowflakeSpriteCount == gWeatherPtr->unknown_6E5)
+    if (gWeatherPtr->snowflakeSpriteCount == gWeatherPtr->targetSnowflakeSpriteCount)
         return FALSE;
 
-    gWeatherPtr->unknown_6E0++;
-    if (gWeatherPtr->unknown_6E0 > 36)
+    if (++gWeatherPtr->snowflakeVisibleCounter > 36)
     {
-        gWeatherPtr->unknown_6E0 = 0;
-        if (gWeatherPtr->snowflakeSpriteCount < gWeatherPtr->unknown_6E5)
+        gWeatherPtr->snowflakeVisibleCounter = 0;
+        if (gWeatherPtr->snowflakeSpriteCount < gWeatherPtr->targetSnowflakeSpriteCount)
             CreateSnowflakeSprite();
         else
-            RemoveSnowflakeSprite();
+            DestroySnowflakeSprite();
     }
-    return (gWeatherPtr->snowflakeSpriteCount != gWeatherPtr->unknown_6E5);
+
+    return gWeatherPtr->snowflakeSpriteCount != gWeatherPtr->targetSnowflakeSpriteCount;
 }
 
-void sub_807EC40(struct Sprite *);
+static const struct OamData sSnowflakeSpriteOamData =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const struct SpriteFrameImage sSnowflakeSpriteImages[] =
+{
+    {gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)},
+    {gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)},
+};
 
-bool8 CreateSnowflakeSprite(void)
+static const union AnimCmd sSnowflakeAnimCmd0[] =
 {
-    u8 spriteId = CreateSpriteAtEnd(&sSnowflakeSpriteTemplate, 0, 0, 78);
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sSnowflakeAnimCmd1[] =
+{
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sSnowflakeAnimCmds[] =
+{
+    sSnowflakeAnimCmd0,
+    sSnowflakeAnimCmd1,
+};
+
+static const struct SpriteTemplate sSnowflakeSpriteTemplate =
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 0x1200,
+    .oam = &sSnowflakeSpriteOamData,
+    .anims = sSnowflakeAnimCmds,
+    .images = sSnowflakeSpriteImages,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = UpdateSnowflakeSprite,
+};
+
+#define tPosY         data[0]
+#define tDeltaY       data[1]
+#define tWaveDelta    data[2]
+#define tWaveIndex    data[3]
+#define tSnowflakeId  data[4]
+#define tFallCounter  data[5]
+#define tFallDuration data[6]
+#define tDeltaY2      data[7]
 
+static bool8 CreateSnowflakeSprite(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&sSnowflakeSpriteTemplate, 0, 0, 78);
     if (spriteId == MAX_SPRITES)
         return FALSE;
-    gSprites[spriteId].data[4] = gWeatherPtr->snowflakeSpriteCount;
-    sub_807EC40(&gSprites[spriteId]);
+
+    gSprites[spriteId].tSnowflakeId = gWeatherPtr->snowflakeSpriteCount;
+    InitSnowflakeSpriteMovement(&gSprites[spriteId]);
     gSprites[spriteId].coordOffsetEnabled = TRUE;
     gWeatherPtr->sprites.s1.snowflakeSprites[gWeatherPtr->snowflakeSpriteCount++] = &gSprites[spriteId];
     return TRUE;
 }
 
-bool8 RemoveSnowflakeSprite(void)
+static bool8 DestroySnowflakeSprite(void)
 {
-    if (gWeatherPtr->snowflakeSpriteCount != 0)
+    if (gWeatherPtr->snowflakeSpriteCount)
     {
         DestroySprite(gWeatherPtr->sprites.s1.snowflakeSprites[--gWeatherPtr->snowflakeSpriteCount]);
         return TRUE;
     }
+
     return FALSE;
 }
 
-void sub_807EC40(struct Sprite *sprite)
+static void InitSnowflakeSpriteMovement(struct Sprite *sprite)
 {
-    u16 r4 = ((sprite->data[4] * 5) & 7) * 30 + (Random() % 30);
-    u16 r6;
+    u16 rand;
+    u16 x = ((sprite->tSnowflakeId * 5) & 7) * 30 + (Random() % 30);
 
     sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-    sprite->pos1.x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
-    sprite->data[0] = sprite->pos1.y * 128;
+    sprite->pos1.x = x - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
+    sprite->tPosY = sprite->pos1.y * 128;
     sprite->pos2.x = 0;
-    r6 = Random();
-    sprite->data[1] = (r6 & 3) * 5 + 64;
-    sprite->data[7] = (r6 & 3) * 5 + 64;
-    StartSpriteAnim(sprite, (r6 & 1) ? 0 : 1);
-    sprite->data[3] = 0;
-    sprite->data[2] = ((r6 & 3) == 0) ? 2 : 1;
-    sprite->data[6] = (r6 & 0x1F) + 210;
-    sprite->data[5] = 0;
+    rand = Random();
+    sprite->tDeltaY = (rand & 3) * 5 + 64;
+    sprite->tDeltaY2 = sprite->tDeltaY;
+    StartSpriteAnim(sprite, (rand & 1) ? 0 : 1);
+    sprite->tWaveIndex = 0;
+    sprite->tWaveDelta = ((rand & 3) == 0) ? 2 : 1;
+    sprite->tFallDuration = (rand & 0x1F) + 210;
+    sprite->tFallCounter = 0;
 }
 
-void sub_807ECEC(struct Sprite *sprite)
+static void WaitSnowflakeSprite(struct Sprite *sprite)
 {
     if (gWeatherPtr->unknown_6E2 > 18)
     {
         sprite->invisible = FALSE;
-        sprite->callback = sub_807ED48;
-        sprite->pos1.y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-        sprite->data[0] = sprite->pos1.y * 128;
+        sprite->callback = UpdateSnowflakeSprite;
+        sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
+        sprite->tPosY = sprite->pos1.y * 128;
         gWeatherPtr->unknown_6E2 = 0;
     }
 }
 
-void sub_807ED48(struct Sprite *sprite)
+static void UpdateSnowflakeSprite(struct Sprite *sprite)
 {
-    s16 r3;
-    s16 r2;
+    s16 x;
+    s16 y;
+
+    sprite->tPosY += sprite->tDeltaY;
+    sprite->pos1.y = sprite->tPosY >> 7;
+    sprite->tWaveIndex += sprite->tWaveDelta;
+    sprite->tWaveIndex &= 0xFF;
+    sprite->pos2.x = gSineTable[sprite->tWaveIndex] / 64;
 
-    sprite->data[0] += sprite->data[1];
-    sprite->pos1.y = sprite->data[0] >> 7;
-    sprite->data[3] = (sprite->data[3] + sprite->data[2]) & 0xFF;
-    sprite->pos2.x = gSineTable[sprite->data[3]] / 64;
+    x = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF;
+    if (x & 0x100)
+        x |= -0x100;
 
-    r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF;
-    if (r3 & 0x100)
-        r3 |= -0x100;  // hmm... what is this?
-    if (r3 < -3)
+    if (x < -3)
         sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
-    else if (r3 > 242)
+    else if (x > 242)
         sprite->pos1.x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
 
-    r2 = (sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF;
-    if (r2 > 163 && r2 < 171)
+    y = (sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF;
+    if (y > 163 && y < 171)
     {
         sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-        sprite->data[0] = sprite->pos1.y * 128;
-        sprite->data[5] = 0;
-        sprite->data[6] = 220;
+        sprite->tPosY = sprite->pos1.y * 128;
+        sprite->tFallCounter = 0;
+        sprite->tFallDuration = 220;
     }
-    else if (r2 > 242 && r2 < 250)
+    else if (y > 242 && y < 250)
     {
         sprite->pos1.y = 163;
-        sprite->data[0] = sprite->pos1.y * 128;
-        sprite->data[5] = 0;
-        sprite->data[6] = 220;
+        sprite->tPosY = sprite->pos1.y * 128;
+        sprite->tFallCounter = 0;
+        sprite->tFallDuration = 220;
         sprite->invisible = TRUE;
-        sprite->callback = sub_807ECEC;
+        sprite->callback = WaitSnowflakeSprite;
     }
 
-    sprite->data[5]++;
-    if (sprite->data[5] == sprite->data[6])
+    if (++sprite->tFallCounter == sprite->tFallDuration)
     {
-        sub_807EC40(sprite);
+        InitSnowflakeSpriteMovement(sprite);
         sprite->pos1.y = 250;
         sprite->invisible = TRUE;
-        sprite->callback = sub_807ECEC;
+        sprite->callback = WaitSnowflakeSprite;
     }
 }
 
+#undef tPosY
+#undef tDeltaY
+#undef tWaveDelta
+#undef tWaveIndex
+#undef tSnowflakeId
+#undef tFallCounter
+#undef tFallDuration
+#undef tDeltaY2
+
 //------------------------------------------------------------------------------
 // Medium Rain
 //------------------------------------------------------------------------------
@@ -1057,19 +1016,17 @@ void MedRain_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
-    gWeatherPtr->unknown_6D6 = 0;
-    gWeatherPtr->unknown_6DB = 4;
-    gWeatherPtr->unknown_6DC = 0;
-    gWeatherPtr->unknown_6D9 = 16;
+    gWeatherPtr->rainSpriteVisibleCounter = 0;
+    gWeatherPtr->rainSpriteVisibleDelay = 4;
+    gWeatherPtr->isHeavyRain = 0;
+    gWeatherPtr->targetRainSpriteCount = 16;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
     gWeatherPtr->weatherGfxLoaded = FALSE;  // duplicate assignment
-    gWeatherPtr->unknown_6ED = 0;
+    gWeatherPtr->thunderTriggered = 0;
     SetRainStrengthFromSoundEffect(SE_T_AME);
 }
 
-void Rain_Main(void);
-
 void MedRain_InitAll(void)
 {
     MedRain_InitVars();
@@ -1081,14 +1038,17 @@ void MedRain_InitAll(void)
 // Heavy Rain
 //------------------------------------------------------------------------------
 
+static void UpdateThunderSound(void);
+static void SetThunderCounter(u16);
+
 void HeavyRain_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = FALSE;
-    gWeatherPtr->unknown_6D6 = 0;
-    gWeatherPtr->unknown_6DB = 4;
-    gWeatherPtr->unknown_6DC = 1;
-    gWeatherPtr->unknown_6D9 = 24;
+    gWeatherPtr->rainSpriteVisibleCounter = 0;
+    gWeatherPtr->rainSpriteVisibleDelay = 4;
+    gWeatherPtr->isHeavyRain = 1;
+    gWeatherPtr->targetRainSpriteCount = 24;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
     gWeatherPtr->weatherGfxLoaded = FALSE;  // duplicate assignment
@@ -1102,9 +1062,6 @@ void HeavyRain_InitAll(void)
         Rain_Main();
 }
 
-void UpdateThunderSound(void);
-void SetThunderCounter(u16);
-
 void Rain_Main(void)
 {
     UpdateThunderSound();
@@ -1115,20 +1072,19 @@ void Rain_Main(void)
         gWeatherPtr->initStep++;
         break;
     case 1:
-        if (CreateRainSprite())
-            break;
-        gWeatherPtr->initStep++;
+        if (!CreateRainSprite())
+            gWeatherPtr->initStep++;
         break;
     case 2:
-        if (sub_807E8E8())
-            break;
-        gWeatherPtr->weatherGfxLoaded = TRUE;
-        gWeatherPtr->initStep++;
+        if (!UpdateVisibleRainSprites())
+        {
+            gWeatherPtr->weatherGfxLoaded = TRUE;
+            gWeatherPtr->initStep++;
+        }
         break;
     case 3:
-        if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_CHANGING_WEATHER)
-            break;
-        gWeatherPtr->initStep = 6;
+        if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_CHANGING_WEATHER)
+            gWeatherPtr->initStep = 6;
         break;
     case 4:
         gWeatherPtr->unknown_6EA = 1;
@@ -1136,9 +1092,8 @@ void Rain_Main(void)
         gWeatherPtr->initStep++;
         // fall through
     case 5:
-        if (--gWeatherPtr->unknown_6E6 != 0)
-            break;
-        gWeatherPtr->initStep++;
+        if (--gWeatherPtr->unknown_6E6 == 0)
+            gWeatherPtr->initStep++;
         break;
     case 6:
         gWeatherPtr->unknown_6EA = 1;
@@ -1153,57 +1108,60 @@ void Rain_Main(void)
         sub_80ABC48(19);
         if (gWeatherPtr->unknown_6EB == 0 && gWeatherPtr->unknown_6EC == 1)
             SetThunderCounter(20);
+
         gWeatherPtr->unknown_6E6 = (Random() % 3) + 6;
         gWeatherPtr->initStep++;
         break;
     case 9:
-        if (--gWeatherPtr->unknown_6E6 != 0)
-            break;
-        sub_80ABC48(3);
-        gWeatherPtr->unknown_6EA = 1;
-        if (--gWeatherPtr->unknown_6EC != 0)
-        {
-            gWeatherPtr->unknown_6E6 = (Random() % 16) + 60;
-            gWeatherPtr->initStep = 10;
-        }
-        else if (gWeatherPtr->unknown_6EB == 0)
-        {
-            gWeatherPtr->initStep = 4;
-        }
-        else
+        if (--gWeatherPtr->unknown_6E6 == 0)
         {
-            gWeatherPtr->initStep = 11;
+            sub_80ABC48(3);
+            gWeatherPtr->unknown_6EA = 1;
+            if (--gWeatherPtr->unknown_6EC != 0)
+            {
+                gWeatherPtr->unknown_6E6 = (Random() % 16) + 60;
+                gWeatherPtr->initStep = 10;
+            }
+            else if (gWeatherPtr->unknown_6EB == 0)
+            {
+                gWeatherPtr->initStep = 4;
+            }
+            else
+            {
+                gWeatherPtr->initStep = 11;
+            }
         }
         break;
     case 10:
-        if (--gWeatherPtr->unknown_6E6 != 0)
-            break;
-        gWeatherPtr->initStep = 8;
+        if (--gWeatherPtr->unknown_6E6 == 0)
+            gWeatherPtr->initStep = 8;
         break;
     case 11:
         gWeatherPtr->unknown_6E6 = (Random() % 16) + 60;
         gWeatherPtr->initStep++;
         break;
     case 12:
-        if (--gWeatherPtr->unknown_6E6 != 0)
-            break;
-        SetThunderCounter(100);
-        sub_80ABC48(19);
-        // Why use "% 16" everywhere else and "& 0xF" here. So dumb.
-        gWeatherPtr->unknown_6E6 = (Random() & 0xF) + 30;
-        gWeatherPtr->initStep++;
+        if (--gWeatherPtr->unknown_6E6 == 0)
+        {
+            SetThunderCounter(100);
+            sub_80ABC48(19);
+            gWeatherPtr->unknown_6E6 = (Random() & 0xF) + 30;
+            gWeatherPtr->initStep++;
+        }
         break;
     case 13:
-        if (--gWeatherPtr->unknown_6E6 != 0)
-            break;
-        sub_80ABC7C(19, 3, 5);
-        gWeatherPtr->initStep++;
+        if (--gWeatherPtr->unknown_6E6 == 0)
+        {
+            sub_80ABC7C(19, 3, 5);
+            gWeatherPtr->initStep++;
+        }
         break;
     case 14:
-        if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_IDLE)
-            break;
-        gWeatherPtr->unknown_6EA = 1;
-        gWeatherPtr->initStep = 4;
+        if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE)
+        {
+            gWeatherPtr->unknown_6EA = 1;
+            gWeatherPtr->initStep = 4;
+        }
         break;
     }
 }
@@ -1218,51 +1176,56 @@ bool8 Rain_Finish(void)
         // fall through
     case 1:
         Rain_Main();
-        if (gWeatherPtr->unknown_6EA != 0)
+        if (gWeatherPtr->unknown_6EA)
         {
             if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT
              || gWeatherPtr->nextWeather == WEATHER_RAIN_MED
              || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY)
                 return FALSE;
-            gWeatherPtr->unknown_6D9 = 0;
+
+            gWeatherPtr->targetRainSpriteCount = 0;
             gWeatherPtr->finishStep++;
         }
         break;
     case 2:
-        if (sub_807E8E8())
-            break;
-        DestroyRainSprites();
-        gWeatherPtr->unknown_6ED = 0;
-        gWeatherPtr->finishStep++;
-        return FALSE;
+        if (!UpdateVisibleRainSprites())
+        {
+            DestroyRainSprites();
+            gWeatherPtr->thunderTriggered = 0;
+            gWeatherPtr->finishStep++;
+            return FALSE;
+        }
+        break;
     default:
         return FALSE;
     }
     return TRUE;
 }
 
-void SetThunderCounter(u16 max)
+static void SetThunderCounter(u16 max)
 {
-    if (gWeatherPtr->unknown_6ED == 0)
+    if (gWeatherPtr->thunderTriggered == 0)
     {
         gWeatherPtr->thunderCounter = Random() % max;
-        gWeatherPtr->unknown_6ED = 1;
+        gWeatherPtr->thunderTriggered = 1;
     }
 }
 
-void UpdateThunderSound(void)
+static void UpdateThunderSound(void)
 {
-    if (gWeatherPtr->unknown_6ED == 1)
+    if (gWeatherPtr->thunderTriggered == 1)
     {
         if (gWeatherPtr->thunderCounter == 0)
         {
             if (IsSEPlaying())
                 return;
+
             if (Random() & 1)
                 PlaySE(SE_T_KAMI);
             else
                 PlaySE(SE_T_KAMI2);
-            gWeatherPtr->unknown_6ED = 0;
+
+            gWeatherPtr->thunderTriggered = 0;
         }
         else
         {
@@ -1275,6 +1238,95 @@ void UpdateThunderSound(void)
 // Fog 1
 //------------------------------------------------------------------------------
 
+// unused data
+static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300};
+
+static const struct OamData gOamData_839AB2C =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 1,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(64x64),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd gSpriteAnim_839AB34[] =
+{
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gSpriteAnim_839AB3C[] =
+{
+    ANIMCMD_FRAME(32, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gSpriteAnim_839AB44[] =
+{
+    ANIMCMD_FRAME(64, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gSpriteAnim_839AB4C[] =
+{
+    ANIMCMD_FRAME(96, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gSpriteAnim_839AB54[] =
+{
+    ANIMCMD_FRAME(128, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd gSpriteAnim_839AB5C[] =
+{
+    ANIMCMD_FRAME(160, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const gSpriteAnimTable_839AB64[] =
+{
+    gSpriteAnim_839AB34,
+    gSpriteAnim_839AB3C,
+    gSpriteAnim_839AB44,
+    gSpriteAnim_839AB4C,
+    gSpriteAnim_839AB54,
+    gSpriteAnim_839AB5C,
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] =
+{
+    AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] =
+{
+    gSpriteAffineAnim_839AB7C,
+};
+
+static void Fog1SpriteCallback(struct Sprite *);
+static const struct SpriteTemplate sFog1SpriteTemplate =
+{
+    .tileTag = 0x1201,
+    .paletteTag = 0x1200,
+    .oam = &gOamData_839AB2C,
+    .anims = gSpriteAnimTable_839AB64,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_839AB8C,
+    .callback = Fog1SpriteCallback,
+};
+
 void Fog1_Main(void);
 static void CreateFog1Sprites(void);
 static void DestroyFog1Sprites(void);
@@ -1287,8 +1339,8 @@ void Fog1_InitVars(void)
     gWeatherPtr->gammaStepDelay = 20;
     if (gWeatherPtr->fog1SpritesCreated == 0)
     {
-        gWeatherPtr->unknown_6F0 = 0;
-        gWeatherPtr->unknown_6F2 = 0;
+        gWeatherPtr->fog1ScrollCounter = 0;
+        gWeatherPtr->fog1ScrollOffset = 0;
         gWeatherPtr->fog1ScrollPosX = 0;
         Weather_SetBlendCoeffs(0, 16);
     }
@@ -1303,11 +1355,11 @@ void Fog1_InitAll(void)
 
 void Fog1_Main(void)
 {
-    gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->unknown_6F2) & 0xFF;
-    if (++gWeatherPtr->unknown_6F0 > 3)
+    gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->fog1ScrollOffset) & 0xFF;
+    if (++gWeatherPtr->fog1ScrollCounter > 3)
     {
-        gWeatherPtr->unknown_6F0 = 0;
-        gWeatherPtr->unknown_6F2++;
+        gWeatherPtr->fog1ScrollCounter = 0;
+        gWeatherPtr->fog1ScrollOffset++;
     }
     switch (gWeatherPtr->initStep)
     {
@@ -1331,12 +1383,13 @@ void Fog1_Main(void)
 
 bool8 Fog1_Finish(void)
 {
-    gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->unknown_6F2) & 0xFF;
-    if (++gWeatherPtr->unknown_6F0 > 3)
+    gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->fog1ScrollOffset) & 0xFF;
+    if (++gWeatherPtr->fog1ScrollCounter > 3)
     {
-        gWeatherPtr->unknown_6F0 = 0;
-        gWeatherPtr->unknown_6F2++;
+        gWeatherPtr->fog1ScrollCounter = 0;
+        gWeatherPtr->fog1ScrollOffset++;
     }
+
     switch (gWeatherPtr->finishStep)
     {
     case 0:
@@ -1344,9 +1397,8 @@ bool8 Fog1_Finish(void)
         gWeatherPtr->finishStep++;
         break;
     case 1:
-        if (!Weather_UpdateBlend())
-            break;
-        gWeatherPtr->finishStep++;
+        if (Weather_UpdateBlend())
+            gWeatherPtr->finishStep++;
         break;
     case 2:
         DestroyFog1Sprites();
@@ -1358,15 +1410,15 @@ bool8 Fog1_Finish(void)
     return TRUE;
 }
 
-#define sprColumn data[0]
+#define tSpriteColumn data[0]
 
 static void Fog1SpriteCallback(struct Sprite *sprite)
 {
     sprite->pos2.y = (u8)gSpriteCoordOffsetY;
-    sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64;
-    if (sprite->pos1.x > 0x10F)
+    sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->tSpriteColumn * 64;
+    if (sprite->pos1.x > 271)
     {
-        sprite->pos1.x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->sprColumn) * 64;
+        sprite->pos1.x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->tSpriteColumn) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
@@ -1374,21 +1426,24 @@ static void Fog1SpriteCallback(struct Sprite *sprite)
 static void CreateFog1Sprites(void)
 {
     u16 i;
+    u8 spriteId;
+    struct Sprite *sprite;
 
     if (!gWeatherPtr->fog1SpritesCreated)
     {
-        struct SpriteSheet fog1SpriteSheet = {gWeatherFog1Tiles, sizeof(gWeatherFog1Tiles), 0x1201};
-
+        struct SpriteSheet fog1SpriteSheet = {
+            .data = gWeatherFog1Tiles,
+            .size = sizeof(gWeatherFog1Tiles),
+            .tag = 0x1201,
+        };
         LoadSpriteSheet(&fog1SpriteSheet);
-        for (i = 0; i < 20; i++)
+        for (i = 0; i < NUM_FOG1_SPRITES; i++)
         {
-            u8 spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF);
-
+            spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF);
             if (spriteId != MAX_SPRITES)
             {
-                struct Sprite *sprite = &gSprites[spriteId];
-
-                sprite->sprColumn = i % 5;
+                sprite = &gSprites[spriteId];
+                sprite->tSpriteColumn = i % 5;
                 sprite->pos1.x = (i % 5) * 64 + 32;
                 sprite->pos1.y = (i / 5) * 64 + 32;
                 gWeatherPtr->sprites.s2.fog1Sprites[i] = sprite;
@@ -1398,36 +1453,38 @@ static void CreateFog1Sprites(void)
                 gWeatherPtr->sprites.s2.fog1Sprites[i] = NULL;
             }
         }
+
         gWeatherPtr->fog1SpritesCreated = TRUE;
     }
 }
 
-#undef sprColumn
-
 static void DestroyFog1Sprites(void)
 {
     u16 i;
 
     if (gWeatherPtr->fog1SpritesCreated)
     {
-        for (i = 0; i < 20; i++)
+        for (i = 0; i < NUM_FOG1_SPRITES; i++)
         {
             if (gWeatherPtr->sprites.s2.fog1Sprites[i] != NULL)
                 DestroySprite(gWeatherPtr->sprites.s2.fog1Sprites[i]);
         }
+
         FreeSpriteTilesByTag(0x1201);
         gWeatherPtr->fog1SpritesCreated = 0;
     }
 }
 
+#undef tSpriteColumn
+
 //------------------------------------------------------------------------------
 // Volcanic ash
 //------------------------------------------------------------------------------
 
-void Ash_Main(void);
-void LoadAshSpriteSheet(void);
-void CreateAshSprites(void);
-void DestroyAshSprites(void);
+static void LoadAshSpriteSheet(void);
+static void CreateAshSprites(void);
+static void DestroyAshSprites(void);
+static void UpdateAshSprite(struct Sprite *);
 
 void Ash_InitVars(void)
 {
@@ -1439,7 +1496,7 @@ void Ash_InitVars(void)
     if (!gWeatherPtr->ashSpritesCreated)
     {
         Weather_SetBlendCoeffs(0, 16);
-        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(64, 63));  // Those aren't even valid coefficients!
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(64, 63)); // These aren't valid blend coefficients!
     }
 }
 
@@ -1452,9 +1509,10 @@ void Ash_InitAll(void)
 
 void Ash_Main(void)
 {
-    gWeatherPtr->unknown_6FC = gSpriteCoordOffsetX & 0x1FF;
-    while (gWeatherPtr->unknown_6FC > 0xEF)
-        gWeatherPtr->unknown_6FC -= 0xF0;
+    gWeatherPtr->ashBaseSpritesX = gSpriteCoordOffsetX & 0x1FF;
+    while (gWeatherPtr->ashBaseSpritesX >= 240)
+        gWeatherPtr->ashBaseSpritesX -= 240;
+
     switch (gWeatherPtr->initStep)
     {
     case 0:
@@ -1464,14 +1522,16 @@ void Ash_Main(void)
     case 1:
         if (!gWeatherPtr->ashSpritesCreated)
             CreateAshSprites();
+
         Weather_SetTargetBlendCoeffs(16, 0, 1);
         gWeatherPtr->initStep++;
         break;
     case 2:
-        if (!Weather_UpdateBlend())
-            break;
-        gWeatherPtr->weatherGfxLoaded = TRUE;
-        gWeatherPtr->initStep++;
+        if (Weather_UpdateBlend())
+        {
+            gWeatherPtr->weatherGfxLoaded = TRUE;
+            gWeatherPtr->initStep++;
+        }
         break;
     default:
         Weather_UpdateBlend();
@@ -1488,10 +1548,11 @@ bool8 Ash_Finish(void)
         gWeatherPtr->finishStep++;
         break;
     case 1:
-        if (!Weather_UpdateBlend())
-            break;
-        DestroyAshSprites();
-        gWeatherPtr->finishStep++;
+        if (Weather_UpdateBlend())
+        {
+            DestroyAshSprites();
+            gWeatherPtr->finishStep++;
+        }
         break;
     case 2:
         SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@@ -1503,72 +1564,78 @@ bool8 Ash_Finish(void)
     return TRUE;
 }
 
-static const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202};
+static const struct SpriteSheet sAshSpriteSheet =
+{
+    .data = gWeatherAshTiles,
+    .size = sizeof(gWeatherAshTiles),
+    .tag = 0x1202,
+};
 
-void LoadAshSpriteSheet(void)
+static void LoadAshSpriteSheet(void)
 {
     LoadSpriteSheet(&sAshSpriteSheet);
 }
 
-const struct OamData gOamData_839ABB8 =
+static const struct OamData sAshSpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 1,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 15,
-    .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_839ABC0[] =
+static const union AnimCmd sAshSpriteAnimCmd0[] =
 {
     ANIMCMD_FRAME(0, 60),
     ANIMCMD_FRAME(64, 60),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gSpriteAnimTable_839ABCC[] =
+static const union AnimCmd *const sAshSpriteAnimCmds[] =
 {
-    gSpriteAnim_839ABC0,
+    sAshSpriteAnimCmd0,
 };
 
-void sub_807FAA8(struct Sprite *);
 static const struct SpriteTemplate sAshSpriteTemplate =
 {
     .tileTag = 4610,
-    .paletteTag = 4608,
-    .oam = &gOamData_839ABB8,
-    .anims = gSpriteAnimTable_839ABCC,
+    .paletteTag = 0x1200,
+    .oam = &sAshSpriteOamData,
+    .anims = sAshSpriteAnimCmds,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_807FAA8,
+    .callback = UpdateAshSprite,
 };
 
-void CreateAshSprites(void)
+#define tOffsetY      data[0]
+#define tCounterY     data[1]
+#define tSpriteColumn data[2]
+#define tSpriteRow    data[3]
+
+static void CreateAshSprites(void)
 {
     u8 i;
+    u8 spriteId;
+    struct Sprite *sprite;
 
     if (!gWeatherPtr->ashSpritesCreated)
     {
-        for (i = 0; i < 20; i++)
+        for (i = 0; i < NUM_ASH_SPRITES; i++)
         {
-            u8 spriteId = CreateSpriteAtEnd(&sAshSpriteTemplate, 0, 0, 0x4E);
-
+            spriteId = CreateSpriteAtEnd(&sAshSpriteTemplate, 0, 0, 0x4E);
             if (spriteId != MAX_SPRITES)
             {
-                struct Sprite *sprite = &gSprites[spriteId];
-
-                sprite->data[1] = 0;
-                sprite->data[2] = (u8)(i % 5);
-                sprite->data[3] = (u8)(i / 5);
-                sprite->data[0] = sprite->data[3] * 64 + 32;
+                sprite = &gSprites[spriteId];
+                sprite->tCounterY = 0;
+                sprite->tSpriteColumn = (u8)(i % 5);
+                sprite->tSpriteRow = (u8)(i / 5);
+                sprite->tOffsetY = sprite->tSpriteRow * 64 + 32;
                 gWeatherPtr->sprites.s2.ashSprites[i] = sprite;
             }
             else
@@ -1576,69 +1643,79 @@ void CreateAshSprites(void)
                 gWeatherPtr->sprites.s2.ashSprites[i] = NULL;
             }
         }
+
         gWeatherPtr->ashSpritesCreated = TRUE;
     }
 }
 
-void DestroyAshSprites(void)
+static void DestroyAshSprites(void)
 {
     u16 i;
 
     if (gWeatherPtr->ashSpritesCreated)
     {
-        for (i = 0; i < 20; i++)
+        for (i = 0; i < NUM_ASH_SPRITES; i++)
         {
             if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL)
                 DestroySprite(gWeatherPtr->sprites.s2.ashSprites[i]);
         }
+
         FreeSpriteTilesByTag(0x1202);
         gWeatherPtr->ashSpritesCreated = FALSE;
     }
 }
 
-void sub_807FAA8(struct Sprite *sprite)
+static void UpdateAshSprite(struct Sprite *sprite)
 {
-    sprite->data[1]++;
-    if (sprite->data[1] > 5)
+    if (++sprite->tCounterY > 5)
     {
-        sprite->data[1] = 0;
-        sprite->data[0]++;
+        sprite->tCounterY = 0;
+        sprite->tOffsetY++;
     }
-    sprite->pos1.y = gSpriteCoordOffsetY + sprite->data[0];
-    sprite->pos1.x = gWeatherPtr->unknown_6FC + 32 + sprite->data[2] * 64;
+
+    sprite->pos1.y = gSpriteCoordOffsetY + sprite->tOffsetY;
+    sprite->pos1.x = gWeatherPtr->ashBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
     if (sprite->pos1.x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->unknown_6FC + 0x1E0 - (4 - sprite->data[2]) * 64;
+        sprite->pos1.x = gWeatherPtr->ashBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
 
+#undef tOffsetY
+#undef tCounterY
+#undef tSpriteColumn
+#undef tSpriteRow
+
 //------------------------------------------------------------------------------
 // Fog 2
 //------------------------------------------------------------------------------
 
+static void UpdateFog2Movement(void);
+static void CreateFog2Sprites(void);
+static void DestroyFog2Sprites(void);
+static void UpdateFog2Sprite(struct Sprite *);
+
 void Fog2_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = 0;
     gWeatherPtr->gammaTargetIndex = 0;
     gWeatherPtr->gammaStepDelay = 20;
-    gWeatherPtr->unknown_6F0 = 0;
-    gWeatherPtr->unknown_6F2 = 1;
-    if (gWeatherPtr->fog2SpritesCreated == 0)
-    {
-        gWeatherPtr->unknown_71C = 0;
-        gWeatherPtr->unknown_71E = 0;
-        gWeatherPtr->unknown_720 = 0;
-        gWeatherPtr->unknown_722 = 0;
-        gWeatherPtr->unknown_718 = 0;
-        gWeatherPtr->unknown_71A = 0;
+    gWeatherPtr->fog1ScrollCounter = 0;
+    gWeatherPtr->fog1ScrollOffset = 1;
+    if (!gWeatherPtr->fog2SpritesCreated)
+    {
+        gWeatherPtr->fog2ScrollXCounter = 0;
+        gWeatherPtr->fog2ScrollYCounter = 0;
+        gWeatherPtr->fog2XOffset = 0;
+        gWeatherPtr->fog2YOffset = 0;
+        gWeatherPtr->fog2BaseSpritesX = 0;
+        gWeatherPtr->fog2PosY = 0;
         Weather_SetBlendCoeffs(0, 16);
     }
 }
 
-void Fog2_Main(void);
-
 void Fog2_InitAll(void)
 {
     Fog2_InitVars();
@@ -1646,12 +1723,9 @@ void Fog2_InitAll(void)
         Fog2_Main();
 }
 
-void sub_807FC9C(void);
-void CreateFog2Sprites(void);
-
 void Fog2_Main(void)
 {
-    sub_807FC9C();
+    UpdateFog2Movement();
     switch (gWeatherPtr->initStep)
     {
     case 0:
@@ -1671,11 +1745,9 @@ void Fog2_Main(void)
     }
 }
 
-void DestroyFog2Sprites(void);
-
 bool8 Fog2_Finish(void)
 {
-    sub_807FC9C();
+    UpdateFog2Movement();
     switch (gWeatherPtr->finishStep)
     {
     case 0:
@@ -1697,170 +1769,185 @@ bool8 Fog2_Finish(void)
     return TRUE;
 }
 
-void sub_807FC9C(void)
+static void UpdateFog2Movement(void)
 {
-    if (++gWeatherPtr->unknown_71C > 2)
+    if (++gWeatherPtr->fog2ScrollXCounter > 2)
     {
-        gWeatherPtr->unknown_720++;
-        gWeatherPtr->unknown_71C = 0;
+        gWeatherPtr->fog2XOffset++;
+        gWeatherPtr->fog2ScrollXCounter = 0;
     }
 
-    if (++gWeatherPtr->unknown_71E > 4)
+    if (++gWeatherPtr->fog2ScrollYCounter > 4)
     {
-        gWeatherPtr->unknown_722++;
-        gWeatherPtr->unknown_71E = 0;
+        gWeatherPtr->fog2YOffset++;
+        gWeatherPtr->fog2ScrollYCounter = 0;
     }
 
-    gWeatherPtr->unknown_718 = (gSpriteCoordOffsetX - gWeatherPtr->unknown_720) & 0xFF;
-    gWeatherPtr->unknown_71A = gSpriteCoordOffsetY + gWeatherPtr->unknown_722;
+    gWeatherPtr->fog2BaseSpritesX = (gSpriteCoordOffsetX - gWeatherPtr->fog2XOffset) & 0xFF;
+    gWeatherPtr->fog2PosY = gSpriteCoordOffsetY + gWeatherPtr->fog2YOffset;
 }
 
-extern const struct SpriteTemplate sFog2SpriteTemplate;  // defined below
-
-void CreateFog2Sprites(void)
+static const struct SpriteSheet gFog2SpriteSheet =
 {
-    u16 i;
-
-    if (!gWeatherPtr->fog2SpritesCreated)
-    {
-        struct SpriteSheet fog2SpriteSheet = {gWeatherFog2Tiles, sizeof(gWeatherFog2Tiles), 0x1203};
-
-        LoadSpriteSheet(&fog2SpriteSheet);
-        for (i = 0; i < 20; i++)
-        {
-            u8 spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF);
-
-            if (spriteId != MAX_SPRITES)
-            {
-                struct Sprite *sprite = &gSprites[spriteId];
-
-                sprite->data[0] = i % 5;
-                sprite->data[1] = i / 5;
-                gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite;
-            }
-            else
-            {
-                gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL;
-            }
-        }
-        gWeatherPtr->fog2SpritesCreated = TRUE;
-    }
-}
+    .data = gWeatherFog2Tiles,
+    .size = sizeof(gWeatherFog2Tiles),
+    .tag = 0x1203,
+};
 
-const struct OamData gOamData_839ABF0 =
+static const struct OamData sFog2SpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 1,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
-    .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_839ABF8[] =
+static const union AnimCmd sFog2SpriteAnimCmd0[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_839AC00[] =
+static const union AnimCmd *const sFog2SpriteAnimCmds[] =
 {
-    gSpriteAnim_839ABF8,
+    sFog2SpriteAnimCmd0,
 };
 
-void Fog2SpriteCallback(struct Sprite *);
-const struct SpriteTemplate sFog2SpriteTemplate =
+static const struct SpriteTemplate sFog2SpriteTemplate =
 {
-    .tileTag = 4611,
-    .paletteTag = 4608,
-    .oam = &gOamData_839ABF0,
-    .anims = gSpriteAnimTable_839AC00,
+    .tileTag = 0x1203,
+    .paletteTag = 0x1200,
+    .oam = &sFog2SpriteOamData,
+    .anims = sFog2SpriteAnimCmds,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = Fog2SpriteCallback,
+    .callback = UpdateFog2Sprite,
 };
 
-void DestroyFog2Sprites(void)
+#define tSpriteColumn data[0]
+#define tSpriteRow    data[1]
+
+static void CreateFog2Sprites(void)
+{
+    u16 i;
+    struct SpriteSheet fog2SpriteSheet;
+    u8 spriteId;
+    struct Sprite *sprite;
+
+    if (!gWeatherPtr->fog2SpritesCreated)
+    {
+        fog2SpriteSheet = gFog2SpriteSheet;
+        LoadSpriteSheet(&fog2SpriteSheet);
+        for (i = 0; i < NUM_FOG2_SPRITES; i++)
+        {
+            spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF);
+            if (spriteId != MAX_SPRITES)
+            {
+                sprite = &gSprites[spriteId];
+                sprite->tSpriteColumn = i % 5;
+                sprite->tSpriteRow = i / 5;
+                gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite;
+            }
+            else
+            {
+                gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL;
+            }
+        }
+
+        gWeatherPtr->fog2SpritesCreated = TRUE;
+    }
+}
+
+static void DestroyFog2Sprites(void)
 {
     u16 i;
 
     if (gWeatherPtr->fog2SpritesCreated)
     {
-        for (i = 0; i < 20; i++)
+        for (i = 0; i < NUM_FOG2_SPRITES; i++)
         {
-            if (gWeatherPtr->sprites.s2.fog2Sprites[i] != NULL)
+            if (gWeatherPtr->sprites.s2.fog2Sprites[i])
                 DestroySprite(gWeatherPtr->sprites.s2.fog2Sprites[i]);
         }
+
         FreeSpriteTilesByTag(0x1203);
         gWeatherPtr->fog2SpritesCreated = FALSE;
     }
 }
 
-void Fog2SpriteCallback(struct Sprite *sprite)
+static void UpdateFog2Sprite(struct Sprite *sprite)
 {
-    sprite->pos2.y = gWeatherPtr->unknown_71A;
-    sprite->pos1.x = gWeatherPtr->unknown_718 + 32 + sprite->data[0] * 64;
+    sprite->pos2.y = gWeatherPtr->fog2PosY;
+    sprite->pos1.x = gWeatherPtr->fog2BaseSpritesX + 32 + sprite->tSpriteColumn * 64;
     if (sprite->pos1.x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->unknown_718 + 0x1E0 - (4 - sprite->data[0]) * 64;
+        sprite->pos1.x = gWeatherPtr->fog2BaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
 
+#undef tSpriteColumn
+#undef tSpriteRow
+
 //------------------------------------------------------------------------------
 // Sandstorm
 //------------------------------------------------------------------------------
 
+static void UpdateSandstormWaveIndex(void);
+static void UpdateSandstormMovement(void);
+static void CreateSandstormSprites(void);
+static void CreateSwirlSandstormSprites(void);
+static void DestroySandstormSprites(void);
+static void UpdateSandstormSprite(struct Sprite *);
+static void WaitSandSwirlSpriteEntrance(struct Sprite *);
+static void UpdateSandstormSwirlSprite(struct Sprite *);
+
+#define MIN_SANDSTORM_WAVE_INDEX 0x20
+
 void Sandstorm_InitVars(void)
 {
     gWeatherPtr->initStep = 0;
     gWeatherPtr->weatherGfxLoaded = 0;
     gWeatherPtr->gammaTargetIndex = 0;
     gWeatherPtr->gammaStepDelay = 20;
-    if (gWeatherPtr->sandstormSprites1Created == 0)
+    if (!gWeatherPtr->sandstormSpritesCreated)
     {
-        gWeatherPtr->unknown_704 = gWeatherPtr->unknown_708 = 0;
-        gWeatherPtr->unknown_712 = 8;
-        gWeatherPtr->unknown_714 = 0;
+        gWeatherPtr->sandstormXOffset = gWeatherPtr->sandstormYOffset = 0;
+        gWeatherPtr->sandstormWaveIndex = 8;
+        gWeatherPtr->sandstormWaveCounter = 0;
         // Dead code. How does the compiler not optimize this out?
-        if (gWeatherPtr->unknown_712 > 0x5F)
-            gWeatherPtr->unknown_712 = 0x80 - gWeatherPtr->unknown_712;
+        if (gWeatherPtr->sandstormWaveIndex >= 0x80 - MIN_SANDSTORM_WAVE_INDEX)
+            gWeatherPtr->sandstormWaveIndex = 0x80 - gWeatherPtr->sandstormWaveIndex;
+
         Weather_SetBlendCoeffs(0, 16);
     }
 }
 
-void Sandstorm_Main(void);
-
 void Sandstorm_InitAll(void)
 {
     Sandstorm_InitVars();
-    while (gWeatherPtr->weatherGfxLoaded == FALSE)
+    while (!gWeatherPtr->weatherGfxLoaded)
         Sandstorm_Main();
 }
 
-void sub_808002C(void);
-void sub_8080064(void);
-void CreateSandstormSprites_1(void);
-void CreateSandstormSprites_2(void);
-
 void Sandstorm_Main(void)
 {
-    sub_8080064();
-    sub_808002C();
-    if (gWeatherPtr->unknown_712 > 0x5F)
-        gWeatherPtr->unknown_712 = 32;
+    UpdateSandstormMovement();
+    UpdateSandstormWaveIndex();
+    if (gWeatherPtr->sandstormWaveIndex >= 0x80 - MIN_SANDSTORM_WAVE_INDEX)
+        gWeatherPtr->sandstormWaveIndex = MIN_SANDSTORM_WAVE_INDEX;
+
     switch (gWeatherPtr->initStep)
     {
     case 0:
-        CreateSandstormSprites_1();
-        CreateSandstormSprites_2();
+        CreateSandstormSprites();
+        CreateSwirlSandstormSprites();
         gWeatherPtr->initStep++;
         break;
     case 1:
@@ -1868,20 +1955,19 @@ void Sandstorm_Main(void)
         gWeatherPtr->initStep++;
         break;
     case 2:
-        if (!Weather_UpdateBlend())
-            break;
-        gWeatherPtr->weatherGfxLoaded = TRUE;
-        gWeatherPtr->initStep++;
+        if (Weather_UpdateBlend())
+        {
+            gWeatherPtr->weatherGfxLoaded = TRUE;
+            gWeatherPtr->initStep++;
+        }
         break;
     }
 }
 
-void sub_80800E4(void);
-
 bool8 Sandstorm_Finish(void)
 {
-    sub_8080064();
-    sub_808002C();
+    UpdateSandstormMovement();
+    UpdateSandstormWaveIndex();
     switch (gWeatherPtr->finishStep)
     {
     case 0:
@@ -1889,216 +1975,235 @@ bool8 Sandstorm_Finish(void)
         gWeatherPtr->finishStep++;
         break;
     case 1:
-        if (!Weather_UpdateBlend())
-            break;
-        gWeatherPtr->finishStep++;
+        if (Weather_UpdateBlend())
+            gWeatherPtr->finishStep++;
         break;
     case 2:
-        sub_80800E4();
+        DestroySandstormSprites();
         gWeatherPtr->finishStep++;
         break;
     default:
         return FALSE;
     }
+
     return TRUE;
 }
 
-void sub_808002C(void)
+static void UpdateSandstormWaveIndex(void)
 {
-    if (gWeatherPtr->unknown_714++ > 4)
+    if (gWeatherPtr->sandstormWaveCounter++ > 4)
     {
-        gWeatherPtr->unknown_712++;
-        gWeatherPtr->unknown_714 = 0;
+        gWeatherPtr->sandstormWaveIndex++;
+        gWeatherPtr->sandstormWaveCounter = 0;
     }
 }
 
-void sub_8080064(void)
+static void UpdateSandstormMovement(void)
 {
-    gWeatherPtr->unknown_704 -= gSineTable[gWeatherPtr->unknown_712] * 4;
-    gWeatherPtr->unknown_708 -= gSineTable[gWeatherPtr->unknown_712];
-    gWeatherPtr->unknown_70E = (gSpriteCoordOffsetX + (gWeatherPtr->unknown_704 >> 8)) & 0xFF;
-    gWeatherPtr->unknown_710 = gSpriteCoordOffsetY + (gWeatherPtr->unknown_708 >> 8);
+    gWeatherPtr->sandstormXOffset -= gSineTable[gWeatherPtr->sandstormWaveIndex] * 4;
+    gWeatherPtr->sandstormYOffset -= gSineTable[gWeatherPtr->sandstormWaveIndex];
+    gWeatherPtr->sandstormBaseSpritesX = (gSpriteCoordOffsetX + (gWeatherPtr->sandstormXOffset >> 8)) & 0xFF;
+    gWeatherPtr->sandstormPosY = gSpriteCoordOffsetY + (gWeatherPtr->sandstormYOffset >> 8);
 }
 
-void sub_80800E4(void)
+static void DestroySandstormSprites(void)
 {
     u16 i;
 
-    if (gWeatherPtr->sandstormSprites1Created)
+    if (gWeatherPtr->sandstormSpritesCreated)
     {
-        for (i = 0; i < 20; i++)
+        for (i = 0; i < NUM_SANDSTORM_SPRITES; i++)
         {
-            if (gWeatherPtr->sprites.s2.sandstormSprites1[i] != NULL)
+            if (gWeatherPtr->sprites.s2.sandstormSprites1[i])
                 DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites1[i]);
         }
-        gWeatherPtr->sandstormSprites1Created = FALSE;
+
+        gWeatherPtr->sandstormSpritesCreated = FALSE;
         FreeSpriteTilesByTag(0x1204);
     }
 
-    if (gWeatherPtr->sandstormSprites2Created)
+    if (gWeatherPtr->sandstormSwirlSpritesCreated)
     {
-        for (i = 0; i < 5; i++)
+        for (i = 0; i < NUM_SWIRL_SANDSTORM_SPRITES; i++)
         {
             if (gWeatherPtr->sprites.s2.sandstormSprites2[i] != NULL)
                 DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites2[i]);
         }
-        gWeatherPtr->sandstormSprites2Created = FALSE;
+
+        gWeatherPtr->sandstormSwirlSpritesCreated = FALSE;
     }
 }
 
-const struct OamData gOamData_839AC1C =
+static const struct OamData sSandstormSpriteOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 1,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_BLEND,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
-    .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_839AC24[] =
+static const union AnimCmd sSandstormSpriteAnimCmd0[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_839AC2C[] =
+static const union AnimCmd sSandstormSpriteAnimCmd1[] =
 {
     ANIMCMD_FRAME(64, 3),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_839AC34[] =
+static const union AnimCmd *const sSandstormSpriteAnimCmds[] =
 {
-    gSpriteAnim_839AC24,
-    gSpriteAnim_839AC2C,
+    sSandstormSpriteAnimCmd0,
+    sSandstormSpriteAnimCmd1,
 };
 
-void SandstormSpriteCallback1(struct Sprite *);
-const struct SpriteTemplate sSandstormSpriteTemplate =
+static const struct SpriteTemplate sSandstormSpriteTemplate =
 {
-    .tileTag = 4612,
-    .paletteTag = 4609,
-    .oam = &gOamData_839AC1C,
-    .anims = gSpriteAnimTable_839AC34,
+    .tileTag = 0x1204,
+    .paletteTag = 0x1201,
+    .oam = &sSandstormSpriteOamData,
+    .anims = sSandstormSpriteAnimCmds,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SandstormSpriteCallback1,
+    .callback = UpdateSandstormSprite,
+};
+
+static const struct SpriteSheet sSandstormSpriteSheet =
+{
+    .data = gWeatherSandstormTiles,
+    .size = sizeof(gWeatherSandstormTiles),
+    .tag = 0x1204,
 };
 
-static const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204};
+// Regular sandstorm sprites
+#define tSpriteColumn  data[0]
+#define tSpriteRow     data[1]
+
+// Swirly sandstorm sprites
+#define tRadius        data[0]
+#define tWaveIndex     data[1]
+#define tRadiusCounter data[2]
+#define tEntranceDelay data[3]
 
-void CreateSandstormSprites_1(void)
+static void CreateSandstormSprites(void)
 {
     u16 i;
+    u8 spriteId;
 
-    if (!gWeatherPtr->sandstormSprites1Created)
+    if (!gWeatherPtr->sandstormSpritesCreated)
     {
         LoadSpriteSheet(&sSandstormSpriteSheet);
-        LoadCustomWeatherSpritePalette(gUnknown_0854C2B0);
-        for (i = 0; i < 20; i++)
+        LoadCustomWeatherSpritePalette(gSandstormWeatherPalette);
+        for (i = 0; i < NUM_SANDSTORM_SPRITES; i++)
         {
-            u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1);
-
+            spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1);
             if (spriteId != MAX_SPRITES)
             {
                 gWeatherPtr->sprites.s2.sandstormSprites1[i] = &gSprites[spriteId];
-                gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[0] = i % 5;
-                gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[1] = i / 5;
+                gWeatherPtr->sprites.s2.sandstormSprites1[i]->tSpriteColumn = i % 5;
+                gWeatherPtr->sprites.s2.sandstormSprites1[i]->tSpriteRow = i / 5;
             }
             else
             {
                 gWeatherPtr->sprites.s2.sandstormSprites1[i] = NULL;
             }
         }
-        gWeatherPtr->sandstormSprites1Created = TRUE;
+
+        gWeatherPtr->sandstormSpritesCreated = TRUE;
     }
 }
 
-const u16 gUnknown_0839AC5C[] = {0,	120, 80, 160, 40, 0};
+static const u16 sSwirlEntranceDelays[] = {0, 120, 80, 160, 40, 0};
 
-void SandstormSpriteCallback2(struct Sprite *);
-
-void CreateSandstormSprites_2(void)
+static void CreateSwirlSandstormSprites(void)
 {
     u16 i;
+    u8 spriteId;
 
-    if (!gWeatherPtr->sandstormSprites2Created)
+    if (!gWeatherPtr->sandstormSwirlSpritesCreated)
     {
-        for (i = 0; i < 5; i++)
+        for (i = 0; i < NUM_SWIRL_SANDSTORM_SPRITES; i++)
         {
-            u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 24, 208, 1);
-
+            spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 24, 208, 1);
             if (spriteId != MAX_SPRITES)
             {
                 gWeatherPtr->sprites.s2.sandstormSprites2[i] = &gSprites[spriteId];
                 gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = 2;
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[1] = i * 51;
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[0] = 8;
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[2] = 0;
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730;
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[3] = gUnknown_0839AC5C[i];
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->tSpriteRow = i * 51;
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->tRadius = 8;
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->tRadiusCounter = 0;
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730; // unused value
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->tEntranceDelay = sSwirlEntranceDelays[i];
                 StartSpriteAnim(gWeatherPtr->sprites.s2.sandstormSprites2[i], 1);
                 CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], 0, 2, 0);
-                gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = SandstormSpriteCallback2;
+                gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = WaitSandSwirlSpriteEntrance;
             }
             else
             {
                 gWeatherPtr->sprites.s2.sandstormSprites2[i] = NULL;
             }
-            gWeatherPtr->sandstormSprites2Created = TRUE;
+
+            gWeatherPtr->sandstormSwirlSpritesCreated = TRUE;
         }
     }
 }
 
-void SandstormSpriteCallback1(struct Sprite *sprite)
+static void UpdateSandstormSprite(struct Sprite *sprite)
 {
-    sprite->pos2.y = gWeatherPtr->unknown_710;
-    sprite->pos1.x = gWeatherPtr->unknown_70E + 32 + sprite->data[0] * 64;
+    sprite->pos2.y = gWeatherPtr->sandstormPosY;
+    sprite->pos1.x = gWeatherPtr->sandstormBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
     if (sprite->pos1.x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->unknown_70E + 0x1E0 - (4 - sprite->data[0]) * 64;
+        sprite->pos1.x = gWeatherPtr->sandstormBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
 
-void SandstormSpriteCallback3(struct Sprite *);
-
-void SandstormSpriteCallback2(struct Sprite *sprite)
+static void WaitSandSwirlSpriteEntrance(struct Sprite *sprite)
 {
-    if (--sprite->data[3] == -1)
-        sprite->callback = SandstormSpriteCallback3;
+    if (--sprite->tEntranceDelay == -1)
+        sprite->callback = UpdateSandstormSwirlSprite;
 }
 
-void SandstormSpriteCallback3(struct Sprite *sprite)
+static void UpdateSandstormSwirlSprite(struct Sprite *sprite)
 {
-    u32 x;
-    u32 y;
+    u32 x, y;
 
     if (--sprite->pos1.y < -48)
     {
         sprite->pos1.y = 208;
-        sprite->data[0] = 4;
+        sprite->tRadius = 4;
     }
-    x = sprite->data[0] * gSineTable[sprite->data[1]];
-    y = sprite->data[0] * gSineTable[sprite->data[1] + 64];
+
+    x = sprite->tRadius * gSineTable[sprite->tWaveIndex];
+    y = sprite->tRadius * gSineTable[sprite->tWaveIndex + 0x40];
     sprite->pos2.x = x >> 8;
     sprite->pos2.y = y >> 8;
-    sprite->data[1] = (sprite->data[1] + 10) & 0xFF;
-    if (++sprite->data[2] > 8)
+    sprite->tWaveIndex = (sprite->tWaveIndex + 10) & 0xFF;
+    if (++sprite->tRadiusCounter > 8)
     {
-        sprite->data[2] = 0;
-        sprite->data[0]++;
+        sprite->tRadiusCounter = 0;
+        sprite->tRadius++;
     }
 }
 
+#undef tSpriteColumn
+#undef tSpriteRow
+
+#undef tRadius
+#undef tWaveIndex
+#undef tRadiusCounter
+#undef tEntranceDelay
+
 //------------------------------------------------------------------------------
 // Shade
 //------------------------------------------------------------------------------
@@ -2125,165 +2230,172 @@ bool8 Shade_Finish(void)
 }
 
 //------------------------------------------------------------------------------
-// Weather 14
+// Bubbles
 //------------------------------------------------------------------------------
 
-const u8 gUnknown_0839AC68[] = {40, 90, 60, 90, 2, 60, 40, 30};
+static void CreateBubbleSprite(u16);
+static void DestroyBubbleSprites(void);
+static void UpdateBubbleSprite(struct Sprite *);
+
+static const u8 sBubbleStartDelays[] = {40, 90, 60, 90, 2, 60, 40, 30};
 
-const struct SpriteSheet gWeatherBubbleSpriteSheet = {gWeatherBubbleTiles, sizeof(gWeatherBubbleTiles), 0x1205};
+static const struct SpriteSheet sWeatherBubbleSpriteSheet =
+{
+    .data = gWeatherBubbleTiles,
+    .size = sizeof(gWeatherBubbleTiles),
+    .tag = 0x1205,
+};
+
+static const s16 sBubbleStartCoords[][2] =
+{
+    {120, 160},
+    {376, 160},
+    { 40, 140},
+    {296, 140},
+    {180, 130},
+    {436, 130},
+    { 60, 160},
+    {436, 160},
+    {220, 180},
+    {476, 180},
+    { 10,  90},
+    {266,  90},
+    {256, 160},
+};
 
 void Bubbles_InitVars(void)
 {
     Fog1_InitVars();
-    if (gWeatherPtr->unknown_72E == 0)
+    if (!gWeatherPtr->bubblesSpritesCreated)
     {
-        LoadSpriteSheet(&gWeatherBubbleSpriteSheet);
-        gWeatherPtr->unknown_728 = 0;
-        gWeatherPtr->unknown_726 = gUnknown_0839AC68[0];
-        gWeatherPtr->unknown_72A = 0;
-        gWeatherPtr->unknown_72C = 0;
+        LoadSpriteSheet(&sWeatherBubbleSpriteSheet);
+        gWeatherPtr->bubblesDelayIndex = 0;
+        gWeatherPtr->bubblesDelayCounter = sBubbleStartDelays[0];
+        gWeatherPtr->bubblesCoordsIndex = 0;
+        gWeatherPtr->bubblesSpriteCount = 0;
     }
 }
 
-void Bubbles_Main(void);
-
 void Bubbles_InitAll(void)
 {
     Bubbles_InitVars();
-    while (gWeatherPtr->weatherGfxLoaded == FALSE)
+    while (!gWeatherPtr->weatherGfxLoaded)
         Bubbles_Main();
 }
 
-void sub_8080588(u16);
-
 void Bubbles_Main(void)
 {
     Fog1_Main();
-    if (++gWeatherPtr->unknown_726 > gUnknown_0839AC68[gWeatherPtr->unknown_728])
+    if (++gWeatherPtr->bubblesDelayCounter > sBubbleStartDelays[gWeatherPtr->bubblesDelayIndex])
     {
-        gWeatherPtr->unknown_726 = 0;
-        if (++gWeatherPtr->unknown_728 > 7)
-            gWeatherPtr->unknown_728 = 0;
-        sub_8080588(gWeatherPtr->unknown_72A);
-        if (++gWeatherPtr->unknown_72A > 12)
-            gWeatherPtr->unknown_72A = 0;
+        gWeatherPtr->bubblesDelayCounter = 0;
+        if (++gWeatherPtr->bubblesDelayIndex > ARRAY_COUNT(sBubbleStartDelays) - 1)
+            gWeatherPtr->bubblesDelayIndex = 0;
+
+        CreateBubbleSprite(gWeatherPtr->bubblesCoordsIndex);
+        if (++gWeatherPtr->bubblesCoordsIndex > ARRAY_COUNT(sBubbleStartCoords) - 1)
+            gWeatherPtr->bubblesCoordsIndex = 0;
     }
 }
 
-void sub_8080610(void);
-
 bool8 Bubbles_Finish(void)
 {
     if (!Fog1_Finish())
     {
-        sub_8080610();
+        DestroyBubbleSprites();
         return FALSE;
     }
+
     return TRUE;
 }
 
-const s16 gUnknown_0839AC78[][2] =
-{
-    {120, 160},
-    {376, 160},
-    { 40, 140},
-    {296, 140},
-    {180, 130},
-    {436, 130},
-    { 60, 160},
-    {436, 160},
-    {220, 180},
-    {476, 180},
-    { 10,  90},
-    {266,  90},
-    {256, 160},
-};
-
-const union AnimCmd gSpriteAnim_839ACAC[] =
+static const union AnimCmd sBubbleSpriteAnimCmd0[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_839ACB8[] =
+static const union AnimCmd *const sBubbleSpriteAnimCmds[] =
 {
-    gSpriteAnim_839ACAC,
+    sBubbleSpriteAnimCmd0,
 };
 
-extern const struct OamData gUnknown_08524904;
-
-void unc_0807DAB4(struct Sprite *);
-const struct SpriteTemplate gSpriteTemplate_839ACBC =
+static const struct SpriteTemplate sBubbleSpriteTemplate =
 {
-    .tileTag = 4613,
-    .paletteTag = 4608,
+    .tileTag = 0x1205,
+    .paletteTag = 0x1200,
     .oam = &gUnknown_08524904,
-    .anims = gSpriteAnimTable_839ACB8,
+    .anims = sBubbleSpriteAnimCmds,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = unc_0807DAB4,
+    .callback = UpdateBubbleSprite,
 };
 
-void sub_8080588(u16 a)
-{
-    s16 x = gUnknown_0839AC78[a][0];
-    s16 y = gUnknown_0839AC78[a][1] - gSpriteCoordOffsetY;
-    u8 spriteId = CreateSpriteAtEnd(
-      &gSpriteTemplate_839ACBC,
-      x,
-      y,
-      0);
+#define tScrollXCounter data[0]
+#define tScrollXDir     data[1]
+#define tCounter        data[2]
 
+static void CreateBubbleSprite(u16 coordsIndex)
+{
+    s16 x = sBubbleStartCoords[coordsIndex][0];
+    s16 y = sBubbleStartCoords[coordsIndex][1] - gSpriteCoordOffsetY;
+    u8 spriteId = CreateSpriteAtEnd(&sBubbleSpriteTemplate, x, y, 0);
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].oam.priority = 1;
         gSprites[spriteId].coordOffsetEnabled = TRUE;
-        gSprites[spriteId].data[0] = 0;
-        gSprites[spriteId].data[1] = 0;
-        gSprites[spriteId].data[2] = 0;
-        gWeatherPtr->unknown_72C++;
+        gSprites[spriteId].tScrollXCounter = 0;
+        gSprites[spriteId].tScrollXDir = 0;
+        gSprites[spriteId].tCounter = 0;
+        gWeatherPtr->bubblesSpriteCount++;
     }
 }
 
-void sub_8080610(void)
+static void DestroyBubbleSprites(void)
 {
     u16 i;
 
-    if (gWeatherPtr->unknown_72C != 0)
+    if (gWeatherPtr->bubblesSpriteCount)
     {
-        for (i = 0; i < 64; i++)
+        for (i = 0; i < MAX_SPRITES; i++)
         {
-            if (gSprites[i].template == &gSpriteTemplate_839ACBC)
+            if (gSprites[i].template == &sBubbleSpriteTemplate)
                 DestroySprite(&gSprites[i]);
         }
+
         FreeSpriteTilesByTag(0x1205);
-        gWeatherPtr->unknown_72C = 0;
+        gWeatherPtr->bubblesSpriteCount = 0;
     }
 }
 
-void unc_0807DAB4(struct Sprite *sprite)
+static void UpdateBubbleSprite(struct Sprite *sprite)
 {
-    ++sprite->data[0];
-    if (++sprite->data[0] > 8)  // double increment
+    ++sprite->tScrollXCounter;
+    if (++sprite->tScrollXCounter > 8) // double increment
     {
-        sprite->data[0] = 0;
-        if (sprite->data[1] == 0)
+        sprite->tScrollXCounter = 0;
+        if (sprite->tScrollXDir == 0)
         {
             if (++sprite->pos2.x > 4)
-                sprite->data[1] = 1;
+                sprite->tScrollXDir = 1;
         }
         else
         {
             if (--sprite->pos2.x <= 0)
-                sprite->data[1] = 0;
+                sprite->tScrollXDir = 0;
         }
     }
+
     sprite->pos1.y -= 3;
-    if (++sprite->data[2] > 0x77)
+    if (++sprite->tCounter >= 120)
         DestroySprite(sprite);
 }
 
+#undef tScrollXCounter
+#undef tScrollXDir
+#undef tCounter
+
 //------------------------------------------------------------------------------
 
 // Unused function.
@@ -2470,3 +2582,5 @@ static void UpdateRainCounter(u8 newWeather, u8 oldWeather)
      && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED))
         IncrementGameStat(GAME_STAT_GOT_RAINED_ON);
 }
+
+
diff --git a/src/fieldmap.c b/src/fieldmap.c
index a96b71c0f..b2b80a2df 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -52,15 +52,15 @@ struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *
 void InitMap(void)
 {
     InitMapLayoutData(&gMapHeader);
-    sub_80E8EE0(gMapHeader.events);
+    SetOccupiedSecretBaseEntranceMetatiles(gMapHeader.events);
     RunOnLoadMapScript();
 }
 
 void InitMapFromSavedGame(void)
 {
     InitMapLayoutData(&gMapHeader);
-    sub_80E9238(0);
-    sub_80E8EE0(gMapHeader.events);
+    InitSecretBaseAppearance(FALSE);
+    SetOccupiedSecretBaseEntranceMetatiles(gMapHeader.events);
     LoadSavedMapView();
     RunOnLoadMapScript();
     UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 3da1a9217..be655b86a 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -23,7 +23,7 @@
 
 extern struct MapPosition gPlayerFacingPosition;
 
-extern const u8 Route103_EventScript_290705[];
+extern const u8 EventScript_FldEffCut[];
 extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
@@ -327,7 +327,7 @@ bool8 FldEff_UseCutOnGrass(void)
 static void FieldCallback_CutTree(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(Route103_EventScript_290705);
+    ScriptContext1_SetupScript(EventScript_FldEffCut);
 }
 
 bool8 FldEff_UseCutOnTree(void)
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 5d1920aac..39ed30260 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -23,7 +23,7 @@
 #include "constants/songs.h"
 #include "constants/vars.h"
 
-extern struct MapPosition gPlayerFacingPosition;
+EWRAM_DATA struct MapPosition gPlayerFacingPosition = {0};
 
 static void sub_80F9C90(u8);
 static void sub_80F9DFC(u8);
@@ -488,8 +488,8 @@ static void sub_80F9DFC(u8 taskId)
 
 static void SetCurrentSecretBase(void)
 {
-    sub_80E9608(&gPlayerFacingPosition, gMapHeader.events);
-    sub_80E8B6C();
+    SetCurSecretBaseIdFromPosition(&gPlayerFacingPosition, gMapHeader.events);
+    TrySetCurSecretBaseIndex();
 }
 
 static void AdjustSecretPowerSpritePixelOffsets(void)
@@ -544,7 +544,7 @@ bool8 SetUpFieldMove_SecretPower(void)
 {
     u8 mb;
 
-    sub_80E8BC8();
+    CheckPlayerHasSecretBase();
 
     if (gSpecialVar_Result == 1 || GetPlayerFacingDirection() != DIR_NORTH)
         return FALSE;
@@ -623,10 +623,8 @@ static void CaveEntranceSpriteCallback2(struct Sprite *sprite)
 {
     if (sprite->data[0] < 40)
     {
-        sprite->data[0]++;
-
-        if (sprite->data[0] == 20)
-            sub_80E8D4C();
+        if (++sprite->data[0] == 20)
+            ToggleSecretBaseEntranceMetatile();
     }
     else
     {
@@ -681,7 +679,7 @@ bool8 FldEff_SecretPowerTree(void)
                  148);
 
     if (gFieldEffectArguments[7] == 1 || gFieldEffectArguments[7] == 3)
-        sub_80E8D4C();
+        ToggleSecretBaseEntranceMetatile();
 
     return FALSE;
 }
@@ -702,7 +700,7 @@ static void TreeEntranceSpriteCallback2(struct Sprite *sprite)
     if (sprite->data[0] >= 40)
     {
         if (gFieldEffectArguments[7] == 0 || gFieldEffectArguments[7] == 2)
-            sub_80E8D4C();
+            ToggleSecretBaseEntranceMetatile();
 
         sprite->data[0] = 0;
         sprite->callback = TreeEntranceSpriteCallbackEnd;
@@ -764,7 +762,7 @@ static void ShrubEntranceSpriteCallback2(struct Sprite *sprite)
         sprite->data[0]++;
 
         if (sprite->data[0] == 20)
-            sub_80E8D4C();
+            ToggleSecretBaseEntranceMetatile();
     }
     else
     {
@@ -1168,7 +1166,7 @@ void GetShieldToyTVDecorationInfo(void)
 
 bool8 sub_80FADE4(u16 metatileId, u8 arg1)
 {
-    if (!CurrentMapIsSecretBase())
+    if (!CurMapIsSecretBase())
         return FALSE;
 
     if (!arg1)
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 86df8e943..18cebdf11 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -27,9 +27,6 @@ static void sub_813561C(u8 taskId);
 static void sub_81356C4(void);
 static void sub_8135714(void);
 
-// extern RAM loc
-extern struct MapPosition gPlayerFacingPosition;
-
 // text
 bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
 {
@@ -143,7 +140,7 @@ bool8 SetUpFieldMove_RockSmash(void)
 static void sub_81356C4(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(Route111_EventScript_2907F0);
+    ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
 }
 
 bool8 FldEff_UseRockSmash(void)
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index c57ab8cdc..47fc7061c 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -30,7 +30,7 @@ bool8 SetUpFieldMove_Strength(void)
 static void FldEff_UseStrength(void)
 {
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
-    ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
+    ScriptContext1_SetupScript(EventScript_FldEffStrength);
 }
 
 bool8 sub_8145E2C(void)
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index a187353ff..788310b5d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -93,7 +93,7 @@ static void FailSweetScentEncounter(u8 taskId)
     {
         CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
         sub_80AC3E4();
-        ScriptContext1_SetupScript(EventScript_290CAE);
+        ScriptContext1_SetupScript(EventScript_FailSweetScent);
         DestroyTask(taskId);
     }
 }
diff --git a/src/frontier_util.c b/src/frontier_util.c
index bce7b926f..4dd8159cb 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -21,7 +21,7 @@
 #include "apprentice.h"
 #include "pokedex.h"
 #include "recorded_battle.h"
-#include "data2.h"
+#include "data.h"
 #include "record_mixing.h"
 #include "strings.h"
 #include "alloc.h"
diff --git a/src/ghost.c b/src/ghost.c
index 998be0caa..97b86aa76 100644
--- a/src/ghost.c
+++ b/src/ghost.c
@@ -87,7 +87,7 @@ const union AffineAnimCmd *const gUnknown_08596D54[] =
     gUnknown_08596D44,
 };
 
-const struct SpriteTemplate gUnknown_08596D58 =
+const struct SpriteTemplate gShadowBallSpriteTemplate =
 {
     .tileTag = ANIM_TAG_SHADOW_BALL,
     .paletteTag = ANIM_TAG_SHADOW_BALL,
@@ -261,20 +261,20 @@ static void sub_81116E8(struct Sprite *sprite)
     AnimTranslateLinear(sprite);
     sprite->pos2.x += Sin(sprite->data[5], 10);
     sprite->pos2.y += Cos(sprite->data[5], 15);
-    
+
     r2 = sprite->data[5];
     sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
     r0 = sprite->data[5];
-    
+
     if (r2 == 0 || r2 > 196)
     {
         if (r0 > 0)
             PlaySE(SE_W109);
     }
-    
+
     if (sprite->data[6] == 0)
     {
-        sprite->invisible = TRUE; 
+        sprite->invisible = TRUE;
         sprite->callback = DestroyAnimSpriteAndDisableBlend;
     }
     else
@@ -283,18 +283,18 @@ static void sub_81116E8(struct Sprite *sprite)
 
 static void sub_8111764(struct Sprite *sprite)
 {
-    
-    s16 r0; 
+
+    s16 r0;
     if (sprite->data[6] > 0xFF)
     {
         if (++sprite->data[6] == 0x10d)
             sprite->data[6] = 0;
         return;
     }
-    
+
     r0 = sprite->data[7];
     sprite->data[7]++;
-    
+
     if ((r0 & 0xFF) == 0)
     {
         sprite->data[7] &= 0xff00;
@@ -392,16 +392,16 @@ static void sub_811196C(u8 taskId)
     }
 }
 
-// Spins a sprite towards the target, pausing in the middle. 
-// Used in Shadow Ball. 
+// Spins a sprite towards the target, pausing in the middle.
+// Used in Shadow Ball.
 // arg 0: duration step 1 (attacker -> center)
 // arg 1: duration step 2 (spin center)
 // arg 2: duration step 3 (center -> target)
 static void InitAnimShadowBall(struct Sprite *sprite)
 {
-    u16 r5, r6;
-    r5 = sprite->pos1.x;
-    r6 = sprite->pos1.y;
+    s16 oldPosX = sprite->pos1.x;
+    s16 oldPosY = sprite->pos1.y;
+
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 0;
@@ -410,8 +410,8 @@ static void InitAnimShadowBall(struct Sprite *sprite)
     sprite->data[3] = gBattleAnimArgs[2];
     sprite->data[4] = sprite->pos1.x << 4;
     sprite->data[5] = sprite->pos1.y << 4;
-    sprite->data[6] = (((s16)r5 - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1);
-    sprite->data[7] = (((s16)r6 - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1);
+    sprite->data[6] = ((oldPosX - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1);
+    sprite->data[7] = ((oldPosY - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1);
     sprite->callback = AnimShadowBallStep;
 }
 
@@ -465,50 +465,57 @@ static void sub_8111B9C(struct Sprite *sprite)
     sprite->callback = sub_8111BB4;
 }
 
-static void sub_8111BB4(struct Sprite *sprite) {
-    
-    s8 r5 = FALSE;
+static void sub_8111BB4(struct Sprite *sprite)
+{
+    bool8 r5 = FALSE;
     bool8 r6 = FALSE;
-    if(sprite->animEnded)
+
+    if (sprite->animEnded)
     {
-        if(!(sprite->invisible))
-            sprite->invisible=TRUE;
-        switch(sprite->data[0])
+        if (!sprite->invisible)
+            sprite->invisible = TRUE;
+
+        switch (sprite->data[0])
         {
-            case 0:
-                if((sprite->data[1]) != 2)
-                    break;
-                goto loc_08111C06;
-            case 1:
-                if((sprite->data[1]) == 4)
-                    r5 = TRUE;
-                break;
-            default:
-                r6 = TRUE;
+        default:
+            r6 = TRUE;
+            break;
+        case 0:
+            if (sprite->data[1] == 2)
+                r5 = TRUE;
+            break;
+        case 1:
+            if (sprite->data[1] == 4)
+                r5 = TRUE;
+            break;
         }
-        if(r5)
+
+        if (r5)
         {
-        loc_08111C06:
             sprite->invisible ^= 1;
             sprite->data[2]++;
             sprite->data[1] = 0;
-            if(sprite->data[2] == 5)
+            if (sprite->data[2] == 5)
             {
                 sprite->data[2] = 0;
                 sprite->data[0]++;
             }
         }
-        else if(r6)
+        else if (r6)
+        {
             DestroyAnimSprite(sprite);
+        }
         else
+        {
             sprite->data[1]++;
+        }
     }
 }
 
 void sub_8111C50(u8 taskId)
 {
     struct Task *task;
-    
+
     task = &gTasks[taskId];
     task->data[0] = CloneBattlerSpriteWithBlend(1);
     if (task->data[0] < 0)
@@ -523,7 +530,7 @@ void sub_8111C50(u8 taskId)
     SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL));
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3]));
     gSprites[task->data[0]].data[0] = 80;
-    if (GetBattlerSide(gBattleAnimTarget) == 0)
+    if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
     {
         gSprites[task->data[0]].data[1] = -144;
         gSprites[task->data[0]].data[2] = 112;
@@ -573,6 +580,7 @@ static void sub_8111D78(u8 taskId)
         break;
     case 2:
         DestroyAnimVisualTask(taskId);
+        break;
     }
 }
 
@@ -595,7 +603,7 @@ static void sub_8111E78(u8 taskId)
     switch (task->data[15])
     {
     case 0:
-        task->data[14] = AllocSpritePalette(0x2771);
+        task->data[14] = AllocSpritePalette(ANIM_TAG_BENT_SPOON);
         if (task->data[14] == 0xFF || task->data[14] == 0xF)
         {
             DestroyAnimVisualTask(taskId);
@@ -605,7 +613,7 @@ static void sub_8111E78(u8 taskId)
             task->data[0] = CloneBattlerSpriteWithBlend(1);
             if (task->data[0] < 0)
             {
-                FreeSpritePaletteByTag(0x2771);
+                FreeSpritePaletteByTag(ANIM_TAG_BENT_SPOON);
                 DestroyAnimVisualTask(taskId);
             }
             else
@@ -698,14 +706,14 @@ static void sub_81120DC(u8 taskId)
 static void sub_8112170(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    u8 position = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
+    u8 rank = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget);
 
     switch (task->data[15])
     {
     case 0:
         gScanlineEffect.state = 3;
         task->data[14] = GetAnimBattlerSpriteId(1);
-        if (position == 1)
+        if (rank == 1)
             ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON);
         else
             ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
@@ -714,12 +722,12 @@ static void sub_8112170(u8 taskId)
         BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15));
         break;
     case 2:
-        gSprites[task->data[14]].invisible = 1;
+        gSprites[task->data[14]].invisible = TRUE;
         obj_delete_but_dont_free_vram(&gSprites[task->data[0]]);
-        FreeSpritePaletteByTag(0x2771);
+        FreeSpritePaletteByTag(ANIM_TAG_BENT_SPOON);
         SetGpuReg(REG_OFFSET_BLDCNT, 0);
         SetGpuReg(REG_OFFSET_BLDALPHA, 0);
-        if (position == 1)
+        if (rank == 1)
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON);
         else
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
@@ -886,7 +894,7 @@ static void sub_81125E0(u8 taskId)
                 }
             }
         }
-        
+
         if (task->data[10])
             task->data[10]--;
         else if (task->data[6])
@@ -1081,7 +1089,7 @@ static void sub_8112ACC(struct Sprite *sprite)
     if (sprite->data[0] == 0)
     {
         SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL));
-        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0x10, 0));
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
         sprite->data[0]++;
         sprite->data[1] = 0;
         sprite->data[2] = 0;
@@ -1120,7 +1128,7 @@ static void sub_8112B78(struct Sprite *sprite)
     sprite->pos2.x = Sin(sprite->data[0], 12);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         sprite->pos2.x = -sprite->pos2.x;
-    
+
     sprite->data[0] = (sprite->data[0] + 6) & 0xFF;
     sprite->data[1] += 0x100;
     sprite->pos2.y = -(sprite->data[1] >> 8);
diff --git a/src/graphics.c b/src/graphics.c
index c3ed90fb6..163cecf5b 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -21,112 +21,112 @@ const u32 gSmokescreenImpactPalette[] = INCBIN_U32("graphics/battle_anims/sprite
 const u32 gBlankGfxCompressed[] = INCBIN_U32("graphics/interface/blank.4bpp.lz");
 
 // Battle anims
-const u32 gBattleAnimSpriteSheet_146[] = INCBIN_U32("graphics/battle_anims/sprites/146.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_000[] = INCBIN_U32("graphics/battle_anims/sprites/000.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_003[] = INCBIN_U32("graphics/battle_anims/sprites/003.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_004[] = INCBIN_U32("graphics/battle_anims/sprites/004.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_005[] = INCBIN_U32("graphics/battle_anims/sprites/005.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_006[] = INCBIN_U32("graphics/battle_anims/sprites/006.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Bubble[] = INCBIN_U32("graphics/battle_anims/sprites/bubble.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Bone[] = INCBIN_U32("graphics/battle_anims/sprites/bone.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_AirWave[] = INCBIN_U32("graphics/battle_anims/sprites/air_wave.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Orb[] = INCBIN_U32("graphics/battle_anims/sprites/orb.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Sword[] = INCBIN_U32("graphics/battle_anims/sprites/sword.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Seed[] = INCBIN_U32("graphics/battle_anims/sprites/seed.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_115[] = INCBIN_U32("graphics/battle_anims/sprites/115.gbapal.lz");
-const u32 gBattleAnimSpritePalette_000[] = INCBIN_U32("graphics/battle_anims/sprites/000.gbapal.lz");
-const u32 gBattleAnimSpritePalette_003[] = INCBIN_U32("graphics/battle_anims/sprites/003.gbapal.lz");
-const u32 gBattleAnimSpritePalette_004[] = INCBIN_U32("graphics/battle_anims/sprites/004.gbapal.lz");
-const u32 gBattleAnimSpritePalette_005[] = INCBIN_U32("graphics/battle_anims/sprites/005.gbapal.lz");
-const u32 gBattleAnimSpritePalette_006[] = INCBIN_U32("graphics/battle_anims/sprites/006.gbapal.lz");
+const u32 gBattleAnimSpritePal_RainDrops[] = INCBIN_U32("graphics/battle_anims/sprites/rain_drops.gbapal.lz");
+const u32 gBattleAnimSpritePal_Bone[] = INCBIN_U32("graphics/battle_anims/sprites/bone.gbapal.lz");
+const u32 gBattleAnimSpritePal_AirWave[] = INCBIN_U32("graphics/battle_anims/sprites/air_wave.gbapal.lz");
+const u32 gBattleAnimSpritePal_Orb[] = INCBIN_U32("graphics/battle_anims/sprites/orb.gbapal.lz");
+const u32 gBattleAnimSpritePal_Sword[] = INCBIN_U32("graphics/battle_anims/sprites/sword.gbapal.lz");
+const u32 gBattleAnimSpritePal_Seed[] = INCBIN_U32("graphics/battle_anims/sprites/seed.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_161[] = INCBIN_U32("graphics/battle_anims/sprites/161.4bpp.lz");
-const u32 gBattleAnimSpritePalette_161[] = INCBIN_U32("graphics/battle_anims/sprites/161.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Needle[] = INCBIN_U32("graphics/battle_anims/sprites/needle.4bpp.lz");
+const u32 gBattleAnimSpritePal_Needle[] = INCBIN_U32("graphics/battle_anims/sprites/needle.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_007[] = INCBIN_U32("graphics/battle_anims/sprites/007.4bpp.lz");
-const u32 gBattleAnimSpritePalette_007[] = INCBIN_U32("graphics/battle_anims/sprites/007.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Explosion6[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_6.4bpp.lz");
+const u32 gBattleAnimSpritePal_Explosion6[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_6.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_008[] = INCBIN_U32("graphics/battle_anims/sprites/008.4bpp.lz");
-const u32 gBattleAnimSpritePalette_008[] = INCBIN_U32("graphics/battle_anims/sprites/008.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PinkOrb[] = INCBIN_U32("graphics/battle_anims/sprites/pink_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_PinkOrb[] = INCBIN_U32("graphics/battle_anims/sprites/pink_orb.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_010[] = INCBIN_U32("graphics/battle_anims/sprites/010.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_010[] = INCBIN_U32("graphics/battle_anims/sprites/010.4bpp.lz");
+const u32 gBattleAnimSpritePal_IceCube[] = INCBIN_U32("graphics/battle_anims/sprites/ice_cube.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_IceCube[] = INCBIN_U32("graphics/battle_anims/sprites/ice_cube.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_009[] = INCBIN_U32("graphics/battle_anims/sprites/009.4bpp.lz");
-const u32 gBattleAnimSpritePalette_009[] = INCBIN_U32("graphics/battle_anims/sprites/009.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Gust[] = INCBIN_U32("graphics/battle_anims/sprites/gust.4bpp.lz");
+const u32 gBattleAnimSpritePal_Gust[] = INCBIN_U32("graphics/battle_anims/sprites/gust.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_011[] = INCBIN_U32("graphics/battle_anims/sprites/011.4bpp.lz");
-const u32 gBattleAnimSpritePalette_011[] = INCBIN_U32("graphics/battle_anims/sprites/011.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Spark2[] = INCBIN_U32("graphics/battle_anims/sprites/spark_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Spark2[] = INCBIN_U32("graphics/battle_anims/sprites/spark_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_012[] = INCBIN_U32("graphics/battle_anims/sprites/012.4bpp.lz");
-const u32 gBattleAnimSpritePalette_012[] = INCBIN_U32("graphics/battle_anims/sprites/012.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Orange[] = INCBIN_U32("graphics/battle_anims/sprites/orange.4bpp.lz");
+const u32 gBattleAnimSpritePal_Orange[] = INCBIN_U32("graphics/battle_anims/sprites/orange.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_152[] = INCBIN_U32("graphics/battle_anims/sprites/152.4bpp.lz");
-const u32 gBattleAnimSpritePalette_152[] = INCBIN_U32("graphics/battle_anims/sprites/152.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Spikes[] = INCBIN_U32("graphics/battle_anims/sprites/spikes.4bpp.lz");
+const u32 gBattleAnimSpritePal_Spikes[] = INCBIN_U32("graphics/battle_anims/sprites/spikes.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_013[] = INCBIN_U32("graphics/battle_anims/sprites/013.4bpp.lz");
-const u32 gBattleAnimSpritePalette_013[] = INCBIN_U32("graphics/battle_anims/sprites/013.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_YellowBall[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_ball.4bpp.lz");
+const u32 gBattleAnimSpritePal_YellowBall[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_ball.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_015[] = INCBIN_U32("graphics/battle_anims/sprites/015.4bpp.lz");
-const u32 gBattleAnimSpritePalette_015[] = INCBIN_U32("graphics/battle_anims/sprites/015.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_TiedBag[] = INCBIN_U32("graphics/battle_anims/sprites/tied_bag.4bpp.lz");
+const u32 gBattleAnimSpritePal_TiedBag[] = INCBIN_U32("graphics/battle_anims/sprites/tied_bag.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_016[] = INCBIN_U32("graphics/battle_anims/sprites/016.4bpp.lz");
-const u32 gBattleAnimSpritePalette_016[] = INCBIN_U32("graphics/battle_anims/sprites/016.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlackSmoke[] = INCBIN_U32("graphics/battle_anims/sprites/black_smoke.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlackSmoke[] = INCBIN_U32("graphics/battle_anims/sprites/black_smoke.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_017[] = INCBIN_U32("graphics/battle_anims/sprites/017.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_BlackBall[] = INCBIN_U32("graphics/battle_anims/sprites/black_ball.4bpp.lz");
 
 const u32 gUnknownGfx_C035B8[] = INCBIN_U32("graphics/unknown/unknown_C035B8.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_019[] = INCBIN_U32("graphics/battle_anims/sprites/019.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_019[] = INCBIN_U32("graphics/battle_anims/sprites/019.4bpp.lz");
+const u32 gBattleAnimSpritePal_Glass[] = INCBIN_U32("graphics/battle_anims/sprites/glass.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Glass[] = INCBIN_U32("graphics/battle_anims/sprites/glass.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_020[] = INCBIN_U32("graphics/battle_anims/sprites/020.4bpp.lz");
-const u32 gBattleAnimSpritePalette_020[] = INCBIN_U32("graphics/battle_anims/sprites/020.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_HornHit[] = INCBIN_U32("graphics/battle_anims/sprites/horn_hit.4bpp.lz");
+const u32 gBattleAnimSpritePal_HornHit[] = INCBIN_U32("graphics/battle_anims/sprites/horn_hit.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_023[] = INCBIN_U32("graphics/battle_anims/sprites/023.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_023[] = INCBIN_U32("graphics/battle_anims/sprites/023.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlueShards[] = INCBIN_U32("graphics/battle_anims/sprites/blue_shards.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlueShards[] = INCBIN_U32("graphics/battle_anims/sprites/blue_shards.4bpp.lz");
 
 const u32 gUnused_BattleSpritePalette_023[] = INCBIN_U32("graphics/unused/battle_anim_023.gbapal.lz");
 
 const u32 gUnusedGfx_MusicNotes[] = INCBIN_U32("graphics/unused/music_notes.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_021[] = INCBIN_U32("graphics/battle_anims/sprites/021.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_021[] = INCBIN_U32("graphics/battle_anims/sprites/021.4bpp.lz");
+const u32 gBattleAnimSpritePal_Hit[] = INCBIN_U32("graphics/battle_anims/sprites/hit.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Hit[] = INCBIN_U32("graphics/battle_anims/sprites/hit.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_022[] = INCBIN_U32("graphics/battle_anims/sprites/022.gbapal.lz");
+const u32 gBattleAnimSpritePal_Hit2[] = INCBIN_U32("graphics/battle_anims/sprites/hit_2.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_025[] = INCBIN_U32("graphics/battle_anims/sprites/025.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_025[] = INCBIN_U32("graphics/battle_anims/sprites/025.4bpp.lz");
+const u32 gBattleAnimSpritePal_WavingHand[] = INCBIN_U32("graphics/battle_anims/sprites/waving_hand.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WavingHand[] = INCBIN_U32("graphics/battle_anims/sprites/waving_hand.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_024[] = INCBIN_U32("graphics/battle_anims/sprites/024.4bpp.lz");
-const u32 gBattleAnimSpritePalette_024[] = INCBIN_U32("graphics/battle_anims/sprites/024.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_ClosingEye[] = INCBIN_U32("graphics/battle_anims/sprites/closing_eye.4bpp.lz");
+const u32 gBattleAnimSpritePal_ClosingEye[] = INCBIN_U32("graphics/battle_anims/sprites/closing_eye.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_031[] = INCBIN_U32("graphics/battle_anims/sprites/031.4bpp.lz");
-const u32 gBattleAnimSpritePalette_031[] = INCBIN_U32("graphics/battle_anims/sprites/031.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlueStar[] = INCBIN_U32("graphics/battle_anims/sprites/blue_star.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlueStar[] = INCBIN_U32("graphics/battle_anims/sprites/blue_star.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_032[] = INCBIN_U32("graphics/battle_anims/sprites/032.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_032[] = INCBIN_U32("graphics/battle_anims/sprites/032.4bpp.lz");
+const u32 gBattleAnimSpritePal_BubbleBurst[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BubbleBurst[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_026[] = INCBIN_U32("graphics/battle_anims/sprites/026.4bpp.lz");
-const u32 gBattleAnimSpritePalette_026[] = INCBIN_U32("graphics/battle_anims/sprites/026.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_HitDuplicate[] = INCBIN_U32("graphics/battle_anims/sprites/hit_duplicate.4bpp.lz");
+const u32 gBattleAnimSpritePal_HitDuplicate[] = INCBIN_U32("graphics/battle_anims/sprites/hit_duplicate.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_027[] = INCBIN_U32("graphics/battle_anims/sprites/027.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_027[] = INCBIN_U32("graphics/battle_anims/sprites/027.4bpp.lz");
+const u32 gBattleAnimSpritePal_Leer[] = INCBIN_U32("graphics/battle_anims/sprites/leer.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Leer[] = INCBIN_U32("graphics/battle_anims/sprites/leer.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_028[] = INCBIN_U32("graphics/battle_anims/sprites/028.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_028[] = INCBIN_U32("graphics/battle_anims/sprites/028.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlueBurst[] = INCBIN_U32("graphics/battle_anims/sprites/blue_burst.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlueBurst[] = INCBIN_U32("graphics/battle_anims/sprites/blue_burst.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_029[] = INCBIN_U32("graphics/battle_anims/sprites/029.4bpp.lz");
-const u32 gBattleAnimSpritePalette_029[] = INCBIN_U32("graphics/battle_anims/sprites/029.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SmallEmber[] = INCBIN_U32("graphics/battle_anims/sprites/small_ember.4bpp.lz");
+const u32 gBattleAnimSpritePal_SmallEmber[] = INCBIN_U32("graphics/battle_anims/sprites/small_ember.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_030[] = INCBIN_U32("graphics/battle_anims/sprites/030.4bpp.lz");
-const u32 gBattleAnimSpritePalette_030[] = INCBIN_U32("graphics/battle_anims/sprites/030.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GraySmoke[] = INCBIN_U32("graphics/battle_anims/sprites/gray_smoke.4bpp.lz");
+const u32 gBattleAnimSpritePal_GraySmoke[] = INCBIN_U32("graphics/battle_anims/sprites/gray_smoke.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_033[] = INCBIN_U32("graphics/battle_anims/sprites/033.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_033[] = INCBIN_U32("graphics/battle_anims/sprites/033.4bpp.lz");
+const u32 gBattleAnimSpritePal_Fire[] = INCBIN_U32("graphics/battle_anims/sprites/fire.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Fire[] = INCBIN_U32("graphics/battle_anims/sprites/fire.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_034[] = INCBIN_U32("graphics/battle_anims/sprites/034.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_035[] = INCBIN_U32("graphics/battle_anims/sprites/035.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_SpinningFire[] = INCBIN_U32("graphics/battle_anims/sprites/spinning_fire.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_FirePlume[] = INCBIN_U32("graphics/battle_anims/sprites/fire_plume.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_036[] = INCBIN_U32("graphics/battle_anims/sprites/036.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_036[] = INCBIN_U32("graphics/battle_anims/sprites/036.4bpp.lz");
+const u32 gBattleAnimSpritePal_Lightning2[] = INCBIN_U32("graphics/battle_anims/sprites/lightning_2.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Lightning2[] = INCBIN_U32("graphics/battle_anims/sprites/lightning_2.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_037[] = INCBIN_U32("graphics/battle_anims/sprites/037.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Lightning[] = INCBIN_U32("graphics/battle_anims/sprites/lightning.4bpp.lz");
 
 const u32 gUnknownGfx_C06D98[] = INCBIN_U32("graphics/unknown/unknown_C06D98.4bpp.lz");
 const u32 gUnknownPal_C06D98[] = INCBIN_U32("graphics/unknown/unknown_C06D98.gbapal.lz");
@@ -141,118 +141,118 @@ const u32 gOldBattleInterfacePal_5_6_7[] = INCBIN_U32("graphics/unused/obi_palpa
 const u32 gOldBattleInterfaceGfx2[] = INCBIN_U32("graphics/unused/obi2.4bpp.lz");
 const u32 gOldBattleInterfaceTilemap[] = INCBIN_U32("graphics/unused/old_battle_interface_tilemap.bin.lz");
 
-const u32 gBattleAnimSpritePalette_038[] = INCBIN_U32("graphics/battle_anims/sprites/038.gbapal.lz");
-const u32 gBattleAnimSpritePalette_039[] = INCBIN_U32("graphics/battle_anims/sprites/039.gbapal.lz");
+const u32 gBattleAnimSpritePal_ClawSlash2[] = INCBIN_U32("graphics/battle_anims/sprites/claw_slash_2.gbapal.lz");
+const u32 gBattleAnimSpritePal_ClawSlash[] = INCBIN_U32("graphics/battle_anims/sprites/claw_slash.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_038[] = INCBIN_U32("graphics/battle_anims/sprites/038.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_039[] = INCBIN_U32("graphics/battle_anims/sprites/039.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_040[] = INCBIN_U32("graphics/battle_anims/sprites/040.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_041[] = INCBIN_U32("graphics/battle_anims/sprites/041.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_ClawSlash2[] = INCBIN_U32("graphics/battle_anims/sprites/claw_slash_2.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_ClawSlash[] = INCBIN_U32("graphics/battle_anims/sprites/claw_slash.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Scratch3[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_3.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Scratch2[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_2.4bpp.lz");
 
 const u32 gPartyMenuHpBar_Gfx[] = INCBIN_U32("graphics/interface/party_menu_hpbar.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_042[] = INCBIN_U32("graphics/battle_anims/sprites/042.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_042[] = INCBIN_U32("graphics/battle_anims/sprites/042.gbapal.lz");
+const u32 gBattleAnimSpritePal_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_043[] = INCBIN_U32("graphics/battle_anims/sprites/043.4bpp.lz");
-const u32 gBattleAnimSpritePalette_043[] = INCBIN_U32("graphics/battle_anims/sprites/043.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_IceChunk[] = INCBIN_U32("graphics/battle_anims/sprites/ice_chunk.4bpp.lz");
+const u32 gBattleAnimSpritePal_IceChunk[] = INCBIN_U32("graphics/battle_anims/sprites/ice_chunk.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_044[] = INCBIN_U32("graphics/battle_anims/sprites/044.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_044[] = INCBIN_U32("graphics/battle_anims/sprites/044.4bpp.lz");
+const u32 gBattleAnimSpritePal_Glass2[] = INCBIN_U32("graphics/battle_anims/sprites/glass_2.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Glass2[] = INCBIN_U32("graphics/battle_anims/sprites/glass_2.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_045[] = INCBIN_U32("graphics/battle_anims/sprites/045.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_045[] = INCBIN_U32("graphics/battle_anims/sprites/045.4bpp.lz");
+const u32 gBattleAnimSpritePal_PinkHeart2[] = INCBIN_U32("graphics/battle_anims/sprites/pink_heart_2.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PinkHeart2[] = INCBIN_U32("graphics/battle_anims/sprites/pink_heart_2.4bpp.lz");
 
 const u32 gUnknown_08C08F0C[] = INCBIN_U32("graphics/battle_interface/unused_window.4bpp.lz");
 const u32 gUnknown_08C093C8[] = INCBIN_U32("graphics/battle_interface/unused_window.gbapal.lz");
 
 const u32 gUnknown_08C093F0[] = INCBIN_U32("graphics/interface/hp_numbers.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_046[] = INCBIN_U32("graphics/battle_anims/sprites/046.4bpp.lz");
-const u32 gBattleAnimSpritePalette_046[] = INCBIN_U32("graphics/battle_anims/sprites/046.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SapDrip[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip.4bpp.lz");
+const u32 gBattleAnimSpritePal_SapDrip[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_047[] = INCBIN_U32("graphics/battle_anims/sprites/047.gbapal.lz");
+const u32 gBattleAnimSpritePal_SapDrip2[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip_2.gbapal.lz");
 
 const u32 gUnusedGfx_Window2[] = INCBIN_U32("graphics/battle_interface/unused_window2.4bpp.lz");
 const u32 gUnusedGfx_Window2Bar[] = INCBIN_U32("graphics/battle_interface/unused_window2bar.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_048[] = INCBIN_U32("graphics/battle_anims/sprites/048.4bpp.lz");
-const u32 gBattleAnimSpritePalette_048[] = INCBIN_U32("graphics/battle_anims/sprites/048.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Sparkle1[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_1.4bpp.lz");
+const u32 gBattleAnimSpritePal_Sparkle1[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_1.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_049[] = INCBIN_U32("graphics/battle_anims/sprites/049.gbapal.lz");
-const u32 gBattleAnimSpritePalette_050[] = INCBIN_U32("graphics/battle_anims/sprites/050.gbapal.lz");
+const u32 gBattleAnimSpritePal_Sparkle2[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_2.gbapal.lz");
+const u32 gBattleAnimSpritePal_HumanoidFoot[] = INCBIN_U32("graphics/battle_anims/sprites/humanoid_foot.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_050[] = INCBIN_U32("graphics/battle_anims/sprites/050.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_051[] = INCBIN_U32("graphics/battle_anims/sprites/051.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_052[] = INCBIN_U32("graphics/battle_anims/sprites/052.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_HumanoidFoot[] = INCBIN_U32("graphics/battle_anims/sprites/humanoid_foot.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_MonsterFoot[] = INCBIN_U32("graphics/battle_anims/sprites/monster_foot.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_HumanoidHand[] = INCBIN_U32("graphics/battle_anims/sprites/humanoid_hand.4bpp.lz");
 
 const u32 gUnusedGfx_LineSketch[] = INCBIN_U32("graphics/unused/line_sketch.4bpp.lz");
 const u32 gUnusedPal_LineSketch[] = INCBIN_U32("graphics/unused/line_sketch.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_054[] = INCBIN_U32("graphics/battle_anims/sprites/054.4bpp.lz");
-const u32 gBattleAnimSpritePalette_054[] = INCBIN_U32("graphics/battle_anims/sprites/054.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_YellowUnk[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_unk.4bpp.lz");
+const u32 gBattleAnimSpritePal_YellowUnk[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_unk.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_056[] = INCBIN_U32("graphics/battle_anims/sprites/056.4bpp.lz");
-const u32 gBattleAnimSpritePalette_056[] = INCBIN_U32("graphics/battle_anims/sprites/056.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SlamHit[] = INCBIN_U32("graphics/battle_anims/sprites/slam_hit.4bpp.lz");
+const u32 gBattleAnimSpritePal_SlamHit[] = INCBIN_U32("graphics/battle_anims/sprites/slam_hit.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_055[] = INCBIN_U32("graphics/battle_anims/sprites/055.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_RedFist[] = INCBIN_U32("graphics/battle_anims/sprites/red_fist.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_057[] = INCBIN_U32("graphics/battle_anims/sprites/057.4bpp.lz");
-const u32 gBattleAnimSpritePalette_057[] = INCBIN_U32("graphics/battle_anims/sprites/057.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Ring[] = INCBIN_U32("graphics/battle_anims/sprites/ring.4bpp.lz");
+const u32 gBattleAnimSpritePal_Ring[] = INCBIN_U32("graphics/battle_anims/sprites/ring.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_058[] = INCBIN_U32("graphics/battle_anims/sprites/058.4bpp.lz");
-const u32 gBattleAnimSpritePalette_058[] = INCBIN_U32("graphics/battle_anims/sprites/058.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Rocks[] = INCBIN_U32("graphics/battle_anims/sprites/rocks.4bpp.lz");
+const u32 gBattleAnimSpritePal_Rocks[] = INCBIN_U32("graphics/battle_anims/sprites/rocks.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_059[] = INCBIN_U32("graphics/battle_anims/sprites/059.4bpp.lz");
-const u32 gBattleAnimSpritePalette_059[] = INCBIN_U32("graphics/battle_anims/sprites/059.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Z[] = INCBIN_U32("graphics/battle_anims/sprites/z.4bpp.lz");
+const u32 gBattleAnimSpritePal_Z[] = INCBIN_U32("graphics/battle_anims/sprites/z.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_060[] = INCBIN_U32("graphics/battle_anims/sprites/060.4bpp.lz");
-const u32 gBattleAnimSpritePalette_060[] = INCBIN_U32("graphics/battle_anims/sprites/060.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_YellowUnk2[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_unk_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_YellowUnk2[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_unk_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_061[] = INCBIN_U32("graphics/battle_anims/sprites/061.4bpp.lz");
-const u32 gBattleAnimSpritePalette_061[] = INCBIN_U32("graphics/battle_anims/sprites/061.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_AirSlash[] = INCBIN_U32("graphics/battle_anims/sprites/air_slash.4bpp.lz");
+const u32 gBattleAnimSpritePal_AirSlash[] = INCBIN_U32("graphics/battle_anims/sprites/air_slash.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_062[] = INCBIN_U32("graphics/battle_anims/sprites/062.4bpp.lz");
-const u32 gBattleAnimSpritePalette_062[] = INCBIN_U32("graphics/battle_anims/sprites/062.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SpinningGreenOrbs[] = INCBIN_U32("graphics/battle_anims/sprites/spinning_green_orbs.4bpp.lz");
+const u32 gBattleAnimSpritePal_SpinningGreenOrbs[] = INCBIN_U32("graphics/battle_anims/sprites/spinning_green_orbs.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_063[] = INCBIN_U32("graphics/battle_anims/sprites/063.4bpp.lz");
-const u32 gBattleAnimSpritePalette_063[] = INCBIN_U32("graphics/battle_anims/sprites/063.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Leaf[] = INCBIN_U32("graphics/battle_anims/sprites/leaf.4bpp.lz");
+const u32 gBattleAnimSpritePal_Leaf[] = INCBIN_U32("graphics/battle_anims/sprites/leaf.gbapal.lz");
 
 const u32 gUnusedGfx_Metronome[] = INCBIN_U32("graphics/unused/metronome_hand_small.4bpp.lz"); // unused, was for metronome at one point
 
-const u32 gBattleAnimSpritePalette_091[] = INCBIN_U32("graphics/battle_anims/sprites/091.gbapal.lz");
+const u32 gBattleAnimSpritePal_Clapping[] = INCBIN_U32("graphics/battle_anims/sprites/clapping.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_065[] = INCBIN_U32("graphics/battle_anims/sprites/065.4bpp.lz");
-const u32 gBattleAnimSpritePalette_065[] = INCBIN_U32("graphics/battle_anims/sprites/065.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PoisonPowder[] = INCBIN_U32("graphics/battle_anims/sprites/poison_powder.4bpp.lz");
+const u32 gBattleAnimSpritePal_PoisonPowder[] = INCBIN_U32("graphics/battle_anims/sprites/poison_powder.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_066[] = INCBIN_U32("graphics/battle_anims/sprites/066.4bpp.lz");
-const u32 gBattleAnimSpritePalette_066[] = INCBIN_U32("graphics/battle_anims/sprites/066.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BrownTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/brown_triangle.4bpp.lz");
+const u32 gBattleAnimSpritePal_BrownTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/brown_triangle.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_070[] = INCBIN_U32("graphics/battle_anims/sprites/070.4bpp.lz");
-const u32 gBattleAnimSpritePalette_070[] = INCBIN_U32("graphics/battle_anims/sprites/070.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Sparkle3[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_3.4bpp.lz");
+const u32 gBattleAnimSpritePal_Sparkle3[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_3.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_071[] = INCBIN_U32("graphics/battle_anims/sprites/071.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Sparkle4[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_4.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_072[] = INCBIN_U32("graphics/battle_anims/sprites/072.4bpp.lz");
-const u32 gBattleAnimSpritePalette_072[] = INCBIN_U32("graphics/battle_anims/sprites/072.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MusicNotes[] = INCBIN_U32("graphics/battle_anims/sprites/music_notes.4bpp.lz");
+const u32 gBattleAnimSpritePal_MusicNotes[] = INCBIN_U32("graphics/battle_anims/sprites/music_notes.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_073[] = INCBIN_U32("graphics/battle_anims/sprites/073.4bpp.lz");
-const u32 gBattleAnimSpritePalette_073[] = INCBIN_U32("graphics/battle_anims/sprites/073.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Duck[] = INCBIN_U32("graphics/battle_anims/sprites/duck.4bpp.lz");
+const u32 gBattleAnimSpritePal_Duck[] = INCBIN_U32("graphics/battle_anims/sprites/duck.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_075[] = INCBIN_U32("graphics/battle_anims/sprites/075.4bpp.lz");
-const u32 gBattleAnimSpritePalette_075[] = INCBIN_U32("graphics/battle_anims/sprites/075.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Alert[] = INCBIN_U32("graphics/battle_anims/sprites/alert.4bpp.lz");
+const u32 gBattleAnimSpritePal_Alert[] = INCBIN_U32("graphics/battle_anims/sprites/alert.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_078[] = INCBIN_U32("graphics/battle_anims/sprites/078.4bpp.lz");
-const u32 gBattleAnimSpritePalette_078[] = INCBIN_U32("graphics/battle_anims/sprites/078.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Shock4[] = INCBIN_U32("graphics/battle_anims/sprites/shock_4.4bpp.lz");
+const u32 gBattleAnimSpritePal_Shock4[] = INCBIN_U32("graphics/battle_anims/sprites/shock_4.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_079[] = INCBIN_U32("graphics/battle_anims/sprites/079.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Shock[] = INCBIN_U32("graphics/battle_anims/sprites/shock.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_080[] = INCBIN_U32("graphics/battle_anims/sprites/080.4bpp.lz");
-const u32 gBattleAnimSpritePalette_080[] = INCBIN_U32("graphics/battle_anims/sprites/080.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Bell2[] = INCBIN_U32("graphics/battle_anims/sprites/bell_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Bell2[] = INCBIN_U32("graphics/battle_anims/sprites/bell_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_081[] = INCBIN_U32("graphics/battle_anims/sprites/081.4bpp.lz");
-const u32 gBattleAnimSpritePalette_081[] = INCBIN_U32("graphics/battle_anims/sprites/081.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PinkGlove[] = INCBIN_U32("graphics/battle_anims/sprites/pink_glove.4bpp.lz");
+const u32 gBattleAnimSpritePal_PinkGlove[] = INCBIN_U32("graphics/battle_anims/sprites/pink_glove.gbapal.lz");
 
 const u16 gUnknown_C0CA1C[] = INCBIN_U16("graphics/unknown/unknown_C0CA1C.bin");
 const u16 gUnknown_C0CA40[] = INCBIN_U16("graphics/unknown/unknown_C0CA40.bin");
@@ -261,85 +261,85 @@ const u32 gUnusedGfx8bpp_LineSketch2[] = INCBIN_U32("graphics/unused/line_sketch
 const u16 gUnknown_C0CAE0[] = INCBIN_U16("graphics/unknown/unknown_C0CAE0.bin");
 const u32 gUnusedTilemap_LineSketch2[] = INCBIN_U32("graphics/unused/line_sketch_2.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_082[] = INCBIN_U32("graphics/battle_anims/sprites/082.4bpp.lz");
-const u32 gBattleAnimSpritePalette_082[] = INCBIN_U32("graphics/battle_anims/sprites/082.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlueLines[] = INCBIN_U32("graphics/battle_anims/sprites/blue_lines.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlueLines[] = INCBIN_U32("graphics/battle_anims/sprites/blue_lines.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_083[] = INCBIN_U32("graphics/battle_anims/sprites/083.gbapal.lz");
-const u32 gBattleAnimSpritePalette_084[] = INCBIN_U32("graphics/battle_anims/sprites/084.gbapal.lz");
-const u32 gBattleAnimSpritePalette_085[] = INCBIN_U32("graphics/battle_anims/sprites/085.gbapal.lz");
-const u32 gBattleAnimSpritePalette_086[] = INCBIN_U32("graphics/battle_anims/sprites/086.gbapal.lz");
-const u32 gBattleAnimSpritePalette_088[] = INCBIN_U32("graphics/battle_anims/sprites/088.gbapal.lz");
-const u32 gBattleAnimSpritePalette_089[] = INCBIN_U32("graphics/battle_anims/sprites/089.gbapal.lz");
-const u32 gBattleAnimSpritePalette_090[] = INCBIN_U32("graphics/battle_anims/sprites/090.gbapal.lz");
-const u32 gBattleAnimSpritePalette_092[] = INCBIN_U32("graphics/battle_anims/sprites/092.gbapal.lz");
-const u32 gBattleAnimSpritePalette_093[] = INCBIN_U32("graphics/battle_anims/sprites/093.gbapal.lz");
-const u32 gBattleAnimSpritePalette_094[] = INCBIN_U32("graphics/battle_anims/sprites/094.gbapal.lz");
+const u32 gBattleAnimSpritePal_Impact3[] = INCBIN_U32("graphics/battle_anims/sprites/impact_3.gbapal.lz");
+const u32 gBattleAnimSpritePal_Impact2[] = INCBIN_U32("graphics/battle_anims/sprites/impact_2.gbapal.lz");
+const u32 gBattleAnimSpritePal_Reticle[] = INCBIN_U32("graphics/battle_anims/sprites/reticle.gbapal.lz");
+const u32 gBattleAnimSpritePal_Breath[] = INCBIN_U32("graphics/battle_anims/sprites/breath.gbapal.lz");
+const u32 gBattleAnimSpritePal_Snowball[] = INCBIN_U32("graphics/battle_anims/sprites/snowball.gbapal.lz");
+const u32 gBattleAnimSpritePal_Vine[] = INCBIN_U32("graphics/battle_anims/sprites/vine.gbapal.lz");
+const u32 gBattleAnimSpritePal_Sword2[] = INCBIN_U32("graphics/battle_anims/sprites/sword_2.gbapal.lz");
+const u32 gBattleAnimSpritePal_RedTube[] = INCBIN_U32("graphics/battle_anims/sprites/red_tube.gbapal.lz");
+const u32 gBattleAnimSpritePal_Amnesia[] = INCBIN_U32("graphics/battle_anims/sprites/amnesia.gbapal.lz");
+const u32 gBattleAnimSpritePal_String2[] = INCBIN_U32("graphics/battle_anims/sprites/string_2.gbapal.lz");
 
 const u32 gUnknown_D0D2B4[] = INCBIN_U32("graphics/unknown/unknown_D0D2B4.bin.lz");
 
-const u32 gBattleAnimSpritePalette_095[] = INCBIN_U32("graphics/battle_anims/sprites/095.gbapal.lz");
-const u32 gBattleAnimSpritePalette_096[] = INCBIN_U32("graphics/battle_anims/sprites/096.gbapal.lz");
-const u32 gBattleAnimSpritePalette_097[] = INCBIN_U32("graphics/battle_anims/sprites/097.gbapal.lz");
-const u32 gBattleAnimSpritePalette_100[] = INCBIN_U32("graphics/battle_anims/sprites/100.gbapal.lz");
-const u32 gBattleAnimSpritePalette_101[] = INCBIN_U32("graphics/battle_anims/sprites/101.gbapal.lz");
-const u32 gBattleAnimSpritePalette_103[] = INCBIN_U32("graphics/battle_anims/sprites/103.gbapal.lz");
+const u32 gBattleAnimSpritePal_Pencil2[] = INCBIN_U32("graphics/battle_anims/sprites/pencil_2.gbapal.lz");
+const u32 gBattleAnimSpritePal_Petal[] = INCBIN_U32("graphics/battle_anims/sprites/petal.gbapal.lz");
+const u32 gBattleAnimSpritePal_BentSpoon[] = INCBIN_U32("graphics/battle_anims/sprites/bent_spoon.gbapal.lz");
+const u32 gBattleAnimSpritePal_Coin[] = INCBIN_U32("graphics/battle_anims/sprites/coin.gbapal.lz");
+const u32 gBattleAnimSpritePal_CrackedEgg[] = INCBIN_U32("graphics/battle_anims/sprites/cracked_egg.gbapal.lz");
+const u32 gBattleAnimSpritePal_FreshEgg[] = INCBIN_U32("graphics/battle_anims/sprites/fresh_egg.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_083[] = INCBIN_U32("graphics/battle_anims/sprites/083.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_084[] = INCBIN_U32("graphics/battle_anims/sprites/084.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_085[] = INCBIN_U32("graphics/battle_anims/sprites/085.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_086[] = INCBIN_U32("graphics/battle_anims/sprites/086.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_088[] = INCBIN_U32("graphics/battle_anims/sprites/088.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_089[] = INCBIN_U32("graphics/battle_anims/sprites/089.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_090[] = INCBIN_U32("graphics/battle_anims/sprites/090.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_091[] = INCBIN_U32("graphics/battle_anims/sprites/091.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_092[] = INCBIN_U32("graphics/battle_anims/sprites/092.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_093[] = INCBIN_U32("graphics/battle_anims/sprites/093.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_094[] = INCBIN_U32("graphics/battle_anims/sprites/094.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_095[] = INCBIN_U32("graphics/battle_anims/sprites/095.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_096[] = INCBIN_U32("graphics/battle_anims/sprites/096.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_097[] = INCBIN_U32("graphics/battle_anims/sprites/097.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_098[] = INCBIN_U32("graphics/battle_anims/sprites/098.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_100[] = INCBIN_U32("graphics/battle_anims/sprites/100.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_101[] = INCBIN_U32("graphics/battle_anims/sprites/101.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_102[] = INCBIN_U32("graphics/battle_anims/sprites/102.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_103[] = INCBIN_U32("graphics/battle_anims/sprites/103.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Impact3[] = INCBIN_U32("graphics/battle_anims/sprites/impact_3.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Impact2[] = INCBIN_U32("graphics/battle_anims/sprites/impact_2.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Reticle[] = INCBIN_U32("graphics/battle_anims/sprites/reticle.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Breath[] = INCBIN_U32("graphics/battle_anims/sprites/breath.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Snowball[] = INCBIN_U32("graphics/battle_anims/sprites/snowball.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Vine[] = INCBIN_U32("graphics/battle_anims/sprites/vine.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Sword2[] = INCBIN_U32("graphics/battle_anims/sprites/sword_2.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Clapping[] = INCBIN_U32("graphics/battle_anims/sprites/clapping.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_RedTube[] = INCBIN_U32("graphics/battle_anims/sprites/red_tube.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Amnesia[] = INCBIN_U32("graphics/battle_anims/sprites/amnesia.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_String2[] = INCBIN_U32("graphics/battle_anims/sprites/string_2.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Pencil2[] = INCBIN_U32("graphics/battle_anims/sprites/pencil_2.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Petal[] = INCBIN_U32("graphics/battle_anims/sprites/petal.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_BentSpoon[] = INCBIN_U32("graphics/battle_anims/sprites/bent_spoon.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Web[] = INCBIN_U32("graphics/battle_anims/sprites/web.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Coin[] = INCBIN_U32("graphics/battle_anims/sprites/coin.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_CrackedEgg[] = INCBIN_U32("graphics/battle_anims/sprites/cracked_egg.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_HatchedEgg[] = INCBIN_U32("graphics/battle_anims/sprites/hatched_egg.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_FreshEgg[] = INCBIN_U32("graphics/battle_anims/sprites/fresh_egg.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_104[] = INCBIN_U32("graphics/battle_anims/sprites/104.4bpp.lz");
-const u32 gBattleAnimSpritePalette_104[] = INCBIN_U32("graphics/battle_anims/sprites/104.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Fangs[] = INCBIN_U32("graphics/battle_anims/sprites/fangs.4bpp.lz");
+const u32 gBattleAnimSpritePal_Fangs[] = INCBIN_U32("graphics/battle_anims/sprites/fangs.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_105[] = INCBIN_U32("graphics/battle_anims/sprites/105.4bpp.lz");
-const u32 gBattleAnimSpritePalette_105[] = INCBIN_U32("graphics/battle_anims/sprites/105.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Explosion2[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Explosion2[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_106[] = INCBIN_U32("graphics/battle_anims/sprites/106.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Explosion3[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_3.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_107[] = INCBIN_U32("graphics/battle_anims/sprites/107.4bpp.lz");
-const u32 gBattleAnimSpritePalette_107[] = INCBIN_U32("graphics/battle_anims/sprites/107.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WaterDroplet[] = INCBIN_U32("graphics/battle_anims/sprites/water_droplet.4bpp.lz");
+const u32 gBattleAnimSpritePal_WaterDroplet[] = INCBIN_U32("graphics/battle_anims/sprites/water_droplet.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_108[] = INCBIN_U32("graphics/battle_anims/sprites/108.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_WaterDroplet2[] = INCBIN_U32("graphics/battle_anims/sprites/water_droplet_2.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_109[] = INCBIN_U32("graphics/battle_anims/sprites/109.4bpp.lz");
-const u32 gBattleAnimSpritePalette_109[] = INCBIN_U32("graphics/battle_anims/sprites/109.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Seed2[] = INCBIN_U32("graphics/battle_anims/sprites/seed_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Seed2[] = INCBIN_U32("graphics/battle_anims/sprites/seed_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_110[] = INCBIN_U32("graphics/battle_anims/sprites/110.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Sprout[] = INCBIN_U32("graphics/battle_anims/sprites/sprout.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_111[] = INCBIN_U32("graphics/battle_anims/sprites/111.4bpp.lz");
-const u32 gBattleAnimSpritePalette_111[] = INCBIN_U32("graphics/battle_anims/sprites/111.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RedWand[] = INCBIN_U32("graphics/battle_anims/sprites/red_wand.4bpp.lz");
+const u32 gBattleAnimSpritePal_RedWand[] = INCBIN_U32("graphics/battle_anims/sprites/red_wand.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_112[] = INCBIN_U32("graphics/battle_anims/sprites/112.4bpp.lz");
-const u32 gBattleAnimSpritePalette_112[] = INCBIN_U32("graphics/battle_anims/sprites/112.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PurpleGreenUnk[] = INCBIN_U32("graphics/battle_anims/sprites/purple_green_unk.4bpp.lz");
+const u32 gBattleAnimSpritePal_PurpleGreenUnk[] = INCBIN_U32("graphics/battle_anims/sprites/purple_green_unk.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_113[] = INCBIN_U32("graphics/battle_anims/sprites/113.4bpp.lz");
-const u32 gBattleAnimSpritePalette_113[] = INCBIN_U32("graphics/battle_anims/sprites/113.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WaterColumn[] = INCBIN_U32("graphics/battle_anims/sprites/water_column.4bpp.lz");
+const u32 gBattleAnimSpritePal_WaterColumn[] = INCBIN_U32("graphics/battle_anims/sprites/water_column.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_114[] = INCBIN_U32("graphics/battle_anims/sprites/114.4bpp.lz");
-const u32 gBattleAnimSpritePalette_114[] = INCBIN_U32("graphics/battle_anims/sprites/114.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MudUnk[] = INCBIN_U32("graphics/battle_anims/sprites/mud_unk.4bpp.lz");
+const u32 gBattleAnimSpritePal_MudUnk[] = INCBIN_U32("graphics/battle_anims/sprites/mud_unk.gbapal.lz");
 
 const u32 gUnusedTilemap_BlueFrame[] = INCBIN_U32("graphics/unused/blue_frame.bin.lz"); // P1, P2, P3 and P4 tilemaps?
 const u32 gUnusedTilemap_RedYellowGreenFrame[] = INCBIN_U32("graphics/unused/redyellowgreen_frame.bin.lz");
 const u32 gUnusedGfx_ColorFrames[] = INCBIN_U32("graphics/unused/color_frames.4bpp.lz");
 const u32 gUnusedPal_ColorFrames[] = INCBIN_U32("graphics/unused/color_frames.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_115[] = INCBIN_U32("graphics/battle_anims/sprites/115.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_RainDrops[] = INCBIN_U32("graphics/battle_anims/sprites/rain_drops.4bpp.lz");
 
 const u32 gUnusedGfx8bpp_WaterSplash [] = INCBIN_U32("graphics/unused/water_splash.8bpp.lz");
 const u32 gUnusedTilemap_WaterSplash[] = INCBIN_U32("graphics/unused/water_splash.bin.lz");
@@ -379,63 +379,63 @@ const u8 gUnknown_D1300C[] = INCBIN_U8("graphics/unknown/unknown_D1300C.4bpp");
 const u32 gBattleInterfaceGfx_UnusedWindow3[] = INCBIN_U32("graphics/battle_interface/unused_window3.4bpp.lz");
 const u32 gBattleInterfaceGfx_UnusedWindow4[] = INCBIN_U32("graphics/battle_interface/unused_window4.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_116[] = INCBIN_U32("graphics/battle_anims/sprites/116.4bpp.lz");
-const u32 gBattleAnimSpritePalette_116[] = INCBIN_U32("graphics/battle_anims/sprites/116.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_FurySwipes[] = INCBIN_U32("graphics/battle_anims/sprites/fury_swipes.4bpp.lz");
+const u32 gBattleAnimSpritePal_FurySwipes[] = INCBIN_U32("graphics/battle_anims/sprites/fury_swipes.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_117[] = INCBIN_U32("graphics/battle_anims/sprites/117.4bpp.lz");
-const u32 gBattleAnimSpritePalette_117[] = INCBIN_U32("graphics/battle_anims/sprites/117.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Vine2[] = INCBIN_U32("graphics/battle_anims/sprites/vine_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Vine2[] = INCBIN_U32("graphics/battle_anims/sprites/vine_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_118[] = INCBIN_U32("graphics/battle_anims/sprites/118.4bpp.lz");
-const u32 gBattleAnimSpritePalette_118[] = INCBIN_U32("graphics/battle_anims/sprites/118.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Teeth[] = INCBIN_U32("graphics/battle_anims/sprites/teeth.4bpp.lz");
+const u32 gBattleAnimSpritePal_Teeth[] = INCBIN_U32("graphics/battle_anims/sprites/teeth.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_119[] = INCBIN_U32("graphics/battle_anims/sprites/119.4bpp.lz");
-const u32 gBattleAnimSpritePalette_119[] = INCBIN_U32("graphics/battle_anims/sprites/119.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Bone2[] = INCBIN_U32("graphics/battle_anims/sprites/bone_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Bone2[] = INCBIN_U32("graphics/battle_anims/sprites/bone_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_120[] = INCBIN_U32("graphics/battle_anims/sprites/120.4bpp.lz");
-const u32 gBattleAnimSpritePalette_120[] = INCBIN_U32("graphics/battle_anims/sprites/120.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WhiteBag[] = INCBIN_U32("graphics/battle_anims/sprites/white_bag.4bpp.lz");
+const u32 gBattleAnimSpritePal_WhiteBag[] = INCBIN_U32("graphics/battle_anims/sprites/white_bag.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_121[] = INCBIN_U32("graphics/battle_anims/sprites/121.4bpp.lz");
-const u32 gBattleAnimSpritePalette_121[] = INCBIN_U32("graphics/battle_anims/sprites/121.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Unknown[] = INCBIN_U32("graphics/battle_anims/sprites/unknown.4bpp.lz");
+const u32 gBattleAnimSpritePal_Unknown[] = INCBIN_U32("graphics/battle_anims/sprites/unknown.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_122[] = INCBIN_U32("graphics/battle_anims/sprites/122.4bpp.lz");
-const u32 gBattleAnimSpritePalette_122[] = INCBIN_U32("graphics/battle_anims/sprites/122.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PurpleCoral[] = INCBIN_U32("graphics/battle_anims/sprites/purple_coral.4bpp.lz");
+const u32 gBattleAnimSpritePal_PurpleCoral[] = INCBIN_U32("graphics/battle_anims/sprites/purple_coral.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_123[] = INCBIN_U32("graphics/battle_anims/sprites/123.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_PurpleDroplet[] = INCBIN_U32("graphics/battle_anims/sprites/purple_droplet.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_124[] = INCBIN_U32("graphics/battle_anims/sprites/124.4bpp.lz");
-const u32 gBattleAnimSpritePalette_124[] = INCBIN_U32("graphics/battle_anims/sprites/124.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Shock2[] = INCBIN_U32("graphics/battle_anims/sprites/shock_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_Shock2[] = INCBIN_U32("graphics/battle_anims/sprites/shock_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_125[] = INCBIN_U32("graphics/battle_anims/sprites/125.4bpp.lz");
-const u32 gBattleAnimSpritePalette_125[] = INCBIN_U32("graphics/battle_anims/sprites/125.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_ClosingEye2[] = INCBIN_U32("graphics/battle_anims/sprites/closing_eye_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_ClosingEye2[] = INCBIN_U32("graphics/battle_anims/sprites/closing_eye_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_126[] = INCBIN_U32("graphics/battle_anims/sprites/126.4bpp.lz");
-const u32 gBattleAnimSpritePalette_126[] = INCBIN_U32("graphics/battle_anims/sprites/126.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MetalBall[] = INCBIN_U32("graphics/battle_anims/sprites/metal_ball.4bpp.lz");
+const u32 gBattleAnimSpritePal_MetalBall[] = INCBIN_U32("graphics/battle_anims/sprites/metal_ball.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_127[] = INCBIN_U32("graphics/battle_anims/sprites/127.4bpp.lz");
-const u32 gBattleAnimSpritePalette_127[] = INCBIN_U32("graphics/battle_anims/sprites/127.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MonsterDoll[] = INCBIN_U32("graphics/battle_anims/sprites/monster_doll.4bpp.lz");
+const u32 gBattleAnimSpritePal_MonsterDoll[] = INCBIN_U32("graphics/battle_anims/sprites/monster_doll.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_128[] = INCBIN_U32("graphics/battle_anims/sprites/128.4bpp.lz");
-const u32 gBattleAnimSpritePalette_128[] = INCBIN_U32("graphics/battle_anims/sprites/128.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Whirlwind[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind.4bpp.lz");
+const u32 gBattleAnimSpritePal_Whirlwind[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_129[] = INCBIN_U32("graphics/battle_anims/sprites/129.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Whirlwind2[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind_2.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_130[] = INCBIN_U32("graphics/battle_anims/sprites/130.4bpp.lz");
-const u32 gBattleAnimSpritePalette_130[] = INCBIN_U32("graphics/battle_anims/sprites/130.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Explosion4[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_4.4bpp.lz");
+const u32 gBattleAnimSpritePal_Explosion4[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_4.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_131[] = INCBIN_U32("graphics/battle_anims/sprites/131.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Explosion5[] = INCBIN_U32("graphics/battle_anims/sprites/explosion_5.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_132[] = INCBIN_U32("graphics/battle_anims/sprites/132.4bpp.lz");
-const u32 gBattleAnimSpritePalette_132[] = INCBIN_U32("graphics/battle_anims/sprites/132.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Tongue[] = INCBIN_U32("graphics/battle_anims/sprites/tongue.4bpp.lz");
+const u32 gBattleAnimSpritePal_Tongue[] = INCBIN_U32("graphics/battle_anims/sprites/tongue.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_133[] = INCBIN_U32("graphics/battle_anims/sprites/133.4bpp.lz");
-const u32 gBattleAnimSpritePalette_133[] = INCBIN_U32("graphics/battle_anims/sprites/133.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Smoke[] = INCBIN_U32("graphics/battle_anims/sprites/smoke.4bpp.lz");
+const u32 gBattleAnimSpritePal_Smoke[] = INCBIN_U32("graphics/battle_anims/sprites/smoke.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_134[] = INCBIN_U32("graphics/battle_anims/sprites/134.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Smoke2[] = INCBIN_U32("graphics/battle_anims/sprites/smoke_2.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_076[] = INCBIN_U32("graphics/battle_anims/sprites/076.4bpp.lz");
-const u32 gBattleAnimSpritePalette_076[] = INCBIN_U32("graphics/battle_anims/sprites/076.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlueFlames[] = INCBIN_U32("graphics/battle_anims/sprites/blue_flames.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlueFlames[] = INCBIN_U32("graphics/battle_anims/sprites/blue_flames.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_077[] = INCBIN_U32("graphics/battle_anims/sprites/077.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_BlueFlames2[] = INCBIN_U32("graphics/battle_anims/sprites/blue_flames_2.4bpp.lz");
 
 // Contest
 
@@ -479,118 +479,118 @@ const u32 gUnknown_08C1A12C[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bi
 
 const u32 gUnknown_08C1A2B4[] = INCBIN_U32("graphics/contest/misc_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_135[] = INCBIN_U32("graphics/battle_anims/sprites/135.4bpp.lz");
-const u32 gBattleAnimSpritePalette_135[] = INCBIN_U32("graphics/battle_anims/sprites/135.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.4bpp.lz");
+const u32 gBattleAnimSpritePal_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_Particles[] = INCBIN_U32("graphics/battle_anims/sprites/particles.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Particles[] = INCBIN_U32("graphics/battle_anims/sprites/particles.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_136[] = INCBIN_U32("graphics/battle_anims/sprites/136.4bpp.lz");
-const u32 gBattleAnimSpritePalette_136[] = INCBIN_U32("graphics/battle_anims/sprites/136.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_CircleImpact[] = INCBIN_U32("graphics/battle_anims/sprites/circle_impact.4bpp.lz");
+const u32 gBattleAnimSpritePal_CircleImpact[] = INCBIN_U32("graphics/battle_anims/sprites/circle_impact.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_137[] = INCBIN_U32("graphics/battle_anims/sprites/137.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Scratch[] = INCBIN_U32("graphics/battle_anims/sprites/scratch.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_139[] = INCBIN_U32("graphics/battle_anims/sprites/139.4bpp.lz");
-const u32 gBattleAnimSpritePalette_139[] = INCBIN_U32("graphics/battle_anims/sprites/139.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SharpTeeth[] = INCBIN_U32("graphics/battle_anims/sprites/sharp_teeth.4bpp.lz");
+const u32 gBattleAnimSpritePal_SharpTeeth[] = INCBIN_U32("graphics/battle_anims/sprites/sharp_teeth.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_145[] = INCBIN_U32("graphics/battle_anims/sprites/145.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Clamp[] = INCBIN_U32("graphics/battle_anims/sprites/clamp.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_138[] = INCBIN_U32("graphics/battle_anims/sprites/138.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Cut[] = INCBIN_U32("graphics/battle_anims/sprites/cut.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_140[] = INCBIN_U32("graphics/battle_anims/sprites/140.4bpp.lz");
-const u32 gBattleAnimSpritePalette_140[] = INCBIN_U32("graphics/battle_anims/sprites/140.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RainbowRings[] = INCBIN_U32("graphics/battle_anims/sprites/rainbow_rings.4bpp.lz");
+const u32 gBattleAnimSpritePal_RainbowRings[] = INCBIN_U32("graphics/battle_anims/sprites/rainbow_rings.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_141[] = INCBIN_U32("graphics/battle_anims/sprites/141.4bpp.lz");
-const u32 gBattleAnimSpritePalette_141[] = INCBIN_U32("graphics/battle_anims/sprites/141.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_IceCrystals[] = INCBIN_U32("graphics/battle_anims/sprites/ice_crystals.4bpp.lz");
+const u32 gBattleAnimSpritePal_IceCrystals[] = INCBIN_U32("graphics/battle_anims/sprites/ice_crystals.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_142[] = INCBIN_U32("graphics/battle_anims/sprites/142.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_IceSpikes[] = INCBIN_U32("graphics/battle_anims/sprites/ice_spikes.4bpp.lz");
 
 const u32 gUnusedGfx_OldBeatUp[] = INCBIN_U32("graphics/unused/old_beatup.4bpp.lz");
 const u32 gUnusedPal_OldBeatUp[] = INCBIN_U32("graphics/unused/old_beatup.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_147[] = INCBIN_U32("graphics/battle_anims/sprites/147.4bpp.lz");
-const u32 gBattleAnimSpritePalette_147[] = INCBIN_U32("graphics/battle_anims/sprites/147.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Orbs[] = INCBIN_U32("graphics/battle_anims/sprites/orbs.4bpp.lz");
+const u32 gBattleAnimSpritePal_Orbs[] = INCBIN_U32("graphics/battle_anims/sprites/orbs.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_149[] = INCBIN_U32("graphics/battle_anims/sprites/149.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_WaterOrb[] = INCBIN_U32("graphics/battle_anims/sprites/water_orb.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_148[] = INCBIN_U32("graphics/battle_anims/sprites/148.4bpp.lz");
-const u32 gBattleAnimSpritePalette_148[] = INCBIN_U32("graphics/battle_anims/sprites/148.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WaterImpact[] = INCBIN_U32("graphics/battle_anims/sprites/water_impact.4bpp.lz");
+const u32 gBattleAnimSpritePal_WaterImpact[] = INCBIN_U32("graphics/battle_anims/sprites/water_impact.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_259[] = INCBIN_U32("graphics/battle_anims/sprites/259.gbapal.lz");
+const u32 gBattleAnimSpritePal_BrownOrb[] = INCBIN_U32("graphics/battle_anims/sprites/brown_orb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_074[] = INCBIN_U32("graphics/battle_anims/sprites/074.4bpp.lz");
-const u32 gBattleAnimSpritePalette_074[] = INCBIN_U32("graphics/battle_anims/sprites/074.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MudSand[] = INCBIN_U32("graphics/battle_anims/sprites/mud_sand.4bpp.lz");
+const u32 gBattleAnimSpritePal_MudSand[] = INCBIN_U32("graphics/battle_anims/sprites/mud_sand.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_150[] = INCBIN_U32("graphics/battle_anims/sprites/150.4bpp.lz");
-const u32 gBattleAnimSpritePalette_150[] = INCBIN_U32("graphics/battle_anims/sprites/150.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PoisonBubble[] = INCBIN_U32("graphics/battle_anims/sprites/poison_bubble.4bpp.lz");
+const u32 gBattleAnimSpritePal_PoisonBubble[] = INCBIN_U32("graphics/battle_anims/sprites/poison_bubble.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_151[] = INCBIN_U32("graphics/battle_anims/sprites/151.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_ToxicBubble[] = INCBIN_U32("graphics/battle_anims/sprites/toxic_bubble.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_153[] = INCBIN_U32("graphics/battle_anims/sprites/153.4bpp.lz");
-const u32 gBattleAnimSpritePalette_153[] = INCBIN_U32("graphics/battle_anims/sprites/153.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_HornHit2[] = INCBIN_U32("graphics/battle_anims/sprites/horn_hit_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_HornHit2[] = INCBIN_U32("graphics/battle_anims/sprites/horn_hit_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_154[] = INCBIN_U32("graphics/battle_anims/sprites/154.4bpp.lz");
-const u32 gBattleAnimSpritePalette_154[] = INCBIN_U32("graphics/battle_anims/sprites/154.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_AirWave2[] = INCBIN_U32("graphics/battle_anims/sprites/air_wave_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_AirWave2[] = INCBIN_U32("graphics/battle_anims/sprites/air_wave_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_155[] = INCBIN_U32("graphics/battle_anims/sprites/155.4bpp.lz");
-const u32 gBattleAnimSpritePalette_155[] = INCBIN_U32("graphics/battle_anims/sprites/155.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SmallBubbles[] = INCBIN_U32("graphics/battle_anims/sprites/small_bubbles.4bpp.lz");
+const u32 gBattleAnimSpritePal_SmallBubbles[] = INCBIN_U32("graphics/battle_anims/sprites/small_bubbles.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_156[] = INCBIN_U32("graphics/battle_anims/sprites/156.4bpp.lz");
-const u32 gBattleAnimSpritePalette_156[] = INCBIN_U32("graphics/battle_anims/sprites/156.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RoundShadow[] = INCBIN_U32("graphics/battle_anims/sprites/round_shadow.4bpp.lz");
+const u32 gBattleAnimSpritePal_RoundShadow[] = INCBIN_U32("graphics/battle_anims/sprites/round_shadow.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_157[] = INCBIN_U32("graphics/battle_anims/sprites/157.4bpp.lz");
-const u32 gBattleAnimSpritePalette_157[] = INCBIN_U32("graphics/battle_anims/sprites/157.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Sunlight[] = INCBIN_U32("graphics/battle_anims/sprites/sunlight.4bpp.lz");
+const u32 gBattleAnimSpritePal_Sunlight[] = INCBIN_U32("graphics/battle_anims/sprites/sunlight.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_158[] = INCBIN_U32("graphics/battle_anims/sprites/158.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Spore[] = INCBIN_U32("graphics/battle_anims/sprites/spore.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_158[] = INCBIN_U32("graphics/battle_anims/sprites/158.gbapal.lz");
+const u32 gBattleAnimSpritePal_Spore[] = INCBIN_U32("graphics/battle_anims/sprites/spore.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_159[] = INCBIN_U32("graphics/battle_anims/sprites/159.4bpp.lz");
-const u32 gBattleAnimSpritePalette_159[] = INCBIN_U32("graphics/battle_anims/sprites/159.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Flower[] = INCBIN_U32("graphics/battle_anims/sprites/flower.4bpp.lz");
+const u32 gBattleAnimSpritePal_Flower[] = INCBIN_U32("graphics/battle_anims/sprites/flower.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_160[] = INCBIN_U32("graphics/battle_anims/sprites/160.4bpp.lz");
-const u32 gBattleAnimSpritePalette_160[] = INCBIN_U32("graphics/battle_anims/sprites/160.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RazorLeaf[] = INCBIN_U32("graphics/battle_anims/sprites/razor_leaf.4bpp.lz");
+const u32 gBattleAnimSpritePal_RazorLeaf[] = INCBIN_U32("graphics/battle_anims/sprites/razor_leaf.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_144[] = INCBIN_U32("graphics/battle_anims/sprites/144.4bpp.lz");
-const u32 gBattleAnimSpritePalette_144[] = INCBIN_U32("graphics/battle_anims/sprites/144.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MistCloud[] = INCBIN_U32("graphics/battle_anims/sprites/mist_cloud.4bpp.lz");
+const u32 gBattleAnimSpritePal_MistCloud[] = INCBIN_U32("graphics/battle_anims/sprites/mist_cloud.gbapal.lz");
 
 const u32 gUnknownGfx_D1C060[] = INCBIN_U32("graphics/unknown/unknown_D1C060.4bpp.lz");
 const u32 gUnknownPal_D1C060[] = INCBIN_U32("graphics/unknown/unknown_D1C060.gbapal.lz");
 const u32 gUnknownTilemap_D1C060[] = INCBIN_U32("graphics/unknown/unknown_D1C060.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_162[] = INCBIN_U32("graphics/battle_anims/sprites/162.4bpp.lz");
-const u32 gBattleAnimSpritePalette_162[] = INCBIN_U32("graphics/battle_anims/sprites/162.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WhirlwindLines[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind_lines.4bpp.lz");
+const u32 gBattleAnimSpritePal_WhirlwindLines[] = INCBIN_U32("graphics/battle_anims/sprites/whirlwind_lines.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_163[] = INCBIN_U32("graphics/battle_anims/sprites/163.4bpp.lz");
-const u32 gBattleAnimSpritePalette_163[] = INCBIN_U32("graphics/battle_anims/sprites/163.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GoldRing[] = INCBIN_U32("graphics/battle_anims/sprites/gold_ring.4bpp.lz");
+const u32 gBattleAnimSpritePal_GoldRing[] = INCBIN_U32("graphics/battle_anims/sprites/gold_ring.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_288[] = INCBIN_U32("graphics/battle_anims/sprites/288.gbapal.lz");
-const u32 gBattleAnimSpritePalette_164[] = INCBIN_U32("graphics/battle_anims/sprites/164.gbapal.lz");
-const u32 gBattleAnimSpritePalette_165[] = INCBIN_U32("graphics/battle_anims/sprites/165.gbapal.lz");
+const u32 gBattleAnimSpritePal_BlueRing2[] = INCBIN_U32("graphics/battle_anims/sprites/blue_ring_2.gbapal.lz");
+const u32 gBattleAnimSpritePal_PurpleRing[] = INCBIN_U32("graphics/battle_anims/sprites/purple_ring.gbapal.lz");
+const u32 gBattleAnimSpritePal_BlueRing[] = INCBIN_U32("graphics/battle_anims/sprites/blue_ring.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_166[] = INCBIN_U32("graphics/battle_anims/sprites/166.4bpp.lz");
-const u32 gBattleAnimSpritePalette_166[] = INCBIN_U32("graphics/battle_anims/sprites/166.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GreenLightWall[] = INCBIN_U32("graphics/battle_anims/sprites/green_light_wall.4bpp.lz");
+const u32 gBattleAnimSpritePal_GreenLightWall[] = INCBIN_U32("graphics/battle_anims/sprites/green_light_wall.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_167[] = INCBIN_U32("graphics/battle_anims/sprites/167.gbapal.lz");
-const u32 gBattleAnimSpritePalette_168[] = INCBIN_U32("graphics/battle_anims/sprites/168.gbapal.lz");
-const u32 gBattleAnimSpritePalette_169[] = INCBIN_U32("graphics/battle_anims/sprites/169.gbapal.lz");
-const u32 gBattleAnimSpritePalette_170[] = INCBIN_U32("graphics/battle_anims/sprites/170.gbapal.lz");
+const u32 gBattleAnimSpritePal_BlueLightWall[] = INCBIN_U32("graphics/battle_anims/sprites/blue_light_wall.gbapal.lz");
+const u32 gBattleAnimSpritePal_RedLightWall[] = INCBIN_U32("graphics/battle_anims/sprites/red_light_wall.gbapal.lz");
+const u32 gBattleAnimSpritePal_GrayLightWall[] = INCBIN_U32("graphics/battle_anims/sprites/gray_light_wall.gbapal.lz");
+const u32 gBattleAnimSpritePal_OrangeLightWall[] = INCBIN_U32("graphics/battle_anims/sprites/orange_light_wall.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_171[] = INCBIN_U32("graphics/battle_anims/sprites/171.4bpp.lz");
-const u32 gBattleAnimSpritePalette_171[] = INCBIN_U32("graphics/battle_anims/sprites/171.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BlackBall2[] = INCBIN_U32("graphics/battle_anims/sprites/black_ball_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_BlackBall2[] = INCBIN_U32("graphics/battle_anims/sprites/black_ball_2.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_172[] = INCBIN_U32("graphics/battle_anims/sprites/172.gbapal.lz");
+const u32 gBattleAnimSpritePal_PurpleGasCloud[] = INCBIN_U32("graphics/battle_anims/sprites/purple_gas_cloud.gbapal.lz");
 
 const u32 gContestJudgeGfx[] = INCBIN_U32("graphics/contest/judge.4bpp.lz");
 const u32 gContest2Pal[] = INCBIN_U32("graphics/contest/judge.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_001[] = INCBIN_U32("graphics/battle_anims/sprites/001.4bpp.lz");
-const u32 gBattleAnimSpritePalette_001[] = INCBIN_U32("graphics/battle_anims/sprites/001.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.4bpp.lz");
+const u32 gBattleAnimSpritePal_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_173[] = INCBIN_U32("graphics/battle_anims/sprites/173.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_SparkH[] = INCBIN_U32("graphics/battle_anims/sprites/spark_h.4bpp.lz");
 
-const u32 gBattleAnimBackgroundImage_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.bin.lz");
+const u32 gBattleAnimBgImage_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.4bpp.lz");
+const u32 gBattleAnimBgPalette_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.bin.lz");
 
 const u32 gMetalShineGfx[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.4bpp.lz");
 const u32 gMetalShinePalette[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.gbapal.lz");
@@ -600,48 +600,48 @@ const u32 gUnusedGfx_Goosuto[] = INCBIN_U32("graphics/unused/goosuto.4bpp.lz");
 const u32 gUnusedPal_Goosuto[] = INCBIN_U32("graphics/unused/goosuto.gbapal.lz");
 const u32 gUnusedTilemap_Goosuto[] = INCBIN_U32("graphics/unused/goosuto.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_174[] = INCBIN_U32("graphics/battle_anims/sprites/174.4bpp.lz");
-const u32 gBattleAnimSpritePalette_174[] = INCBIN_U32("graphics/battle_anims/sprites/174.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_YellowStar[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_star.4bpp.lz");
+const u32 gBattleAnimSpritePal_YellowStar[] = INCBIN_U32("graphics/battle_anims/sprites/yellow_star.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_175[] = INCBIN_U32("graphics/battle_anims/sprites/175.4bpp.lz");
-const u32 gBattleAnimSpritePalette_175[] = INCBIN_U32("graphics/battle_anims/sprites/175.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_LargeFreshEgg[] = INCBIN_U32("graphics/battle_anims/sprites/large_fresh_egg.4bpp.lz");
+const u32 gBattleAnimSpritePal_LargeFreshEgg[] = INCBIN_U32("graphics/battle_anims/sprites/large_fresh_egg.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_176[] = INCBIN_U32("graphics/battle_anims/sprites/176.4bpp.lz");
-const u32 gBattleAnimSpritePalette_176[] = INCBIN_U32("graphics/battle_anims/sprites/176.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_ShadowBall[] = INCBIN_U32("graphics/battle_anims/sprites/shadow_ball.4bpp.lz");
+const u32 gBattleAnimSpritePal_ShadowBall[] = INCBIN_U32("graphics/battle_anims/sprites/shadow_ball.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_177[] = INCBIN_U32("graphics/battle_anims/sprites/177.4bpp.lz");
-const u32 gBattleAnimSpritePalette_177[] = INCBIN_U32("graphics/battle_anims/sprites/177.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Lick[] = INCBIN_U32("graphics/battle_anims/sprites/lick.4bpp.lz");
+const u32 gBattleAnimSpritePal_Lick[] = INCBIN_U32("graphics/battle_anims/sprites/lick.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_178[] = INCBIN_U32("graphics/battle_anims/sprites/178.4bpp.lz");
-const u32 gBattleAnimSpritePalette_178[] = INCBIN_U32("graphics/battle_anims/sprites/178.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_VoidLines[] = INCBIN_U32("graphics/battle_anims/sprites/void_lines.4bpp.lz");
+const u32 gBattleAnimSpritePal_VoidLines[] = INCBIN_U32("graphics/battle_anims/sprites/void_lines.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_179[] = INCBIN_U32("graphics/battle_anims/sprites/179.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_179[] = INCBIN_U32("graphics/battle_anims/sprites/179.4bpp.lz");
+const u32 gBattleAnimSpritePal_String[] = INCBIN_U32("graphics/battle_anims/sprites/string.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_String[] = INCBIN_U32("graphics/battle_anims/sprites/string.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_180[] = INCBIN_U32("graphics/battle_anims/sprites/180.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_181[] = INCBIN_U32("graphics/battle_anims/sprites/181.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_WebThread[] = INCBIN_U32("graphics/battle_anims/sprites/web_thread.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_SpiderWeb[] = INCBIN_U32("graphics/battle_anims/sprites/spider_web.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_182[] = INCBIN_U32("graphics/battle_anims/sprites/182.4bpp.lz");
-const u32 gBattleAnimSpritePalette_182[] = INCBIN_U32("graphics/battle_anims/sprites/182.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Lightbulb[] = INCBIN_U32("graphics/battle_anims/sprites/lightbulb.4bpp.lz");
+const u32 gBattleAnimSpritePal_Lightbulb[] = INCBIN_U32("graphics/battle_anims/sprites/lightbulb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_183[] = INCBIN_U32("graphics/battle_anims/sprites/183.4bpp.lz");
-const u32 gBattleAnimSpritePalette_183[] = INCBIN_U32("graphics/battle_anims/sprites/183.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Slash[] = INCBIN_U32("graphics/battle_anims/sprites/slash.4bpp.lz");
+const u32 gBattleAnimSpritePal_Slash[] = INCBIN_U32("graphics/battle_anims/sprites/slash.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_184[] = INCBIN_U32("graphics/battle_anims/sprites/184.4bpp.lz");
-const u32 gBattleAnimSpritePalette_184[] = INCBIN_U32("graphics/battle_anims/sprites/184.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_FocusEnergy[] = INCBIN_U32("graphics/battle_anims/sprites/focus_energy.4bpp.lz");
+const u32 gBattleAnimSpritePal_FocusEnergy[] = INCBIN_U32("graphics/battle_anims/sprites/focus_energy.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_185[] = INCBIN_U32("graphics/battle_anims/sprites/185.4bpp.lz");
-const u32 gBattleAnimSpritePalette_185[] = INCBIN_U32("graphics/battle_anims/sprites/185.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SphereToCube[] = INCBIN_U32("graphics/battle_anims/sprites/sphere_to_cube.4bpp.lz");
+const u32 gBattleAnimSpritePal_SphereToCube[] = INCBIN_U32("graphics/battle_anims/sprites/sphere_to_cube.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_03[] = INCBIN_U32("graphics/battle_anims/backgrounds/03.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_03[] = INCBIN_U32("graphics/battle_anims/backgrounds/03.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_03[] = INCBIN_U32("graphics/battle_anims/backgrounds/03.bin.lz");
+const u32 gBattleAnimBgImage_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.4bpp.lz");
+const u32 gBattleAnimBgPalette_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_187[] = INCBIN_U32("graphics/battle_anims/sprites/187.4bpp.lz");
-const u32 gBattleAnimSpritePalette_187[] = INCBIN_U32("graphics/battle_anims/sprites/187.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Eye[] = INCBIN_U32("graphics/battle_anims/sprites/eye.4bpp.lz");
+const u32 gBattleAnimSpritePal_Eye[] = INCBIN_U32("graphics/battle_anims/sprites/eye.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_186[] = INCBIN_U32("graphics/battle_anims/sprites/186.4bpp.lz");
-const u32 gBattleAnimSpritePalette_186[] = INCBIN_U32("graphics/battle_anims/sprites/186.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Tendrils[] = INCBIN_U32("graphics/battle_anims/sprites/tendrils.4bpp.lz");
+const u32 gBattleAnimSpritePal_Tendrils[] = INCBIN_U32("graphics/battle_anims/sprites/tendrils.gbapal.lz");
 
 const u32 gHealthboxSinglesPlayerGfx[] = INCBIN_U32("graphics/battle_interface/healthbox_singles_player.4bpp.lz");
 const u32 gHealthboxSinglesOpponentGfx[] = INCBIN_U32("graphics/battle_interface/healthbox_singles_opponent.4bpp.lz");
@@ -652,237 +652,237 @@ const u32 gHealthboxSafariGfx[] = INCBIN_U32("graphics/battle_interface/healthbo
 const u32 gUnusedGfx_Shadow[] = INCBIN_U32("graphics/unused/shadow.4bpp.lz");
 const u32 gUnusedPal_Shadow[] = INCBIN_U32("graphics/unused/shadow.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_014[] = INCBIN_U32("graphics/battle_anims/sprites/014.4bpp.lz");
-const u32 gBattleAnimSpritePalette_014[] = INCBIN_U32("graphics/battle_anims/sprites/014.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_LockOn[] = INCBIN_U32("graphics/battle_anims/sprites/lock_on.4bpp.lz");
+const u32 gBattleAnimSpritePal_LockOn[] = INCBIN_U32("graphics/battle_anims/sprites/lock_on.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_190[] = INCBIN_U32("graphics/battle_anims/sprites/190.4bpp.lz");
-const u32 gBattleAnimSpritePalette_190[] = INCBIN_U32("graphics/battle_anims/sprites/190.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_OpeningEye[] = INCBIN_U32("graphics/battle_anims/sprites/opening_eye.4bpp.lz");
+const u32 gBattleAnimSpritePal_OpeningEye[] = INCBIN_U32("graphics/battle_anims/sprites/opening_eye.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_191[] = INCBIN_U32("graphics/battle_anims/sprites/191.4bpp.lz");
-const u32 gBattleAnimSpritePalette_191[] = INCBIN_U32("graphics/battle_anims/sprites/191.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RoundWhiteHalo[] = INCBIN_U32("graphics/battle_anims/sprites/round_white_halo.4bpp.lz");
+const u32 gBattleAnimSpritePal_RoundWhiteHalo[] = INCBIN_U32("graphics/battle_anims/sprites/round_white_halo.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_189[] = INCBIN_U32("graphics/battle_anims/sprites/189.4bpp.lz");
-const u32 gBattleAnimSpritePalette_189[] = INCBIN_U32("graphics/battle_anims/sprites/189.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_TealAlert[] = INCBIN_U32("graphics/battle_anims/sprites/teal_alert.4bpp.lz");
+const u32 gBattleAnimSpritePal_TealAlert[] = INCBIN_U32("graphics/battle_anims/sprites/teal_alert.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_192[] = INCBIN_U32("graphics/battle_anims/sprites/192.4bpp.lz");
-const u32 gBattleAnimSpritePalette_192[] = INCBIN_U32("graphics/battle_anims/sprites/192.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_FangAttack[] = INCBIN_U32("graphics/battle_anims/sprites/fang_attack.4bpp.lz");
+const u32 gBattleAnimSpritePal_FangAttack[] = INCBIN_U32("graphics/battle_anims/sprites/fang_attack.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_193[] = INCBIN_U32("graphics/battle_anims/sprites/193.4bpp.lz");
-const u32 gBattleAnimSpritePalette_193[] = INCBIN_U32("graphics/battle_anims/sprites/193.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PurpleHandOutline[] = INCBIN_U32("graphics/battle_anims/sprites/purple_hand_outline.4bpp.lz");
+const u32 gBattleAnimSpritePal_PurpleHandOutline[] = INCBIN_U32("graphics/battle_anims/sprites/purple_hand_outline.gbapal.lz");
 
 const u32 gUnknown_08C20668[] = INCBIN_U32("graphics/battle_anims/masks/curse.4bpp.lz");
 const u32 gUnknown_08C20684[] = INCBIN_U32("graphics/battle_anims/masks/curse.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_002[] = INCBIN_U32("graphics/battle_anims/sprites/002.4bpp.lz");
-const u32 gBattleAnimSpritePalette_002[] = INCBIN_U32("graphics/battle_anims/sprites/002.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Pencil[] = INCBIN_U32("graphics/battle_anims/sprites/pencil.4bpp.lz");
+const u32 gBattleAnimSpritePal_Pencil[] = INCBIN_U32("graphics/battle_anims/sprites/pencil.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_196[] = INCBIN_U32("graphics/battle_anims/sprites/196.4bpp.lz");
-const u32 gBattleAnimSpritePalette_196[] = INCBIN_U32("graphics/battle_anims/sprites/196.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Spiral[] = INCBIN_U32("graphics/battle_anims/sprites/spiral.4bpp.lz");
+const u32 gBattleAnimSpritePal_Spiral[] = INCBIN_U32("graphics/battle_anims/sprites/spiral.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_194[] = INCBIN_U32("graphics/battle_anims/sprites/194.4bpp.lz");
-const u32 gBattleAnimSpritePalette_194[] = INCBIN_U32("graphics/battle_anims/sprites/194.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Moon[] = INCBIN_U32("graphics/battle_anims/sprites/moon.4bpp.lz");
+const u32 gBattleAnimSpritePal_Moon[] = INCBIN_U32("graphics/battle_anims/sprites/moon.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_195[] = INCBIN_U32("graphics/battle_anims/sprites/195.4bpp.lz");
-const u32 gBattleAnimSpritePalette_195[] = INCBIN_U32("graphics/battle_anims/sprites/195.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GreenSparkle[] = INCBIN_U32("graphics/battle_anims/sprites/green_sparkle.4bpp.lz");
+const u32 gBattleAnimSpritePal_GreenSparkle[] = INCBIN_U32("graphics/battle_anims/sprites/green_sparkle.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_197[] = INCBIN_U32("graphics/battle_anims/sprites/197.4bpp.lz");
-const u32 gBattleAnimSpritePalette_197[] = INCBIN_U32("graphics/battle_anims/sprites/197.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SnoreZ[] = INCBIN_U32("graphics/battle_anims/sprites/snore_z.4bpp.lz");
+const u32 gBattleAnimSpritePal_SnoreZ[] = INCBIN_U32("graphics/battle_anims/sprites/snore_z.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_198[] = INCBIN_U32("graphics/battle_anims/sprites/198.4bpp.lz");
-const u32 gBattleAnimSpritePalette_198[] = INCBIN_U32("graphics/battle_anims/sprites/198.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Explosion[] = INCBIN_U32("graphics/battle_anims/sprites/explosion.4bpp.lz");
+const u32 gBattleAnimSpritePal_Explosion[] = INCBIN_U32("graphics/battle_anims/sprites/explosion.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_199[] = INCBIN_U32("graphics/battle_anims/sprites/199.4bpp.lz");
-const u32 gBattleAnimSpritePalette_199[] = INCBIN_U32("graphics/battle_anims/sprites/199.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Nail[] = INCBIN_U32("graphics/battle_anims/sprites/nail.4bpp.lz");
+const u32 gBattleAnimSpritePal_Nail[] = INCBIN_U32("graphics/battle_anims/sprites/nail.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_200[] = INCBIN_U32("graphics/battle_anims/sprites/200.4bpp.lz");
-const u32 gBattleAnimSpritePalette_200[] = INCBIN_U32("graphics/battle_anims/sprites/200.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GhostlySpirit[] = INCBIN_U32("graphics/battle_anims/sprites/ghostly_spirit.4bpp.lz");
+const u32 gBattleAnimSpritePal_GhostlySpirit[] = INCBIN_U32("graphics/battle_anims/sprites/ghostly_spirit.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_201[] = INCBIN_U32("graphics/battle_anims/sprites/201.4bpp.lz");
-const u32 gBattleAnimSpritePalette_201[] = INCBIN_U32("graphics/battle_anims/sprites/201.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WarmRock[] = INCBIN_U32("graphics/battle_anims/sprites/warm_rock.4bpp.lz");
+const u32 gBattleAnimSpritePal_WarmRock[] = INCBIN_U32("graphics/battle_anims/sprites/warm_rock.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_204[] = INCBIN_U32("graphics/battle_anims/sprites/204.4bpp.lz");
-const u32 gBattleAnimSpritePalette_204[] = INCBIN_U32("graphics/battle_anims/sprites/204.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PunchImpact[] = INCBIN_U32("graphics/battle_anims/sprites/punch_impact.4bpp.lz");
+const u32 gBattleAnimSpritePal_PunchImpact[] = INCBIN_U32("graphics/battle_anims/sprites/punch_impact.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_202[] = INCBIN_U32("graphics/battle_anims/sprites/202.4bpp.lz");
-const u32 gBattleAnimSpritePalette_202[] = INCBIN_U32("graphics/battle_anims/sprites/202.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BreakingEgg[] = INCBIN_U32("graphics/battle_anims/sprites/breaking_egg.4bpp.lz");
+const u32 gBattleAnimSpritePal_BreakingEgg[] = INCBIN_U32("graphics/battle_anims/sprites/breaking_egg.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_203[] = INCBIN_U32("graphics/battle_anims/sprites/203.4bpp.lz");
-const u32 gBattleAnimSpritePalette_203[] = INCBIN_U32("graphics/battle_anims/sprites/203.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_ThinRing[] = INCBIN_U32("graphics/battle_anims/sprites/thin_ring.4bpp.lz");
+const u32 gBattleAnimSpritePal_ThinRing[] = INCBIN_U32("graphics/battle_anims/sprites/thin_ring.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_206[] = INCBIN_U32("graphics/battle_anims/sprites/206.4bpp.lz");
-const u32 gBattleAnimSpritePalette_206[] = INCBIN_U32("graphics/battle_anims/sprites/206.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MusicNotes2[] = INCBIN_U32("graphics/battle_anims/sprites/music_notes_2.4bpp.lz");
+const u32 gBattleAnimSpritePal_MusicNotes2[] = INCBIN_U32("graphics/battle_anims/sprites/music_notes_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_205[] = INCBIN_U32("graphics/battle_anims/sprites/205.4bpp.lz");
-const u32 gBattleAnimSpritePalette_205[] = INCBIN_U32("graphics/battle_anims/sprites/205.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Bell[] = INCBIN_U32("graphics/battle_anims/sprites/bell.4bpp.lz");
+const u32 gBattleAnimSpritePal_Bell[] = INCBIN_U32("graphics/battle_anims/sprites/bell.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_207[] = INCBIN_U32("graphics/battle_anims/sprites/207.4bpp.lz");
-const u32 gBattleAnimSpritePalette_207[] = INCBIN_U32("graphics/battle_anims/sprites/207.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SpeedDust[] = INCBIN_U32("graphics/battle_anims/sprites/speed_dust.4bpp.lz");
+const u32 gBattleAnimSpritePal_SpeedDust[] = INCBIN_U32("graphics/battle_anims/sprites/speed_dust.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_208[] = INCBIN_U32("graphics/battle_anims/sprites/208.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_TornMetal[] = INCBIN_U32("graphics/battle_anims/sprites/torn_metal.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_209[] = INCBIN_U32("graphics/battle_anims/sprites/209.4bpp.lz");
-const u32 gBattleAnimSpritePalette_209[] = INCBIN_U32("graphics/battle_anims/sprites/209.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_ThoughtBubble[] = INCBIN_U32("graphics/battle_anims/sprites/thought_bubble.4bpp.lz");
+const u32 gBattleAnimSpritePal_ThoughtBubble[] = INCBIN_U32("graphics/battle_anims/sprites/thought_bubble.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_064[] = INCBIN_U32("graphics/battle_anims/sprites/064.4bpp.lz");
-const u32 gBattleAnimSpritePalette_064[] = INCBIN_U32("graphics/battle_anims/sprites/064.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Finger[] = INCBIN_U32("graphics/battle_anims/sprites/finger.4bpp.lz");
+const u32 gBattleAnimSpritePal_Finger[] = INCBIN_U32("graphics/battle_anims/sprites/finger.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_210[] = INCBIN_U32("graphics/battle_anims/sprites/210.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_MagentaHeart[] = INCBIN_U32("graphics/battle_anims/sprites/magenta_heart.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_219[] = INCBIN_U32("graphics/battle_anims/sprites/219.gbapal.lz");
-const u32 gBattleAnimSpritePalette_210[] = INCBIN_U32("graphics/battle_anims/sprites/210.gbapal.lz");
-const u32 gBattleAnimSpritePalette_216[] = INCBIN_U32("graphics/battle_anims/sprites/216.gbapal.lz");
+const u32 gBattleAnimSpritePal_PinkHeart[] = INCBIN_U32("graphics/battle_anims/sprites/pink_heart.gbapal.lz");
+const u32 gBattleAnimSpritePal_MagentaHeart[] = INCBIN_U32("graphics/battle_anims/sprites/magenta_heart.gbapal.lz");
+const u32 gBattleAnimSpritePal_RedHeart[] = INCBIN_U32("graphics/battle_anims/sprites/red_heart.gbapal.lz");
 
 const u32 gUnknown_08C232E0[] = INCBIN_U32("graphics/battle_anims/backgrounds/attract.4bpp.lz");
 const u32 gUnknown_08C23D50[] = INCBIN_U32("graphics/battle_anims/backgrounds/attract.gbapal.lz");
 const u32 gUnknown_08C23D78[] = INCBIN_U32("graphics/battle_anims/backgrounds/attract.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_217[] = INCBIN_U32("graphics/battle_anims/sprites/217.4bpp.lz");
-const u32 gBattleAnimSpritePalette_217[] = INCBIN_U32("graphics/battle_anims/sprites/217.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/red_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_RedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/red_orb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_212[] = INCBIN_U32("graphics/battle_anims/sprites/212.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_211[] = INCBIN_U32("graphics/battle_anims/sprites/211.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_213[] = INCBIN_U32("graphics/battle_anims/sprites/213.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_CircleOfLight[] = INCBIN_U32("graphics/battle_anims/sprites/circle_of_light.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_ElectricOrbs[] = INCBIN_U32("graphics/battle_anims/sprites/electric_orbs.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Electricity[] = INCBIN_U32("graphics/battle_anims/sprites/electricity.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_211[] = INCBIN_U32("graphics/battle_anims/sprites/211.gbapal.lz");
+const u32 gBattleAnimSpritePal_ElectricOrbs[] = INCBIN_U32("graphics/battle_anims/sprites/electric_orbs.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_214[] = INCBIN_U32("graphics/battle_anims/sprites/214.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Finger2[] = INCBIN_U32("graphics/battle_anims/sprites/finger_2.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_215[] = INCBIN_U32("graphics/battle_anims/sprites/215.4bpp.lz");
-const u32 gBattleAnimSpritePalette_215[] = INCBIN_U32("graphics/battle_anims/sprites/215.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MovementWaves[] = INCBIN_U32("graphics/battle_anims/sprites/movement_waves.4bpp.lz");
+const u32 gBattleAnimSpritePal_MovementWaves[] = INCBIN_U32("graphics/battle_anims/sprites/movement_waves.gbapal.lz");
 
 const u32 gUnknown_08C249D0[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face.gbapal.lz");
 const u32 gUnknown_08C249F8[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_218[] = INCBIN_U32("graphics/battle_anims/sprites/218.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_218[] = INCBIN_U32("graphics/battle_anims/sprites/218.4bpp.lz");
+const u32 gBattleAnimSpritePal_EyeSparkle[] = INCBIN_U32("graphics/battle_anims/sprites/eye_sparkle.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_EyeSparkle[] = INCBIN_U32("graphics/battle_anims/sprites/eye_sparkle.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_087[] = INCBIN_U32("graphics/battle_anims/sprites/087.4bpp.lz");
-const u32 gBattleAnimSpritePalette_087[] = INCBIN_U32("graphics/battle_anims/sprites/087.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Anger[] = INCBIN_U32("graphics/battle_anims/sprites/anger.4bpp.lz");
+const u32 gBattleAnimSpritePal_Anger[] = INCBIN_U32("graphics/battle_anims/sprites/anger.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_018[] = INCBIN_U32("graphics/battle_anims/sprites/018.4bpp.lz");
-const u32 gBattleAnimSpritePalette_018[] = INCBIN_U32("graphics/battle_anims/sprites/018.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Conversion[] = INCBIN_U32("graphics/battle_anims/sprites/conversion.4bpp.lz");
+const u32 gBattleAnimSpritePal_Conversion[] = INCBIN_U32("graphics/battle_anims/sprites/conversion.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_220[] = INCBIN_U32("graphics/battle_anims/sprites/220.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_220[] = INCBIN_U32("graphics/battle_anims/sprites/220.4bpp.lz");
+const u32 gBattleAnimSpritePal_Angel[] = INCBIN_U32("graphics/battle_anims/sprites/angel.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Angel[] = INCBIN_U32("graphics/battle_anims/sprites/angel.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_221[] = INCBIN_U32("graphics/battle_anims/sprites/221.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_221[] = INCBIN_U32("graphics/battle_anims/sprites/221.4bpp.lz");
+const u32 gBattleAnimSpritePal_Devil[] = INCBIN_U32("graphics/battle_anims/sprites/devil.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Devil[] = INCBIN_U32("graphics/battle_anims/sprites/devil.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_222[] = INCBIN_U32("graphics/battle_anims/sprites/222.4bpp.lz");
-const u32 gBattleAnimSpritePalette_222[] = INCBIN_U32("graphics/battle_anims/sprites/222.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Swipe[] = INCBIN_U32("graphics/battle_anims/sprites/swipe.4bpp.lz");
+const u32 gBattleAnimSpritePal_Swipe[] = INCBIN_U32("graphics/battle_anims/sprites/swipe.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_223[] = INCBIN_U32("graphics/battle_anims/sprites/223.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_223[] = INCBIN_U32("graphics/battle_anims/sprites/223.4bpp.lz");
+const u32 gBattleAnimSpritePal_Roots[] = INCBIN_U32("graphics/battle_anims/sprites/roots.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Roots[] = INCBIN_U32("graphics/battle_anims/sprites/roots.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_224[] = INCBIN_U32("graphics/battle_anims/sprites/224.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_224[] = INCBIN_U32("graphics/battle_anims/sprites/224.4bpp.lz");
+const u32 gBattleAnimSpritePal_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_230[] = INCBIN_U32("graphics/battle_anims/sprites/230.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_230[] = INCBIN_U32("graphics/battle_anims/sprites/230.4bpp.lz");
+const u32 gBattleAnimSpritePal_TriForceTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_force_triangle.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_TriForceTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_force_triangle.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_228[] = INCBIN_U32("graphics/battle_anims/sprites/228.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_228[] = INCBIN_U32("graphics/battle_anims/sprites/228.4bpp.lz");
+const u32 gBattleAnimSpritePal_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.4bpp.lz");
 
-const u32 gBattleAnimBackgroundPalette_04[] = INCBIN_U32("graphics/battle_anims/backgrounds/04.gbapal.lz");
-const u32 gBattleAnimBackgroundImage_04[] = INCBIN_U32("graphics/battle_anims/backgrounds/04.4bpp.lz");
-const u32 gBattleAnimBackgroundTilemap_04[] = INCBIN_U32("graphics/battle_anims/backgrounds/04.bin.lz");
+const u32 gBattleAnimBgPalette_Impact[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact.gbapal.lz");
+const u32 gBattleAnimBgImage_Impact[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact.4bpp.lz");
+const u32 gBattleAnimBgTilemap_ImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_opponent.bin.lz");
 
-const u32 gBattleAnimBackgroundTilemap_05[] = INCBIN_U32("graphics/battle_anims/backgrounds/05.bin.lz");
-const u32 gBattleAnimBackgroundTilemap_06[] = INCBIN_U32("graphics/battle_anims/backgrounds/06.bin.lz");
+const u32 gBattleAnimBgTilemap_ImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_player.bin.lz");
+const u32 gBattleAnimBgTilemap_ImpactContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_contests.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_225[] = INCBIN_U32("graphics/battle_anims/sprites/225.4bpp.lz");
-const u32 gBattleAnimSpritePalette_225[] = INCBIN_U32("graphics/battle_anims/sprites/225.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_JaggedMusicNote[] = INCBIN_U32("graphics/battle_anims/sprites/jagged_music_note.4bpp.lz");
+const u32 gBattleAnimSpritePal_JaggedMusicNote[] = INCBIN_U32("graphics/battle_anims/sprites/jagged_music_note.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_227[] = INCBIN_U32("graphics/battle_anims/sprites/227.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Spotlight[] = INCBIN_U32("graphics/battle_anims/sprites/spotlight.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_226[] = INCBIN_U32("graphics/battle_anims/sprites/226.4bpp.lz");
-const u32 gBattleAnimSpritePalette_226[] = INCBIN_U32("graphics/battle_anims/sprites/226.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Pokeball[] = INCBIN_U32("graphics/battle_anims/sprites/pokeball.4bpp.lz");
+const u32 gBattleAnimSpritePal_Pokeball[] = INCBIN_U32("graphics/battle_anims/sprites/pokeball.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_229[] = INCBIN_U32("graphics/battle_anims/sprites/229.4bpp.lz");
-const u32 gBattleAnimSpritePalette_229[] = INCBIN_U32("graphics/battle_anims/sprites/229.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RapidSpin[] = INCBIN_U32("graphics/battle_anims/sprites/rapid_spin.4bpp.lz");
+const u32 gBattleAnimSpritePal_RapidSpin[] = INCBIN_U32("graphics/battle_anims/sprites/rapid_spin.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_099[] = INCBIN_U32("graphics/battle_anims/sprites/099.4bpp.lz");
-const u32 gBattleAnimSpritePalette_099[] = INCBIN_U32("graphics/battle_anims/sprites/099.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MilkBottle[] = INCBIN_U32("graphics/battle_anims/sprites/milk_bottle.4bpp.lz");
+const u32 gBattleAnimSpritePal_MilkBottle[] = INCBIN_U32("graphics/battle_anims/sprites/milk_bottle.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_232[] = INCBIN_U32("graphics/battle_anims/sprites/232.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_WispFire[] = INCBIN_U32("graphics/battle_anims/sprites/wisp_fire.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_231[] = INCBIN_U32("graphics/battle_anims/sprites/231.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_231[] = INCBIN_U32("graphics/battle_anims/sprites/231.4bpp.lz");
+const u32 gBattleAnimSpritePal_WispOrb[] = INCBIN_U32("graphics/battle_anims/sprites/wisp_orb.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WispOrb[] = INCBIN_U32("graphics/battle_anims/sprites/wisp_orb.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_233[] = INCBIN_U32("graphics/battle_anims/sprites/233.4bpp.lz");
-const u32 gBattleAnimSpritePalette_233[] = INCBIN_U32("graphics/battle_anims/sprites/233.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GoldStars[] = INCBIN_U32("graphics/battle_anims/sprites/gold_stars.4bpp.lz");
+const u32 gBattleAnimSpritePal_GoldStars[] = INCBIN_U32("graphics/battle_anims/sprites/gold_stars.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_234[] = INCBIN_U32("graphics/battle_anims/sprites/234.4bpp.lz");
-const u32 gBattleAnimSpritePalette_234[] = INCBIN_U32("graphics/battle_anims/sprites/234.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_EclipsingOrb[] = INCBIN_U32("graphics/battle_anims/sprites/eclipsing_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_EclipsingOrb[] = INCBIN_U32("graphics/battle_anims/sprites/eclipsing_orb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_238[] = INCBIN_U32("graphics/battle_anims/sprites/238.4bpp.lz");
-const u32 gBattleAnimSpritePalette_238[] = INCBIN_U32("graphics/battle_anims/sprites/238.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PinkPetal[] = INCBIN_U32("graphics/battle_anims/sprites/pink_petal.4bpp.lz");
+const u32 gBattleAnimSpritePal_PinkPetal[] = INCBIN_U32("graphics/battle_anims/sprites/pink_petal.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_235[] = INCBIN_U32("graphics/battle_anims/sprites/235.4bpp.lz");
-const u32 gBattleAnimSpritePalette_235[] = INCBIN_U32("graphics/battle_anims/sprites/235.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GrayOrb[] = INCBIN_U32("graphics/battle_anims/sprites/gray_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_GrayOrb[] = INCBIN_U32("graphics/battle_anims/sprites/gray_orb.gbapal.lz");
 
-const u32 gBattleAnimSpritePalette_236[] = INCBIN_U32("graphics/battle_anims/sprites/236.gbapal.lz");
-const u32 gBattleAnimSpritePalette_237[] = INCBIN_U32("graphics/battle_anims/sprites/237.gbapal.lz");
+const u32 gBattleAnimSpritePal_BlueOrb[] = INCBIN_U32("graphics/battle_anims/sprites/blue_orb.gbapal.lz");
+const u32 gBattleAnimSpritePal_RedOrb2[] = INCBIN_U32("graphics/battle_anims/sprites/red_orb_2.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_07[] = INCBIN_U32("graphics/battle_anims/backgrounds/07.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_07[] = INCBIN_U32("graphics/battle_anims/backgrounds/07.gbapal.lz");
+const u32 gBattleAnimBgImage_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.4bpp.lz");
+const u32 gBattleAnimBgPalette_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.gbapal.lz");
 
-const u32 gBattleAnimBackgroundPalette_18[] = INCBIN_U32("graphics/battle_anims/backgrounds/18.gbapal.lz");
+const u32 gBattleAnimBgPalette_Sky[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky.gbapal.lz");
 
-const u32 gBattleAnimBackgroundTilemap_07[] = INCBIN_U32("graphics/battle_anims/backgrounds/07.bin.lz");
-const u32 gBattleAnimBackgroundTilemap_08[] = INCBIN_U32("graphics/battle_anims/backgrounds/08.bin.lz");
+const u32 gBattleAnimBgTilemap_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.bin.lz");
+const u32 gBattleAnimBgTilemap_DrillContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill_contests.bin.lz");
 
-const u32 gBattleAnimBackgroundImage_20[] = INCBIN_U32("graphics/battle_anims/backgrounds/20.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_20[] = INCBIN_U32("graphics/battle_anims/backgrounds/20.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_20[] = INCBIN_U32("graphics/battle_anims/backgrounds/20.bin.lz");
+const u32 gBattleAnimBgImage_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.4bpp.lz");
+const u32 gBattleAnimBgPalette_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.bin.lz");
 
-const u32 gBattleAnimBackgroundTilemap_09[] = INCBIN_U32("graphics/battle_anims/backgrounds/09.bin.lz");
-const u32 gBattleAnimBackgroundPalette_09[] = INCBIN_U32("graphics/battle_anims/backgrounds/09.gbapal.lz");
+const u32 gBattleAnimBgTilemap_HighspeedOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_opponent.bin.lz");
+const u32 gBattleAnimBgPalette_Highspeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed.gbapal.lz");
 
-const u32 gBattleAnimBackgroundPalette_22[] = INCBIN_U32("graphics/battle_anims/backgrounds/22.gbapal.lz");
+const u32 gBattleAnimBgPalette_Bug[] = INCBIN_U32("graphics/battle_anims/backgrounds/bug.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_09[] = INCBIN_U32("graphics/battle_anims/backgrounds/09.4bpp.lz");
-const u32 gBattleAnimBackgroundTilemap_10[] = INCBIN_U32("graphics/battle_anims/backgrounds/10.bin.lz");
+const u32 gBattleAnimBgImage_Highspeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed.4bpp.lz");
+const u32 gBattleAnimBgTilemap_HighspeedPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_player.bin.lz");
 
 const u32 gUnknown_08C2A634[] = INCBIN_U32("graphics/battle_anims/masks/morning_sun.4bpp.lz");
 const u32 gUnknown_08C2A6D4[] = INCBIN_U32("graphics/battle_anims/masks/morning_sun.gbapal.lz");
 const u32 gUnknown_08C2A6EC[] = INCBIN_U32("graphics/battle_anims/masks/morning_sun.bin.lz");
 
-const u32 gBattleAnimBackgroundTilemap_12[] = INCBIN_U32("graphics/battle_anims/backgrounds/12.bin.lz");
-const u32 gBattleAnimBackgroundTilemap_13[] = INCBIN_U32("graphics/battle_anims/backgrounds/13.bin.lz");
-const u32 gBattleAnimBackgroundTilemap_14[] = INCBIN_U32("graphics/battle_anims/backgrounds/14.bin.lz");
+const u32 gBattleAnimBgTilemap_GuillotineOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_opponent.bin.lz");
+const u32 gBattleAnimBgTilemap_GuillotinePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_player.bin.lz");
+const u32 gBattleAnimBgTilemap_GuillotineContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_contests.bin.lz");
 
-const u32 gBattleAnimBackgroundImage_12[] = INCBIN_U32("graphics/battle_anims/backgrounds/12.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_12[] = INCBIN_U32("graphics/battle_anims/backgrounds/12.gbapal.lz");
+const u32 gBattleAnimBgImage_Guillotine[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine.4bpp.lz");
+const u32 gBattleAnimBgPalette_Guillotine[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_11[] = INCBIN_U32("graphics/battle_anims/backgrounds/11.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_11[] = INCBIN_U32("graphics/battle_anims/backgrounds/11.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_11[] = INCBIN_U32("graphics/battle_anims/backgrounds/11.bin.lz");
+const u32 gBattleAnimBgImage_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.4bpp.lz");
+const u32 gBattleAnimBgPalette_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_239[] = INCBIN_U32("graphics/battle_anims/sprites/239.4bpp.lz");
-const u32 gBattleAnimSpritePalette_239[] = INCBIN_U32("graphics/battle_anims/sprites/239.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PainSplit[] = INCBIN_U32("graphics/battle_anims/sprites/pain_split.4bpp.lz");
+const u32 gBattleAnimSpritePal_PainSplit[] = INCBIN_U32("graphics/battle_anims/sprites/pain_split.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_143[] = INCBIN_U32("graphics/battle_anims/sprites/143.4bpp.lz");
-const u32 gBattleAnimSpritePalette_143[] = INCBIN_U32("graphics/battle_anims/sprites/143.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_HandsAndFeet[] = INCBIN_U32("graphics/battle_anims/sprites/hands_and_feet.4bpp.lz");
+const u32 gBattleAnimSpritePal_HandsAndFeet[] = INCBIN_U32("graphics/battle_anims/sprites/hands_and_feet.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_240[] = INCBIN_U32("graphics/battle_anims/sprites/240.4bpp.lz");
-const u32 gBattleAnimSpritePalette_240[] = INCBIN_U32("graphics/battle_anims/sprites/240.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Confetti[] = INCBIN_U32("graphics/battle_anims/sprites/confetti.4bpp.lz");
+const u32 gBattleAnimSpritePal_Confetti[] = INCBIN_U32("graphics/battle_anims/sprites/confetti.gbapal.lz");
 
 const u32 gSubstituteDollPal[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.gbapal.lz");
 const u32 gSubstituteDollGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.4bpp.lz");
 const u32 gSubstituteDollTilemap[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_241[] = INCBIN_U32("graphics/battle_anims/sprites/241.4bpp.lz");
-const u32 gBattleAnimSpritePalette_241[] = INCBIN_U32("graphics/battle_anims/sprites/241.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GreenStar[] = INCBIN_U32("graphics/battle_anims/sprites/green_star.4bpp.lz");
+const u32 gBattleAnimSpritePal_GreenStar[] = INCBIN_U32("graphics/battle_anims/sprites/green_star.gbapal.lz");
 
 const u32 gContestConfetti_Gfx[] = INCBIN_U32("graphics/misc/confetti.4bpp.lz");
 const u32 gContestConfetti_Pal[] = INCBIN_U32("graphics/misc/confetti.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_242[] = INCBIN_U32("graphics/battle_anims/sprites/242.4bpp.lz");
-const u32 gBattleAnimSpritePalette_242[] = INCBIN_U32("graphics/battle_anims/sprites/242.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PinkCloud[] = INCBIN_U32("graphics/battle_anims/sprites/pink_cloud.4bpp.lz");
+const u32 gBattleAnimSpritePal_PinkCloud[] = INCBIN_U32("graphics/battle_anims/sprites/pink_cloud.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_243[] = INCBIN_U32("graphics/battle_anims/sprites/243.4bpp.lz");
-const u32 gBattleAnimSpritePalette_243[] = INCBIN_U32("graphics/battle_anims/sprites/243.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SweatDrop[] = INCBIN_U32("graphics/battle_anims/sprites/sweat_drop.4bpp.lz");
+const u32 gBattleAnimSpritePal_SweatDrop[] = INCBIN_U32("graphics/battle_anims/sprites/sweat_drop.gbapal.lz");
 
 const u32 gBattleStatMask_Gfx[] = INCBIN_U32("graphics/battle_anims/masks/stat.4bpp.lz");
 const u32 gBattleStatMask1_Tilemap[] = INCBIN_U32("graphics/battle_anims/masks/stat_tilemap_1.bin.lz");
@@ -901,52 +901,52 @@ const u32 gCureBubblesGfx[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbl
 const u32 gCureBubblesPal[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.gbapal.lz");
 const u32 gCureBubblesTilemap[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.bin.lz");
 
-const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz");
+const u32 gBattleAnimSpritePal_PurpleScratch[] = INCBIN_U32("graphics/battle_anims/sprites/purple_scratch.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PurpleScratch[] = INCBIN_U32("graphics/battle_anims/sprites/purple_scratch.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_246[] = INCBIN_U32("graphics/battle_anims/sprites/246.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_PurpleSwipe[] = INCBIN_U32("graphics/battle_anims/sprites/purple_swipe.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_244[] = INCBIN_U32("graphics/battle_anims/sprites/244.4bpp.lz");
-const u32 gBattleAnimSpritePalette_244[] = INCBIN_U32("graphics/battle_anims/sprites/244.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GuardRing[] = INCBIN_U32("graphics/battle_anims/sprites/guard_ring.4bpp.lz");
+const u32 gBattleAnimSpritePal_GuardRing[] = INCBIN_U32("graphics/battle_anims/sprites/guard_ring.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_247[] = INCBIN_U32("graphics/battle_anims/sprites/247.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_TagHand[] = INCBIN_U32("graphics/battle_anims/sprites/tag_hand.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_053[] = INCBIN_U32("graphics/battle_anims/sprites/053.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_NoiseLine[] = INCBIN_U32("graphics/battle_anims/sprites/noise_line.4bpp.lz");
 
 const u32 gUnknown_08C2EA50[] = INCBIN_U32("graphics/battle_anims/masks/unknown_C2EA50.4bpp.lz");
 const u32 gUnknown_08C2EA9C[] = INCBIN_U32("graphics/battle_anims/masks/unknown_C2EA50.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_248[] = INCBIN_U32("graphics/battle_anims/sprites/248.4bpp.lz");
-const u32 gBattleAnimSpritePalette_248[] = INCBIN_U32("graphics/battle_anims/sprites/248.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.4bpp.lz");
+const u32 gBattleAnimSpritePal_SmallRedEye[] = INCBIN_U32("graphics/battle_anims/sprites/small_red_eye.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_249[] = INCBIN_U32("graphics/battle_anims/sprites/249.4bpp.lz");
-const u32 gBattleAnimSpritePalette_249[] = INCBIN_U32("graphics/battle_anims/sprites/249.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_HollowOrb[] = INCBIN_U32("graphics/battle_anims/sprites/hollow_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_HollowOrb[] = INCBIN_U32("graphics/battle_anims/sprites/hollow_orb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_250[] = INCBIN_U32("graphics/battle_anims/sprites/250.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_XSign[] = INCBIN_U32("graphics/battle_anims/sprites/x_sign.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_251[] = INCBIN_U32("graphics/battle_anims/sprites/251.4bpp.lz");
-const u32 gBattleAnimSpritePalette_251[] = INCBIN_U32("graphics/battle_anims/sprites/251.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_BluegreenOrb[] = INCBIN_U32("graphics/battle_anims/sprites/bluegreen_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_BluegreenOrb[] = INCBIN_U32("graphics/battle_anims/sprites/bluegreen_orb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_252[] = INCBIN_U32("graphics/battle_anims/sprites/252.4bpp.lz");
-const u32 gBattleAnimSpritePalette_252[] = INCBIN_U32("graphics/battle_anims/sprites/252.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PawPrint[] = INCBIN_U32("graphics/battle_anims/sprites/paw_print.4bpp.lz");
+const u32 gBattleAnimSpritePal_PawPrint[] = INCBIN_U32("graphics/battle_anims/sprites/paw_print.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_253[] = INCBIN_U32("graphics/battle_anims/sprites/253.4bpp.lz");
-const u32 gBattleAnimSpritePalette_253[] = INCBIN_U32("graphics/battle_anims/sprites/253.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_PurpleFlame[] = INCBIN_U32("graphics/battle_anims/sprites/purple_flame.4bpp.lz");
+const u32 gBattleAnimSpritePal_PurpleFlame[] = INCBIN_U32("graphics/battle_anims/sprites/purple_flame.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_254[] = INCBIN_U32("graphics/battle_anims/sprites/254.4bpp.lz");
-const u32 gBattleAnimSpritePalette_254[] = INCBIN_U32("graphics/battle_anims/sprites/254.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RedBall[] = INCBIN_U32("graphics/battle_anims/sprites/red_ball.4bpp.lz");
+const u32 gBattleAnimSpritePal_RedBall[] = INCBIN_U32("graphics/battle_anims/sprites/red_ball.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_255[] = INCBIN_U32("graphics/battle_anims/sprites/255.4bpp.lz");
-const u32 gBattleAnimSpritePalette_255[] = INCBIN_U32("graphics/battle_anims/sprites/255.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SmellingsaltEffect[] = INCBIN_U32("graphics/battle_anims/sprites/smellingsalt_effect.4bpp.lz");
+const u32 gBattleAnimSpritePal_SmellingsaltEffect[] = INCBIN_U32("graphics/battle_anims/sprites/smellingsalt_effect.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_258[] = INCBIN_U32("graphics/battle_anims/sprites/258.4bpp.lz");
-const u32 gBattleAnimSpritePalette_258[] = INCBIN_U32("graphics/battle_anims/sprites/258.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MagnifyingGlass[] = INCBIN_U32("graphics/battle_anims/sprites/magnifying_glass.4bpp.lz");
+const u32 gBattleAnimSpritePal_MagnifyingGlass[] = INCBIN_U32("graphics/battle_anims/sprites/magnifying_glass.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_256[] = INCBIN_U32("graphics/battle_anims/sprites/256.4bpp.lz");
-const u32 gBattleAnimSpritePalette_256[] = INCBIN_U32("graphics/battle_anims/sprites/256.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Meteor[] = INCBIN_U32("graphics/battle_anims/sprites/meteor.4bpp.lz");
+const u32 gBattleAnimSpritePal_Meteor[] = INCBIN_U32("graphics/battle_anims/sprites/meteor.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_257[] = INCBIN_U32("graphics/battle_anims/sprites/257.4bpp.lz");
-const u32 gBattleAnimSpritePalette_257[] = INCBIN_U32("graphics/battle_anims/sprites/257.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_FlatRock[] = INCBIN_U32("graphics/battle_anims/sprites/flat_rock.4bpp.lz");
+const u32 gBattleAnimSpritePal_FlatRock[] = INCBIN_U32("graphics/battle_anims/sprites/flat_rock.gbapal.lz");
 
 const u32 gUnknownPal_C2F9E0[] = INCBIN_U32("graphics/unknown/unknown_C2F9E0.gbapal.lz");
 
@@ -1005,58 +1005,58 @@ const u32 gUnknown_08D85A1C[] = INCBIN_U32("graphics/battle_frontier/battle_tile
 
 #include "data/graphics/intro_scene.h"
 
-const u32 gBattleAnimSpriteSheet_261[] = INCBIN_U32("graphics/battle_anims/sprites/261.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_FlyingDirt[] = INCBIN_U32("graphics/battle_anims/sprites/flying_dirt.4bpp.lz");
 
 const u32 gUnknown_08D8D410[] = INCBIN_U32("graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz");
 const u32 gUnknown_08D8D58C[] = INCBIN_U32("graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_261[] = INCBIN_U32("graphics/battle_anims/sprites/261.gbapal.lz");
+const u32 gBattleAnimSpritePal_FlyingDirt[] = INCBIN_U32("graphics/battle_anims/sprites/flying_dirt.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_260[] = INCBIN_U32("graphics/battle_anims/sprites/260.4bpp.lz");
-const u32 gBattleAnimSpritePalette_260[] = INCBIN_U32("graphics/battle_anims/sprites/260.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_MetalSoundWaves[] = INCBIN_U32("graphics/battle_anims/sprites/metal_sound_waves.4bpp.lz");
+const u32 gBattleAnimSpritePal_MetalSoundWaves[] = INCBIN_U32("graphics/battle_anims/sprites/metal_sound_waves.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_15[] = INCBIN_U32("graphics/battle_anims/backgrounds/15.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_15[] = INCBIN_U32("graphics/battle_anims/backgrounds/15.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_15[] = INCBIN_U32("graphics/battle_anims/backgrounds/15.bin.lz");
+const u32 gBattleAnimBgImage_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.4bpp.lz");
+const u32 gBattleAnimBgPalette_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_262[] = INCBIN_U32("graphics/battle_anims/sprites/262.4bpp.lz");
-const u32 gBattleAnimSpritePalette_262[] = INCBIN_U32("graphics/battle_anims/sprites/262.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.4bpp.lz");
+const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.gbapal.lz");
 
 const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/nextturn.4bpp.lz");
 const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp");
 const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp");
 
-const u32 gBattleAnimSpriteSheet_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.4bpp.lz");
-const u32 gBattleAnimSpritePalette_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.gbapal.lz");
-const u32 gBattleAnimSpritePalette_265[] = INCBIN_U32("graphics/battle_anims/sprites/265.gbapal.lz");
-const u32 gBattleAnimSpritePalette_067[] = INCBIN_U32("graphics/battle_anims/sprites/067.gbapal.lz");
-const u32 gBattleAnimSpritePalette_068[] = INCBIN_U32("graphics/battle_anims/sprites/068.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz");
+const u32 gBattleAnimSpritePal_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz");
+const u32 gBattleAnimSpritePal_GlowyGreenOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_green_orb.gbapal.lz");
+const u32 gBattleAnimSpritePal_SleepPowder[] = INCBIN_U32("graphics/battle_anims/sprites/sleep_powder.gbapal.lz");
+const u32 gBattleAnimSpritePal_StunSpore[] = INCBIN_U32("graphics/battle_anims/sprites/stun_spore.gbapal.lz");
 
 const u32 gContestApplauseGfx[] = INCBIN_U32("graphics/contest/applause.4bpp.lz");
 const u8 gContestApplauseMeterGfx[] = INCBIN_U8("graphics/contest/applause_meter.4bpp");
 
 const u16 gContestPal[] = INCBIN_U16("graphics/contest/nextturn.gbapal");
 
-const u32 gBattleAnimSpriteSheet_272[] = INCBIN_U32("graphics/battle_anims/sprites/272.4bpp.lz");
-const u32 gBattleAnimSpritePalette_272[] = INCBIN_U32("graphics/battle_anims/sprites/272.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.4bpp.lz");
+const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_273[] = INCBIN_U32("graphics/battle_anims/sprites/273.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_SweatBead[] = INCBIN_U32("graphics/battle_anims/sprites/sweat_bead.4bpp.lz");
 
-const u32 gBattleAnimSpriteSheet_269[] = INCBIN_U32("graphics/battle_anims/sprites/269.4bpp.lz");
-const u32 gBattleAnimSpritePalette_269[] = INCBIN_U32("graphics/battle_anims/sprites/269.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RedBrick[] = INCBIN_U32("graphics/battle_anims/sprites/red_brick.4bpp.lz");
+const u32 gBattleAnimSpritePal_RedBrick[] = INCBIN_U32("graphics/battle_anims/sprites/red_brick.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_274[] = INCBIN_U32("graphics/battle_anims/sprites/274.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_275[] = INCBIN_U32("graphics/battle_anims/sprites/275.4bpp.lz");
-const u32 gBattleAnimSpriteSheet_276[] = INCBIN_U32("graphics/battle_anims/sprites/276.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Gem1[] = INCBIN_U32("graphics/battle_anims/sprites/gem_1.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Gem2[] = INCBIN_U32("graphics/battle_anims/sprites/gem_2.4bpp.lz");
+const u32 gBattleAnimSpriteGfx_Gem3[] = INCBIN_U32("graphics/battle_anims/sprites/gem_3.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_274[] = INCBIN_U32("graphics/battle_anims/sprites/274.gbapal.lz");
+const u32 gBattleAnimSpritePal_Gem1[] = INCBIN_U32("graphics/battle_anims/sprites/gem_1.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_17[] = INCBIN_U32("graphics/battle_anims/backgrounds/17.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_17[] = INCBIN_U32("graphics/battle_anims/backgrounds/17.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_17[] = INCBIN_U32("graphics/battle_anims/backgrounds/17.bin.lz");
+const u32 gBattleAnimBgImage_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.4bpp.lz");
+const u32 gBattleAnimBgPalette_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.gbapal.lz");
+const u32 gBattleAnimBgTilemap_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_280[] = INCBIN_U32("graphics/battle_anims/sprites/280.4bpp.lz");
-const u32 gBattleAnimSpritePalette_280[] = INCBIN_U32("graphics/battle_anims/sprites/280.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Protect[] = INCBIN_U32("graphics/battle_anims/sprites/protect.4bpp.lz");
+const u32 gBattleAnimSpritePal_Protect[] = INCBIN_U32("graphics/battle_anims/sprites/protect.gbapal.lz");
 
 const u32 gBattleAnimBackgroundImageMuddyWater_Pal[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_muddy.gbapal.lz");
 
@@ -1066,13 +1066,13 @@ const u32 gBattleInterface_BallStatusBarGfx[] = INCBIN_U32("graphics/battle_inte
 
 const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");
 
-const u32 gBattleAnimBackgroundImage_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.bin.lz");
+const u32 gBattleAnimBgImage_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.4bpp.lz");
+const u32 gBattleAnimBgPalette_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.bin.lz");
 
-const u32 gBattleAnimSpritePalette_287[] = INCBIN_U32("graphics/battle_anims/sprites/287.gbapal.lz");
+const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("graphics/battle_anims/sprites/whip_hit.gbapal.lz");
 
-const u32 gBattleAnimBackgroundPalette_24[] = INCBIN_U32("graphics/battle_anims/backgrounds/24.gbapal.lz");
+const u32 gBattleAnimBgPalette_Solarbeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz");
 
 const u32 gUnknown_E6BC04[] = INCBIN_U32("graphics/unknown/unknown_E6BC04.bin.lz");
 
@@ -1081,51 +1081,51 @@ const u32 sBlenderCenterGfx[] = INCBIN_U32("graphics/berry_blender/center.8bpp.l
 const u32 gUnknown_08D91DB8[] = INCBIN_U32("graphics/berry_blender/outer.4bpp.lz");
 const u32 gUnknown_08D927EC[] = INCBIN_U32("graphics/berry_blender/outer_map.bin.lz");
 
-const u32 gBattleAnimBackgroundPalette_16[] = INCBIN_U32("graphics/battle_anims/backgrounds/16.gbapal.lz");
-const u32 gBattleAnimBackgroundImage_16[] = INCBIN_U32("graphics/battle_anims/backgrounds/16.4bpp.lz");
-const u32 gBattleAnimBackgroundTilemap_16[] = INCBIN_U32("graphics/battle_anims/backgrounds/16.bin.lz");
+const u32 gBattleAnimBgPalette_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.gbapal.lz");
+const u32 gBattleAnimBgImage_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.4bpp.lz");
+const u32 gBattleAnimBgTilemap_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.bin.lz");
 
-const u32 gBattleAnimSpritePalette_277[] = INCBIN_U32("graphics/battle_anims/sprites/277.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_277[] = INCBIN_U32("graphics/battle_anims/sprites/277.4bpp.lz");
+const u32 gBattleAnimSpritePal_SlamHit2[] = INCBIN_U32("graphics/battle_anims/sprites/slam_hit_2.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_SlamHit2[] = INCBIN_U32("graphics/battle_anims/sprites/slam_hit_2.4bpp.lz");
 
 const u32 gBattleAnimFogTilemap[] = INCBIN_U32("graphics/battle_anims/backgrounds/fog.bin.lz");
 
-const u32 gBattleAnimSpritePalette_283[] = INCBIN_U32("graphics/battle_anims/sprites/283.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_283[] = INCBIN_U32("graphics/battle_anims/sprites/283.4bpp.lz");
+const u32 gBattleAnimSpritePal_WeatherBall[] = INCBIN_U32("graphics/battle_anims/sprites/weather_ball.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WeatherBall[] = INCBIN_U32("graphics/battle_anims/sprites/weather_ball.4bpp.lz");
 
-const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_player.bin.lz");
-const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz");
-const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_contest.bin.lz");
+const u32 gBattleAnimBgTilemap_ScaryFacePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_player.bin.lz");
+const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz");
+const u32 gBattleAnimBgTilemap_ScaryFaceContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_contest.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_263[] = INCBIN_U32("graphics/battle_anims/sprites/263.4bpp.lz");
-const u32 gBattleAnimSpritePalette_263[] = INCBIN_U32("graphics/battle_anims/sprites/263.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Hail[] = INCBIN_U32("graphics/battle_anims/sprites/hail.4bpp.lz");
+const u32 gBattleAnimSpritePal_Hail[] = INCBIN_U32("graphics/battle_anims/sprites/hail.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_266[] = INCBIN_U32("graphics/battle_anims/sprites/266.4bpp.lz");
-const u32 gBattleAnimSpritePalette_266[] = INCBIN_U32("graphics/battle_anims/sprites/266.gbapal.lz");
-const u32 gBattleAnimSpritePalette_267[] = INCBIN_U32("graphics/battle_anims/sprites/267.gbapal.lz");
-const u32 gBattleAnimSpritePalette_268[] = INCBIN_U32("graphics/battle_anims/sprites/268.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_GreenSpike[] = INCBIN_U32("graphics/battle_anims/sprites/green_spike.4bpp.lz");
+const u32 gBattleAnimSpritePal_GreenSpike[] = INCBIN_U32("graphics/battle_anims/sprites/green_spike.gbapal.lz");
+const u32 gBattleAnimSpritePal_WhiteCircleOfLight[] = INCBIN_U32("graphics/battle_anims/sprites/white_circle_of_light.gbapal.lz");
+const u32 gBattleAnimSpritePal_GlowyBlueOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_blue_orb.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_278[] = INCBIN_U32("graphics/battle_anims/sprites/278.4bpp.lz");
-const u32 gBattleAnimSpritePalette_278[] = INCBIN_U32("graphics/battle_anims/sprites/278.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Recycle[] = INCBIN_U32("graphics/battle_anims/sprites/recycle.4bpp.lz");
+const u32 gBattleAnimSpritePal_Recycle[] = INCBIN_U32("graphics/battle_anims/sprites/recycle.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_279[] = INCBIN_U32("graphics/battle_anims/sprites/279.4bpp.lz");
-const u32 gBattleAnimSpritePalette_279[] = INCBIN_U32("graphics/battle_anims/sprites/279.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_RedParticles[] = INCBIN_U32("graphics/battle_anims/sprites/red_particles.4bpp.lz");
+const u32 gBattleAnimSpritePal_RedParticles[] = INCBIN_U32("graphics/battle_anims/sprites/red_particles.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_281[] = INCBIN_U32("graphics/battle_anims/sprites/281.4bpp.lz");
-const u32 gBattleAnimSpritePalette_281[] = INCBIN_U32("graphics/battle_anims/sprites/281.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_DirtMound[] = INCBIN_U32("graphics/battle_anims/sprites/dirt_mound.4bpp.lz");
+const u32 gBattleAnimSpritePal_DirtMound[] = INCBIN_U32("graphics/battle_anims/sprites/dirt_mound.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_21[] = INCBIN_U32("graphics/battle_anims/backgrounds/21.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_21[] = INCBIN_U32("graphics/battle_anims/backgrounds/21.gbapal.lz");
-const u32 gBattleAnimBackgroundTilemap_21[] = INCBIN_U32("graphics/battle_anims/backgrounds/21.bin.lz");
+const u32 gBattleAnimBgImage_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.4bpp.lz");
+const u32 gBattleAnimBgPalette_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.gbapal.lz");
+const u32 gBattleAnimBgTilemap_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.bin.lz");
 
-const u32 gBattleAnimSpriteSheet_284[] = INCBIN_U32("graphics/battle_anims/sprites/284.4bpp.lz");
-const u32 gBattleAnimSpritePalette_284[] = INCBIN_U32("graphics/battle_anims/sprites/284.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Bird[] = INCBIN_U32("graphics/battle_anims/sprites/bird.4bpp.lz");
+const u32 gBattleAnimSpritePal_Bird[] = INCBIN_U32("graphics/battle_anims/sprites/bird.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_285[] = INCBIN_U32("graphics/battle_anims/sprites/285.4bpp.lz");
-const u32 gBattleAnimSpritePalette_285[] = INCBIN_U32("graphics/battle_anims/sprites/285.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_CrossImpact[] = INCBIN_U32("graphics/battle_anims/sprites/cross_impact.4bpp.lz");
+const u32 gBattleAnimSpritePal_CrossImpact[] = INCBIN_U32("graphics/battle_anims/sprites/cross_impact.gbapal.lz");
 
-const u32 gBattleAnimBackgroundImage_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.4bpp.lz");
-const u32 gBattleAnimBackgroundPalette_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.gbapal.lz");
+const u32 gBattleAnimBgImage_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.4bpp.lz");
+const u32 gBattleAnimBgPalette_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.gbapal.lz");
 
 const u32 gUnknown_08D95E00[] = INCBIN_U32("graphics/unknown/unknown_D95E00.bin.lz");
 
@@ -1133,10 +1133,10 @@ const u32 gUnknown_08D960D0[] = INCBIN_U32("graphics/unknown/unknown_D960D0.bin.
 
 const u32 gUnknown_08D963A4[] = INCBIN_U32("graphics/unknown/unknown_D963A4.bin.lz");
 
-const u32 gBattleAnimSpritePalette_286[] = INCBIN_U32("graphics/battle_anims/sprites/286.gbapal.lz");
+const u32 gBattleAnimSpritePal_Slash2[] = INCBIN_U32("graphics/battle_anims/sprites/slash_2.gbapal.lz");
 
-const u32 gBattleAnimSpriteSheet_188[] = INCBIN_U32("graphics/battle_anims/sprites/188.4bpp.lz");
-const u32 gBattleAnimSpritePalette_188[] = INCBIN_U32("graphics/battle_anims/sprites/188.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.4bpp.lz");
+const u32 gBattleAnimSpritePal_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.gbapal.lz");
 
 const u32 gPartyMenuMisc_Gfx[] = INCBIN_U32("graphics/interface/party_menu_misc.4bpp.lz");
 const u32 gPartyMenuMisc_Pal[] = INCBIN_U32("graphics/interface/party_menu_misc.gbapal.lz");
@@ -1223,14 +1223,14 @@ const u32 gUnknown_08D9BA44[] = INCBIN_U32("graphics/interface/pokeblock_feeding
 #include "data/graphics/items.h"
 #include "data/graphics/decorations.h"
 
-const u32 gBattleAnimSpritePalette_282[] = INCBIN_U32("graphics/battle_anims/sprites/282.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_282[] = INCBIN_U32("graphics/battle_anims/sprites/282.4bpp.lz");
+const u32 gBattleAnimSpritePal_Shock3[] = INCBIN_U32("graphics/battle_anims/sprites/shock_3.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Shock3[] = INCBIN_U32("graphics/battle_anims/sprites/shock_3.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_270[] = INCBIN_U32("graphics/battle_anims/sprites/270.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_270[] = INCBIN_U32("graphics/battle_anims/sprites/270.4bpp.lz");
+const u32 gBattleAnimSpritePal_WhiteFeather[] = INCBIN_U32("graphics/battle_anims/sprites/white_feather.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WhiteFeather[] = INCBIN_U32("graphics/battle_anims/sprites/white_feather.4bpp.lz");
 
-const u32 gBattleAnimSpritePalette_271[] = INCBIN_U32("graphics/battle_anims/sprites/271.gbapal.lz");
-const u32 gBattleAnimSpriteSheet_271[] = INCBIN_U32("graphics/battle_anims/sprites/271.4bpp.lz");
+const u32 gBattleAnimSpritePal_Sparkle6[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_6.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Sparkle6[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_6.4bpp.lz");
 
 const u16 gUnknown_08DBA518[] = INCBIN_U16("graphics/misc/cable_car_bg.gbapal");
 const u16 gCableCar_Pal[] = INCBIN_U16("graphics/misc/cable_car.gbapal");
@@ -1363,7 +1363,7 @@ const u16 gPokenavMessageBox_Pal[] = INCBIN_U16("graphics/pokenav/message.gbapal
 const u32 gPokenavMessageBox_Gfx[] = INCBIN_U32("graphics/pokenav/message.4bpp.lz");
 const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("graphics/pokenav/message.bin.lz");
 
-const u16 gHoennMapZoomIcons_Pal[] = INCBIN_U16("graphics/pokenav/zoom.gbapal");
+const u16 gHoennMapZoomIcons_Pal[] = INCBIN_U16("graphics/pokenav/zoom_tiles.gbapal");
 const u32 gHoennMapZoomIcons_Gfx[] = INCBIN_U32("graphics/pokenav/zoom.4bpp.lz");
 
 const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/cancel.gbapal");
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 8eba90d96..fdf2020ff 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -32,7 +32,7 @@
 #include "menu.h"
 #include "fldeff_misc.h"
 #include "trainer_pokemon_sprites.h"
-#include "data2.h"
+#include "data.h"
 #include "rom_81520A8.h"
 #include "constants/rgb.h"
 
diff --git a/src/item.c b/src/item.c
index 0e13ddf4c..fe8e8eadd 100644
--- a/src/item.c
+++ b/src/item.c
@@ -537,7 +537,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
         if (totalQuantity < count)
             return FALSE;   // We don't have enough of the item
 
-        if (CurrentMapIsSecretBase() == TRUE)
+        if (CurMapIsSecretBase() == TRUE)
         {
             VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x200);
             VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, itemId);
diff --git a/src/item_menu.c b/src/item_menu.c
index 8bec5407e..bfeeaacd0 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -8,7 +8,7 @@
 #include "bg.h"
 #include "constants/items.h"
 #include "constants/songs.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "event_object_movement.h"
diff --git a/src/item_use.c b/src/item_use.c
index 7947964ca..8e28d48fd 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -7,7 +7,7 @@
 #include "berry_powder.h"
 #include "bike.h"
 #include "coins.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
@@ -42,8 +42,8 @@
 #include "constants/vars.h"
 #include "event_obj_lock.h"
 
-extern u8 Route102_EventScript_274482[];
-extern u8 Route102_EventScript_2744C0[];
+extern u8 BerryTree_EventScript_274482[];
+extern u8 BerryTree_EventScript_2744C0[];
 extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
 
 void SetUpItemUseCallback(u8 taskId);
@@ -669,7 +669,7 @@ void sub_80FDD74(u8 taskId)
 {
     RemoveBagItem(gSpecialVar_ItemId, 1);
     ScriptContext2_Enable();
-    ScriptContext1_SetupScript(Route102_EventScript_274482);
+    ScriptContext1_SetupScript(BerryTree_EventScript_274482);
     DestroyTask(taskId);
 }
 
@@ -694,7 +694,7 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
 void sub_80FDE08(u8 taskId)
 {
     ScriptContext2_Enable();
-    ScriptContext1_SetupScript(Route102_EventScript_2744C0);
+    ScriptContext1_SetupScript(BerryTree_EventScript_2744C0);
     DestroyTask(taskId);
 }
 
diff --git a/src/link_rfu.c b/src/link_rfu.c
index abbab63f2..9732e9889 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -154,9 +154,18 @@ const u8 sWireless_RSEtoASCIITable[] = {
     0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
 };
-const struct OamData sWirelessStatusIndicatorOamData = {
+const struct OamData sWirelessStatusIndicatorOamData =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
-    .size = SPRITE_SIZE(16x16)
+    .x = 0,
+    .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
 };
 static const union AnimCmd sWirelessStatusIndicatorAnim0[] = {
     // 3 bars
@@ -3665,7 +3674,7 @@ void sub_8010168(void)
         gUnknown_03005000.unk_00 = sub_8010148;
 }
 
-void sub_8010198(void)
+void LinkRfu_FatalError(void)
 {
     sub_800D630();
     gUnknown_03005000.unk_ce4 = 1;
@@ -5182,3 +5191,4 @@ u32 GetRfuRecvQueueLength(void)
 {
     return gUnknown_03005000.unk_124.unk_8c2;
 }
+
diff --git a/src/main_menu.c b/src/main_menu.c
index 6639f6559..bc509c70d 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -23,7 +23,7 @@
 #include "palette.h"
 #include "pokeball.h"
 #include "pokedex.h"
-#include "pokemon_3.h"
+#include "pokemon.h"
 #include "random.h"
 #include "rtc.h"
 #include "save.h"
diff --git a/src/match_call.c b/src/match_call.c
index 641079ba9..35daacc3d 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "battle_setup.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index ec5cb238b..8bb9cb6e4 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -914,7 +914,7 @@ struct Story
 };
 
 static const struct Story sStorytellerStories[] = {
-    {GAME_STAT_50, 1, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956},
+    {GAME_STAT_NUM_UNION_ROOM_BATTLES, 1, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956},
     {GAME_STAT_STARTED_TRENDS, 1, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE},
     {GAME_STAT_PLANTED_BERRIES, 1, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8},
     {GAME_STAT_TRADED_BIKES, 1, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E},
@@ -1193,7 +1193,7 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu
                 gSpecialVar_Result = 1;
                 sSelectedStory = selection;
             }
-            sub_80E2A78(sStorytellerWindowId);
+            ClearToTransparentAndRemoveWindow(sStorytellerWindowId);
             DestroyTask(taskId);
             EnableBothScriptContexts();
             break;
diff --git a/src/menu.c b/src/menu.c
index 958788b25..354346d27 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -43,8 +43,8 @@ struct Menu
     u8 fontId;
     u8 optionWidth;
     u8 optionHeight;
-    u8 horizontalCount;
-    u8 verticalCount;
+    u8 columns;
+    u8 rows;
     bool8 APressMuted;
 };
 
@@ -1283,8 +1283,8 @@ u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight,
     sMenu.fontId = fontId;
     sMenu.optionWidth = a4;
     sMenu.optionHeight = cursorHeight;
-    sMenu.horizontalCount = a6;
-    sMenu.verticalCount = a7;
+    sMenu.columns = a6;
+    sMenu.rows = a7;
 
     pos = a9;
 
@@ -1308,16 +1308,16 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
 {
     u8 cursorWidth = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
     u8 cursorHeight = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
-    u8 xPos = (oldCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left;
-    u8 yPos = (oldCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top;
+    u8 xPos = (oldCursorPos % sMenu.columns) * sMenu.optionWidth + sMenu.left;
+    u8 yPos = (oldCursorPos / sMenu.columns) * sMenu.optionHeight + sMenu.top;
     FillWindowPixelRect(sMenu.windowId,
                         PIXEL_FILL(1),
                         xPos,
                         yPos,
                         cursorWidth,
                         cursorHeight);
-    xPos = (newCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left;
-    yPos = (newCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top;
+    xPos = (newCursorPos % sMenu.columns) * sMenu.optionWidth + sMenu.left;
+    yPos = (newCursorPos / sMenu.columns) * sMenu.optionHeight + sMenu.top;
     AddTextPrinterParameterized(sMenu.windowId,
                       sMenu.fontId,
                       gText_SelectorArrow3,
@@ -1333,13 +1333,13 @@ u8 sub_8199134(s8 deltaX, s8 deltaY)
 
     if (deltaX != 0)
     {
-        if ((sMenu.cursorPos % sMenu.horizontalCount) + deltaX < 0)
+        if ((sMenu.cursorPos % sMenu.columns) + deltaX < 0)
         {
-            sMenu.cursorPos += sMenu.horizontalCount - 1;
+            sMenu.cursorPos += sMenu.columns - 1;
         }
-        else if ((sMenu.cursorPos % sMenu.horizontalCount) + deltaX >= sMenu.horizontalCount)
+        else if ((sMenu.cursorPos % sMenu.columns) + deltaX >= sMenu.columns)
         {
-            sMenu.cursorPos = (sMenu.cursorPos / sMenu.horizontalCount) * sMenu.horizontalCount;
+            sMenu.cursorPos = (sMenu.cursorPos / sMenu.columns) * sMenu.columns;
         }
         else
         {
@@ -1349,17 +1349,17 @@ u8 sub_8199134(s8 deltaX, s8 deltaY)
 
     if (deltaY != 0)
     {
-        if ((sMenu.cursorPos / sMenu.horizontalCount) + deltaY < 0)
+        if ((sMenu.cursorPos / sMenu.columns) + deltaY < 0)
         {
-            sMenu.cursorPos += sMenu.horizontalCount * (sMenu.verticalCount - 1);
+            sMenu.cursorPos += sMenu.columns * (sMenu.rows - 1);
         }
-        else if ((sMenu.cursorPos / sMenu.horizontalCount) + deltaY >= sMenu.verticalCount)
+        else if ((sMenu.cursorPos / sMenu.columns) + deltaY >= sMenu.rows)
         {
-            sMenu.cursorPos -= sMenu.horizontalCount * (sMenu.verticalCount - 1);
+            sMenu.cursorPos -= sMenu.columns * (sMenu.rows - 1);
         }
         else
         {
-            sMenu.cursorPos += (sMenu.horizontalCount * deltaY);
+            sMenu.cursorPos += (sMenu.columns * deltaY);
         }
     }
 
@@ -1381,8 +1381,8 @@ u8 sub_81991F8(s8 deltaX, s8 deltaY)
 
     if (deltaX != 0)
     {
-        if (((sMenu.cursorPos % sMenu.horizontalCount) + deltaX >= 0) &&
-        ((sMenu.cursorPos % sMenu.horizontalCount) + deltaX < sMenu.horizontalCount))
+        if (((sMenu.cursorPos % sMenu.columns) + deltaX >= 0) &&
+        ((sMenu.cursorPos % sMenu.columns) + deltaX < sMenu.columns))
         {
             sMenu.cursorPos += deltaX;
         }
@@ -1390,10 +1390,10 @@ u8 sub_81991F8(s8 deltaX, s8 deltaY)
 
     if (deltaY != 0)
     {
-        if (((sMenu.cursorPos / sMenu.horizontalCount) + deltaY >= 0) &&
-        ((sMenu.cursorPos / sMenu.horizontalCount) + deltaY < sMenu.verticalCount))
+        if (((sMenu.cursorPos / sMenu.columns) + deltaY >= 0) &&
+        ((sMenu.cursorPos / sMenu.columns) + deltaY < sMenu.rows))
         {
-            sMenu.cursorPos += (sMenu.horizontalCount * deltaY);
+            sMenu.cursorPos += (sMenu.columns * deltaY);
         }
     }
 
@@ -1661,16 +1661,14 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sYesNoWindowId, 2, initialCursorPos);
 }
 
-void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs)
+void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const struct MenuAction *strs)
 {
-    u32 i;
-    u32 j;
-    for (i = 0; i < a7; i++)
+    u32 i, j;
+
+    for (i = 0; i < rows; i++)
     {
-        for (j = 0; j < a6; j++)
-        {
-            AddTextPrinterParameterized(windowId, 1, strs[(i * a6) + j].text, (a4 * j) + 8, (i * 16) + 1, 0xFF, NULL);
-        }
+        for (j = 0; j < columns; j++)
+            AddTextPrinterParameterized(windowId, 1, strs[(i * columns) + j].text, (optionWidth * j) + 8, (i * 16) + 1, 0xFF, NULL);
     }
     CopyWindowToVram(windowId, 2);
 }
@@ -1706,20 +1704,20 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M
     CopyWindowToVram(windowId, 2);
 }
 
-u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount, u8 initialCursorPos)
+u8 sub_8199944(u8 windowId, u8 optionWidth, u8 columns, u8 rows, u8 initialCursorPos)
 {
     s32 pos;
 
     sMenu.left = 0;
     sMenu.top = 1;
     sMenu.minCursorPos = 0;
-    sMenu.maxCursorPos = (horizontalCount * verticalCount) - 1;
+    sMenu.maxCursorPos = (columns * rows) - 1;
     sMenu.windowId = windowId;
     sMenu.fontId = 1;
     sMenu.optionWidth = optionWidth;
     sMenu.optionHeight = 16;
-    sMenu.horizontalCount = horizontalCount;
-    sMenu.verticalCount = verticalCount;
+    sMenu.columns = columns;
+    sMenu.rows = rows;
 
     pos = initialCursorPos;
 
@@ -1921,7 +1919,7 @@ void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP)
     }
 }
 
-void sub_8199D98(void)
+void ResetBgPositions(void)
 {
     ChangeBgX(0, 0, 0);
     ChangeBgX(1, 0, 0);
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index b5745d812..801e2546b 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -344,17 +344,17 @@ void sub_812220C(struct ItemSlot *slots, u8 count, u8 *arg2, u8 *usedSlotsCount,
         *arg2 = (*usedSlotsCount);
 }
 
-void sub_812225C(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3)
+void sub_812225C(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 numItems)
 {
-    if ((*arg0) != 0 && (*arg0) + arg2 > arg3)
-        (*arg0) = arg3 - arg2;
+    if (*scrollOffset != 0 && *scrollOffset + maxShownItems > numItems)
+        *scrollOffset = numItems - maxShownItems;
 
-    if ((*arg0) + (*arg1) >= arg3)
+    if (*scrollOffset + *cursorPos >= numItems)
     {
-        if (arg3 == 0)
-            (*arg1) = 0;
+        if (numItems == 0)
+            *cursorPos = 0;
         else
-            (*arg1) = arg3 - 1;
+            *cursorPos = numItems - 1;
     }
 }
 
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index f21f4e51a..34dd1fe2b 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -2,7 +2,7 @@
 #include "alloc.h"
 #include "battle_main.h"
 #include "contest_effect.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "graphics.h"
@@ -38,7 +38,7 @@ static void sub_81D2634(struct UnknownStruct_81D1ED4 *a0);
 static void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list);
 static void nullsub_79(void);
 static void sub_81D3408(struct Sprite *sprite);
-/*static*/ void sub_81D3564(struct Sprite *sprite);
+static void sub_81D3564(struct Sprite *sprite);
 static void sub_81D35E8(struct Sprite *sprite);
 
 static const struct WindowTemplate sUnknown_086253E8[] =
@@ -259,7 +259,7 @@ static void sub_81D1D44(u8 windowId, s32 itemId, u8 y)
     u8 buffer[30];
     u16 length;
 
-	if (itemId == LIST_CANCEL)
+    if (itemId == LIST_CANCEL)
         return;
 
     StringCopy(buffer, gSaveBlock1Ptr->mail[6 + itemId].playerName);
@@ -1473,9 +1473,77 @@ static void sub_81D32F4(struct Sprite *sprite)
     }
 }
 
-// Todo: Move these variables to C.
-extern const s16 gUnknown_08625B2C[][2];
-extern const struct SpriteTemplate gUnknown_08625B14;
+static const struct OamData sOamData_8625AD0 =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
+    .size = SPRITE_SIZE(16x16),
+    .priority = 0,
+};
+
+static const union AnimCmd sSpriteAnim_8625AD8[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_FRAME(12, 5),
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_FRAME(20, 5),
+    ANIMCMD_FRAME(24, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_8625AF8[] =
+{
+    sSpriteAnim_8625AD8,
+    sSpriteAnim_8625AD8 + 2,
+};
+
+// unused
+static const union AnimCmd *const sSpriteAnimTable_8625B00[] =
+{
+    sSpriteAnim_8625AD8 + 4,
+    sSpriteAnim_8625AD8 + 6,
+};
+
+// unused
+static const union AnimCmd *const sSpriteAnimTable_8625B08[] =
+{
+    sSpriteAnim_8625AD8 + 8,
+    sSpriteAnim_8625AD8 + 10,
+};
+
+// unused
+static const union AnimCmd *const *const sUnknown_08625B10 = sSpriteAnimTable_8625B08;
+
+const struct SpriteTemplate gUnknown_08625B14 =
+{
+    .tileTag = 104,
+    .paletteTag = 104,
+    .oam = &sOamData_8625AD0,
+    .anims = sSpriteAnimTable_8625AF8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_81D3564,
+};
+
+static const s16 gUnknown_08625B2C[][2] =
+{
+    {0,   -35},
+    {20,  -28},
+    {33,  -10},
+    {33,   10},
+    {20,   28},
+    {0,    35},
+    {-20,  28},
+    {-33,  10},
+    {-33, -10},
+    {-20, -28},
+};
 
 void sub_81D3314(struct Sprite *sprite)
 {
@@ -1594,7 +1662,7 @@ void sub_81D354C(struct Sprite **sprites)
     FreeSpritePaletteByTag(104);
 }
 
-/*static*/ void sub_81D3564(struct Sprite *sprite)
+static void sub_81D3564(struct Sprite *sprite)
 {
     if (sprite->data[1] != 0)
     {
@@ -1639,3 +1707,128 @@ static void sub_81D35E8(struct Sprite *sprite)
         id = gSprites[id].data[5];
     }
 }
+
+static const u8 *const sLvlUpStatStrings[] =
+{
+    gUnknown_085EEA46,
+    gUnknown_085EEA4E,
+    gUnknown_085EEA55,
+    gUnknown_085EEA63,
+    gUnknown_085EEA6B,
+    gUnknown_085EEA5D
+};
+
+void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bgClr, u8 fgClr, u8 shadowClr)
+{
+    u16 i, x;
+    s16 statsDiff[NUM_STATS];
+    u8 text[12];
+    u8 color[3];
+
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(bgClr));
+
+    statsDiff[0] = statsAfter[STAT_HP]    - statsBefore[STAT_HP];
+    statsDiff[1] = statsAfter[STAT_ATK]   - statsBefore[STAT_ATK];
+    statsDiff[2] = statsAfter[STAT_DEF]   - statsBefore[STAT_DEF];
+    statsDiff[3] = statsAfter[STAT_SPATK] - statsBefore[STAT_SPATK];
+    statsDiff[4] = statsAfter[STAT_SPDEF] - statsBefore[STAT_SPDEF];
+    statsDiff[5] = statsAfter[STAT_SPEED] - statsBefore[STAT_SPEED];
+
+    color[0] = bgClr;
+    color[1] = fgClr;
+    color[2] = shadowClr;
+
+    for (i = 0; i < NUM_STATS; i++)
+    {
+
+        AddTextPrinterParameterized3(windowId,
+                                     1,
+                                     0,
+                                     15 * i,
+                                     color,
+                                     -1,
+                                     sLvlUpStatStrings[i]);
+
+        StringCopy(text, (statsDiff[i] >= 0) ? gText_UnkCtrlF904 : gText_Dash);
+        AddTextPrinterParameterized3(windowId,
+                                     1,
+                                     56,
+                                     15 * i,
+                                     color,
+                                     -1,
+                                     text);
+        if (abs(statsDiff[i]) <= 9)
+            x = 18;
+        else
+            x = 12;
+
+        ConvertIntToDecimalStringN(text, abs(statsDiff[i]), STR_CONV_MODE_LEFT_ALIGN, 2);
+        AddTextPrinterParameterized3(windowId,
+                                     1,
+                                     56 + x,
+                                     15 * i,
+                                     color,
+                                     -1,
+                                     text);
+    }
+}
+
+void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 shadowClr)
+{
+    u16 i, numDigits, x;
+    s16 stats[NUM_STATS];
+    u8 text[12];
+    u8 color[3];
+
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(bgClr));
+
+    stats[0] = currStats[STAT_HP];
+    stats[1] = currStats[STAT_ATK];
+    stats[2] = currStats[STAT_DEF];
+    stats[3] = currStats[STAT_SPATK];
+    stats[4] = currStats[STAT_SPDEF];
+    stats[5] = currStats[STAT_SPEED];
+
+    color[0] = bgClr;
+    color[1] = fgClr;
+    color[2] = shadowClr;
+
+    for (i = 0; i < NUM_STATS; i++)
+    {
+        if (stats[i] > 99)
+            numDigits = 3;
+        else if (stats[i] > 9)
+            numDigits = 2;
+        else
+            numDigits = 1;
+
+        ConvertIntToDecimalStringN(text, stats[i], STR_CONV_MODE_LEFT_ALIGN, numDigits);
+        x = 6 * (4 - numDigits);
+
+        AddTextPrinterParameterized3(windowId,
+                                     1,
+                                     0,
+                                     15 * i,
+                                     color,
+                                     -1,
+                                     sLvlUpStatStrings[i]);
+
+        AddTextPrinterParameterized3(windowId,
+                                     1,
+                                     56 + x,
+                                     15 * i,
+                                     color,
+                                     -1,
+                                     text);
+    }
+}
+
+void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *currStats)
+{
+    currStats[STAT_HP]    = GetMonData(mon, MON_DATA_MAX_HP);
+    currStats[STAT_ATK]   = GetMonData(mon, MON_DATA_ATK);
+    currStats[STAT_DEF]   = GetMonData(mon, MON_DATA_DEF);
+    currStats[STAT_SPEED] = GetMonData(mon, MON_DATA_SPEED);
+    currStats[STAT_SPATK] = GetMonData(mon, MON_DATA_SPATK);
+    currStats[STAT_SPDEF] = GetMonData(mon, MON_DATA_SPDEF);
+}
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 8a2c3ad91..16298183b 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -191,7 +191,7 @@ static const u8 sTileBitAttributes[] =
     [MB_SECRET_BASE_UNUSED] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_BLOCK_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_SECRET_BASE_DECORATION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
-    [MB_SECRET_BASE_LARGE_MAT_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_HOLDS_SMALL_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_UNUSED_B6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_SECRET_BASE_NORTH_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
     [MB_SECRET_BASE_BALLOON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
@@ -205,7 +205,7 @@ static const u8 sTileBitAttributes[] =
     [MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_IMPASSABLE_WEST_AND_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_SECRET_BASE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
-    [MB_LARGE_MAT_CENTER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_HOLDS_LARGE_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_SECRET_BASE_TV_SHIELD] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_PLAYER_ROOM_PC_ON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
     [MB_C6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
@@ -751,17 +751,17 @@ bool8 Unref_MetatileBehavior_IsSecretBaseUnused_B2_2(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBaseLargeMatEdge(u8 metatileBehavior)
+bool8 MetatileBehavior_HoldsSmallDecoration(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_SECRET_BASE_LARGE_MAT_EDGE)
+    if (metatileBehavior == MB_HOLDS_SMALL_DECORATION)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsLargeMatCenter(u8 metatileBehavior)
+bool8 MetatileBehavior_HoldsLargeDecoration(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_LARGE_MAT_CENTER)
+    if (metatileBehavior == MB_HOLDS_LARGE_DECORATION)
         return TRUE;
     else
         return FALSE;
diff --git a/src/mevent2.c b/src/mevent2.c
index 4174c4055..f36e5d06b 100755
--- a/src/mevent2.c
+++ b/src/mevent2.c
@@ -15,8 +15,8 @@ static EWRAM_DATA bool32 gUnknown_02022C70 = FALSE;
 
 static void sub_801B180(void);
 static void s_DestroyWonderNews(void);
-static bool32 sub_801B114(const struct MEventBuffer_3120_Sub *data);
-static bool32 sub_801B2CC(const struct MEventBuffer_32E0_Sub *data);
+static bool32 sub_801B114(const struct WonderNews *data);
+static bool32 sub_801B2CC(const struct WonderCard *data);
 static void sub_801B330(void);
 static void sub_801B368(void);
 static void sub_801B9F8(void);
@@ -29,14 +29,14 @@ void sub_801AFD8(void)
     sub_811F8BC();
 }
 
-struct MEventBuffer_3120_Sub *sav1_get_mevent_buffer_0(void)
+struct WonderNews *GetSavedWonderNews(void)
 {
-    return &gSaveBlock1Ptr->unk_322C.buffer_000.data;
+    return &gSaveBlock1Ptr->unk_322C.wonderNews.data;
 }
 
-struct MEventBuffer_32E0_Sub *sav1_get_mevent_buffer_1(void)
+struct WonderCard *GetSavedWonderCard(void)
 {
-    return &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+    return &gSaveBlock1Ptr->unk_322C.wonderCard.data;
 }
 
 struct MEventBuffer_3430_Sub *sav1_get_mevent_buffer_2(void)
@@ -59,28 +59,28 @@ void DestroyWonderNews(void)
     s_DestroyWonderNews();
 }
 
-bool32 sub_801B078(const struct MEventBuffer_3120_Sub *src)
+bool32 sub_801B078(const struct WonderNews *src)
 {
     if (!sub_801B114(src))
         return FALSE;
 
     s_DestroyWonderNews();
-    gSaveBlock1Ptr->unk_322C.buffer_000.data = *src;
-    gSaveBlock1Ptr->unk_322C.buffer_000.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_000.data, sizeof(struct MEventBuffer_3120_Sub));
+    gSaveBlock1Ptr->unk_322C.wonderNews.data = *src;
+    gSaveBlock1Ptr->unk_322C.wonderNews.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderNews.data, sizeof(struct WonderNews));
     return TRUE;
 }
 
 bool32 ValidateReceivedWonderNews(void)
 {
-    if (CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_000.data, sizeof(struct MEventBuffer_3120_Sub)) != gSaveBlock1Ptr->unk_322C.buffer_000.crc)
+    if (CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderNews.data, sizeof(struct WonderNews)) != gSaveBlock1Ptr->unk_322C.wonderNews.crc)
         return FALSE;
-    if (!sub_801B114(&gSaveBlock1Ptr->unk_322C.buffer_000.data))
+    if (!sub_801B114(&gSaveBlock1Ptr->unk_322C.wonderNews.data))
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 sub_801B114(const struct MEventBuffer_3120_Sub *data)
+static bool32 sub_801B114(const struct WonderNews *data)
 {
     if (data->unk_00 == 0)
         return FALSE;
@@ -90,7 +90,7 @@ static bool32 sub_801B114(const struct MEventBuffer_3120_Sub *data)
 
 bool32 WonderNews_Test_Unk_02(void)
 {
-    const struct MEventBuffer_3120_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_000.data;
+    const struct WonderNews *data = &gSaveBlock1Ptr->unk_322C.wonderNews.data;
     if (data->unk_02 == 0)
         return FALSE;
 
@@ -99,8 +99,8 @@ bool32 WonderNews_Test_Unk_02(void)
 
 static void s_DestroyWonderNews(void)
 {
-    CpuFill32(0, sav1_get_mevent_buffer_0(), sizeof(gSaveBlock1Ptr->unk_322C.buffer_000.data));
-    gSaveBlock1Ptr->unk_322C.buffer_000.crc = 0;
+    CpuFill32(0, GetSavedWonderNews(), sizeof(gSaveBlock1Ptr->unk_322C.wonderNews.data));
+    gSaveBlock1Ptr->unk_322C.wonderNews.crc = 0;
 }
 
 static void sub_801B180(void)
@@ -111,12 +111,12 @@ static void sub_801B180(void)
 
 bool32 sub_801B1A4(const u8 *src)
 {
-    const u8 *r5 = (const u8 *)&gSaveBlock1Ptr->unk_322C.buffer_000.data;
+    const u8 *r5 = (const u8 *)&gSaveBlock1Ptr->unk_322C.wonderNews.data;
     u32 i;
     if (!ValidateReceivedWonderNews())
         return FALSE;
 
-    for (i = 0; i < sizeof(struct MEventBuffer_3120_Sub); i++)
+    for (i = 0; i < sizeof(struct WonderNews); i++)
     {
         if (r5[i] != src[i])
             return FALSE;
@@ -136,35 +136,35 @@ void DestroyWonderCard(void)
     ClearEReaderTrainer(&gSaveBlock2Ptr->frontier.ereaderTrainer);
 }
 
-bool32 sub_801B21C(const struct MEventBuffer_32E0_Sub *data)
+bool32 sub_801B21C(const struct WonderCard *data)
 {
     struct MEventBuffer_3430_Sub *r2;
-    struct MEventBuffer_32E0_Sub *r1;
+    struct WonderCard *r1;
     if (!sub_801B2CC(data))
         return FALSE;
 
     DestroyWonderCard();
-    memcpy(&gSaveBlock1Ptr->unk_322C.buffer_1c0.data, data, sizeof(struct MEventBuffer_32E0_Sub));
-    gSaveBlock1Ptr->unk_322C.buffer_1c0.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub));
+    memcpy(&gSaveBlock1Ptr->unk_322C.wonderCard.data, data, sizeof(struct WonderCard));
+    gSaveBlock1Ptr->unk_322C.wonderCard.crc = CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderCard.data, sizeof(struct WonderCard));
     r2 = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
-    r1 = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+    r1 = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
     r2->unk_06 = r1->unk_02;
     return TRUE;
 }
 
 bool32 ValidateReceivedWonderCard(void)
 {
-    if (gSaveBlock1Ptr->unk_322C.buffer_1c0.crc != CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)))
+    if (gSaveBlock1Ptr->unk_322C.wonderCard.crc != CalcCRC16WithTable((void *)&gSaveBlock1Ptr->unk_322C.wonderCard.data, sizeof(struct WonderCard)))
         return FALSE;
-    if (!sub_801B2CC(&gSaveBlock1Ptr->unk_322C.buffer_1c0.data))
+    if (!sub_801B2CC(&gSaveBlock1Ptr->unk_322C.wonderCard.data))
         return FALSE;
-    if (!sub_80991F8())
+    if (!ValidateSavedRamScript())
         return FALSE;
 
     return TRUE;
 }
 
-static bool32 sub_801B2CC(const struct MEventBuffer_32E0_Sub *data)
+static bool32 sub_801B2CC(const struct WonderCard *data)
 {
     if (data->unk_00 == 0)
         return FALSE;
@@ -182,7 +182,7 @@ static bool32 sub_801B2CC(const struct MEventBuffer_32E0_Sub *data)
 
 bool32 WonderCard_Test_Unk_08_6(void)
 {
-    const struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+    const struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
     if (data->unk_08_6 == 0)
         return FALSE;
 
@@ -191,8 +191,8 @@ bool32 WonderCard_Test_Unk_08_6(void)
 
 static void sub_801B330(void)
 {
-    CpuFill32(0, &gSaveBlock1Ptr->unk_322C.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub));
-    gSaveBlock1Ptr->unk_322C.buffer_1c0.crc = 0;
+    CpuFill32(0, &gSaveBlock1Ptr->unk_322C.wonderCard.data, sizeof(struct WonderCard));
+    gSaveBlock1Ptr->unk_322C.wonderCard.crc = 0;
 }
 
 static void sub_801B368(void)
@@ -204,12 +204,12 @@ static void sub_801B368(void)
 u16 GetWonderCardFlagID(void)
 {
     if (ValidateReceivedWonderCard())
-        return gSaveBlock1Ptr->unk_322C.buffer_1c0.data.unk_00;
+        return gSaveBlock1Ptr->unk_322C.wonderCard.data.unk_00;
 
     return 0;
 }
 
-void sub_801B3C0(struct MEventBuffer_32E0_Sub *buffer)
+void WonderCard_ResetInternalReceivedFlag(struct WonderCard *buffer)
 {
     if (buffer->unk_08_6 == 1)
         buffer->unk_08_6 = 0;
@@ -299,11 +299,11 @@ static bool32 sub_801B4A4(const u16 *data)
 
 static int sub_801B4CC(void)
 {
-    struct MEventBuffer_32E0_Sub *data;
+    struct WonderCard *data;
     if (!ValidateReceivedWonderCard())
         return 0;
 
-    data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+    data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
     if (data->unk_08_0 != 1)
         return 0;
 
@@ -312,7 +312,7 @@ static int sub_801B4CC(void)
 
 bool32 sub_801B508(const u16 *data)
 {
-    struct MEventBuffer_32E0_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+    struct WonderCard *buffer = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
     int size = buffer->unk_09;
     int i;
     if (!sub_801B4A4(data))
@@ -355,9 +355,9 @@ void sub_801B580(struct MEventStruct_Unk1442CC *data, bool32 a1)
 
     if (ValidateReceivedWonderCard())
     {
-        data->unk_14 = sav1_get_mevent_buffer_1()->unk_00;
+        data->unk_14 = GetSavedWonderCard()->unk_00;
         data->unk_20 = *sav1_get_mevent_buffer_2();
-        data->unk_44 = sav1_get_mevent_buffer_1()->unk_09;
+        data->unk_44 = GetSavedWonderCard()->unk_09;
     }
     else
     {
@@ -399,7 +399,7 @@ bool32 sub_801B6A0(const struct MEventStruct_Unk1442CC *data, bool32 a1)
     return TRUE;
 }
 
-u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused)
+u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const void *unused)
 {
     if (a1->unk_14 == 0)
         return 0;
@@ -410,7 +410,7 @@ u32 sub_801B6EC(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *un
     return 2;
 }
 
-u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *unused)
+u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, const void *unused)
 {
     int r4 = a1->unk_44 - sub_801B438(&a1->unk_20, a1->unk_44);
     if (r4 == 0)
@@ -422,7 +422,7 @@ u32 sub_801B708(const u16 *a0, const struct MEventStruct_Unk1442CC *a1, void *un
     return 2;
 }
 
-bool32 sub_801B748(const struct MEventStruct_Unk1442CC *a0, const u16 *a1)
+bool32 MEventStruct_Unk1442CC_CompareField_unk_16(const struct MEventStruct_Unk1442CC *a0, const u16 *a1)
 {
     int i;
     for (i = 0; i < 4; i++)
@@ -439,7 +439,7 @@ static int sub_801B770(const struct MEventStruct_Unk1442CC *a0)
     return sub_801B438(&a0->unk_20, a0->unk_44);
 }
 
-u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command)
+u16 MEventStruct_Unk1442CC_GetValueNFrom_unk_20(const struct MEventStruct_Unk1442CC *a0, u32 command)
 {
     switch (command)
     {
@@ -461,7 +461,7 @@ u16 sub_801B784(const struct MEventStruct_Unk1442CC *a0, u32 command)
 
 static void sub_801B7D8(u32 command)
 {
-    struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+    struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
     if (data->unk_08_0 == 2)
     {
         u16 *dest = NULL;
@@ -495,7 +495,7 @@ u16 mevent_081445C0(u32 command)
     {
         case 0:
         {
-            struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+            struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 2)
             {
                 struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
@@ -505,7 +505,7 @@ u16 mevent_081445C0(u32 command)
         }
         case 1:
         {
-            struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+            struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 2)
             {
                 struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
@@ -515,7 +515,7 @@ u16 mevent_081445C0(u32 command)
         }
         case 2:
         {
-            struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+            struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 2)
             {
                 struct MEventBuffer_3430_Sub *buffer = &gSaveBlock1Ptr->unk_322C.buffer_310.data;
@@ -525,14 +525,14 @@ u16 mevent_081445C0(u32 command)
         }
         case 3:
         {
-            struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+            struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 1)
                 return sub_801B4CC();
             break;
         }
         case 4:
         {
-            struct MEventBuffer_32E0_Sub *data = &gSaveBlock1Ptr->unk_322C.buffer_1c0.data;
+            struct WonderCard *data = &gSaveBlock1Ptr->unk_322C.wonderCard.data;
             if (data->unk_08_0 == 1)
                 return data->unk_09;
             break;
@@ -557,7 +557,7 @@ bool32 sub_801B94C(u16 a0)
     if (!ValidateReceivedWonderCard())
         return FALSE;
 
-    if (gSaveBlock1Ptr->unk_322C.buffer_1c0.data.unk_00 != a0)
+    if (gSaveBlock1Ptr->unk_322C.wonderCard.data.unk_00 != a0)
         return FALSE;
 
     gUnknown_02022C70 = TRUE;
diff --git a/src/mevent_801BAAC.c b/src/mevent_801BAAC.c
index 09a959429..8f5b2d636 100644
--- a/src/mevent_801BAAC.c
+++ b/src/mevent_801BAAC.c
@@ -36,7 +36,7 @@ struct UnkStruct_203F3C8_02DC
 
 struct UnkStruct_203F3C8
 {
-    /*0000*/ struct MEventBuffer_32E0_Sub unk_0000;
+    /*0000*/ struct WonderCard unk_0000;
     /*014c*/ struct MEventBuffer_3430_Sub unk_014C;
     /*0170*/ const struct UnkStruct_8467FB8 * unk_0170;
     /*0174*/ u8 unk_0174;
@@ -151,7 +151,7 @@ const struct UnkStruct_8467FB8 gUnknown_082F1D60[8] = {
     {1, 0, 0, 7, gWonderCardBgGfx8, gWonderCardBgTilemap8, gWonderCardBgPal8}
 };
 
-bool32 InitWonderCardResources(struct MEventBuffer_32E0_Sub * r5, struct MEventBuffer_3430_Sub * r6)
+bool32 InitWonderCardResources(struct WonderCard * r5, struct MEventBuffer_3430_Sub * r6)
 {
     if (r5 == NULL || r6 == NULL)
         return FALSE;
@@ -466,7 +466,7 @@ void sub_801C61C(void)
 
 struct UnkStruct_203F3CC
 {
-    /*0000*/ struct MEventBuffer_3120_Sub unk_0000;
+    /*0000*/ struct WonderNews unk_0000;
     /*01bc*/ const struct UnkStruct_8467FB8 * unk_01BC;
     /*01c0*/ u8 unk_01C0_0:1;
              u8 unk_01C0_1:7;
@@ -543,7 +543,7 @@ const struct UnkStruct_8467FB8 gUnknown_082F24C8[] = {
     {1, 0, 0, 0, gWonderNewsGfx8, gWonderNewsTilemap8, gWonderNewsPal8}
 };
 
-bool32 InitWonderNewsResources(const struct MEventBuffer_3120_Sub * a0)
+bool32 InitWonderNewsResources(const struct WonderNews * a0)
 {
     if (a0 == NULL)
         return FALSE;
diff --git a/src/mevent_client.c b/src/mevent_client.c
new file mode 100644
index 000000000..ec8908af2
--- /dev/null
+++ b/src/mevent_client.c
@@ -0,0 +1,291 @@
+#include "global.h"
+#include "alloc.h"
+#include "decompress.h"
+#include "overworld.h"
+#include "script.h"
+#include "battle_tower.h"
+#include "mevent.h"
+#include "mystery_event_script.h"
+#include "mevent_client.h"
+
+EWRAM_DATA struct mevent_client * s_mevent_client_ptr = NULL;
+
+static void mevent_client_init(struct mevent_client *, u32, u32);
+static u32 mevent_client_exec(struct mevent_client *);
+static void mevent_client_free_resources(struct mevent_client *);
+
+extern const struct mevent_client_cmd gUnknown_082F2598[];
+
+void mevent_client_do_init(u32 arg)
+{
+    s_mevent_client_ptr = AllocZeroed(sizeof(struct mevent_client));
+    mevent_client_init(s_mevent_client_ptr, 1, 0);
+    s_mevent_client_ptr->unk_4C = arg;
+}
+
+u32 mevent_client_do_exec(u16 * a0)
+{
+    u32 result;
+    if (s_mevent_client_ptr == NULL)
+        return 6;
+    result = mevent_client_exec(s_mevent_client_ptr);
+    if (result == 6)
+    {
+        *a0 = s_mevent_client_ptr->param;
+        mevent_client_free_resources(s_mevent_client_ptr);
+        Free(s_mevent_client_ptr);
+        s_mevent_client_ptr = NULL;
+    }
+    return result;
+}
+
+void mevent_client_inc_flag(void)
+{
+    s_mevent_client_ptr->flag++;
+}
+
+void * mevent_client_get_buffer(void)
+{
+    return s_mevent_client_ptr->buffer;
+}
+
+void mevent_client_set_param(u32 a0)
+{
+    s_mevent_client_ptr->param = a0;
+}
+
+static void mevent_client_init(struct mevent_client * svr, u32 sendPlayerNo, u32 recvPlayerNo)
+{
+    svr->unk_00 = 0;
+    svr->mainseqno = 0;
+    svr->flag = 0;
+    svr->sendBuffer = AllocZeroed(ME_SEND_BUF_SIZE);
+    svr->recvBuffer = AllocZeroed(ME_SEND_BUF_SIZE);
+    svr->cmdBuffer = AllocZeroed(ME_SEND_BUF_SIZE);
+    svr->buffer = AllocZeroed(0x40);
+    mevent_srv_sub_init(&svr->manager, sendPlayerNo, recvPlayerNo);
+}
+
+static void mevent_client_free_resources(struct mevent_client * svr)
+{
+    Free(svr->sendBuffer);
+    Free(svr->recvBuffer);
+    Free(svr->cmdBuffer);
+    Free(svr->buffer);
+}
+
+static void mevent_client_jmp_buffer(struct mevent_client * svr)
+{
+    memcpy(svr->cmdBuffer, svr->recvBuffer, ME_SEND_BUF_SIZE);
+    svr->cmdidx = 0;
+}
+
+static void mevent_client_send_word(struct mevent_client * svr, u32 ident, u32 word)
+{
+    CpuFill32(0, svr->sendBuffer, ME_SEND_BUF_SIZE);
+    *(u32 *)svr->sendBuffer = word;
+    mevent_srv_sub_init_send(&svr->manager, ident, svr->sendBuffer, sizeof(u32));
+}
+
+static u32 mainseq_0(struct mevent_client * svr)
+{
+    // init
+    memcpy(svr->cmdBuffer, gUnknown_082F2598, ME_SEND_BUF_SIZE);
+    svr->cmdidx = 0;
+    svr->mainseqno = 4;
+    svr->flag = 0;
+    return 0;
+}
+
+static u32 mainseq_1(struct mevent_client * svr)
+{
+    // done
+    return 6;
+}
+
+
+static u32 mainseq_2(struct mevent_client * svr)
+{
+    // do recv
+    if (mevent_srv_sub_recv(&svr->manager))
+    {
+        svr->mainseqno = 4;
+        svr->flag = 0;
+    }
+    return 1;
+}
+
+static u32 mainseq_3(struct mevent_client * svr)
+{
+    // do send
+    if (mevent_srv_sub_send(&svr->manager))
+    {
+        svr->mainseqno = 4;
+        svr->flag = 0;
+    }
+    return 1;
+}
+
+static u32 mainseq_4(struct mevent_client * svr)
+{
+    // process command
+    struct mevent_client_cmd * cmd = &svr->cmdBuffer[svr->cmdidx];
+    ++svr->cmdidx;
+    switch (cmd->instr)
+    {
+    case 0:
+        break;
+    case 1:
+        svr->param = cmd->parameter;
+        svr->mainseqno = 1;
+        svr->flag = 0;
+        break;
+    case 2:
+        mevent_srv_sub_init_recv(&svr->manager, cmd->parameter, svr->recvBuffer);
+        svr->mainseqno = 2;
+        svr->flag = 0;
+        break;
+    case 3:
+        svr->mainseqno = 3;
+        svr->flag = 0;
+        break;
+    case 20:
+        mevent_srv_sub_init_send(&svr->manager, 0x14, svr->sendBuffer, 0);
+        svr->mainseqno = 3;
+        svr->flag = 0;
+        break;
+    case 19:
+        mevent_client_send_word(svr, 0x12, GetGameStat(cmd->parameter));
+        svr->mainseqno = 3;
+        svr->flag = 0;
+        break;
+    case 6:
+        if (svr->param == 0)
+            mevent_client_jmp_buffer(svr);
+        break;
+    case 7:
+        if (svr->param == 1)
+            mevent_client_jmp_buffer(svr);
+        break;
+    case 4:
+        mevent_client_jmp_buffer(svr);
+        break;
+    case 5:
+        memcpy(svr->buffer, svr->recvBuffer, 0x40);
+        svr->mainseqno = 5;
+        svr->flag = 0;
+        return 2;
+    case 11:
+        memcpy(svr->buffer, svr->recvBuffer, 0x40);
+        svr->mainseqno = 5;
+        svr->flag = 0;
+        return 3;
+    case 12:
+        memcpy(svr->buffer, svr->recvBuffer, 0x40);
+        svr->mainseqno = 5;
+        svr->flag = 0;
+        return 5;
+    case 13:
+        svr->mainseqno = 5;
+        svr->flag = 0;
+        return 4;
+    case 8:
+        sub_801B580(svr->sendBuffer, svr->unk_4C);
+        mevent_srv_sub_init_send(&svr->manager, 0x11, svr->sendBuffer, sizeof(struct MEventStruct_Unk1442CC));
+        break;
+    case 14:
+        mevent_client_send_word(svr, 0x13, svr->param);
+        break;
+    case 10:
+        sub_801B21C(svr->recvBuffer);
+        break;
+    case 9:
+        if (!sub_801B1A4(svr->recvBuffer))
+        {
+            sub_801B078(svr->recvBuffer);
+            mevent_client_send_word(svr, 0x13, 0);
+        }
+        else
+            mevent_client_send_word(svr, 0x13, 1);
+        break;
+    case 15:
+        svr->mainseqno = 6;
+        svr->flag = 0;
+        break;
+    case 16:
+        sub_801B508(svr->recvBuffer);
+        break;
+    case 17:
+        InitRamScript_NoEventObject(svr->recvBuffer, 1000);
+        break;
+    case 18:
+        memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, svr->recvBuffer, 0xbc);
+        ValidateEReaderTrainer();
+        break;
+    case 21:
+        memcpy(gDecompressionBuffer, svr->recvBuffer, ME_SEND_BUF_SIZE);
+        svr->mainseqno = 7;
+        svr->flag = 0;
+        break;
+    }
+
+    return 1;
+}
+
+static u32 mainseq_5(struct mevent_client * svr)
+{
+    // wait flag
+    if (svr->flag)
+    {
+        svr->mainseqno = 4;
+        svr->flag = 0;
+    }
+    return 1;
+}
+
+static u32 mainseq_6(struct mevent_client * svr)
+{
+    // ???
+    switch (svr->flag)
+    {
+    case 0:
+        sub_8153870(svr->recvBuffer);
+        ++svr->flag;
+        break;
+    case 1:
+        if (!sub_8153884(&svr->param))
+        {
+            svr->mainseqno = 4;
+            svr->flag = 0;
+        }
+        break;
+    }
+    return 1;
+}
+
+static u32 mainseq_7(struct mevent_client * svr)
+{
+    // exec arbitrary code
+    u32 (*func)(u32 *, struct SaveBlock2 *, struct SaveBlock1 *) = (void *)gDecompressionBuffer;
+    if (func(&svr->param, gSaveBlock2Ptr, gSaveBlock1Ptr) == 1)
+    {
+        svr->mainseqno = 4;
+        svr->flag = 0;
+    }
+    return 1;
+}
+
+static u32 mevent_client_exec(struct mevent_client * svr)
+{
+    u32 (*funcs[])(struct mevent_client *) = {
+        mainseq_0,
+        mainseq_1,
+        mainseq_2,
+        mainseq_3,
+        mainseq_4,
+        mainseq_5,
+        mainseq_6,
+        mainseq_7
+    };
+    return funcs[svr->mainseqno](svr);
+}
diff --git a/src/mevent_scripts.c b/src/mevent_scripts.c
new file mode 100644
index 000000000..41a5ddd51
--- /dev/null
+++ b/src/mevent_scripts.c
@@ -0,0 +1,191 @@
+#include "global.h"
+#include "mevent_client.h"
+#include "mevent_server.h"
+
+const u8 gText_CanceledReadingCard[] = _("Canceled reading\nthe Card.");
+
+
+const struct mevent_client_cmd gUnknown_082F2598[] = {
+    {.instr =  2, .parameter = 16},
+    {.instr =  4, .parameter = 0}
+};
+
+const struct mevent_client_cmd gUnknown_082F25A8[] = {
+    {.instr =  8, .parameter = 0},
+    {.instr =  3, .parameter = 0},
+    {.instr =  2, .parameter = 16},
+    {.instr =  4, .parameter = 0}
+};
+
+const struct mevent_client_cmd gUnknown_082F25C8[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 10}
+};
+
+const struct mevent_client_cmd gUnknown_082F25D8[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 11}
+};
+
+const struct mevent_client_cmd gUnknown_082F25E8[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 0}
+};
+
+const struct mevent_client_cmd gUnknown_082F25F8[] = {
+    {.instr =  2, .parameter = 22},
+    {.instr = 10, .parameter = 0},
+    {.instr =  2, .parameter = 25},
+    {.instr = 17, .parameter = 0},
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 2}
+};
+
+const struct mevent_client_cmd gUnknown_082F2628[] = {
+    {.instr =  2, .parameter = 23},
+    {.instr =  9, .parameter = 0},
+    {.instr =  3, .parameter = 0},
+    {.instr =  2, .parameter = 16},
+    {.instr =  4, .parameter = 0}
+};
+
+const struct mevent_client_cmd gUnknown_082F2650[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 7}
+};
+
+const struct mevent_client_cmd gUnknown_082F2660[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 3}
+};
+
+const struct mevent_client_cmd gUnknown_082F2670[] = {
+    {.instr = 13, .parameter = 0},
+    {.instr = 14, .parameter = 0},
+    {.instr =  3, .parameter = 0},
+    {.instr =  2, .parameter = 16},
+    {.instr =  4, .parameter = 0}
+};
+
+const struct mevent_client_cmd gUnknown_082F2698[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 9}
+};
+
+const struct mevent_client_cmd gUnknown_082F26A8[] = {
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 5}
+};
+
+const struct mevent_client_cmd gUnknown_082F26B8[] = {
+    {.instr =  2, .parameter = 21},
+    {.instr = 12, .parameter = 0},
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 14},
+    {.instr =  2, .parameter = 21},
+    {.instr = 12, .parameter = 0},
+    {.instr = 20, .parameter = 0},
+    {.instr =  1, .parameter = 13}
+};
+
+const struct mevent_cmd gUnknown_082F26F8[] = {
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F25C8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x0a, .parameter = NULL},
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F25D8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x0b, .parameter = NULL},
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F2698},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x09, .parameter = NULL}
+};
+
+const struct mevent_cmd gUnknown_082F2788[] = {
+    {.instr = 18, .flag = 0x20, .parameter = gUnknown_082F26B8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr = 20, .flag = 0x1b, .parameter = gText_CanceledReadingCard},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x09, .parameter = NULL}
+};
+
+const struct mevent_cmd gUnknown_082F27D0[] = {
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F2650},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x07, .parameter = NULL}
+};
+
+const struct mevent_cmd gUnknown_082F2800[] = {
+    {.instr = 18, .flag = 0x28, .parameter = gUnknown_082F2628},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr = 14, .flag = 0x00, .parameter = NULL},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x13, .parameter = NULL},
+    {.instr =  8, .flag = 0x00, .parameter = NULL},
+    {.instr =  4, .flag = 0x01, .parameter = gUnknown_082F27D0},
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F2660},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x03, .parameter = NULL}
+};
+
+const struct mevent_cmd gUnknown_082F2884[] = {
+    {.instr = 18, .flag = 0x30, .parameter = gUnknown_082F25F8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr = 13, .flag = 0x00, .parameter = NULL},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr = 15, .flag = 0x00, .parameter = NULL},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x02, .parameter = NULL}
+};
+
+const struct mevent_cmd gUnknown_082F28E4[] = {
+    {.instr = 18, .flag = 0x28, .parameter = gUnknown_082F2670},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x13, .parameter = NULL},
+    {.instr =  8, .flag = 0x00, .parameter = NULL},
+    {.instr =  4, .flag = 0x00, .parameter = gUnknown_082F2884},
+    {.instr =  3, .flag = 0x00, .parameter = gUnknown_082F2788}
+};
+
+const struct mevent_cmd gUnknown_082F292C[] = {
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F26A8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x05, .parameter = NULL},
+    {.instr = 18, .flag = 0x10, .parameter = gUnknown_082F25E8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x14, .parameter = NULL},
+    {.instr =  0, .flag = 0x00, .parameter = NULL}
+};
+
+const struct mevent_cmd s_mevent_wonder_news[] = {
+    {.instr = 27, .flag = 0x00, .parameter = NULL},
+    {.instr = 18, .flag = 0x20, .parameter = gUnknown_082F25A8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x11, .parameter = NULL},
+    {.instr =  5, .flag = 0x00, .parameter = NULL},
+    {.instr = 30, .flag = 0x00, .parameter = NULL},
+    {.instr =  4, .flag = 0x00, .parameter = gUnknown_082F26F8},
+    {.instr =  3, .flag = 0x00, .parameter = gUnknown_082F2800}
+};
+
+const struct mevent_cmd s_mevent_wonder_card[] = {
+    {.instr = 26, .flag = 0x00, .parameter = NULL},
+    {.instr = 28, .flag = 0x00, .parameter = NULL},
+    {.instr = 18, .flag = 0x20, .parameter = gUnknown_082F25A8},
+    {.instr =  1, .flag = 0x00, .parameter = NULL},
+    {.instr =  2, .flag = 0x11, .parameter = NULL},
+    {.instr =  5, .flag = 0x00, .parameter = NULL},
+    {.instr =  6, .flag = 0x00, .parameter = NULL},
+    {.instr =  4, .flag = 0x00, .parameter = gUnknown_082F26F8},
+    {.instr =  7, .flag = 0x00, .parameter = NULL},
+    {.instr =  4, .flag = 0x02, .parameter = gUnknown_082F28E4},
+    {.instr =  4, .flag = 0x00, .parameter = gUnknown_082F2884},
+    {.instr =  3, .flag = 0x00, .parameter = gUnknown_082F292C}
+};
diff --git a/src/mevent_server.c b/src/mevent_server.c
new file mode 100644
index 000000000..06b10dd95
--- /dev/null
+++ b/src/mevent_server.c
@@ -0,0 +1,295 @@
+#include "global.h"
+#include "alloc.h"
+#include "script.h"
+#include "mevent.h"
+#include "mevent_server.h"
+#include "mevent_server_helpers.h"
+
+EWRAM_DATA struct mevent_srv_common * s_mevent_srv_common_ptr = NULL;
+
+static void mevent_srv_init_common(struct mevent_srv_common *, const void *, u32, u32);
+static void mevent_srv_free_resources(struct mevent_srv_common *);
+static u32 mevent_srv_exec_common(struct mevent_srv_common *);
+
+extern const struct mevent_cmd s_mevent_wonder_news[];
+extern const struct mevent_cmd s_mevent_wonder_card[];
+
+void mevent_srv_init_wnews(void)
+{
+    s_mevent_srv_common_ptr = AllocZeroed(sizeof(struct mevent_srv_common));
+    mevent_srv_init_common(s_mevent_srv_common_ptr, s_mevent_wonder_news, 0, 1);
+}
+
+void mevent_srv_new_wcard(void)
+{
+    s_mevent_srv_common_ptr = AllocZeroed(sizeof(struct mevent_srv_common));
+    mevent_srv_init_common(s_mevent_srv_common_ptr, s_mevent_wonder_card, 0, 1);
+}
+
+u32 mevent_srv_common_do_exec(u16 * a0)
+{
+    u32 result;
+    if (s_mevent_srv_common_ptr == NULL)
+        return 3;
+    result = mevent_srv_exec_common(s_mevent_srv_common_ptr);
+    if (result == 3)
+    {
+        *a0 = s_mevent_srv_common_ptr->param;
+        mevent_srv_free_resources(s_mevent_srv_common_ptr);
+        Free(s_mevent_srv_common_ptr);
+        s_mevent_srv_common_ptr = NULL;
+    }
+    return result;
+}
+
+static void mevent_srv_init_common(struct mevent_srv_common * svr, const void * cmdBuffer, u32 sendPlayerNo, u32 recvPlayerNo)
+{
+    svr->unk_00 = 0;
+    svr->mainseqno = 0;
+    svr->wonder_card = AllocZeroed(sizeof(struct WonderCard));
+    svr->wonder_news = AllocZeroed(sizeof(struct WonderNews));
+    svr->recvBuffer = AllocZeroed(ME_SEND_BUF_SIZE);
+    svr->mevent_unk1442cc = AllocZeroed(sizeof(struct MEventStruct_Unk1442CC));
+    svr->cmdBuffer = cmdBuffer;
+    svr->cmdidx = 0;
+    mevent_srv_sub_init(&svr->manager, sendPlayerNo, recvPlayerNo);
+}
+
+static void mevent_srv_free_resources(struct mevent_srv_common * svr)
+{
+    Free(svr->wonder_card);
+    Free(svr->wonder_news);
+    Free(svr->recvBuffer);
+    Free(svr->mevent_unk1442cc);
+}
+
+void mevent_srv_common_init_send(struct mevent_srv_common * svr, u32 ident, const void * src, u32 size)
+{
+    AGB_ASSERT(size <= ME_SEND_BUF_SIZE);
+    mevent_srv_sub_init_send(&svr->manager, ident, src, size);
+}
+
+static const void * mevent_first_if_not_null_else_second(const void * a0, const void * a1)
+{
+    if (a0 != NULL)
+        return a0;
+    else
+        return a1;
+}
+
+static u32 mevent_compare_pointers(const void * a0, const void * a1)
+{
+    if (a1 < a0)
+        return 0;
+    else if (a1 == a0)
+        return 1;
+    else
+        return 2;
+}
+
+static u32 common_mainseq_0(struct mevent_srv_common * svr)
+{
+    // start
+    svr->mainseqno = 4;
+    return 0;
+}
+
+static u32 common_mainseq_1(struct mevent_srv_common * svr)
+{
+    // done
+    return 3;
+}
+
+static u32 common_mainseq_2(struct mevent_srv_common * svr)
+{
+    // do recv
+    if (mevent_srv_sub_recv(&svr->manager))
+        svr->mainseqno = 4;
+    return 1;
+}
+
+static u32 common_mainseq_3(struct mevent_srv_common * svr)
+{
+    // do send
+    if (mevent_srv_sub_send(&svr->manager))
+        svr->mainseqno = 4;
+    return 1;
+}
+
+static u32 common_mainseq_4(struct mevent_srv_common * svr)
+{
+    // process command
+    const struct mevent_cmd * cmd = &svr->cmdBuffer[svr->cmdidx];
+    const void * ptr;
+    svr->cmdidx++;
+
+    switch (cmd->instr)
+    {
+    case 0:
+        // end
+        AGB_ASSERT(cmd->parameter == NULL);
+        svr->mainseqno = 1;
+        svr->param = cmd->flag;
+        break;
+    case 1:
+        // wait_send
+        svr->mainseqno = 3;
+        break;
+    case 2:
+        // receive
+        AGB_ASSERT(cmd->parameter == NULL);
+        mevent_srv_sub_init_recv(&svr->manager, cmd->flag, svr->recvBuffer);
+        svr->mainseqno = 2;
+        break;
+    case 3:
+        // jump
+        AGB_ASSERT(cmd->flag == FALSE);
+        svr->cmdidx = 0;
+        svr->cmdBuffer = cmd->parameter;
+        break;
+    case 5:
+        // get_1442CC
+        AGB_ASSERT(cmd->flag == FALSE);
+        AGB_ASSERT(cmd->parameter == NULL);
+        memcpy(svr->mevent_unk1442cc, svr->recvBuffer, sizeof(struct MEventStruct_Unk1442CC));
+        break;
+    case 6:
+        // check_header__pass_false
+        AGB_ASSERT(cmd->flag == FALSE);
+        AGB_ASSERT(cmd->parameter == NULL);
+        svr->param = sub_801B6A0(svr->mevent_unk1442cc, FALSE);
+        break;
+    case 30:
+        // check_header__pass_true
+        AGB_ASSERT(cmd->flag == FALSE);
+        AGB_ASSERT(cmd->parameter == NULL);
+        svr->param = sub_801B6A0(svr->mevent_unk1442cc, TRUE);
+        break;
+    case 4:
+        // jump_if_eq
+        if (svr->param == cmd->flag)
+        {
+            svr->cmdidx = 0;
+            svr->cmdBuffer = cmd->parameter;
+        }
+        break;
+    case 7:
+        // check_crc
+        AGB_ASSERT(cmd->flag == FALSE);
+        ptr = mevent_first_if_not_null_else_second(cmd->parameter, svr->wonder_card);
+        svr->param = sub_801B6EC(ptr, svr->mevent_unk1442cc, ptr);
+        break;
+    case 8:
+        // read_word
+        AGB_ASSERT(cmd->flag == FALSE);
+        AGB_ASSERT(cmd->parameter == NULL);
+        svr->param = *(u32 *)svr->recvBuffer;
+        break;
+    case 9:
+        AGB_ASSERT(cmd->flag == FALSE);
+        ptr = mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord);
+        svr->param = sub_801B708(ptr, svr->mevent_unk1442cc, ptr);
+        break;
+    case 10:
+        AGB_ASSERT(cmd->parameter == NULL);
+        svr->param = MEventStruct_Unk1442CC_GetValueNFrom_unk_20(svr->mevent_unk1442cc, cmd->flag);
+        break;
+    case 11:
+        AGB_ASSERT(cmd->flag == FALSE);
+        svr->param = MEventStruct_Unk1442CC_CompareField_unk_16(svr->mevent_unk1442cc, cmd->parameter);
+        break;
+    case 12:
+        AGB_ASSERT(cmd->flag == FALSE);
+        svr->param = mevent_compare_pointers(cmd->parameter, *(void **)svr->recvBuffer);
+        break;
+    case 14:
+        AGB_ASSERT(cmd->flag == FALSE);
+        mevent_srv_common_init_send(svr, 0x17, mevent_first_if_not_null_else_second(cmd->parameter, svr->wonder_news), sizeof(struct WonderNews));
+        break;
+    case 13:
+        AGB_ASSERT(cmd->flag == FALSE);
+        mevent_srv_common_init_send(svr, 0x16, mevent_first_if_not_null_else_second(cmd->parameter, svr->wonder_card), sizeof(struct WonderCard));
+        break;
+    case 16:
+        AGB_ASSERT(cmd->flag == FALSE);
+        mevent_srv_common_init_send(svr, 0x18, mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord), 4);
+        break;
+    case 15:
+        if (cmd->parameter == NULL)
+            mevent_srv_common_init_send(svr, 0x19, svr->sendBuffer1, svr->sendBuffer1Size);
+        else
+            mevent_srv_common_init_send(svr, 0x19, cmd->parameter, cmd->flag);
+        break;
+    case 18:
+        if (cmd->parameter == NULL)
+            mevent_srv_common_init_send(svr, 0x10, svr->sendBuffer2, svr->sendBuffer2Size);
+        else
+            mevent_srv_common_init_send(svr, 0x10, cmd->parameter, cmd->flag);
+        break;
+    case 19:
+        AGB_ASSERT(cmd->flag == FALSE);
+        mevent_srv_common_init_send(svr, 0x1a, cmd->parameter, 188);
+        break;
+    case 20:
+        mevent_srv_common_init_send(svr, 0x15, cmd->parameter, cmd->flag);
+        break;
+    case 17:
+        mevent_srv_common_init_send(svr, 0x1c, cmd->parameter, cmd->flag);
+        break;
+    case 22:
+        AGB_ASSERT(cmd->flag == FALSE);
+        memcpy(svr->wonder_card, cmd->parameter, 332);
+        break;
+    case 23:
+        AGB_ASSERT(cmd->flag == FALSE);
+        memcpy(svr->wonder_news, cmd->parameter, 444);
+        break;
+    case 21:
+        AGB_ASSERT(cmd->flag == FALSE);
+        svr->sendWord = *(u32 *)cmd->parameter;
+        break;
+    case 24:
+        svr->sendBuffer1 = cmd->parameter;
+        svr->sendBuffer1Size = cmd->flag;
+        break;
+    case 25:
+        svr->sendBuffer2 = cmd->parameter;
+        svr->sendBuffer2Size = cmd->flag;
+        break;
+    case 26:
+        AGB_ASSERT(cmd->flag == FALSE && cmd->parameter == NULL);
+        memcpy(svr->wonder_card, GetSavedWonderCard(), 332);
+        WonderCard_ResetInternalReceivedFlag(svr->wonder_card);
+        break;
+    case 27:
+        AGB_ASSERT(cmd->flag == FALSE && cmd->parameter == NULL);
+        memcpy(svr->wonder_news, GetSavedWonderNews(), 444);
+        break;
+    case 28:
+        AGB_ASSERT(cmd->flag == FALSE && cmd->parameter == NULL);
+        svr->sendBuffer1 = GetSavedRamScriptIfValid();
+        break;
+    case 29:
+        mevent_srv_common_init_send(svr, 0x1b, cmd->parameter, cmd->flag);
+        break;
+    }
+
+    return 1;
+}
+
+static u32 (*const func_tbl[])(struct mevent_srv_common *) = {
+    common_mainseq_0,
+    common_mainseq_1,
+    common_mainseq_2,
+    common_mainseq_3,
+    common_mainseq_4
+};
+
+static u32 mevent_srv_exec_common(struct mevent_srv_common * svr)
+{
+    u32 response;
+    AGB_ASSERT(svr->mainseqno < NELEMS(func_tbl));
+    response = func_tbl[svr->mainseqno](svr);
+    AGB_ASSERT(svr->mainseqno < NELEMS(func_tbl));
+    return response;
+}
diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c
new file mode 100644
index 000000000..9d47ba745
--- /dev/null
+++ b/src/mevent_server_helpers.c
@@ -0,0 +1,211 @@
+#include "global.h"
+#include "alloc.h"
+#include "decompress.h"
+#include "util.h"
+#include "link.h"
+#include "link_rfu.h"
+#include "overworld.h"
+#include "script.h"
+#include "battle_tower.h"
+#include "mystery_event_script.h"
+#include "mevent.h"
+#include "mevent_server_helpers.h"
+
+static u32 mevent_receive_func(struct mevent_srv_sub *);
+static u32 mevent_send_func(struct mevent_srv_sub *);
+
+u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr)
+{
+    return svr->recvFunc(svr);
+}
+
+u32 mevent_srv_sub_send(struct mevent_srv_sub * svr)
+{
+    return svr->sendFunc(svr);
+}
+
+void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recvPlayerNo)
+{
+    svr->sendPlayerNo = sendPlayerNo;
+    svr->recvPlayerNo = recvPlayerNo;
+    svr->seqno = 0;
+    svr->sendCRC = 0;
+    svr->sendSize = 0;
+    svr->sendCounter = 0;
+    svr->recvCRC = 0;
+    svr->recvSize = 0;
+    svr->recvCounter = 0;
+    svr->sendBfr = NULL;
+    svr->recvBfr = NULL;
+    svr->sendFunc = mevent_send_func;
+    svr->recvFunc = mevent_receive_func;
+}
+
+void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size)
+{
+    svr->seqno = 0;
+    svr->sendIdent = ident;
+    svr->sendCounter = 0;
+    svr->sendCRC = 0;
+    if (size != 0)
+        svr->sendSize = size;
+    else
+        svr->sendSize = ME_SEND_BUF_SIZE;
+    svr->sendBfr = src;
+}
+
+void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest)
+{
+    svr->seqno = 0;
+    svr->recvIdent = ident;
+    svr->recvCounter = 0;
+    svr->recvCRC = 0;
+    svr->recvSize = 0;
+    svr->recvBfr = dest;
+}
+
+static void mevent_recv_block(u32 recv_idx, void * dest, size_t size)
+{
+    memcpy(dest, gBlockRecvBuffer[recv_idx], size);
+}
+
+static bool32 mevent_has_received(u32 recv_idx)
+{
+    if ((GetBlockReceivedStatus() >> recv_idx) & 1)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void mevent_reset_recv(u32 recv_idx)
+{
+    ResetBlockReceivedFlag(recv_idx);
+}
+
+static bool32 mevent_receive_func(struct mevent_srv_sub * svr)
+{
+    struct send_recv_header header;
+
+    switch (svr->seqno)
+    {
+        case 0:
+            if (mevent_has_received(svr->recvPlayerNo))
+            {
+                mevent_recv_block(svr->recvPlayerNo, &header, sizeof(header));
+                svr->recvSize = header.size;
+                svr->recvCRC = header.crc;
+                if (svr->recvSize > ME_SEND_BUF_SIZE)
+                {
+                    LinkRfu_FatalError();
+                    return FALSE;
+                }
+                else if (svr->recvIdent != header.ident)
+                {
+                    LinkRfu_FatalError();
+                    return FALSE;
+                }
+                else
+                {
+                    svr->recvCounter = 0;
+                    mevent_reset_recv(svr->recvPlayerNo);
+                    ++svr->seqno;
+                }
+            }
+            break;
+        case 1:
+            if (mevent_has_received(svr->recvPlayerNo))
+            {
+                size_t blocksiz = svr->recvCounter * 252;
+                if (svr->recvSize - blocksiz <= 252)
+                {
+                    mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + blocksiz, svr->recvSize - blocksiz);
+                    ++svr->recvCounter;
+                    ++svr->seqno;
+                }
+                else
+                {
+                    mevent_recv_block(svr->recvPlayerNo, svr->recvBfr + blocksiz, 252);
+                    ++svr->recvCounter;
+                }
+                mevent_reset_recv(svr->recvPlayerNo);
+            }
+            break;
+        case 2:
+            if (CalcCRC16WithTable(svr->recvBfr, svr->recvSize) != svr->recvCRC)
+            {
+                LinkRfu_FatalError();
+                return FALSE;
+            }
+            else
+            {
+                svr->seqno = 0;
+                return TRUE;
+            }
+            break;
+
+    }
+
+    return FALSE;
+}
+
+static bool32 mevent_send_func(struct mevent_srv_sub * svr)
+{
+    struct send_recv_header header;
+
+    switch (svr->seqno)
+    {
+        case 0:
+            if (IsLinkTaskFinished())
+            {
+                header.ident = svr->sendIdent;
+                header.size = svr->sendSize;
+                header.crc = CalcCRC16WithTable(svr->sendBfr, svr->sendSize);
+                svr->sendCRC = header.crc;
+                svr->sendCounter = 0;
+                SendBlock(0, &header, sizeof(header));
+                ++svr->seqno;
+            }
+            break;
+        case 1:
+            if (IsLinkTaskFinished())
+            {
+                if (mevent_has_received(svr->sendPlayerNo))
+                {
+                    size_t blocksiz;
+                    mevent_reset_recv(svr->sendPlayerNo);
+                    blocksiz = 252 * svr->sendCounter;
+                    if (svr->sendSize - blocksiz <= 252)
+                    {
+                        SendBlock(0, svr->sendBfr + blocksiz, svr->sendSize - blocksiz);
+                        ++svr->sendCounter;
+                        ++svr->seqno;
+                    }
+                    else
+                    {
+                        SendBlock(0, svr->sendBfr + blocksiz, 252);
+                        ++svr->sendCounter;
+                    }
+                }
+            }
+            break;
+        case 2:
+            if (IsLinkTaskFinished())
+            {
+                if (CalcCRC16WithTable(svr->sendBfr, svr->sendSize) != svr->sendCRC)
+                    LinkRfu_FatalError();
+                else
+                    ++svr->seqno;
+            }
+            break;
+        case 3:
+            if (mevent_has_received(svr->sendPlayerNo))
+            {
+                mevent_reset_recv(svr->sendPlayerNo);
+                svr->seqno = 0;
+                return TRUE;
+            }
+            break;
+    }
+
+    return FALSE;
+}
diff --git a/src/move_relearner.c b/src/move_relearner.c
index e148b9ace..0b0b4a5aa 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "bg.h"
 #include "contest_effect.h"
-#include "data2.h"
+#include "data.h"
 #include "event_data.h"
 #include "field_screen_effect.h"
 #include "gpu_regs.h"
diff --git a/src/mystery_gift.c b/src/mystery_gift.c
index c8b3a9060..ab3df9020 100644
--- a/src/mystery_gift.c
+++ b/src/mystery_gift.c
@@ -25,7 +25,7 @@
 #include "mevent_801BAAC.h"
 #include "save.h"
 #include "link.h"
-#include "mevent_server_ish.h"
+#include "mevent_client.h"
 #include "event_data.h"
 #include "link_rfu.h"
 #include "mevent_news.h"
@@ -815,11 +815,11 @@ static bool32 HandleLoadWonderCardOrNews(u8 * state, bool32 cardOrNews)
     case 0:
         if (cardOrNews == 0)
         {
-            InitWonderCardResources(sav1_get_mevent_buffer_1(), sav1_get_mevent_buffer_2());
+            InitWonderCardResources(GetSavedWonderCard(), sav1_get_mevent_buffer_2());
         }
         else
         {
-            InitWonderNewsResources(sav1_get_mevent_buffer_0());
+            InitWonderNewsResources(GetSavedWonderNews());
         }
         (*state)++;
         break;
@@ -1269,7 +1269,7 @@ void task00_mystery_gift(u8 taskId)
         {
             ClearScreenInBg0(TRUE);
             data->state = 7;
-            mevent_srv_ish_do_init(data->IsCardOrNews);
+            mevent_client_do_init(data->IsCardOrNews);
         }
         else if (gSpecialVar_Result == 5)
         {
@@ -1282,7 +1282,7 @@ void task00_mystery_gift(u8 taskId)
         data->state = 8;
         break;
     case  8:
-        switch (mevent_srv_ish_do_exec(&data->curPromptWindowId))
+        switch (mevent_client_do_exec(&data->curPromptWindowId))
         {
         case 6:
             task_add_05_task_del_08FA224_when_no_RfuFunc();
@@ -1290,8 +1290,8 @@ void task00_mystery_gift(u8 taskId)
             data->state = 13;
             break;
         case 5:
-            memcpy(data->buffer, mevent_srv_ish_get_buffer(), 0x40);
-            mevent_srv_ish_inc_flag();
+            memcpy(data->buffer, mevent_client_get_buffer(), 0x40);
+            mevent_client_inc_flag();
             break;
         case 3:
             data->state = 10;
@@ -1306,29 +1306,29 @@ void task00_mystery_gift(u8 taskId)
         }
         break;
     case  9:
-        switch ((u32)mevent_message_print_and_prompt_yes_no(&data->textState, &data->curPromptWindowId, FALSE, mevent_srv_ish_get_buffer()))
+        switch ((u32)mevent_message_print_and_prompt_yes_no(&data->textState, &data->curPromptWindowId, FALSE, mevent_client_get_buffer()))
         {
         case 0:
-            mevent_srv_ish_set_param(0);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(0);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         case 1:
-            mevent_srv_ish_set_param(1);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(1);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         case -1u:
-            mevent_srv_ish_set_param(1);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(1);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         }
         break;
     case 10:
-        if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, mevent_srv_ish_get_buffer()))
+        if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, mevent_client_get_buffer()))
         {
-            mevent_srv_ish_inc_flag();
+            mevent_client_inc_flag();
             data->state = 7;
         }
         break;
@@ -1342,19 +1342,19 @@ void task00_mystery_gift(u8 taskId)
             }
             else
             {
-                mevent_srv_ish_set_param(0);
-                mevent_srv_ish_inc_flag();
+                mevent_client_set_param(0);
+                mevent_client_inc_flag();
                 data->state = 7;
             }
             break;
         case 1:
-            mevent_srv_ish_set_param(1);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(1);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         case -1u:
-            mevent_srv_ish_set_param(1);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(1);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         }
@@ -1363,18 +1363,18 @@ void task00_mystery_gift(u8 taskId)
         switch ((u32)mevent_message_print_and_prompt_yes_no(&data->textState, &data->curPromptWindowId, FALSE, gText_HaventReceivedCardsGift))
         {
         case 0:
-            mevent_srv_ish_set_param(0);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(0);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         case 1:
-            mevent_srv_ish_set_param(1);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(1);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         case -1u:
-            mevent_srv_ish_set_param(1);
-            mevent_srv_ish_inc_flag();
+            mevent_client_set_param(1);
+            mevent_client_inc_flag();
             data->state = 7;
             break;
         }
diff --git a/src/naming_screen.c b/src/naming_screen.c
index c264cfeed..7da7d99b0 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -21,7 +21,7 @@
 #include "trig.h"
 #include "field_effect.h"
 #include "pokemon_icon.h"
-#include "data2.h"
+#include "data.h"
 #include "strings.h"
 #include "menu.h"
 #include "text_window.h"
@@ -450,7 +450,7 @@ static u8 sub_80E3274(void)
 static bool8 MainState_BeginFadeIn(void)
 {
     sub_80E4CF8(3, gUnknown_08DD4544);
-    gNamingScreenData->currentPage = 1;
+    gNamingScreenData->currentPage = PAGE_UPPER;
     sub_80E4CF8(2, gUnknown_08DD46E0);
     sub_80E4CF8(1, gUnknown_08DD4620);
     sub_80E4DE4(gNamingScreenData->windows[1], 0);
@@ -1857,7 +1857,7 @@ static const struct NamingScreenTemplate playerNamingScreenTemplate =
     .maxChars = 7,
     .iconFunction = 1,
     .addGenderIcon = 0,
-    .initialPage = 1,
+    .initialPage = PAGE_UPPER,
     .unused = 35,
     .title = gText_YourName,
 };
@@ -1868,7 +1868,7 @@ static const struct NamingScreenTemplate pcBoxNamingTemplate =
     .maxChars = 8,
     .iconFunction = 2,
     .addGenderIcon = 0,
-    .initialPage = 1,
+    .initialPage = PAGE_UPPER,
     .unused = 19,
     .title = gText_BoxName,
 };
@@ -1879,7 +1879,7 @@ static const struct NamingScreenTemplate monNamingScreenTemplate =
     .maxChars = 10,
     .iconFunction = 3,
     .addGenderIcon = 1,
-    .initialPage = 1,
+    .initialPage = PAGE_UPPER,
     .unused = 35,
     .title = gText_PkmnsNickname,
 };
@@ -1890,7 +1890,7 @@ static const struct NamingScreenTemplate wandaWordsScreenTemplate =
     .maxChars = 15,
     .iconFunction = 4,
     .addGenderIcon = 0,
-    .initialPage = 1,
+    .initialPage = PAGE_UPPER,
     .unused = 11,
     .title = gText_TellHimTheWords,
 };
@@ -1907,52 +1907,43 @@ static const struct NamingScreenTemplate *const sNamingScreenTemplates[] =
 const struct OamData gOamData_858BFEC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
 };
 
 const struct OamData gOamData_858BFF4 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
 };
 
 const struct OamData gOamData_858BFFC =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
 };
 
 static const struct Subsprite gUnknown_0858C004[] =
@@ -2204,3 +2195,5 @@ static const struct SpritePalette gUnknown_0858C230[] =
     {gNamingScreenMenu_Pal + 0x40,  0x0007},
     {NULL}
 };
+
+
diff --git a/src/new_game.c b/src/new_game.c
index feab258d9..7a0c668a4 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -170,7 +170,7 @@ void NewGameInitData(void)
     InitEventData();
     ClearTVShowData();
     ResetGabbyAndTy();
-    ResetSecretBases();
+    ClearSecretBases();
     ClearBerryTrees();
     SetMoney(&gSaveBlock1Ptr->money, 3000);
     SetCoins(0);
diff --git a/src/overworld.c b/src/overworld.c
index c46440012..4356752c1 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -889,7 +889,7 @@ static void mli0_load_map(u32 a1)
     if (a1 != 1 && isIndoors)
     {
         UpdateTVScreensOnMap(gBackupMapLayout.width, gBackupMapLayout.height);
-        sub_80E9238(1);
+        InitSecretBaseAppearance(TRUE);
     }
 }
 
@@ -1508,7 +1508,7 @@ void SetUnusedCallback(void *func)
 
 static bool8 map_post_load_hook_exec(void)
 {
-    if (gFieldCallback2 != NULL)
+    if (gFieldCallback2)
     {
         if (!gFieldCallback2())
         {
@@ -1522,7 +1522,7 @@ static bool8 map_post_load_hook_exec(void)
     }
     else
     {
-        if (gFieldCallback != NULL)
+        if (gFieldCallback)
             gFieldCallback();
         else
             mapldr_default();
@@ -1701,7 +1701,7 @@ void sub_80861E8(void)
 
 static void sub_8086204(void)
 {
-    if ((gMapHeader.flags & 0xF8) == 8 && sub_80E909C() == TRUE)
+    if ((gMapHeader.flags & 0xF8) == 8 && SecretBaseMapPopupEnabled() == TRUE)
         ShowMapNamePopup();
     sub_80AF3C8();
 }
@@ -1947,7 +1947,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2)
         (*state)++;
         break;
     case 11:
-        if ((gMapHeader.flags & 0xF8) == 8 && sub_80E909C() == 1)
+        if ((gMapHeader.flags & 0xF8) == 8 && SecretBaseMapPopupEnabled() == TRUE)
             ShowMapNamePopup();
         (*state)++;
         break;
@@ -2287,7 +2287,7 @@ static void SetKeyInterceptCallback(u16 (*func)(u32))
 static void CheckRfuKeepAliveTimer(void)
 {
     if (gWirelessCommType != 0 && ++sRfuKeepAliveTimer > 60)
-        sub_8010198();
+        LinkRfu_FatalError();
 }
 
 static void ResetAllTradingStates(void)
@@ -2960,7 +2960,7 @@ static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s1
     eventObj->currentCoords.y = y;
     eventObj->previousCoords.x = x;
     eventObj->previousCoords.y = y;
-    sub_8093038(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y);
+    SetSpritePosToMapCoords(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y);
     eventObj->initialCoords.x += 8;
     EventObjectUpdateZCoord(eventObj);
 }
diff --git a/src/party_menu.c b/src/party_menu.c
index 6233558ff..b1dd8b94a 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -10,7 +10,7 @@
 #include "battle_pyramid_bag.h"
 #include "bg.h"
 #include "contest.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "easy_chat.h"
 #include "event_data.h"
diff --git a/src/player_pc.c b/src/player_pc.c
index 49b9cc5f5..08f24d379 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -412,9 +412,9 @@ static void PlayerPC_Mailbox(u8 taskId)
     }
 }
 
-static void PlayerPC_Decoration(u8 var)
+static void PlayerPC_Decoration(u8 taskId)
 {
-    sub_8126B2C(var); //DoPlayerPCDecoration(var);
+    DoPlayerRoomDecorationMenu(taskId);
 }
 
 static void PlayerPC_TurnOff(u8 taskId)
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 9c1be0f15..4ad15414d 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -1,13 +1,14 @@
 #include "global.h"
-#include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere
+#include "alloc.h"
+#include "battle.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "gpu_regs.h"
 #include "graphics.h"
+#include "item_menu.h"
 #include "main.h"
-#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "m4a.h"
@@ -50,10 +51,8 @@ struct PokeblockFeedStruct
     u8 unused;
 };
 
-extern u16 gSpecialVar_ItemId;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u16 gUnknown_0860F074[];
 
 // this file's functions
diff --git a/src/pokedex.c b/src/pokedex.c
index 94feaf440..0dae8a7b3 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle_main.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "gpu_regs.h"
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 8ca0c8d6e..487db6d58 100755..100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -169,9 +169,14 @@ const struct OamData gOamData_85B8C60 =
 {
     .y = 160,
     .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
+    .x = 0,
     .size = SPRITE_SIZE(64x64),
-    .priority = 1
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
 };
 
 const struct SpriteTemplate gUnknown_085B8C68 =
@@ -521,3 +526,4 @@ static void sub_8145B24(s8 a0)
     sCryVolumeMeter->unk1 = r2;
     sCryVolumeMeter->unk2 = 5;
 }
+
diff --git a/src/pokemon.c b/src/pokemon.c
index 7c26b4c22..9c6afe0b8 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -9,6 +9,7 @@
 #include "battle_pyramid.h"
 #include "battle_setup.h"
 #include "battle_tower.h"
+#include "data.h"
 #include "event_data.h"
 #include "evolution_scene.h"
 #include "field_specials.h"
@@ -51,29 +52,6 @@ struct SpeciesItem
     u16 item;
 };
 
-extern const struct SpriteFrameImage gUnknown_082FF3A8[];
-extern const struct SpriteFrameImage gUnknown_082FF3C8[];
-extern const struct SpriteFrameImage gUnknown_082FF3E8[];
-extern const struct SpriteFrameImage gUnknown_082FF408[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_Brendan[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_May[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_Wally[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_Steven[];
-extern const union AffineAnimCmd *const gUnknown_082FF618[];
-extern const union AffineAnimCmd *const gUnknown_082FF694[];
-extern const union AnimCmd *gPlayerMonSpriteAnimsTable[];
-extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[];
-extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
-extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
-extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
-extern const struct CompressedSpritePalette gMonPaletteTable[];
-extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
-extern const u8 gTrainerClassNames[][13];
-
 // this file's functions
 static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
 static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);
@@ -1810,419 +1788,63 @@ static const u8 sMonFrontAnimIdsTable[] =
     [SPECIES_CHIMECHO - 1] = 0x1d,
 };
 
-static const u8 sMonAnimationDelayTable[] =
+static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
 {
-    [SPECIES_BULBASAUR - 1] = 0x00,
-    [SPECIES_IVYSAUR - 1] = 0x00,
-    [SPECIES_VENUSAUR - 1] = 0x00,
-    [SPECIES_CHARMANDER - 1] = 0x00,
-    [SPECIES_CHARMELEON - 1] = 0x00,
-    [SPECIES_CHARIZARD - 1] = 0x00,
-    [SPECIES_SQUIRTLE - 1] = 0x00,
-    [SPECIES_WARTORTLE - 1] = 0x00,
     [SPECIES_BLASTOISE - 1] = 0x32,
-    [SPECIES_CATERPIE - 1] = 0x00,
-    [SPECIES_METAPOD - 1] = 0x00,
-    [SPECIES_BUTTERFREE - 1] = 0x00,
     [SPECIES_WEEDLE - 1] = 0x0a,
     [SPECIES_KAKUNA - 1] = 0x14,
     [SPECIES_BEEDRILL - 1] = 0x23,
-    [SPECIES_PIDGEY - 1] = 0x00,
     [SPECIES_PIDGEOTTO - 1] = 0x19,
-    [SPECIES_PIDGEOT - 1] = 0x00,
-    [SPECIES_RATTATA - 1] = 0x00,
-    [SPECIES_RATICATE - 1] = 0x00,
-    [SPECIES_SPEAROW - 1] = 0x00,
     [SPECIES_FEAROW - 1] = 0x02,
     [SPECIES_EKANS - 1] = 0x1e,
-    [SPECIES_ARBOK - 1] = 0x00,
-    [SPECIES_PIKACHU - 1] = 0x00,
-    [SPECIES_RAICHU - 1] = 0x00,
-    [SPECIES_SANDSHREW - 1] = 0x00,
-    [SPECIES_SANDSLASH - 1] = 0x00,
     [SPECIES_NIDORAN_F - 1] = 0x1c,
-    [SPECIES_NIDORINA - 1] = 0x00,
-    [SPECIES_NIDOQUEEN - 1] = 0x00,
-    [SPECIES_NIDORAN_M - 1] = 0x00,
-    [SPECIES_NIDORINO - 1] = 0x00,
     [SPECIES_NIDOKING - 1] = 0x19,
-    [SPECIES_CLEFAIRY - 1] = 0x00,
-    [SPECIES_CLEFABLE - 1] = 0x00,
-    [SPECIES_VULPIX - 1] = 0x00,
-    [SPECIES_NINETALES - 1] = 0x00,
-    [SPECIES_JIGGLYPUFF - 1] = 0x00,
-    [SPECIES_WIGGLYTUFF - 1] = 0x00,
-    [SPECIES_ZUBAT - 1] = 0x00,
-    [SPECIES_GOLBAT - 1] = 0x00,
-    [SPECIES_ODDISH - 1] = 0x00,
-    [SPECIES_GLOOM - 1] = 0x00,
-    [SPECIES_VILEPLUME - 1] = 0x00,
     [SPECIES_PARAS - 1] = 0x0a,
     [SPECIES_PARASECT - 1] = 0x2d,
     [SPECIES_VENONAT - 1] = 0x14,
-    [SPECIES_VENOMOTH - 1] = 0x00,
     [SPECIES_DIGLETT - 1] = 0x19,
     [SPECIES_DUGTRIO - 1] = 0x23,
     [SPECIES_MEOWTH - 1] = 0x28,
     [SPECIES_PERSIAN - 1] = 0x14,
-    [SPECIES_PSYDUCK - 1] = 0x00,
-    [SPECIES_GOLDUCK - 1] = 0x00,
     [SPECIES_MANKEY - 1] = 0x14,
-    [SPECIES_PRIMEAPE - 1] = 0x00,
     [SPECIES_GROWLITHE - 1] = 0x1e,
     [SPECIES_ARCANINE - 1] = 0x28,
-    [SPECIES_POLIWAG - 1] = 0x00,
     [SPECIES_POLIWHIRL - 1] = 0x05,
-    [SPECIES_POLIWRATH - 1] = 0x00,
-    [SPECIES_ABRA - 1] = 0x00,
-    [SPECIES_KADABRA - 1] = 0x00,
-    [SPECIES_ALAKAZAM - 1] = 0x00,
-    [SPECIES_MACHOP - 1] = 0x00,
-    [SPECIES_MACHOKE - 1] = 0x00,
-    [SPECIES_MACHAMP - 1] = 0x00,
-    [SPECIES_BELLSPROUT - 1] = 0x00,
     [SPECIES_WEEPINBELL - 1] = 0x03,
-    [SPECIES_VICTREEBEL - 1] = 0x00,
-    [SPECIES_TENTACOOL - 1] = 0x00,
-    [SPECIES_TENTACRUEL - 1] = 0x00,
-    [SPECIES_GEODUDE - 1] = 0x00,
-    [SPECIES_GRAVELER - 1] = 0x00,
-    [SPECIES_GOLEM - 1] = 0x00,
-    [SPECIES_PONYTA - 1] = 0x00,
-    [SPECIES_RAPIDASH - 1] = 0x00,
-    [SPECIES_SLOWPOKE - 1] = 0x00,
-    [SPECIES_SLOWBRO - 1] = 0x00,
-    [SPECIES_MAGNEMITE - 1] = 0x00,
-    [SPECIES_MAGNETON - 1] = 0x00,
-    [SPECIES_FARFETCHD - 1] = 0x00,
-    [SPECIES_DODUO - 1] = 0x00,
-    [SPECIES_DODRIO - 1] = 0x00,
-    [SPECIES_SEEL - 1] = 0x00,
-    [SPECIES_DEWGONG - 1] = 0x00,
-    [SPECIES_GRIMER - 1] = 0x00,
     [SPECIES_MUK - 1] = 0x2d,
     [SPECIES_SHELLDER - 1] = 0x14,
-    [SPECIES_CLOYSTER - 1] = 0x00,
-    [SPECIES_GASTLY - 1] = 0x00,
     [SPECIES_HAUNTER - 1] = 0x17,
-    [SPECIES_GENGAR - 1] = 0x00,
-    [SPECIES_ONIX - 1] = 0x00,
     [SPECIES_DROWZEE - 1] = 0x30,
     [SPECIES_HYPNO - 1] = 0x28,
-    [SPECIES_KRABBY - 1] = 0x00,
-    [SPECIES_KINGLER - 1] = 0x00,
-    [SPECIES_VOLTORB - 1] = 0x00,
-    [SPECIES_ELECTRODE - 1] = 0x00,
-    [SPECIES_EXEGGCUTE - 1] = 0x00,
-    [SPECIES_EXEGGUTOR - 1] = 0x00,
-    [SPECIES_CUBONE - 1] = 0x00,
-    [SPECIES_MAROWAK - 1] = 0x00,
-    [SPECIES_HITMONLEE - 1] = 0x00,
     [SPECIES_HITMONCHAN - 1] = 0x19,
-    [SPECIES_LICKITUNG - 1] = 0x00,
-    [SPECIES_KOFFING - 1] = 0x00,
-    [SPECIES_WEEZING - 1] = 0x00,
-    [SPECIES_RHYHORN - 1] = 0x00,
-    [SPECIES_RHYDON - 1] = 0x00,
-    [SPECIES_CHANSEY - 1] = 0x00,
-    [SPECIES_TANGELA - 1] = 0x00,
-    [SPECIES_KANGASKHAN - 1] = 0x00,
-    [SPECIES_HORSEA - 1] = 0x00,
-    [SPECIES_SEADRA - 1] = 0x00,
-    [SPECIES_GOLDEEN - 1] = 0x00,
-    [SPECIES_SEAKING - 1] = 0x00,
-    [SPECIES_STARYU - 1] = 0x00,
-    [SPECIES_STARMIE - 1] = 0x00,
-    [SPECIES_MR_MIME - 1] = 0x00,
     [SPECIES_SCYTHER - 1] = 0x0a,
-    [SPECIES_JYNX - 1] = 0x00,
-    [SPECIES_ELECTABUZZ - 1] = 0x00,
-    [SPECIES_MAGMAR - 1] = 0x00,
-    [SPECIES_PINSIR - 1] = 0x00,
     [SPECIES_TAUROS - 1] = 0x0a,
-    [SPECIES_MAGIKARP - 1] = 0x00,
-    [SPECIES_GYARADOS - 1] = 0x00,
-    [SPECIES_LAPRAS - 1] = 0x00,
-    [SPECIES_DITTO - 1] = 0x00,
-    [SPECIES_EEVEE - 1] = 0x00,
-    [SPECIES_VAPOREON - 1] = 0x00,
-    [SPECIES_JOLTEON - 1] = 0x00,
-    [SPECIES_FLAREON - 1] = 0x00,
-    [SPECIES_PORYGON - 1] = 0x00,
-    [SPECIES_OMANYTE - 1] = 0x00,
-    [SPECIES_OMASTAR - 1] = 0x00,
-    [SPECIES_KABUTO - 1] = 0x00,
-    [SPECIES_KABUTOPS - 1] = 0x00,
-    [SPECIES_AERODACTYL - 1] = 0x00,
-    [SPECIES_SNORLAX - 1] = 0x00,
-    [SPECIES_ARTICUNO - 1] = 0x00,
-    [SPECIES_ZAPDOS - 1] = 0x00,
-    [SPECIES_MOLTRES - 1] = 0x00,
-    [SPECIES_DRATINI - 1] = 0x00,
-    [SPECIES_DRAGONAIR - 1] = 0x00,
-    [SPECIES_DRAGONITE - 1] = 0x00,
-    [SPECIES_MEWTWO - 1] = 0x00,
-    [SPECIES_MEW - 1] = 0x00,
-    [SPECIES_CHIKORITA - 1] = 0x00,
-    [SPECIES_BAYLEEF - 1] = 0x00,
-    [SPECIES_MEGANIUM - 1] = 0x00,
-    [SPECIES_CYNDAQUIL - 1] = 0x00,
-    [SPECIES_QUILAVA - 1] = 0x00,
     [SPECIES_TYPHLOSION - 1] = 0x14,
-    [SPECIES_TOTODILE - 1] = 0x00,
-    [SPECIES_CROCONAW - 1] = 0x00,
     [SPECIES_FERALIGATR - 1] = 0x05,
-    [SPECIES_SENTRET - 1] = 0x00,
-    [SPECIES_FURRET - 1] = 0x00,
-    [SPECIES_HOOTHOOT - 1] = 0x00,
-    [SPECIES_NOCTOWL - 1] = 0x00,
-    [SPECIES_LEDYBA - 1] = 0x00,
-    [SPECIES_LEDIAN - 1] = 0x00,
-    [SPECIES_SPINARAK - 1] = 0x00,
-    [SPECIES_ARIADOS - 1] = 0x00,
-    [SPECIES_CROBAT - 1] = 0x00,
-    [SPECIES_CHINCHOU - 1] = 0x00,
-    [SPECIES_LANTURN - 1] = 0x00,
-    [SPECIES_PICHU - 1] = 0x00,
-    [SPECIES_CLEFFA - 1] = 0x00,
-    [SPECIES_IGGLYBUFF - 1] = 0x00,
-    [SPECIES_TOGEPI - 1] = 0x00,
-    [SPECIES_TOGETIC - 1] = 0x00,
     [SPECIES_NATU - 1] = 0x1e,
-    [SPECIES_XATU - 1] = 0x00,
     [SPECIES_MAREEP - 1] = 0x32,
-    [SPECIES_FLAAFFY - 1] = 0x00,
     [SPECIES_AMPHAROS - 1] = 0x0a,
-    [SPECIES_BELLOSSOM - 1] = 0x00,
-    [SPECIES_MARILL - 1] = 0x00,
-    [SPECIES_AZUMARILL - 1] = 0x00,
-    [SPECIES_SUDOWOODO - 1] = 0x00,
     [SPECIES_POLITOED - 1] = 0x28,
-    [SPECIES_HOPPIP - 1] = 0x00,
-    [SPECIES_SKIPLOOM - 1] = 0x00,
-    [SPECIES_JUMPLUFF - 1] = 0x00,
-    [SPECIES_AIPOM - 1] = 0x00,
-    [SPECIES_SUNKERN - 1] = 0x00,
-    [SPECIES_SUNFLORA - 1] = 0x00,
-    [SPECIES_YANMA - 1] = 0x00,
-    [SPECIES_WOOPER - 1] = 0x00,
-    [SPECIES_QUAGSIRE - 1] = 0x00,
-    [SPECIES_ESPEON - 1] = 0x00,
-    [SPECIES_UMBREON - 1] = 0x00,
-    [SPECIES_MURKROW - 1] = 0x00,
-    [SPECIES_SLOWKING - 1] = 0x00,
-    [SPECIES_MISDREAVUS - 1] = 0x00,
-    [SPECIES_UNOWN - 1] = 0x00,
-    [SPECIES_WOBBUFFET - 1] = 0x00,
-    [SPECIES_GIRAFARIG - 1] = 0x00,
-    [SPECIES_PINECO - 1] = 0x00,
-    [SPECIES_FORRETRESS - 1] = 0x00,
     [SPECIES_DUNSPARCE - 1] = 0x0a,
-    [SPECIES_GLIGAR - 1] = 0x00,
     [SPECIES_STEELIX - 1] = 0x2d,
-    [SPECIES_SNUBBULL - 1] = 0x00,
-    [SPECIES_GRANBULL - 1] = 0x00,
     [SPECIES_QWILFISH - 1] = 0x27,
     [SPECIES_SCIZOR - 1] = 0x13,
-    [SPECIES_SHUCKLE - 1] = 0x00,
-    [SPECIES_HERACROSS - 1] = 0x00,
-    [SPECIES_SNEASEL - 1] = 0x00,
-    [SPECIES_TEDDIURSA - 1] = 0x00,
-    [SPECIES_URSARING - 1] = 0x00,
-    [SPECIES_SLUGMA - 1] = 0x00,
-    [SPECIES_MAGCARGO - 1] = 0x00,
-    [SPECIES_SWINUB - 1] = 0x00,
-    [SPECIES_PILOSWINE - 1] = 0x00,
-    [SPECIES_CORSOLA - 1] = 0x00,
-    [SPECIES_REMORAID - 1] = 0x00,
     [SPECIES_OCTILLERY - 1] = 0x14,
-    [SPECIES_DELIBIRD - 1] = 0x00,
-    [SPECIES_MANTINE - 1] = 0x00,
-    [SPECIES_SKARMORY - 1] = 0x00,
-    [SPECIES_HOUNDOUR - 1] = 0x00,
-    [SPECIES_HOUNDOOM - 1] = 0x00,
-    [SPECIES_KINGDRA - 1] = 0x00,
-    [SPECIES_PHANPY - 1] = 0x00,
-    [SPECIES_DONPHAN - 1] = 0x00,
-    [SPECIES_PORYGON2 - 1] = 0x00,
-    [SPECIES_STANTLER - 1] = 0x00,
-    [SPECIES_SMEARGLE - 1] = 0x00,
-    [SPECIES_TYROGUE - 1] = 0x00,
-    [SPECIES_HITMONTOP - 1] = 0x00,
     [SPECIES_SMOOCHUM - 1] = 0x28,
-    [SPECIES_ELEKID - 1] = 0x00,
-    [SPECIES_MAGBY - 1] = 0x00,
-    [SPECIES_MILTANK - 1] = 0x00,
-    [SPECIES_BLISSEY - 1] = 0x00,
-    [SPECIES_RAIKOU - 1] = 0x00,
-    [SPECIES_ENTEI - 1] = 0x00,
-    [SPECIES_SUICUNE - 1] = 0x00,
-    [SPECIES_LARVITAR - 1] = 0x00,
-    [SPECIES_PUPITAR - 1] = 0x00,
     [SPECIES_TYRANITAR - 1] = 0x0a,
     [SPECIES_LUGIA - 1] = 0x14,
-    [SPECIES_HO_OH - 1] = 0x00,
-    [SPECIES_CELEBI - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_B - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_C - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_D - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_E - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_F - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_G - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_H - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_I - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_J - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_K - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_L - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_M - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_N - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_O - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_P - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_Q - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_R - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_S - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_T - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_U - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_V - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_W - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_X - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_Y - 1] = 0x00,
-    [SPECIES_OLD_UNOWN_Z - 1] = 0x00,
-    [SPECIES_TREECKO - 1] = 0x00,
-    [SPECIES_GROVYLE - 1] = 0x00,
-    [SPECIES_SCEPTILE - 1] = 0x00,
-    [SPECIES_TORCHIC - 1] = 0x00,
-    [SPECIES_COMBUSKEN - 1] = 0x00,
-    [SPECIES_BLAZIKEN - 1] = 0x00,
-    [SPECIES_MUDKIP - 1] = 0x00,
-    [SPECIES_MARSHTOMP - 1] = 0x00,
-    [SPECIES_SWAMPERT - 1] = 0x00,
-    [SPECIES_POOCHYENA - 1] = 0x00,
-    [SPECIES_MIGHTYENA - 1] = 0x00,
-    [SPECIES_ZIGZAGOON - 1] = 0x00,
-    [SPECIES_LINOONE - 1] = 0x00,
-    [SPECIES_WURMPLE - 1] = 0x00,
-    [SPECIES_SILCOON - 1] = 0x00,
-    [SPECIES_BEAUTIFLY - 1] = 0x00,
-    [SPECIES_CASCOON - 1] = 0x00,
-    [SPECIES_DUSTOX - 1] = 0x00,
-    [SPECIES_LOTAD - 1] = 0x00,
-    [SPECIES_LOMBRE - 1] = 0x00,
-    [SPECIES_LUDICOLO - 1] = 0x00,
-    [SPECIES_SEEDOT - 1] = 0x00,
-    [SPECIES_NUZLEAF - 1] = 0x00,
-    [SPECIES_SHIFTRY - 1] = 0x00,
-    [SPECIES_NINCADA - 1] = 0x00,
-    [SPECIES_NINJASK - 1] = 0x00,
-    [SPECIES_SHEDINJA - 1] = 0x00,
-    [SPECIES_TAILLOW - 1] = 0x00,
-    [SPECIES_SWELLOW - 1] = 0x00,
-    [SPECIES_SHROOMISH - 1] = 0x00,
-    [SPECIES_BRELOOM - 1] = 0x00,
-    [SPECIES_SPINDA - 1] = 0x00,
-    [SPECIES_WINGULL - 1] = 0x00,
-    [SPECIES_PELIPPER - 1] = 0x00,
-    [SPECIES_SURSKIT - 1] = 0x00,
-    [SPECIES_MASQUERAIN - 1] = 0x00,
-    [SPECIES_WAILMER - 1] = 0x00,
     [SPECIES_WAILORD - 1] = 0x0a,
-    [SPECIES_SKITTY - 1] = 0x00,
-    [SPECIES_DELCATTY - 1] = 0x00,
     [SPECIES_KECLEON - 1] = 0x1e,
-    [SPECIES_BALTOY - 1] = 0x00,
-    [SPECIES_CLAYDOL - 1] = 0x00,
-    [SPECIES_NOSEPASS - 1] = 0x00,
-    [SPECIES_TORKOAL - 1] = 0x00,
-    [SPECIES_SABLEYE - 1] = 0x00,
-    [SPECIES_BARBOACH - 1] = 0x00,
-    [SPECIES_WHISCASH - 1] = 0x00,
-    [SPECIES_LUVDISC - 1] = 0x00,
-    [SPECIES_CORPHISH - 1] = 0x00,
-    [SPECIES_CRAWDAUNT - 1] = 0x00,
-    [SPECIES_FEEBAS - 1] = 0x00,
     [SPECIES_MILOTIC - 1] = 0x2d,
-    [SPECIES_CARVANHA - 1] = 0x00,
-    [SPECIES_SHARPEDO - 1] = 0x00,
-    [SPECIES_TRAPINCH - 1] = 0x00,
-    [SPECIES_VIBRAVA - 1] = 0x00,
-    [SPECIES_FLYGON - 1] = 0x00,
-    [SPECIES_MAKUHITA - 1] = 0x00,
-    [SPECIES_HARIYAMA - 1] = 0x00,
-    [SPECIES_ELECTRIKE - 1] = 0x00,
-    [SPECIES_MANECTRIC - 1] = 0x00,
-    [SPECIES_NUMEL - 1] = 0x00,
-    [SPECIES_CAMERUPT - 1] = 0x00,
     [SPECIES_SPHEAL - 1] = 0x0f,
-    [SPECIES_SEALEO - 1] = 0x00,
-    [SPECIES_WALREIN - 1] = 0x00,
-    [SPECIES_CACNEA - 1] = 0x00,
-    [SPECIES_CACTURNE - 1] = 0x00,
     [SPECIES_SNORUNT - 1] = 0x14,
-    [SPECIES_GLALIE - 1] = 0x00,
-    [SPECIES_LUNATONE - 1] = 0x00,
-    [SPECIES_SOLROCK - 1] = 0x00,
-    [SPECIES_AZURILL - 1] = 0x00,
-    [SPECIES_SPOINK - 1] = 0x00,
     [SPECIES_GRUMPIG - 1] = 0x0f,
-    [SPECIES_PLUSLE - 1] = 0x00,
-    [SPECIES_MINUN - 1] = 0x00,
-    [SPECIES_MAWILE - 1] = 0x00,
-    [SPECIES_MEDITITE - 1] = 0x00,
-    [SPECIES_MEDICHAM - 1] = 0x00,
-    [SPECIES_SWABLU - 1] = 0x00,
-    [SPECIES_ALTARIA - 1] = 0x00,
     [SPECIES_WYNAUT - 1] = 0x0f,
-    [SPECIES_DUSKULL - 1] = 0x00,
     [SPECIES_DUSCLOPS - 1] = 0x1e,
-    [SPECIES_ROSELIA - 1] = 0x00,
-    [SPECIES_SLAKOTH - 1] = 0x00,
-    [SPECIES_VIGOROTH - 1] = 0x00,
-    [SPECIES_SLAKING - 1] = 0x00,
-    [SPECIES_GULPIN - 1] = 0x00,
-    [SPECIES_SWALOT - 1] = 0x00,
-    [SPECIES_TROPIUS - 1] = 0x00,
-    [SPECIES_WHISMUR - 1] = 0x00,
-    [SPECIES_LOUDRED - 1] = 0x00,
-    [SPECIES_EXPLOUD - 1] = 0x00,
-    [SPECIES_CLAMPERL - 1] = 0x00,
-    [SPECIES_HUNTAIL - 1] = 0x00,
-    [SPECIES_GOREBYSS - 1] = 0x00,
     [SPECIES_ABSOL - 1] = 0x2d,
-    [SPECIES_SHUPPET - 1] = 0x00,
-    [SPECIES_BANETTE - 1] = 0x00,
-    [SPECIES_SEVIPER - 1] = 0x00,
-    [SPECIES_ZANGOOSE - 1] = 0x00,
-    [SPECIES_RELICANTH - 1] = 0x00,
-    [SPECIES_ARON - 1] = 0x00,
-    [SPECIES_LAIRON - 1] = 0x00,
-    [SPECIES_AGGRON - 1] = 0x00,
-    [SPECIES_CASTFORM - 1] = 0x00,
-    [SPECIES_VOLBEAT - 1] = 0x00,
-    [SPECIES_ILLUMISE - 1] = 0x00,
-    [SPECIES_LILEEP - 1] = 0x00,
-    [SPECIES_CRADILY - 1] = 0x00,
-    [SPECIES_ANORITH - 1] = 0x00,
-    [SPECIES_ARMALDO - 1] = 0x00,
-    [SPECIES_RALTS - 1] = 0x00,
-    [SPECIES_KIRLIA - 1] = 0x00,
-    [SPECIES_GARDEVOIR - 1] = 0x00,
-    [SPECIES_BAGON - 1] = 0x00,
-    [SPECIES_SHELGON - 1] = 0x00,
     [SPECIES_SALAMENCE - 1] = 0x46,
-    [SPECIES_BELDUM - 1] = 0x00,
-    [SPECIES_METANG - 1] = 0x00,
-    [SPECIES_METAGROSS - 1] = 0x00,
-    [SPECIES_REGIROCK - 1] = 0x00,
-    [SPECIES_REGICE - 1] = 0x00,
-    [SPECIES_REGISTEEL - 1] = 0x00,
     [SPECIES_KYOGRE - 1] = 0x3c,
-    [SPECIES_GROUDON - 1] = 0x00,
     [SPECIES_RAYQUAZA - 1] = 0x3c,
-    [SPECIES_LATIAS - 1] = 0x00,
-    [SPECIES_LATIOS - 1] = 0x00,
-    [SPECIES_JIRACHI - 1] = 0x00,
-    [SPECIES_DEOXYS - 1] = 0x00,
-    [SPECIES_CHIMECHO - 1] = 0x00,
 };
 
 const u8 gPPUpGetMask[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values
@@ -3671,7 +3293,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
         }
 
         // flash fire triggered
-        if ((gBattleResources->flags->flags[battlerIdAtk] & UNKNOWN_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
+        if ((gBattleResources->flags->flags[battlerIdAtk] & RESOURCE_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
             damage = (15 * damage) / 10;
     }
 
@@ -3791,7 +3413,7 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality)
         return MON_MALE;
 }
 
-void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition)
+void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
 {
     if (gMonSpritesGfxPtr != NULL)
         gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition];
@@ -3802,13 +3424,13 @@ void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition)
     else
         gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition];
 
-    gMultiuseSpriteTemplate.paletteTag = species;
+    gMultiuseSpriteTemplate.paletteTag = speciesTag;
     if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
-        gMultiuseSpriteTemplate.anims = gPlayerMonSpriteAnimsTable;
-    else if (species > 500)
-        gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500];
+        gMultiuseSpriteTemplate.anims = gUnknown_082FF70C;
+    else if (speciesTag > SPECIES_SHINY_TAG)
+        gMultiuseSpriteTemplate.anims = gMonFrontAnimsPtrTable[speciesTag - SPECIES_SHINY_TAG];
     else
-        gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species];
+        gMultiuseSpriteTemplate.anims = gMonFrontAnimsPtrTable[speciesTag];
 }
 
 void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@@ -4822,7 +4444,7 @@ u8 GetMonAbility(struct Pokemon *mon)
     return GetAbilityBySpecies(species, altAbility);
 }
 
-void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
+void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord)
 {
     s32 i, j;
 
@@ -5819,7 +5441,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
                 if (gEvolutionTable[species][i].param == heldItem)
                 {
                     heldItem = 0;
-                    SetMonData(mon, MON_DATA_HELD_ITEM, (u8 *)&heldItem);
+                    SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem);
                     targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 }
                 break;
@@ -7175,7 +6797,7 @@ static void sub_806F1FC(struct Unknown_806F160_Struct* structPtr)
             structPtr->frameImages[i * structPtr->field_0_0 + j].data = &structPtr->byteArrays[i][j * 0x800];
         }
         structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->field_0_0];
-        structPtr->templates[i].anims = gPlayerMonSpriteAnimsTable;
+        structPtr->templates[i].anims = gUnknown_082FF70C;
         structPtr->templates[i].paletteTag = i;
     }
 }
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 4ff182a0e..6a135875e 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -25,446 +25,446 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
 
 const u8 *const gMonIconTable[] =
 {
-    gMonIcon_Bulbasaur,
-    gMonIcon_Bulbasaur,
-    gMonIcon_Ivysaur,
-    gMonIcon_Venusaur,
-    gMonIcon_Charmander,
-    gMonIcon_Charmeleon,
-    gMonIcon_Charizard,
-    gMonIcon_Squirtle,
-    gMonIcon_Wartortle,
-    gMonIcon_Blastoise,
-    gMonIcon_Caterpie,
-    gMonIcon_Metapod,
-    gMonIcon_Butterfree,
-    gMonIcon_Weedle,
-    gMonIcon_Kakuna,
-    gMonIcon_Beedrill,
-    gMonIcon_Pidgey,
-    gMonIcon_Pidgeotto,
-    gMonIcon_Pidgeot,
-    gMonIcon_Rattata,
-    gMonIcon_Raticate,
-    gMonIcon_Spearow,
-    gMonIcon_Fearow,
-    gMonIcon_Ekans,
-    gMonIcon_Arbok,
-    gMonIcon_Pikachu,
-    gMonIcon_Raichu,
-    gMonIcon_Sandshrew,
-    gMonIcon_Sandslash,
-    gMonIcon_NidoranF,
-    gMonIcon_Nidorina,
-    gMonIcon_Nidoqueen,
-    gMonIcon_NidoranM,
-    gMonIcon_Nidorino,
-    gMonIcon_Nidoking,
-    gMonIcon_Clefairy,
-    gMonIcon_Clefable,
-    gMonIcon_Vulpix,
-    gMonIcon_Ninetales,
-    gMonIcon_Jigglypuff,
-    gMonIcon_Wigglytuff,
-    gMonIcon_Zubat,
-    gMonIcon_Golbat,
-    gMonIcon_Oddish,
-    gMonIcon_Gloom,
-    gMonIcon_Vileplume,
-    gMonIcon_Paras,
-    gMonIcon_Parasect,
-    gMonIcon_Venonat,
-    gMonIcon_Venomoth,
-    gMonIcon_Diglett,
-    gMonIcon_Dugtrio,
-    gMonIcon_Meowth,
-    gMonIcon_Persian,
-    gMonIcon_Psyduck,
-    gMonIcon_Golduck,
-    gMonIcon_Mankey,
-    gMonIcon_Primeape,
-    gMonIcon_Growlithe,
-    gMonIcon_Arcanine,
-    gMonIcon_Poliwag,
-    gMonIcon_Poliwhirl,
-    gMonIcon_Poliwrath,
-    gMonIcon_Abra,
-    gMonIcon_Kadabra,
-    gMonIcon_Alakazam,
-    gMonIcon_Machop,
-    gMonIcon_Machoke,
-    gMonIcon_Machamp,
-    gMonIcon_Bellsprout,
-    gMonIcon_Weepinbell,
-    gMonIcon_Victreebel,
-    gMonIcon_Tentacool,
-    gMonIcon_Tentacruel,
-    gMonIcon_Geodude,
-    gMonIcon_Graveler,
-    gMonIcon_Golem,
-    gMonIcon_Ponyta,
-    gMonIcon_Rapidash,
-    gMonIcon_Slowpoke,
-    gMonIcon_Slowbro,
-    gMonIcon_Magnemite,
-    gMonIcon_Magneton,
-    gMonIcon_Farfetchd,
-    gMonIcon_Doduo,
-    gMonIcon_Dodrio,
-    gMonIcon_Seel,
-    gMonIcon_Dewgong,
-    gMonIcon_Grimer,
-    gMonIcon_Muk,
-    gMonIcon_Shellder,
-    gMonIcon_Cloyster,
-    gMonIcon_Gastly,
-    gMonIcon_Haunter,
-    gMonIcon_Gengar,
-    gMonIcon_Onix,
-    gMonIcon_Drowzee,
-    gMonIcon_Hypno,
-    gMonIcon_Krabby,
-    gMonIcon_Kingler,
-    gMonIcon_Voltorb,
-    gMonIcon_Electrode,
-    gMonIcon_Exeggcute,
-    gMonIcon_Exeggutor,
-    gMonIcon_Cubone,
-    gMonIcon_Marowak,
-    gMonIcon_Hitmonlee,
-    gMonIcon_Hitmonchan,
-    gMonIcon_Lickitung,
-    gMonIcon_Koffing,
-    gMonIcon_Weezing,
-    gMonIcon_Rhyhorn,
-    gMonIcon_Rhydon,
-    gMonIcon_Chansey,
-    gMonIcon_Tangela,
-    gMonIcon_Kangaskhan,
-    gMonIcon_Horsea,
-    gMonIcon_Seadra,
-    gMonIcon_Goldeen,
-    gMonIcon_Seaking,
-    gMonIcon_Staryu,
-    gMonIcon_Starmie,
-    gMonIcon_Mrmime,
-    gMonIcon_Scyther,
-    gMonIcon_Jynx,
-    gMonIcon_Electabuzz,
-    gMonIcon_Magmar,
-    gMonIcon_Pinsir,
-    gMonIcon_Tauros,
-    gMonIcon_Magikarp,
-    gMonIcon_Gyarados,
-    gMonIcon_Lapras,
-    gMonIcon_Ditto,
-    gMonIcon_Eevee,
-    gMonIcon_Vaporeon,
-    gMonIcon_Jolteon,
-    gMonIcon_Flareon,
-    gMonIcon_Porygon,
-    gMonIcon_Omanyte,
-    gMonIcon_Omastar,
-    gMonIcon_Kabuto,
-    gMonIcon_Kabutops,
-    gMonIcon_Aerodactyl,
-    gMonIcon_Snorlax,
-    gMonIcon_Articuno,
-    gMonIcon_Zapdos,
-    gMonIcon_Moltres,
-    gMonIcon_Dratini,
-    gMonIcon_Dragonair,
-    gMonIcon_Dragonite,
-    gMonIcon_Mewtwo,
-    gMonIcon_Mew,
-    gMonIcon_Chikorita,
-    gMonIcon_Bayleef,
-    gMonIcon_Meganium,
-    gMonIcon_Cyndaquil,
-    gMonIcon_Quilava,
-    gMonIcon_Typhlosion,
-    gMonIcon_Totodile,
-    gMonIcon_Croconaw,
-    gMonIcon_Feraligatr,
-    gMonIcon_Sentret,
-    gMonIcon_Furret,
-    gMonIcon_Hoothoot,
-    gMonIcon_Noctowl,
-    gMonIcon_Ledyba,
-    gMonIcon_Ledian,
-    gMonIcon_Spinarak,
-    gMonIcon_Ariados,
-    gMonIcon_Crobat,
-    gMonIcon_Chinchou,
-    gMonIcon_Lanturn,
-    gMonIcon_Pichu,
-    gMonIcon_Cleffa,
-    gMonIcon_Igglybuff,
-    gMonIcon_Togepi,
-    gMonIcon_Togetic,
-    gMonIcon_Natu,
-    gMonIcon_Xatu,
-    gMonIcon_Mareep,
-    gMonIcon_Flaaffy,
-    gMonIcon_Ampharos,
-    gMonIcon_Bellossom,
-    gMonIcon_Marill,
-    gMonIcon_Azumarill,
-    gMonIcon_Sudowoodo,
-    gMonIcon_Politoed,
-    gMonIcon_Hoppip,
-    gMonIcon_Skiploom,
-    gMonIcon_Jumpluff,
-    gMonIcon_Aipom,
-    gMonIcon_Sunkern,
-    gMonIcon_Sunflora,
-    gMonIcon_Yanma,
-    gMonIcon_Wooper,
-    gMonIcon_Quagsire,
-    gMonIcon_Espeon,
-    gMonIcon_Umbreon,
-    gMonIcon_Murkrow,
-    gMonIcon_Slowking,
-    gMonIcon_Misdreavus,
-    gMonIcon_UnownA,
-    gMonIcon_Wobbuffet,
-    gMonIcon_Girafarig,
-    gMonIcon_Pineco,
-    gMonIcon_Forretress,
-    gMonIcon_Dunsparce,
-    gMonIcon_Gligar,
-    gMonIcon_Steelix,
-    gMonIcon_Snubbull,
-    gMonIcon_Granbull,
-    gMonIcon_Qwilfish,
-    gMonIcon_Scizor,
-    gMonIcon_Shuckle,
-    gMonIcon_Heracross,
-    gMonIcon_Sneasel,
-    gMonIcon_Teddiursa,
-    gMonIcon_Ursaring,
-    gMonIcon_Slugma,
-    gMonIcon_Magcargo,
-    gMonIcon_Swinub,
-    gMonIcon_Piloswine,
-    gMonIcon_Corsola,
-    gMonIcon_Remoraid,
-    gMonIcon_Octillery,
-    gMonIcon_Delibird,
-    gMonIcon_Mantine,
-    gMonIcon_Skarmory,
-    gMonIcon_Houndour,
-    gMonIcon_Houndoom,
-    gMonIcon_Kingdra,
-    gMonIcon_Phanpy,
-    gMonIcon_Donphan,
-    gMonIcon_Porygon2,
-    gMonIcon_Stantler,
-    gMonIcon_Smeargle,
-    gMonIcon_Tyrogue,
-    gMonIcon_Hitmontop,
-    gMonIcon_Smoochum,
-    gMonIcon_Elekid,
-    gMonIcon_Magby,
-    gMonIcon_Miltank,
-    gMonIcon_Blissey,
-    gMonIcon_Raikou,
-    gMonIcon_Entei,
-    gMonIcon_Suicune,
-    gMonIcon_Larvitar,
-    gMonIcon_Pupitar,
-    gMonIcon_Tyranitar,
-    gMonIcon_Lugia,
-    gMonIcon_HoOh,
-    gMonIcon_Celebi,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_Treecko,
-    gMonIcon_Grovyle,
-    gMonIcon_Sceptile,
-    gMonIcon_Torchic,
-    gMonIcon_Combusken,
-    gMonIcon_Blaziken,
-    gMonIcon_Mudkip,
-    gMonIcon_Marshtomp,
-    gMonIcon_Swampert,
-    gMonIcon_Poochyena,
-    gMonIcon_Mightyena,
-    gMonIcon_Zigzagoon,
-    gMonIcon_Linoone,
-    gMonIcon_Wurmple,
-    gMonIcon_Silcoon,
-    gMonIcon_Beautifly,
-    gMonIcon_Cascoon,
-    gMonIcon_Dustox,
-    gMonIcon_Lotad,
-    gMonIcon_Lombre,
-    gMonIcon_Ludicolo,
-    gMonIcon_Seedot,
-    gMonIcon_Nuzleaf,
-    gMonIcon_Shiftry,
-    gMonIcon_Nincada,
-    gMonIcon_Ninjask,
-    gMonIcon_Shedinja,
-    gMonIcon_Taillow,
-    gMonIcon_Swellow,
-    gMonIcon_Shroomish,
-    gMonIcon_Breloom,
-    gMonIcon_Spinda,
-    gMonIcon_Wingull,
-    gMonIcon_Pelipper,
-    gMonIcon_Surskit,
-    gMonIcon_Masquerain,
-    gMonIcon_Wailmer,
-    gMonIcon_Wailord,
-    gMonIcon_Skitty,
-    gMonIcon_Delcatty,
-    gMonIcon_Kecleon,
-    gMonIcon_Baltoy,
-    gMonIcon_Claydol,
-    gMonIcon_Nosepass,
-    gMonIcon_Torkoal,
-    gMonIcon_Sableye,
-    gMonIcon_Barboach,
-    gMonIcon_Whiscash,
-    gMonIcon_Luvdisc,
-    gMonIcon_Corphish,
-    gMonIcon_Crawdaunt,
-    gMonIcon_Feebas,
-    gMonIcon_Milotic,
-    gMonIcon_Carvanha,
-    gMonIcon_Sharpedo,
-    gMonIcon_Trapinch,
-    gMonIcon_Vibrava,
-    gMonIcon_Flygon,
-    gMonIcon_Makuhita,
-    gMonIcon_Hariyama,
-    gMonIcon_Electrike,
-    gMonIcon_Manectric,
-    gMonIcon_Numel,
-    gMonIcon_Camerupt,
-    gMonIcon_Spheal,
-    gMonIcon_Sealeo,
-    gMonIcon_Walrein,
-    gMonIcon_Cacnea,
-    gMonIcon_Cacturne,
-    gMonIcon_Snorunt,
-    gMonIcon_Glalie,
-    gMonIcon_Lunatone,
-    gMonIcon_Solrock,
-    gMonIcon_Azurill,
-    gMonIcon_Spoink,
-    gMonIcon_Grumpig,
-    gMonIcon_Plusle,
-    gMonIcon_Minun,
-    gMonIcon_Mawile,
-    gMonIcon_Meditite,
-    gMonIcon_Medicham,
-    gMonIcon_Swablu,
-    gMonIcon_Altaria,
-    gMonIcon_Wynaut,
-    gMonIcon_Duskull,
-    gMonIcon_Dusclops,
-    gMonIcon_Roselia,
-    gMonIcon_Slakoth,
-    gMonIcon_Vigoroth,
-    gMonIcon_Slaking,
-    gMonIcon_Gulpin,
-    gMonIcon_Swalot,
-    gMonIcon_Tropius,
-    gMonIcon_Whismur,
-    gMonIcon_Loudred,
-    gMonIcon_Exploud,
-    gMonIcon_Clamperl,
-    gMonIcon_Huntail,
-    gMonIcon_Gorebyss,
-    gMonIcon_Absol,
-    gMonIcon_Shuppet,
-    gMonIcon_Banette,
-    gMonIcon_Seviper,
-    gMonIcon_Zangoose,
-    gMonIcon_Relicanth,
-    gMonIcon_Aron,
-    gMonIcon_Lairon,
-    gMonIcon_Aggron,
-    gMonIcon_Castform,
-    gMonIcon_Volbeat,
-    gMonIcon_Illumise,
-    gMonIcon_Lileep,
-    gMonIcon_Cradily,
-    gMonIcon_Anorith,
-    gMonIcon_Armaldo,
-    gMonIcon_Ralts,
-    gMonIcon_Kirlia,
-    gMonIcon_Gardevoir,
-    gMonIcon_Bagon,
-    gMonIcon_Shelgon,
-    gMonIcon_Salamence,
-    gMonIcon_Beldum,
-    gMonIcon_Metang,
-    gMonIcon_Metagross,
-    gMonIcon_Regirock,
-    gMonIcon_Regice,
-    gMonIcon_Registeel,
-    gMonIcon_Kyogre,
-    gMonIcon_Groudon,
-    gMonIcon_Rayquaza,
-    gMonIcon_Latias,
-    gMonIcon_Latios,
-    gMonIcon_Jirachi,
-    gMonIcon_Deoxys,
-    gMonIcon_Chimecho,
-    gMonIcon_Egg,
-    gMonIcon_UnownB,
-    gMonIcon_UnownC,
-    gMonIcon_UnownD,
-    gMonIcon_UnownE,
-    gMonIcon_UnownF,
-    gMonIcon_UnownG,
-    gMonIcon_UnownH,
-    gMonIcon_UnownI,
-    gMonIcon_UnownJ,
-    gMonIcon_UnownK,
-    gMonIcon_UnownL,
-    gMonIcon_UnownM,
-    gMonIcon_UnownN,
-    gMonIcon_UnownO,
-    gMonIcon_UnownP,
-    gMonIcon_UnownQ,
-    gMonIcon_UnownR,
-    gMonIcon_UnownS,
-    gMonIcon_UnownT,
-    gMonIcon_UnownU,
-    gMonIcon_UnownV,
-    gMonIcon_UnownW,
-    gMonIcon_UnownX,
-    gMonIcon_UnownY,
-    gMonIcon_UnownZ,
-    gMonIcon_UnownExclamationMark,
-    gMonIcon_UnownQuestionMark,
+    [SPECIES_NONE] = gMonIcon_Bulbasaur,
+    [SPECIES_BULBASAUR] = gMonIcon_Bulbasaur,
+    [SPECIES_IVYSAUR] = gMonIcon_Ivysaur,
+    [SPECIES_VENUSAUR] = gMonIcon_Venusaur,
+    [SPECIES_CHARMANDER] = gMonIcon_Charmander,
+    [SPECIES_CHARMELEON] = gMonIcon_Charmeleon,
+    [SPECIES_CHARIZARD] = gMonIcon_Charizard,
+    [SPECIES_SQUIRTLE] = gMonIcon_Squirtle,
+    [SPECIES_WARTORTLE] = gMonIcon_Wartortle,
+    [SPECIES_BLASTOISE] = gMonIcon_Blastoise,
+    [SPECIES_CATERPIE] = gMonIcon_Caterpie,
+    [SPECIES_METAPOD] = gMonIcon_Metapod,
+    [SPECIES_BUTTERFREE] = gMonIcon_Butterfree,
+    [SPECIES_WEEDLE] = gMonIcon_Weedle,
+    [SPECIES_KAKUNA] = gMonIcon_Kakuna,
+    [SPECIES_BEEDRILL] = gMonIcon_Beedrill,
+    [SPECIES_PIDGEY] = gMonIcon_Pidgey,
+    [SPECIES_PIDGEOTTO] = gMonIcon_Pidgeotto,
+    [SPECIES_PIDGEOT] = gMonIcon_Pidgeot,
+    [SPECIES_RATTATA] = gMonIcon_Rattata,
+    [SPECIES_RATICATE] = gMonIcon_Raticate,
+    [SPECIES_SPEAROW] = gMonIcon_Spearow,
+    [SPECIES_FEAROW] = gMonIcon_Fearow,
+    [SPECIES_EKANS] = gMonIcon_Ekans,
+    [SPECIES_ARBOK] = gMonIcon_Arbok,
+    [SPECIES_PIKACHU] = gMonIcon_Pikachu,
+    [SPECIES_RAICHU] = gMonIcon_Raichu,
+    [SPECIES_SANDSHREW] = gMonIcon_Sandshrew,
+    [SPECIES_SANDSLASH] = gMonIcon_Sandslash,
+    [SPECIES_NIDORAN_F] = gMonIcon_NidoranF,
+    [SPECIES_NIDORINA] = gMonIcon_Nidorina,
+    [SPECIES_NIDOQUEEN] = gMonIcon_Nidoqueen,
+    [SPECIES_NIDORAN_M] = gMonIcon_NidoranM,
+    [SPECIES_NIDORINO] = gMonIcon_Nidorino,
+    [SPECIES_NIDOKING] = gMonIcon_Nidoking,
+    [SPECIES_CLEFAIRY] = gMonIcon_Clefairy,
+    [SPECIES_CLEFABLE] = gMonIcon_Clefable,
+    [SPECIES_VULPIX] = gMonIcon_Vulpix,
+    [SPECIES_NINETALES] = gMonIcon_Ninetales,
+    [SPECIES_JIGGLYPUFF] = gMonIcon_Jigglypuff,
+    [SPECIES_WIGGLYTUFF] = gMonIcon_Wigglytuff,
+    [SPECIES_ZUBAT] = gMonIcon_Zubat,
+    [SPECIES_GOLBAT] = gMonIcon_Golbat,
+    [SPECIES_ODDISH] = gMonIcon_Oddish,
+    [SPECIES_GLOOM] = gMonIcon_Gloom,
+    [SPECIES_VILEPLUME] = gMonIcon_Vileplume,
+    [SPECIES_PARAS] = gMonIcon_Paras,
+    [SPECIES_PARASECT] = gMonIcon_Parasect,
+    [SPECIES_VENONAT] = gMonIcon_Venonat,
+    [SPECIES_VENOMOTH] = gMonIcon_Venomoth,
+    [SPECIES_DIGLETT] = gMonIcon_Diglett,
+    [SPECIES_DUGTRIO] = gMonIcon_Dugtrio,
+    [SPECIES_MEOWTH] = gMonIcon_Meowth,
+    [SPECIES_PERSIAN] = gMonIcon_Persian,
+    [SPECIES_PSYDUCK] = gMonIcon_Psyduck,
+    [SPECIES_GOLDUCK] = gMonIcon_Golduck,
+    [SPECIES_MANKEY] = gMonIcon_Mankey,
+    [SPECIES_PRIMEAPE] = gMonIcon_Primeape,
+    [SPECIES_GROWLITHE] = gMonIcon_Growlithe,
+    [SPECIES_ARCANINE] = gMonIcon_Arcanine,
+    [SPECIES_POLIWAG] = gMonIcon_Poliwag,
+    [SPECIES_POLIWHIRL] = gMonIcon_Poliwhirl,
+    [SPECIES_POLIWRATH] = gMonIcon_Poliwrath,
+    [SPECIES_ABRA] = gMonIcon_Abra,
+    [SPECIES_KADABRA] = gMonIcon_Kadabra,
+    [SPECIES_ALAKAZAM] = gMonIcon_Alakazam,
+    [SPECIES_MACHOP] = gMonIcon_Machop,
+    [SPECIES_MACHOKE] = gMonIcon_Machoke,
+    [SPECIES_MACHAMP] = gMonIcon_Machamp,
+    [SPECIES_BELLSPROUT] = gMonIcon_Bellsprout,
+    [SPECIES_WEEPINBELL] = gMonIcon_Weepinbell,
+    [SPECIES_VICTREEBEL] = gMonIcon_Victreebel,
+    [SPECIES_TENTACOOL] = gMonIcon_Tentacool,
+    [SPECIES_TENTACRUEL] = gMonIcon_Tentacruel,
+    [SPECIES_GEODUDE] = gMonIcon_Geodude,
+    [SPECIES_GRAVELER] = gMonIcon_Graveler,
+    [SPECIES_GOLEM] = gMonIcon_Golem,
+    [SPECIES_PONYTA] = gMonIcon_Ponyta,
+    [SPECIES_RAPIDASH] = gMonIcon_Rapidash,
+    [SPECIES_SLOWPOKE] = gMonIcon_Slowpoke,
+    [SPECIES_SLOWBRO] = gMonIcon_Slowbro,
+    [SPECIES_MAGNEMITE] = gMonIcon_Magnemite,
+    [SPECIES_MAGNETON] = gMonIcon_Magneton,
+    [SPECIES_FARFETCHD] = gMonIcon_Farfetchd,
+    [SPECIES_DODUO] = gMonIcon_Doduo,
+    [SPECIES_DODRIO] = gMonIcon_Dodrio,
+    [SPECIES_SEEL] = gMonIcon_Seel,
+    [SPECIES_DEWGONG] = gMonIcon_Dewgong,
+    [SPECIES_GRIMER] = gMonIcon_Grimer,
+    [SPECIES_MUK] = gMonIcon_Muk,
+    [SPECIES_SHELLDER] = gMonIcon_Shellder,
+    [SPECIES_CLOYSTER] = gMonIcon_Cloyster,
+    [SPECIES_GASTLY] = gMonIcon_Gastly,
+    [SPECIES_HAUNTER] = gMonIcon_Haunter,
+    [SPECIES_GENGAR] = gMonIcon_Gengar,
+    [SPECIES_ONIX] = gMonIcon_Onix,
+    [SPECIES_DROWZEE] = gMonIcon_Drowzee,
+    [SPECIES_HYPNO] = gMonIcon_Hypno,
+    [SPECIES_KRABBY] = gMonIcon_Krabby,
+    [SPECIES_KINGLER] = gMonIcon_Kingler,
+    [SPECIES_VOLTORB] = gMonIcon_Voltorb,
+    [SPECIES_ELECTRODE] = gMonIcon_Electrode,
+    [SPECIES_EXEGGCUTE] = gMonIcon_Exeggcute,
+    [SPECIES_EXEGGUTOR] = gMonIcon_Exeggutor,
+    [SPECIES_CUBONE] = gMonIcon_Cubone,
+    [SPECIES_MAROWAK] = gMonIcon_Marowak,
+    [SPECIES_HITMONLEE] = gMonIcon_Hitmonlee,
+    [SPECIES_HITMONCHAN] = gMonIcon_Hitmonchan,
+    [SPECIES_LICKITUNG] = gMonIcon_Lickitung,
+    [SPECIES_KOFFING] = gMonIcon_Koffing,
+    [SPECIES_WEEZING] = gMonIcon_Weezing,
+    [SPECIES_RHYHORN] = gMonIcon_Rhyhorn,
+    [SPECIES_RHYDON] = gMonIcon_Rhydon,
+    [SPECIES_CHANSEY] = gMonIcon_Chansey,
+    [SPECIES_TANGELA] = gMonIcon_Tangela,
+    [SPECIES_KANGASKHAN] = gMonIcon_Kangaskhan,
+    [SPECIES_HORSEA] = gMonIcon_Horsea,
+    [SPECIES_SEADRA] = gMonIcon_Seadra,
+    [SPECIES_GOLDEEN] = gMonIcon_Goldeen,
+    [SPECIES_SEAKING] = gMonIcon_Seaking,
+    [SPECIES_STARYU] = gMonIcon_Staryu,
+    [SPECIES_STARMIE] = gMonIcon_Starmie,
+    [SPECIES_MR_MIME] = gMonIcon_Mrmime,
+    [SPECIES_SCYTHER] = gMonIcon_Scyther,
+    [SPECIES_JYNX] = gMonIcon_Jynx,
+    [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz,
+    [SPECIES_MAGMAR] = gMonIcon_Magmar,
+    [SPECIES_PINSIR] = gMonIcon_Pinsir,
+    [SPECIES_TAUROS] = gMonIcon_Tauros,
+    [SPECIES_MAGIKARP] = gMonIcon_Magikarp,
+    [SPECIES_GYARADOS] = gMonIcon_Gyarados,
+    [SPECIES_LAPRAS] = gMonIcon_Lapras,
+    [SPECIES_DITTO] = gMonIcon_Ditto,
+    [SPECIES_EEVEE] = gMonIcon_Eevee,
+    [SPECIES_VAPOREON] = gMonIcon_Vaporeon,
+    [SPECIES_JOLTEON] = gMonIcon_Jolteon,
+    [SPECIES_FLAREON] = gMonIcon_Flareon,
+    [SPECIES_PORYGON] = gMonIcon_Porygon,
+    [SPECIES_OMANYTE] = gMonIcon_Omanyte,
+    [SPECIES_OMASTAR] = gMonIcon_Omastar,
+    [SPECIES_KABUTO] = gMonIcon_Kabuto,
+    [SPECIES_KABUTOPS] = gMonIcon_Kabutops,
+    [SPECIES_AERODACTYL] = gMonIcon_Aerodactyl,
+    [SPECIES_SNORLAX] = gMonIcon_Snorlax,
+    [SPECIES_ARTICUNO] = gMonIcon_Articuno,
+    [SPECIES_ZAPDOS] = gMonIcon_Zapdos,
+    [SPECIES_MOLTRES] = gMonIcon_Moltres,
+    [SPECIES_DRATINI] = gMonIcon_Dratini,
+    [SPECIES_DRAGONAIR] = gMonIcon_Dragonair,
+    [SPECIES_DRAGONITE] = gMonIcon_Dragonite,
+    [SPECIES_MEWTWO] = gMonIcon_Mewtwo,
+    [SPECIES_MEW] = gMonIcon_Mew,
+    [SPECIES_CHIKORITA] = gMonIcon_Chikorita,
+    [SPECIES_BAYLEEF] = gMonIcon_Bayleef,
+    [SPECIES_MEGANIUM] = gMonIcon_Meganium,
+    [SPECIES_CYNDAQUIL] = gMonIcon_Cyndaquil,
+    [SPECIES_QUILAVA] = gMonIcon_Quilava,
+    [SPECIES_TYPHLOSION] = gMonIcon_Typhlosion,
+    [SPECIES_TOTODILE] = gMonIcon_Totodile,
+    [SPECIES_CROCONAW] = gMonIcon_Croconaw,
+    [SPECIES_FERALIGATR] = gMonIcon_Feraligatr,
+    [SPECIES_SENTRET] = gMonIcon_Sentret,
+    [SPECIES_FURRET] = gMonIcon_Furret,
+    [SPECIES_HOOTHOOT] = gMonIcon_Hoothoot,
+    [SPECIES_NOCTOWL] = gMonIcon_Noctowl,
+    [SPECIES_LEDYBA] = gMonIcon_Ledyba,
+    [SPECIES_LEDIAN] = gMonIcon_Ledian,
+    [SPECIES_SPINARAK] = gMonIcon_Spinarak,
+    [SPECIES_ARIADOS] = gMonIcon_Ariados,
+    [SPECIES_CROBAT] = gMonIcon_Crobat,
+    [SPECIES_CHINCHOU] = gMonIcon_Chinchou,
+    [SPECIES_LANTURN] = gMonIcon_Lanturn,
+    [SPECIES_PICHU] = gMonIcon_Pichu,
+    [SPECIES_CLEFFA] = gMonIcon_Cleffa,
+    [SPECIES_IGGLYBUFF] = gMonIcon_Igglybuff,
+    [SPECIES_TOGEPI] = gMonIcon_Togepi,
+    [SPECIES_TOGETIC] = gMonIcon_Togetic,
+    [SPECIES_NATU] = gMonIcon_Natu,
+    [SPECIES_XATU] = gMonIcon_Xatu,
+    [SPECIES_MAREEP] = gMonIcon_Mareep,
+    [SPECIES_FLAAFFY] = gMonIcon_Flaaffy,
+    [SPECIES_AMPHAROS] = gMonIcon_Ampharos,
+    [SPECIES_BELLOSSOM] = gMonIcon_Bellossom,
+    [SPECIES_MARILL] = gMonIcon_Marill,
+    [SPECIES_AZUMARILL] = gMonIcon_Azumarill,
+    [SPECIES_SUDOWOODO] = gMonIcon_Sudowoodo,
+    [SPECIES_POLITOED] = gMonIcon_Politoed,
+    [SPECIES_HOPPIP] = gMonIcon_Hoppip,
+    [SPECIES_SKIPLOOM] = gMonIcon_Skiploom,
+    [SPECIES_JUMPLUFF] = gMonIcon_Jumpluff,
+    [SPECIES_AIPOM] = gMonIcon_Aipom,
+    [SPECIES_SUNKERN] = gMonIcon_Sunkern,
+    [SPECIES_SUNFLORA] = gMonIcon_Sunflora,
+    [SPECIES_YANMA] = gMonIcon_Yanma,
+    [SPECIES_WOOPER] = gMonIcon_Wooper,
+    [SPECIES_QUAGSIRE] = gMonIcon_Quagsire,
+    [SPECIES_ESPEON] = gMonIcon_Espeon,
+    [SPECIES_UMBREON] = gMonIcon_Umbreon,
+    [SPECIES_MURKROW] = gMonIcon_Murkrow,
+    [SPECIES_SLOWKING] = gMonIcon_Slowking,
+    [SPECIES_MISDREAVUS] = gMonIcon_Misdreavus,
+    [SPECIES_UNOWN] = gMonIcon_UnownA,
+    [SPECIES_WOBBUFFET] = gMonIcon_Wobbuffet,
+    [SPECIES_GIRAFARIG] = gMonIcon_Girafarig,
+    [SPECIES_PINECO] = gMonIcon_Pineco,
+    [SPECIES_FORRETRESS] = gMonIcon_Forretress,
+    [SPECIES_DUNSPARCE] = gMonIcon_Dunsparce,
+    [SPECIES_GLIGAR] = gMonIcon_Gligar,
+    [SPECIES_STEELIX] = gMonIcon_Steelix,
+    [SPECIES_SNUBBULL] = gMonIcon_Snubbull,
+    [SPECIES_GRANBULL] = gMonIcon_Granbull,
+    [SPECIES_QWILFISH] = gMonIcon_Qwilfish,
+    [SPECIES_SCIZOR] = gMonIcon_Scizor,
+    [SPECIES_SHUCKLE] = gMonIcon_Shuckle,
+    [SPECIES_HERACROSS] = gMonIcon_Heracross,
+    [SPECIES_SNEASEL] = gMonIcon_Sneasel,
+    [SPECIES_TEDDIURSA] = gMonIcon_Teddiursa,
+    [SPECIES_URSARING] = gMonIcon_Ursaring,
+    [SPECIES_SLUGMA] = gMonIcon_Slugma,
+    [SPECIES_MAGCARGO] = gMonIcon_Magcargo,
+    [SPECIES_SWINUB] = gMonIcon_Swinub,
+    [SPECIES_PILOSWINE] = gMonIcon_Piloswine,
+    [SPECIES_CORSOLA] = gMonIcon_Corsola,
+    [SPECIES_REMORAID] = gMonIcon_Remoraid,
+    [SPECIES_OCTILLERY] = gMonIcon_Octillery,
+    [SPECIES_DELIBIRD] = gMonIcon_Delibird,
+    [SPECIES_MANTINE] = gMonIcon_Mantine,
+    [SPECIES_SKARMORY] = gMonIcon_Skarmory,
+    [SPECIES_HOUNDOUR] = gMonIcon_Houndour,
+    [SPECIES_HOUNDOOM] = gMonIcon_Houndoom,
+    [SPECIES_KINGDRA] = gMonIcon_Kingdra,
+    [SPECIES_PHANPY] = gMonIcon_Phanpy,
+    [SPECIES_DONPHAN] = gMonIcon_Donphan,
+    [SPECIES_PORYGON2] = gMonIcon_Porygon2,
+    [SPECIES_STANTLER] = gMonIcon_Stantler,
+    [SPECIES_SMEARGLE] = gMonIcon_Smeargle,
+    [SPECIES_TYROGUE] = gMonIcon_Tyrogue,
+    [SPECIES_HITMONTOP] = gMonIcon_Hitmontop,
+    [SPECIES_SMOOCHUM] = gMonIcon_Smoochum,
+    [SPECIES_ELEKID] = gMonIcon_Elekid,
+    [SPECIES_MAGBY] = gMonIcon_Magby,
+    [SPECIES_MILTANK] = gMonIcon_Miltank,
+    [SPECIES_BLISSEY] = gMonIcon_Blissey,
+    [SPECIES_RAIKOU] = gMonIcon_Raikou,
+    [SPECIES_ENTEI] = gMonIcon_Entei,
+    [SPECIES_SUICUNE] = gMonIcon_Suicune,
+    [SPECIES_LARVITAR] = gMonIcon_Larvitar,
+    [SPECIES_PUPITAR] = gMonIcon_Pupitar,
+    [SPECIES_TYRANITAR] = gMonIcon_Tyranitar,
+    [SPECIES_LUGIA] = gMonIcon_Lugia,
+    [SPECIES_HO_OH] = gMonIcon_HoOh,
+    [SPECIES_CELEBI] = gMonIcon_Celebi,
+    [SPECIES_OLD_UNOWN_B] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_C] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_D] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_E] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_F] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_G] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_H] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_I] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_J] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_K] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_L] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_M] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_N] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_O] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_P] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Q] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_R] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_S] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_T] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_U] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_V] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_W] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_X] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Y] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Z] = gMonIcon_QuestionMark,
+    [SPECIES_TREECKO] = gMonIcon_Treecko,
+    [SPECIES_GROVYLE] = gMonIcon_Grovyle,
+    [SPECIES_SCEPTILE] = gMonIcon_Sceptile,
+    [SPECIES_TORCHIC] = gMonIcon_Torchic,
+    [SPECIES_COMBUSKEN] = gMonIcon_Combusken,
+    [SPECIES_BLAZIKEN] = gMonIcon_Blaziken,
+    [SPECIES_MUDKIP] = gMonIcon_Mudkip,
+    [SPECIES_MARSHTOMP] = gMonIcon_Marshtomp,
+    [SPECIES_SWAMPERT] = gMonIcon_Swampert,
+    [SPECIES_POOCHYENA] = gMonIcon_Poochyena,
+    [SPECIES_MIGHTYENA] = gMonIcon_Mightyena,
+    [SPECIES_ZIGZAGOON] = gMonIcon_Zigzagoon,
+    [SPECIES_LINOONE] = gMonIcon_Linoone,
+    [SPECIES_WURMPLE] = gMonIcon_Wurmple,
+    [SPECIES_SILCOON] = gMonIcon_Silcoon,
+    [SPECIES_BEAUTIFLY] = gMonIcon_Beautifly,
+    [SPECIES_CASCOON] = gMonIcon_Cascoon,
+    [SPECIES_DUSTOX] = gMonIcon_Dustox,
+    [SPECIES_LOTAD] = gMonIcon_Lotad,
+    [SPECIES_LOMBRE] = gMonIcon_Lombre,
+    [SPECIES_LUDICOLO] = gMonIcon_Ludicolo,
+    [SPECIES_SEEDOT] = gMonIcon_Seedot,
+    [SPECIES_NUZLEAF] = gMonIcon_Nuzleaf,
+    [SPECIES_SHIFTRY] = gMonIcon_Shiftry,
+    [SPECIES_NINCADA] = gMonIcon_Nincada,
+    [SPECIES_NINJASK] = gMonIcon_Ninjask,
+    [SPECIES_SHEDINJA] = gMonIcon_Shedinja,
+    [SPECIES_TAILLOW] = gMonIcon_Taillow,
+    [SPECIES_SWELLOW] = gMonIcon_Swellow,
+    [SPECIES_SHROOMISH] = gMonIcon_Shroomish,
+    [SPECIES_BRELOOM] = gMonIcon_Breloom,
+    [SPECIES_SPINDA] = gMonIcon_Spinda,
+    [SPECIES_WINGULL] = gMonIcon_Wingull,
+    [SPECIES_PELIPPER] = gMonIcon_Pelipper,
+    [SPECIES_SURSKIT] = gMonIcon_Surskit,
+    [SPECIES_MASQUERAIN] = gMonIcon_Masquerain,
+    [SPECIES_WAILMER] = gMonIcon_Wailmer,
+    [SPECIES_WAILORD] = gMonIcon_Wailord,
+    [SPECIES_SKITTY] = gMonIcon_Skitty,
+    [SPECIES_DELCATTY] = gMonIcon_Delcatty,
+    [SPECIES_KECLEON] = gMonIcon_Kecleon,
+    [SPECIES_BALTOY] = gMonIcon_Baltoy,
+    [SPECIES_CLAYDOL] = gMonIcon_Claydol,
+    [SPECIES_NOSEPASS] = gMonIcon_Nosepass,
+    [SPECIES_TORKOAL] = gMonIcon_Torkoal,
+    [SPECIES_SABLEYE] = gMonIcon_Sableye,
+    [SPECIES_BARBOACH] = gMonIcon_Barboach,
+    [SPECIES_WHISCASH] = gMonIcon_Whiscash,
+    [SPECIES_LUVDISC] = gMonIcon_Luvdisc,
+    [SPECIES_CORPHISH] = gMonIcon_Corphish,
+    [SPECIES_CRAWDAUNT] = gMonIcon_Crawdaunt,
+    [SPECIES_FEEBAS] = gMonIcon_Feebas,
+    [SPECIES_MILOTIC] = gMonIcon_Milotic,
+    [SPECIES_CARVANHA] = gMonIcon_Carvanha,
+    [SPECIES_SHARPEDO] = gMonIcon_Sharpedo,
+    [SPECIES_TRAPINCH] = gMonIcon_Trapinch,
+    [SPECIES_VIBRAVA] = gMonIcon_Vibrava,
+    [SPECIES_FLYGON] = gMonIcon_Flygon,
+    [SPECIES_MAKUHITA] = gMonIcon_Makuhita,
+    [SPECIES_HARIYAMA] = gMonIcon_Hariyama,
+    [SPECIES_ELECTRIKE] = gMonIcon_Electrike,
+    [SPECIES_MANECTRIC] = gMonIcon_Manectric,
+    [SPECIES_NUMEL] = gMonIcon_Numel,
+    [SPECIES_CAMERUPT] = gMonIcon_Camerupt,
+    [SPECIES_SPHEAL] = gMonIcon_Spheal,
+    [SPECIES_SEALEO] = gMonIcon_Sealeo,
+    [SPECIES_WALREIN] = gMonIcon_Walrein,
+    [SPECIES_CACNEA] = gMonIcon_Cacnea,
+    [SPECIES_CACTURNE] = gMonIcon_Cacturne,
+    [SPECIES_SNORUNT] = gMonIcon_Snorunt,
+    [SPECIES_GLALIE] = gMonIcon_Glalie,
+    [SPECIES_LUNATONE] = gMonIcon_Lunatone,
+    [SPECIES_SOLROCK] = gMonIcon_Solrock,
+    [SPECIES_AZURILL] = gMonIcon_Azurill,
+    [SPECIES_SPOINK] = gMonIcon_Spoink,
+    [SPECIES_GRUMPIG] = gMonIcon_Grumpig,
+    [SPECIES_PLUSLE] = gMonIcon_Plusle,
+    [SPECIES_MINUN] = gMonIcon_Minun,
+    [SPECIES_MAWILE] = gMonIcon_Mawile,
+    [SPECIES_MEDITITE] = gMonIcon_Meditite,
+    [SPECIES_MEDICHAM] = gMonIcon_Medicham,
+    [SPECIES_SWABLU] = gMonIcon_Swablu,
+    [SPECIES_ALTARIA] = gMonIcon_Altaria,
+    [SPECIES_WYNAUT] = gMonIcon_Wynaut,
+    [SPECIES_DUSKULL] = gMonIcon_Duskull,
+    [SPECIES_DUSCLOPS] = gMonIcon_Dusclops,
+    [SPECIES_ROSELIA] = gMonIcon_Roselia,
+    [SPECIES_SLAKOTH] = gMonIcon_Slakoth,
+    [SPECIES_VIGOROTH] = gMonIcon_Vigoroth,
+    [SPECIES_SLAKING] = gMonIcon_Slaking,
+    [SPECIES_GULPIN] = gMonIcon_Gulpin,
+    [SPECIES_SWALOT] = gMonIcon_Swalot,
+    [SPECIES_TROPIUS] = gMonIcon_Tropius,
+    [SPECIES_WHISMUR] = gMonIcon_Whismur,
+    [SPECIES_LOUDRED] = gMonIcon_Loudred,
+    [SPECIES_EXPLOUD] = gMonIcon_Exploud,
+    [SPECIES_CLAMPERL] = gMonIcon_Clamperl,
+    [SPECIES_HUNTAIL] = gMonIcon_Huntail,
+    [SPECIES_GOREBYSS] = gMonIcon_Gorebyss,
+    [SPECIES_ABSOL] = gMonIcon_Absol,
+    [SPECIES_SHUPPET] = gMonIcon_Shuppet,
+    [SPECIES_BANETTE] = gMonIcon_Banette,
+    [SPECIES_SEVIPER] = gMonIcon_Seviper,
+    [SPECIES_ZANGOOSE] = gMonIcon_Zangoose,
+    [SPECIES_RELICANTH] = gMonIcon_Relicanth,
+    [SPECIES_ARON] = gMonIcon_Aron,
+    [SPECIES_LAIRON] = gMonIcon_Lairon,
+    [SPECIES_AGGRON] = gMonIcon_Aggron,
+    [SPECIES_CASTFORM] = gMonIcon_Castform,
+    [SPECIES_VOLBEAT] = gMonIcon_Volbeat,
+    [SPECIES_ILLUMISE] = gMonIcon_Illumise,
+    [SPECIES_LILEEP] = gMonIcon_Lileep,
+    [SPECIES_CRADILY] = gMonIcon_Cradily,
+    [SPECIES_ANORITH] = gMonIcon_Anorith,
+    [SPECIES_ARMALDO] = gMonIcon_Armaldo,
+    [SPECIES_RALTS] = gMonIcon_Ralts,
+    [SPECIES_KIRLIA] = gMonIcon_Kirlia,
+    [SPECIES_GARDEVOIR] = gMonIcon_Gardevoir,
+    [SPECIES_BAGON] = gMonIcon_Bagon,
+    [SPECIES_SHELGON] = gMonIcon_Shelgon,
+    [SPECIES_SALAMENCE] = gMonIcon_Salamence,
+    [SPECIES_BELDUM] = gMonIcon_Beldum,
+    [SPECIES_METANG] = gMonIcon_Metang,
+    [SPECIES_METAGROSS] = gMonIcon_Metagross,
+    [SPECIES_REGIROCK] = gMonIcon_Regirock,
+    [SPECIES_REGICE] = gMonIcon_Regice,
+    [SPECIES_REGISTEEL] = gMonIcon_Registeel,
+    [SPECIES_KYOGRE] = gMonIcon_Kyogre,
+    [SPECIES_GROUDON] = gMonIcon_Groudon,
+    [SPECIES_RAYQUAZA] = gMonIcon_Rayquaza,
+    [SPECIES_LATIAS] = gMonIcon_Latias,
+    [SPECIES_LATIOS] = gMonIcon_Latios,
+    [SPECIES_JIRACHI] = gMonIcon_Jirachi,
+    [SPECIES_DEOXYS] = gMonIcon_Deoxys,
+    [SPECIES_CHIMECHO] = gMonIcon_Chimecho,
+    [SPECIES_EGG] = gMonIcon_Egg,
+    [SPECIES_UNOWN_B] = gMonIcon_UnownB,
+    [SPECIES_UNOWN_C] = gMonIcon_UnownC,
+    [SPECIES_UNOWN_D] = gMonIcon_UnownD,
+    [SPECIES_UNOWN_E] = gMonIcon_UnownE,
+    [SPECIES_UNOWN_F] = gMonIcon_UnownF,
+    [SPECIES_UNOWN_G] = gMonIcon_UnownG,
+    [SPECIES_UNOWN_H] = gMonIcon_UnownH,
+    [SPECIES_UNOWN_I] = gMonIcon_UnownI,
+    [SPECIES_UNOWN_J] = gMonIcon_UnownJ,
+    [SPECIES_UNOWN_K] = gMonIcon_UnownK,
+    [SPECIES_UNOWN_L] = gMonIcon_UnownL,
+    [SPECIES_UNOWN_M] = gMonIcon_UnownM,
+    [SPECIES_UNOWN_N] = gMonIcon_UnownN,
+    [SPECIES_UNOWN_O] = gMonIcon_UnownO,
+    [SPECIES_UNOWN_P] = gMonIcon_UnownP,
+    [SPECIES_UNOWN_Q] = gMonIcon_UnownQ,
+    [SPECIES_UNOWN_R] = gMonIcon_UnownR,
+    [SPECIES_UNOWN_S] = gMonIcon_UnownS,
+    [SPECIES_UNOWN_T] = gMonIcon_UnownT,
+    [SPECIES_UNOWN_U] = gMonIcon_UnownU,
+    [SPECIES_UNOWN_V] = gMonIcon_UnownV,
+    [SPECIES_UNOWN_W] = gMonIcon_UnownW,
+    [SPECIES_UNOWN_X] = gMonIcon_UnownX,
+    [SPECIES_UNOWN_Y] = gMonIcon_UnownY,
+    [SPECIES_UNOWN_Z] = gMonIcon_UnownZ,
+    [SPECIES_UNOWN_EMARK] = gMonIcon_UnownExclamationMark,
+    [SPECIES_UNOWN_QMARK] = gMonIcon_UnownQuestionMark,
 };
 
 const u8 gMonIconPaletteIndices[] =
@@ -927,18 +927,15 @@ const struct SpritePalette gMonIconPaletteTable[] =
 const struct OamData sMonIconOamData =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
-    .matrixNum = 0,
     .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
-    .affineParam = 0
 };
 
 // fastest to slowest
@@ -1141,7 +1138,7 @@ void sub_80D2EF8(struct Sprite *sprite)
 void LoadMonIconPalettes(void)
 {
     u8 i;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < ARRAY_COUNT(gMonIconPaletteTable); i++)
         LoadSpritePalette(&gMonIconPaletteTable[i]);
 }
 
@@ -1195,7 +1192,7 @@ void sub_80D3014(struct Sprite *sprite)
 const u8* GetMonIconTiles(u16 species, bool32 extra)
 {
     const u8* iconSprite = gMonIconTable[species];
-    if(species == SPECIES_DEOXYS && extra == TRUE)
+    if (species == SPECIES_DEOXYS && extra == TRUE)
     {
         iconSprite = (const u8*)(0x400 + (u32)iconSprite); //WTF?
     }
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
new file mode 100755
index 000000000..9603bb884
--- /dev/null
+++ b/src/pokemon_jump.c
@@ -0,0 +1,838 @@
+#include "global.h"
+#include "alloc.h"
+#include "link.h"
+#include "main.h"
+#include "palette.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "pokemon.h"
+#include "pokemon_jump.h"
+#include "constants/rgb.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+
+struct PokemonJump1_MonInfo
+{
+    u16 species;
+    u32 otId;
+    u32 personality;
+};
+
+struct PokemonJump1_82E4
+{
+    int unk0;
+    int unk4;
+    u8 filler8[0x4];
+    u16 unkC;
+    u16 unkE;
+    u16 unk10;
+    u16 unk12;
+    int unk14;
+    int unk18;
+    u8 filler1C[0xC];
+};
+
+struct PokemonJump1
+{
+    MainCallback unk0;
+    u8 unk4;
+    u8 unk5;
+    u8 unk6;
+    u8 unk7;
+    u16 unk8;
+    u16 unkA;
+    u16 unkC;
+    u16 unkE;
+    u8 filler10[0x4];
+    int unk14;
+    int unk18;
+    int unk1C;
+    u8 filler20[0x4];
+    int unk24;
+    u8 filler28[0x4];
+    int unk2C;
+    u32 unk30;
+    u8 filler34[0x6];
+    u16 unk3A;
+    u8 filler3C[0x6];
+    u16 unk42;
+    u8 unk44;
+    u8 filler45[0x1];
+    u8 unk46;
+    u8 isLeader;
+    u8 unk48;
+    u8 unk49;
+    u16 unk4A;
+    u8 unk4C;
+    u8 unk4D;
+    u8 filler4E[0x6];
+    int unk54;
+    int unk58;
+    int unk5C;
+    int unk60;
+    int unk64;
+    int unk68;
+    int unk6C;
+    u8 unk70;
+    u8 unk71;
+    u16 unk72;
+    u16 unk74;
+    int unk78;
+    u8 unk7C[5];
+    u8 filler81[0xA];
+    u8 unk8B[5];
+    u16 unk90[5];
+    u16 unk9A[5];
+    void **unkA4;
+    u8 fillerA8[0x8200];
+    struct PokemonJump1_MonInfo unk82A8[5];
+    struct PokemonJump1_82E4 unk82E4[5];
+    struct PokemonJump1_82E4 *unk83AC;
+};
+
+struct PokemonJumpMons
+{
+    u16 species;
+    u16 unk2;
+};
+
+struct Unk802B078
+{
+    u8 unk0;
+    u8 unk1;
+    u16 unk2;
+    u16 unk4;
+    u16 unk6;
+    int unk8;
+};
+
+static void sub_802AA60(struct PokemonJump1 *);
+void sub_802AA94(struct PokemonJump1 *);
+void sub_802AB20(void);
+static void sub_802AB98(void);
+s16 sub_802AC00(u16);
+static void sub_802AC2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon);
+static void sub_802AC6C(void);
+static void sub_802ACA0(u8 taskId);
+static void sub_802AF80(u8 taskId);
+static void sub_802B008(void);
+static void sub_802B194(u8 taskId);
+static void sub_802B1FC(void);
+bool32 sub_802B248(void);
+bool32 sub_802B2D4(void);
+bool32 sub_802B368(void);
+bool32 sub_802B3D4(void);
+bool32 sub_802B4CC(void);
+bool32 sub_802B5C8(void);
+bool32 sub_802B664(void);
+bool32 sub_802B6B8(void);
+bool32 sub_802B720(void);
+bool32 sub_802B29C(void);
+bool32 sub_802B31C(void);
+bool32 sub_802B3B4(void);
+bool32 sub_802B470(void);
+bool32 sub_802B568(void);
+bool32 sub_802B628(void);
+bool32 sub_802B664(void);
+bool32 sub_802B704(void);
+bool32 sub_802B720(void);
+bool32 sub_802B7E0(void);
+bool32 sub_802B8CC(void);
+void sub_802BD84(u8 taskId);
+void sub_802BE60(TaskFunc func, u8 taskPriority);
+void sub_802BE80(void);
+void sub_802C0B8(void);
+void sub_802C0E8(void);
+void sub_802C1DC(void);
+void sub_802C43C(void);
+bool32 sub_802C538(void);
+bool32 sub_802C70C(void);
+void sub_802D074(void *);
+void sub_802D0AC(void);
+int sub_802D0F0(void);
+void sub_802E138(struct PokemonJump1_82E4 *, u8 *);
+bool32 sub_802E1BC(struct PokemonJump1_82E4 *, struct Unk802B078 *);
+void sub_802E234(struct PokemonJump1_82E4 *, u8 , u16);
+bool32 sub_802E264(struct PokemonJump1_82E4 *, int, u8 *, u16 *);
+bool32 sub_802E2D0(struct PokemonJump1_82E4 *, int);
+void sub_802E3A8(void);
+
+extern struct PokemonJump1 *gUnknown_02022CFC;
+
+const struct PokemonJumpMons gPkmnJumpSpecies[] =
+{
+    { .species = SPECIES_BULBASAUR,  .unk2 = 2, },
+    { .species = SPECIES_CHARMANDER, .unk2 = 1, },
+    { .species = SPECIES_SQUIRTLE,   .unk2 = 0, },
+    { .species = SPECIES_CATERPIE,   .unk2 = 1, },
+    { .species = SPECIES_METAPOD,    .unk2 = 1, },
+    { .species = SPECIES_WEEDLE,     .unk2 = 1, },
+    { .species = SPECIES_KAKUNA,     .unk2 = 1, },
+    { .species = SPECIES_RATTATA,    .unk2 = 1, },
+    { .species = SPECIES_RATICATE,   .unk2 = 1, },
+    { .species = SPECIES_PIKACHU,    .unk2 = 0, },
+    { .species = SPECIES_SANDSHREW,  .unk2 = 0, },
+    { .species = SPECIES_NIDORAN_F,  .unk2 = 0, },
+    { .species = SPECIES_NIDORAN_M,  .unk2 = 0, },
+    { .species = SPECIES_CLEFAIRY,   .unk2 = 0, },
+    { .species = SPECIES_VULPIX,     .unk2 = 0, },
+    { .species = SPECIES_JIGGLYPUFF, .unk2 = 2, },
+    { .species = SPECIES_ODDISH,     .unk2 = 2, },
+    { .species = SPECIES_PARAS,      .unk2 = 1, },
+    { .species = SPECIES_MEOWTH,     .unk2 = 0, },
+    { .species = SPECIES_PSYDUCK,    .unk2 = 2, },
+    { .species = SPECIES_MANKEY,     .unk2 = 1, },
+    { .species = SPECIES_GROWLITHE,  .unk2 = 1, },
+    { .species = SPECIES_POLIWAG,    .unk2 = 2, },
+    { .species = SPECIES_BELLSPROUT, .unk2 = 2, },
+    { .species = SPECIES_SHELLDER,   .unk2 = 1, },
+    { .species = SPECIES_KRABBY,     .unk2 = 1, },
+    { .species = SPECIES_EXEGGCUTE,  .unk2 = 2, },
+    { .species = SPECIES_CUBONE,     .unk2 = 0, },
+    { .species = SPECIES_DITTO,      .unk2 = 2, },
+    { .species = SPECIES_EEVEE,      .unk2 = 0, },
+    { .species = SPECIES_OMANYTE,    .unk2 = 1, },
+    { .species = SPECIES_KABUTO,     .unk2 = 1, },
+    { .species = SPECIES_CHIKORITA,  .unk2 = 2, },
+    { .species = SPECIES_CYNDAQUIL,  .unk2 = 1, },
+    { .species = SPECIES_TOTODILE,   .unk2 = 0, },
+    { .species = SPECIES_SPINARAK,   .unk2 = 1, },
+    { .species = SPECIES_PICHU,      .unk2 = 0, },
+    { .species = SPECIES_CLEFFA,     .unk2 = 0, },
+    { .species = SPECIES_IGGLYBUFF,  .unk2 = 2, },
+    { .species = SPECIES_TOGEPI,     .unk2 = 2, },
+    { .species = SPECIES_MAREEP,     .unk2 = 0, },
+    { .species = SPECIES_BELLOSSOM,  .unk2 = 2, },
+    { .species = SPECIES_MARILL,     .unk2 = 2, },
+    { .species = SPECIES_SUNKERN,    .unk2 = 2, },
+    { .species = SPECIES_WOOPER,     .unk2 = 2, },
+    { .species = SPECIES_PINECO,     .unk2 = 2, },
+    { .species = SPECIES_SNUBBULL,   .unk2 = 0, },
+    { .species = SPECIES_SHUCKLE,    .unk2 = 2, },
+    { .species = SPECIES_TEDDIURSA,  .unk2 = 0, },
+    { .species = SPECIES_SLUGMA,     .unk2 = 2, },
+    { .species = SPECIES_SWINUB,     .unk2 = 0, },
+    { .species = SPECIES_HOUNDOUR,   .unk2 = 1, },
+    { .species = SPECIES_PHANPY,     .unk2 = 0, },
+    { .species = SPECIES_PORYGON2,   .unk2 = 0, },
+    { .species = SPECIES_TYROGUE,    .unk2 = 1, },
+    { .species = SPECIES_SMOOCHUM,   .unk2 = 2, },
+    { .species = SPECIES_ELEKID,     .unk2 = 1, },
+    { .species = SPECIES_MAGBY,      .unk2 = 1, },
+    { .species = SPECIES_LARVITAR,   .unk2 = 1, },
+    { .species = SPECIES_TREECKO,    .unk2 = 1, },
+    { .species = SPECIES_TORCHIC,    .unk2 = 2, },
+    { .species = SPECIES_MUDKIP,     .unk2 = 0, },
+    { .species = SPECIES_MARSHTOMP,  .unk2 = 0, },
+    { .species = SPECIES_POOCHYENA,  .unk2 = 1, },
+    { .species = SPECIES_ZIGZAGOON,  .unk2 = 0, },
+    { .species = SPECIES_LINOONE,    .unk2 = 0, },
+    { .species = SPECIES_WURMPLE,    .unk2 = 1, },
+    { .species = SPECIES_SILCOON,    .unk2 = 2, },
+    { .species = SPECIES_CASCOON,    .unk2 = 2, },
+    { .species = SPECIES_LOTAD,      .unk2 = 2, },
+    { .species = SPECIES_SEEDOT,     .unk2 = 1, },
+    { .species = SPECIES_RALTS,      .unk2 = 0, },
+    { .species = SPECIES_KIRLIA,     .unk2 = 0, },
+    { .species = SPECIES_SURSKIT,    .unk2 = 2, },
+    { .species = SPECIES_SHROOMISH,  .unk2 = 2, },
+    { .species = SPECIES_NINCADA,    .unk2 = 1, },
+    { .species = SPECIES_WHISMUR,    .unk2 = 0, },
+    { .species = SPECIES_AZURILL,    .unk2 = 2, },
+    { .species = SPECIES_SKITTY,     .unk2 = 0, },
+    { .species = SPECIES_SABLEYE,    .unk2 = 0, },
+    { .species = SPECIES_MAWILE,     .unk2 = 0, },
+    { .species = SPECIES_ARON,       .unk2 = 1, },
+    { .species = SPECIES_MEDITITE,   .unk2 = 2, },
+    { .species = SPECIES_ELECTRIKE,  .unk2 = 1, },
+    { .species = SPECIES_PLUSLE,     .unk2 = 1, },
+    { .species = SPECIES_MINUN,      .unk2 = 1, },
+    { .species = SPECIES_VOLBEAT,    .unk2 = 0, },
+    { .species = SPECIES_ILLUMISE,   .unk2 = 0, },
+    { .species = SPECIES_ROSELIA,    .unk2 = 2, },
+    { .species = SPECIES_GULPIN,     .unk2 = 2, },
+    { .species = SPECIES_NUMEL,      .unk2 = 2, },
+    { .species = SPECIES_TORKOAL,    .unk2 = 2, },
+    { .species = SPECIES_SPOINK,     .unk2 = 0, },
+    { .species = SPECIES_TRAPINCH,   .unk2 = 2, },
+    { .species = SPECIES_CACNEA,     .unk2 = 2, },
+    { .species = SPECIES_ANORITH,    .unk2 = 1, },
+    { .species = SPECIES_WYNAUT,     .unk2 = 0, },
+    { .species = SPECIES_SNORUNT,    .unk2 = 0, },
+    { .species = SPECIES_CLAMPERL,   .unk2 = 1, },
+    { .species = SPECIES_BAGON,      .unk2 = 1, },
+};
+
+bool32 (* const gUnknown_082FB5F4[])(void) =
+{
+    sub_802B248,
+    sub_802B2D4,
+    sub_802B368,
+    sub_802B3D4,
+    sub_802B4CC,
+    sub_802B5C8,
+    sub_802B664,
+    sub_802B6B8,
+    sub_802B720,
+};
+
+bool32 (* const gUnknown_082FB618[])(void) =
+{
+    sub_802B29C,
+    sub_802B31C,
+    sub_802B3B4,
+    sub_802B470,
+    sub_802B568,
+    sub_802B628,
+    sub_802B664,
+    sub_802B704,
+    sub_802B720,
+};
+
+void sub_802A9A8(u16 partyIndex, MainCallback callback)
+{
+    u8 taskId;
+
+    if (gReceivedRemoteLinkPlayers)
+    {
+        gUnknown_02022CFC = Alloc(sizeof(*gUnknown_02022CFC));
+        if (gUnknown_02022CFC)
+        {
+            ResetTasks();
+            taskId = CreateTask(sub_802ACA0, 1);
+            gUnknown_02022CFC->unk8 = 0;
+            gUnknown_02022CFC->unk0 = callback;
+            gUnknown_02022CFC->unk4 = taskId;
+            gUnknown_02022CFC->unk6 = GetMultiplayerId();
+            sub_802AC2C(&gUnknown_02022CFC->unk82A8[gUnknown_02022CFC->unk6], &gPlayerParty[partyIndex]);
+            sub_802AA60(gUnknown_02022CFC);
+            SetWordTaskArg(taskId, 2, (u32)gUnknown_02022CFC);
+            SetMainCallback2(sub_802AC6C);
+            return;
+        }
+    }
+
+    SetMainCallback2(callback);
+}
+
+void sub_802AA48(void)
+{
+    sub_802D0AC();
+    Free(gUnknown_02022CFC);
+}
+
+static void sub_802AA60(struct PokemonJump1 *arg0)
+{
+    arg0->unk5 = GetLinkPlayerCount();
+    arg0->unk70 = 5;
+    arg0->unk72 = 0;
+    sub_802AB20();
+    sub_802AA94(arg0);
+    if (arg0->unk5 == 5)
+        sub_802E3A8();
+}
+
+void sub_802AA94(struct PokemonJump1 *arg0)
+{
+    int i;
+
+    arg0->unk14 = 6;
+    arg0->unk18 = 6;
+    arg0->unk4A = 0;
+    arg0->unk1C = 0;
+    arg0->unk5C = 0;
+    arg0->isLeader = GetMultiplayerId() == 0;
+    arg0->unk8 = 0;
+    arg0->unkA = 0;
+    arg0->unkC = 0;
+    arg0->unkE = 0;
+    arg0->unk58 = 0;
+    arg0->unk3A = 0;
+    arg0->unk44 = 0;
+    arg0->unk54 = 0;
+    arg0->unk46 = 0;
+    arg0->unk49 = 0;
+    arg0->unk48 = 1;
+    arg0->unk78 = 0;
+    arg0->unk71 = 0;
+    arg0->unk74 = 0;
+    arg0->unk60 = 1;
+    arg0->unk4D = 0;
+    arg0->unk68 = 0;
+    arg0->unk64 = 0;
+    arg0->unk2C = 0;
+    arg0->unk30 = 0;
+    sub_802AB98();
+    sub_802C0E8();
+
+    for (i = 0; i < 5; i++)
+    {
+        arg0->unk7C[i] = 0;
+        arg0->unk9A[i] = 0;
+    }
+}
+
+#ifdef NONMATCHING
+void sub_802AB20(void)
+{
+    int i;
+    s16 index;
+
+    for (i = 0; i < 5; i++)
+    {
+        index = sub_802AC00(gUnknown_02022CFC->unk82A8[i].species);
+        gUnknown_02022CFC->unk82E4[i].unkC = gPkmnJumpSpecies[index].unk2;
+    }
+
+    gUnknown_02022CFC->unk83AC = &gUnknown_02022CFC->unk82E4[gUnknown_02022CFC->unk6];
+}
+#else
+NAKED
+void sub_802AB20(void)
+{
+    asm_unified("\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    ldr r7, =gUnknown_02022CFC\n\
+    movs r6, 0\n\
+    movs r5, 0\n\
+    ldr r0, =gPkmnJumpSpecies\n\
+    mov r8, r0\n\
+    movs r4, 0x4\n\
+_0802AB32:\n\
+    ldr r0, [r7]\n\
+    adds r0, r5\n\
+    ldr r1, =0x000082a8\n\
+    adds r0, r1\n\
+    ldrh r0, [r0]\n\
+    bl sub_802AC00\n\
+    lsls r0, 16\n\
+    ldr r1, [r7]\n\
+    adds r1, r6\n\
+    asrs r0, 14\n\
+    add r0, r8\n\
+    ldrh r0, [r0, 0x2]\n\
+    ldr r2, =0x000082f0\n\
+    adds r1, r2\n\
+    strh r0, [r1]\n\
+    adds r6, 0x28\n\
+    adds r5, 0xC\n\
+    subs r4, 0x1\n\
+    cmp r4, 0\n\
+    bge _0802AB32\n\
+    ldr r0, =gUnknown_02022CFC\n\
+    ldr r1, [r0]\n\
+    ldr r0, =0x000083ac\n\
+    adds r3, r1, r0\n\
+    ldrb r2, [r1, 0x6]\n\
+    lsls r0, r2, 2\n\
+    adds r0, r2\n\
+    lsls r0, 3\n\
+    ldr r2, =0x000082e4\n\
+    adds r0, r2\n\
+    adds r1, r0\n\
+    str r1, [r3]\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
+}
+#endif // NONMATCHING
+
+static void sub_802AB98(void)
+{
+    int i;
+
+    for (i = 0; i < 5; i++)
+    {
+        gUnknown_02022CFC->unk82E4[i].unkE = 0;
+        gUnknown_02022CFC->unk82E4[i].unk10 = 0;
+        gUnknown_02022CFC->unk82E4[i].unk12 = 0;
+        gUnknown_02022CFC->unk82E4[i].unk0 = 0;
+        gUnknown_02022CFC->unk82E4[i].unk4 = 0x7FFFFFFF;
+        gUnknown_02022CFC->unk82E4[i].unk14 = 0;
+        gUnknown_02022CFC->unk8B[i] = 9;
+    }
+}
+
+s16 sub_802AC00(u16 species)
+{
+    u32 i;
+    for (i = 0; i < ARRAY_COUNT(gPkmnJumpSpecies); i++)
+    {
+        if (gPkmnJumpSpecies[i].species == species)
+            return i;
+    }
+
+    return -1;
+}
+
+static void sub_802AC2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon)
+{
+    monInfo->species = GetMonData(mon, MON_DATA_SPECIES);
+    monInfo->otId = GetMonData(mon, MON_DATA_OT_ID);
+    monInfo->personality = GetMonData(mon, MON_DATA_PERSONALITY);
+}
+
+static void sub_802AC58(void)
+{
+    TransferPlttBuffer();
+    LoadOam();
+    ProcessSpriteCopyRequests();
+}
+
+static void sub_802AC6C(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+static void sub_802AC84(TaskFunc func)
+{
+    gUnknown_02022CFC->unk4 = CreateTask(func, 1);
+    gUnknown_02022CFC->unk8 = 0;
+}
+
+static void sub_802ACA0(u8 taskId)
+{
+    switch (gUnknown_02022CFC->unk8)
+    {
+    case 0:
+        SetVBlankCallback(NULL);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        sub_802BE60(sub_802BD84, 5);
+        FadeOutMapMusic(4);
+        gUnknown_02022CFC->unk8++;
+        break;
+    case 1:
+        if (!FuncIsActiveTask(sub_802BD84))
+        {
+            sub_802D074(&gUnknown_02022CFC->unkA4);
+            LoadWirelessStatusIndicatorSpriteGfx();
+            CreateWirelessStatusIndicatorSprite(0, 0);
+            gUnknown_02022CFC->unk8++;
+        }
+        break;
+    case 2:
+        if (!sub_802D0F0() && IsNotWaitingForBGMStop() == TRUE)
+        {
+            FadeOutAndPlayNewMapMusic(MUS_RG_JUMP, 8);
+            gUnknown_02022CFC->unk8++;
+        }
+        break;
+    case 3:
+        if (IsLinkTaskFinished())
+        {
+            BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
+            BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
+            SetVBlankCallback(sub_802AC58);
+            gUnknown_02022CFC->unk8++;
+        }
+        break;
+    case 4:
+        UpdatePaletteFade();
+        if (!gPaletteFade.active)
+        {
+            gUnknown_02022CFC->unk7 = 0;
+            gUnknown_02022CFC->unk8++;
+        }
+        break;
+    case 5:
+        gUnknown_02022CFC->unk7++;
+        if (gUnknown_02022CFC->unk7 >= 20)
+        {
+            if (gUnknown_02022CFC->isLeader)
+                sub_802AC84(sub_802AF80);
+            else
+                sub_802AC84(sub_802B194);
+
+            sub_802BE80();
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+void sub_802AE14(int arg0)
+{
+    if (arg0 == 0)
+    {
+        gUnknown_02022CFC->unk30 = 0x1111;
+        gUnknown_02022CFC->unk2C = 1;
+    }
+    else
+    {
+        gUnknown_02022CFC->unk30 = (1 << (arg0 - 1)) - 1;
+        gUnknown_02022CFC->unk2C = 0;
+    }
+}
+
+static void sub_802AE50(u8 arg0)
+{
+    int i;
+
+    gUnknown_02022CFC->unk70 = arg0;
+    gUnknown_02022CFC->unk8 = 0;
+    gUnknown_02022CFC->unkA = 0;
+    gUnknown_02022CFC->unk48 = 1;
+    gUnknown_02022CFC->unk49 = 0;
+    for (i = 1; i < gUnknown_02022CFC->unk5; i++)
+        gUnknown_02022CFC->unk82E4[i].unk18 = 0;
+}
+
+static void sub_802AEA4(void)
+{
+    int i;
+    int count;
+    u16 var0;
+    u8 var1;
+    u16 var2;
+
+    for (i = 1, count = 0; i < gUnknown_02022CFC->unk5; i++)
+    {
+        var0 = gUnknown_02022CFC->unk82E4[i].unk10;
+        if (sub_802E264(&gUnknown_02022CFC->unk82E4[i], i, &var1, &var2))
+        {
+            gUnknown_02022CFC->unk90[i] = var2;
+            gUnknown_02022CFC->unk8B[i] = var1;
+            gUnknown_02022CFC->unk82E4[i].unk12 = var0;
+        }
+
+        if (gUnknown_02022CFC->unk82E4[i].unk18 && gUnknown_02022CFC->unk8B[i] == gUnknown_02022CFC->unk70)
+            count++;
+    }
+
+    if (count == gUnknown_02022CFC->unk5 - 1)
+        gUnknown_02022CFC->unk49 = 1;
+}
+
+static void sub_802AF80(u8 taskId)
+{
+    sub_802AEA4();
+    sub_802C43C();
+    if (!gUnknown_02022CFC->unk48 && gUnknown_02022CFC->unk49)
+    {
+        sub_802AE50(gUnknown_02022CFC->unk4C);
+        sub_802AE14(3);
+    }
+
+    if (gUnknown_02022CFC->unk48 == 1)
+    {
+        if (!gUnknown_082FB5F4[gUnknown_02022CFC->unk70]())
+        {
+            gUnknown_02022CFC->unk48 = 0;
+            gUnknown_02022CFC->unk82E4[gUnknown_02022CFC->unk6].unk18 = 1;
+        }
+    }
+
+    sub_802C1DC();
+    sub_802B008();
+}
+
+static void sub_802B008(void)
+{
+    if (!gUnknown_02022CFC->unk2C)
+        sub_802E138(gUnknown_02022CFC->unk82E4, &gUnknown_02022CFC->unk70);
+
+    if (gUnknown_02022CFC->unk30 != 0x1111)
+    {
+        gUnknown_02022CFC->unk2C++;
+        gUnknown_02022CFC->unk2C &= gUnknown_02022CFC->unk30;
+    }
+}
+
+static void sub_802B044(u8 arg0)
+{
+    gUnknown_02022CFC->unk70 = arg0;
+    gUnknown_02022CFC->unk8 = 0;
+    gUnknown_02022CFC->unkA = 0;
+    gUnknown_02022CFC->unk48 = 1;
+    gUnknown_02022CFC->unk82E4[gUnknown_02022CFC->unk6].unk18 = 0;
+}
+
+static void sub_802B078(void)
+{
+    int i;
+    u16 var0;
+    struct Unk802B078 sp0;
+
+    var0 = gUnknown_02022CFC->unk82E4[0].unk10;
+    if (sub_802E1BC(gUnknown_02022CFC->unk82E4, &sp0))
+    {
+        if (gUnknown_02022CFC->unk82E4[gUnknown_02022CFC->unk6].unk18 == 1
+         && sp0.unk0 != gUnknown_02022CFC->unk70)
+        {
+            sub_802B044(sp0.unk0);
+        }
+
+        if (gUnknown_02022CFC->unk78 != sp0.unk8)
+        {
+            gUnknown_02022CFC->unk78 = sp0.unk8;
+            gUnknown_02022CFC->unk5C = 1;
+            gUnknown_02022CFC->unk71 = sp0.unk1;
+            if (gUnknown_02022CFC->unk71)
+                gUnknown_02022CFC->unk4D = 1;
+            else
+                gUnknown_02022CFC->unk4D = 0;
+        }
+
+        gUnknown_02022CFC->unk72 = sp0.unk2;
+        gUnknown_02022CFC->unk74 = sp0.unk4;
+        gUnknown_02022CFC->unk82E4[0].unk12 = var0;
+    }
+
+    for (i = 1; i < gUnknown_02022CFC->unk5; i++)
+    {
+        if (i != gUnknown_02022CFC->unk6)
+        {
+            var0 = gUnknown_02022CFC->unk82E4[i].unk10;
+            if (sub_802E2D0(&gUnknown_02022CFC->unk82E4[i], i))
+                gUnknown_02022CFC->unk82E4[i].unk12 = var0;
+        }
+    }
+}
+
+static void sub_802B194(u8 taskId)
+{
+    sub_802B078();
+    if (gUnknown_02022CFC->unk48)
+    {
+        if (!gUnknown_082FB618[gUnknown_02022CFC->unk70]())
+        {
+            gUnknown_02022CFC->unk48 = 0;
+            gUnknown_02022CFC->unk82E4[gUnknown_02022CFC->unk6].unk18 = 1;
+            sub_802AE14(3);
+        }
+    }
+
+    sub_802C1DC();
+    sub_802B1FC();
+}
+
+static void sub_802B1FC(void)
+{
+    if (!gUnknown_02022CFC->unk2C)
+        sub_802E234(&gUnknown_02022CFC->unk82E4[gUnknown_02022CFC->unk6], gUnknown_02022CFC->unk70, gUnknown_02022CFC->unk42);
+
+    if (gUnknown_02022CFC->unk30 != 0x1111)
+    {
+        gUnknown_02022CFC->unk2C++;
+        gUnknown_02022CFC->unk2C &= gUnknown_02022CFC->unk30;
+    }
+}
+
+bool32 sub_802B248(void)
+{
+    switch (gUnknown_02022CFC->unk8)
+    {
+    case 0:
+        sub_802AE14(3);
+        gUnknown_02022CFC->unk8++;
+        // fall through
+    case 1:
+        if (!sub_802B7E0())
+        {
+            gUnknown_02022CFC->unk72 = gUnknown_02022CFC->unk4A;
+            gUnknown_02022CFC->unk4C = 1;
+            return FALSE;
+        }
+        break;
+    }
+
+    return TRUE;
+}
+
+bool32 sub_802B29C(void)
+{
+    switch (gUnknown_02022CFC->unk8)
+    {
+    case 0:
+        sub_802AE14(0);
+        gUnknown_02022CFC->unk24 = gUnknown_02022CFC->unk72;
+        gUnknown_02022CFC->unk8++;
+        // fall through
+    case 1:
+        return sub_802B7E0();
+    }
+
+    return TRUE;
+}
+
+bool32 sub_802B2D4(void)
+{
+    switch (gUnknown_02022CFC->unk8)
+    {
+    case 0:
+        sub_802C0E8();
+        sub_802AE14(5);
+        gUnknown_02022CFC->unk8++;
+        break;
+    case 1:
+        if (gUnknown_02022CFC->unk49)
+        {
+            gUnknown_02022CFC->unk4C = 2;
+            return FALSE;
+        }
+        break;
+    }
+
+    return TRUE;
+}
+
+bool32 sub_802B31C(void)
+{
+    switch (gUnknown_02022CFC->unk8)
+    {
+    case 0:
+        sub_802C0E8();
+        sub_802AE14(0);
+        gUnknown_02022CFC->unk4A = gUnknown_02022CFC->unk72;
+        gUnknown_02022CFC->unk8++;
+        // fall through
+    case 1:
+        if (sub_802C70C())
+            return FALSE;
+        break;
+    }
+
+    return TRUE;
+}
+
+bool32 sub_802B368(void)
+{
+    if (!sub_802B8CC())
+    {
+        gUnknown_02022CFC->unk72 = gUnknown_02022CFC->unk4A;
+        gUnknown_02022CFC->unk4C = 1;
+    }
+    else if (sub_802C538())
+    {
+        return TRUE;
+    }
+    else
+    {
+        sub_802C0B8();
+        gUnknown_02022CFC->unk4C = 3;
+    }
+
+    return FALSE;
+}
+
+bool32 sub_802B3B4(void)
+{
+    if (!sub_802B8CC())
+        ;
+    else if (sub_802C538())
+        return TRUE;
+    else
+        sub_802C0B8();
+
+    return FALSE;
+}
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 98d83d8ce..f63e1ccba 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "data.h"
 #include "event_data.h"
 #include "pokedex.h"
 #include "pokemon.h"
@@ -45,7 +46,6 @@ static const u8 sGiftRibbonsMonDataIds[] =
 
 extern const u8 gText_DecimalPoint[];
 extern const u8 gText_Marco[];
-extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 
 #define CM_PER_INCH 2.54
 
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index fb1be0698..148be7c5c 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "alloc.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "dma3.h"
 #include "dynamic_placeholder_text_util.h"
@@ -463,8 +463,6 @@ EWRAM_DATA static u8 sMovingMonOrigBoxId = 0;
 EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0;
 EWRAM_DATA static bool8 sCanOnlyMove = 0;
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-
 // This file's functions.
 static void CreatePCMenu(u8 whichMenu, s16 *windowIdPtr);
 static void Cb2_EnterPSS(u8 boxOption);
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 3a5b06d45..2ec088628 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -9,7 +9,7 @@
 #include "bg.h"
 #include "contest.h"
 #include "contest_effect.h"
-#include "data2.h"
+#include "data.h"
 #include "daycare.h"
 #include "decompress.h"
 #include "dynamic_placeholder_text_util.h"
@@ -164,7 +164,6 @@ static EWRAM_DATA struct PokemonSummaryScreenData
 EWRAM_DATA u8 gLastViewedMonIndex = 0;
 static EWRAM_DATA u8 sUnknown_0203CF21 = 0;
 ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0;
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 
 struct UnkStruct_61CC04
 {
diff --git a/src/pokenav.c b/src/pokenav.c
index 42114a4b2..68cdb0e89 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -18,6 +18,7 @@
 #include "decompress.h"
 #include "strings.h"
 #include "constants/rgb.h"
+#include "pokenav.h"
 
 enum
 {
@@ -26,39 +27,38 @@ enum
     MODE_FORCE_CALL_2, // Set after making a call, has to exit Pokenav.
 };
 
-#define UNKNOWN_OFFSET 100000
-
-struct UnknownSubStruct_0203CF40
+enum
 {
-    void (*unk0)(u32);
-    u32 (*unk4)(void);
-    u32 unk8;
-    u32 unkC;
-    u32 unk10;
-    u32 unk14;
-    struct Sprite *unk18;
-    struct Sprite *unk1C[2];
-    struct Sprite *unk24[2];
-    u8 tilemapBuffer[0x1000];
+    NAVMENU_CB_UNK_0,
+    NAVMENU_CB_UNK_1,
+    NAVMENU_CB_UNK_2,
+    NAVMENU_CB_UNK_3,
+    NAVMENU_CB_UNK_4,
+    NAVMENU_CB_UNK_5,
+    NAVMENU_CB_UNK_6
 };
 
+#define LOOPED_TASK_DECODE_STATE(action) (action - 5)
+
+#define LOOPED_TASK_ID(primary, secondary) (((secondary) << 16) |(primary))
+#define LOOPED_TASK_PRIMARY_ID(taskId) (taskId & 0xFFFF)
+#define LOOPED_TASK_SECONDARY_ID(taskId) (taskId >> 16)
+
+#define UNKNOWN_OFFSET 100000
+
 #define SUBSTRUCT_COUNT 19
 
-struct UnknownStruct_0203CF40
+struct PokenavResources
 {
-    u32 (*field0)(void);
-    u32 field4;
+    u32 (*currentMenuCb1)(void);
+    u32 currentMenuIndex;
     u16 mode;
     u16 fieldA;
     bool32 hasAnyRibbons;
-    struct UnknownSubStruct_0203CF40 *field10[SUBSTRUCT_COUNT];
+    void *field10[SUBSTRUCT_COUNT];
 };
 
 extern u32 sub_81C9430(void);
-extern void sub_81CAADC(void);
-extern u32 sub_81C99D4(void);
-extern void sub_8199D98(void);
-extern void sub_81C7D28(void);
 extern u32 sub_81C9298(void);
 extern u32 sub_81C941C(void);
 extern u32 sub_81C9924(void);
@@ -117,46 +117,29 @@ extern u32 sub_81D09F4(void);
 extern u32 sub_81CFA04(void);
 extern u32 sub_81CFE08(void);
 
-u32 sub_81C791C(s32 a0);
-bool32 sub_81C756C(u32 a0);
-bool32 sub_81C76C4(void);
+bool32 SetActivePokenavMenu(u32 a0);
+bool32 InitPokenavMainMenu(void);
 static bool32 AnyMonHasRibbon(void);
 u32 sub_81C75E0(void);
 u32 sub_81C75D4(void);
-u32 sub_81C76FC(void);
+u32 PokenavMainMenuLoopedTaskIsActive(void);
 u32 sub_81C786C(void);
-u32 sub_81C7764(s32 a0);
-u32 sub_81C78D4(s32 a0);
-bool32 sub_81C7738(void);
-void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 a1, u32 a2);
+bool32 WaitForPokenavShutdownFade(void);
 void sub_81C7834(void *func1, void *func2);
-static void InitMainStruct(struct UnknownStruct_0203CF40 *a0);
-void FreeSubstruct(u32 index);
+static void InitPokenavResources(struct PokenavResources *a0);
 void sub_81C7850(u32 a0);
-void sub_81C7BF8(u32 a0);
-void sub_81C71E4(u8 a0);
-void sub_81C7170(u8 taskId);
+void Task_RunLoopedTask_LinkMode(u8 a0);
+void Task_RunLoopedTask(u8 taskId);
 void sub_81C742C(u8 taskId);
-void sub_81C7710(void);
+void ShutdownPokenav(void);
 static void InitKeys_(void);
-static void FreeVars(void);
-static void VblankCb_Pokenav(void);
+static void FreePokenavResources(void);
+static void VBlankCB_Pokenav(void);
 static void CB2_Pokenav(void);
-void sub_81C7C28(void);
 void sub_81C72BC(void);
-void sub_81C7B74(void);
-void sub_81C7C94(void);
-void sub_81C7F24(u32 arg0);
-void sub_81C7E58(u32 arg0);
-void sub_81C8110(bool32 arg0);
-void sub_81C80D4(bool32 arg0);
-void sub_81C803C(u32 arg0, bool32 arg1);
-void sub_81C8088(u32 arg0, bool32 arg1);
-void sub_81C814C(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3);
-void sub_81C817C(struct Sprite *sprite);
 
 // Const rom data.
-u32 (*const gUnknown_0861F3EC[15][7])(void) =
+u32 (*const PokenavMenuCallbacks[15][7])(void) =
 {
     {
         sub_81C9298,
@@ -295,211 +278,130 @@ u32 (*const gUnknown_0861F3EC[15][7])(void) =
     },
 };
 
-const u16 gUnknown_0861F590[] = INCBIN_U16("graphics/pokenav/icon2.gbapal");
-const u32 gUnknown_0861F5B0[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz");
-const u32 gUnknown_0861F994[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz");
-
-const struct BgTemplate gUnknown_0861FA04[] =
-{
-    {
-        .bg = 0,
-        .charBaseIndex = 0,
-        .mapBaseIndex = 5,
-        .screenSize = 0,
-        .paletteMode = 0,
-        .priority = 0,
-        .baseTile = 0,
-    }
-};
-
-const struct WindowTemplate gUnknown_0861FA08[2] =
-{
-    {
-        .bg = 0,
-        .tilemapLeft = 1,
-        .tilemapTop = 22,
-        .width = 16,
-        .height = 2,
-        .paletteNum = 0,
-        .baseBlock = 0x36,
-    },
-    {
-        .bg = 0xFF,
-        .tilemapLeft = 0,
-        .tilemapTop = 0,
-        .width = 0,
-        .height = 0,
-        .paletteNum = 0,
-        .baseBlock = 0,
-    },
-};
-
-const u8 *const (sMenuButtonReminders[12]) =
-{
-    gText_Navgear_ClearButtonList,
-    gText_NavgearMap_ZoomedOutButtons,
-    gText_NavgearMap_ZoomedInButtons,
-    gText_NavgearCondition_MonListButtons,
-    gText_NavgearCondition_MonStatusButtons,
-    gText_NavgearCondition_MarkingButtons,
-    gText_NavgearMatchCall_TrainerListButtons,
-    gText_NavgearMatchCall_CallMenuButtons,
-    gText_NavgearMatchCall_CheckTrainerButtons,
-    gText_NavgearRibbons_MonListButtons,
-    gText_NavgearRibbons_RibbonListButtons,
-    gText_NavgearRibbons_RibbonCheckButtons,
-};
-
-const u8 gMenuButtonReminderColor[4] =
-{
-    4, 1, 2, 0
-};
-
-const struct CompressedSpriteSheet gUnknown_0861FA4C[] =
-{
-    {
-        .data = gUnknown_0861F5B0,
-        .size = 0x1000,
-        .tag = 0,
-    }
-};
-
-const struct SpritePalette gUnknown_0861FA54[2] =
-{
-    {
-        .data = gUnknown_0861F590,
-        .tag = 0,
-    },
-};
-
-const struct CompressedSpriteSheet gUnknown_0861FA64 =
-{
-    .data = gPokenavLeftHeaderHoennMap_Gfx,
-    .size = 0xC00,
-    .tag = 2
-};
-
-extern struct UnknownStruct_0203CF40 *gUnknown_0203CF40;
-extern u8 gUnknown_0203CF3C;
-extern const struct SpriteTemplate gUnknown_0861FB04;
+EWRAM_DATA u8 gNextLoopedTaskId = 0;
+EWRAM_DATA struct PokenavResources *gPokenavResources = NULL;
 
 // code
-u32 sub_81C7078(u32 (*func)(s32), u32 priority)
+u32 CreateLoopedTask(LoopedTask loopedTask, u32 priority)
 {
     u16 taskId;
 
     if (!IsUpdateLinkStateCBActive())
-        taskId = CreateTask(sub_81C7170, priority);
+        taskId = CreateTask(Task_RunLoopedTask, priority);
     else
-        taskId = CreateTask(sub_81C71E4, priority);
+        taskId = CreateTask(Task_RunLoopedTask_LinkMode, priority);
 
-    SetWordTaskArg(taskId, 1, (u32)func);
+    SetWordTaskArg(taskId, 1, (u32)loopedTask);
 
-    gTasks[taskId].data[3] = gUnknown_0203CF3C;
-    return ((gUnknown_0203CF3C++) << 16) | taskId;
+    gTasks[taskId].data[3] = gNextLoopedTaskId;
+    return LOOPED_TASK_ID(taskId, gNextLoopedTaskId++);
 }
 
-bool32 sub_81C70D8(u32 a0)
+bool32 IsLoopedTaskActive(u32 taskId)
 {
-    u32 taskId = a0 & 0xFFFF;
-    u32 v2 = a0 >> 16;
+    u32 primaryId = LOOPED_TASK_PRIMARY_ID(taskId);
+    u32 secondaryId = LOOPED_TASK_SECONDARY_ID(taskId);
 
-    if (gTasks[taskId].isActive
-        && (gTasks[taskId].func == sub_81C7170 || gTasks[taskId].func == sub_81C71E4)
-        && gTasks[taskId].data[3] == v2)
+    if (gTasks[primaryId].isActive
+        && (gTasks[primaryId].func == Task_RunLoopedTask || gTasks[primaryId].func == Task_RunLoopedTask_LinkMode)
+        && gTasks[primaryId].data[3] == secondaryId)
         return TRUE;
     else
         return FALSE;
 }
 
-bool32 sub_81C7124(u32 a0)
+bool32 FuncIsActiveLoopedTask(LoopedTask func)
 {
     s32 i;
     for (i = 0; i < NUM_TASKS; i++)
     {
         if (gTasks[i].isActive
-            && (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)
-            && GetWordTaskArg(i, 1) == a0)
+            && (gTasks[i].func == Task_RunLoopedTask || gTasks[i].func == Task_RunLoopedTask_LinkMode)
+            && (LoopedTask)GetWordTaskArg(i, 1) == func)
             return TRUE;
     }
     return FALSE;
 }
 
-void sub_81C7170(u8 taskId)
+void Task_RunLoopedTask(u8 taskId)
 {
-    u32 (*func)(s32) = (void *)GetWordTaskArg(taskId, 1);
-    s16 *data = gTasks[taskId].data;
+    LoopedTask loopedTask = (LoopedTask)GetWordTaskArg(taskId, 1);
+    s16 *state = &gTasks[taskId].data[0];
     bool32 exitLoop = FALSE;
 
     while (!exitLoop)
     {
-        u32 var = func(data[0]);
-        switch (var)
+        u32 action = loopedTask(*state);
+        switch (action)
         {
-        case 1:
-            data[0] = data[0] + 1;
+        case LT_INC_AND_CONTINUE:
+            (*state)++;
             break;
-        case 0:
-            data[0]++;
+        case LT_INC_AND_PAUSE:
+            (*state)++;
             return;
-        case 4:
+        case LT_FINISH:
             DestroyTask(taskId);
             return;
+        // case LT_SET_STATE:
         default:
-            data[0] = var - 5;
+            *state = LOOPED_TASK_DECODE_STATE(action);
             break;
-        case 3:
+        case LT_CONTINUE:
             break;
-        case 2:
+        case LT_PAUSE:
             return;
         }
     }
 }
 
-void sub_81C71E4(u8 taskId)
+// Every "Continue" action pauses instead.
+void Task_RunLoopedTask_LinkMode(u8 taskId)
 {
-    u32 (*func)(u32);
-    s16 *data;
-    u32 v1;
+    LoopedTask task;
+    s16 *state;
+    u32 action;
 
     if (sub_8087598())
         return;
-    func = (u32 (*)(u32))GetWordTaskArg(taskId, 1);
-    data = gTasks[taskId].data;
-    v1 = func(data[0]);
-    switch (v1)
-    {
-    case 0:
-    case 1:
-        data[0]++;
+    
+    task = (LoopedTask)GetWordTaskArg(taskId, 1);
+    state = &gTasks[taskId].data[0];
+    action = task(*state);
+    switch (action)
+    {
+    case LT_INC_AND_PAUSE:
+    case LT_INC_AND_CONTINUE:
+        (*state)++;
         break;
-    case 4:
+    case LT_FINISH:
         DestroyTask(taskId);
         break;
+    // case: LT_SET_STATE:
     default:
-        data[0] = v1 - 5;
+        *state = LOOPED_TASK_DECODE_STATE(action);
         break;
-    case 2:
-    case 3:
+    case LT_PAUSE:
+    case LT_CONTINUE:
         break;
     }
 }
 
 void CB2_InitPokeNav(void)
 {
-    gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40));
-    if (gUnknown_0203CF40 == NULL)
+    gPokenavResources = Alloc(sizeof(*gPokenavResources));
+    if (gPokenavResources == NULL)
     {
         SetMainCallback2(CB2_ReturnToFieldWithOpenMenu);
     }
     else
     {
-        InitMainStruct(gUnknown_0203CF40);
+        InitPokenavResources(gPokenavResources);
         ResetTasks();
         SetVBlankCallback(NULL);
         CreateTask(sub_81C742C, 0);
         SetMainCallback2(CB2_Pokenav);
-        SetVBlankCallback(VblankCb_Pokenav);
+        SetVBlankCallback(VBlankCB_Pokenav);
     }
 }
 
@@ -515,38 +417,37 @@ void sub_81C72BC(void)
     if (gPaletteFade.active)
         return;
 
-    gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40));
-    if (gUnknown_0203CF40 == NULL)
+    gPokenavResources = Alloc(sizeof(*gPokenavResources));
+    if (gPokenavResources == NULL)
     {
         SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
     }
     else
     {
-        InitMainStruct(gUnknown_0203CF40);
-        gUnknown_0203CF40->mode = MODE_FORCE_CALL_1;
+        InitPokenavResources(gPokenavResources);
+        gPokenavResources->mode = MODE_FORCE_CALL_1;
         ResetTasks();
         ResetSpriteData();
         FreeAllSpritePalettes();
         SetVBlankCallback(NULL);
         CreateTask(sub_81C742C, 0);
         SetMainCallback2(CB2_Pokenav);
-        SetVBlankCallback(VblankCb_Pokenav);
+        SetVBlankCallback(VBlankCB_Pokenav);
     }
 }
 
-static void FreeVars(void)
+static void FreePokenavResources(void)
 {
     s32 i;
 
     for (i = 0; i < SUBSTRUCT_COUNT; i++)
-        FreeSubstruct(i);
+        FreePokenavSubstruct(i);
 
-    FREE_AND_SET_NULL(gUnknown_0203CF40);
+    FREE_AND_SET_NULL(gPokenavResources);
     InitKeys();
 }
 
-// Clears UnknownStruct_0203CF40
-static void InitMainStruct(struct UnknownStruct_0203CF40 *a0)
+static void InitPokenavResources(struct PokenavResources *a0)
 {
     s32 i;
 
@@ -554,9 +455,9 @@ static void InitMainStruct(struct UnknownStruct_0203CF40 *a0)
         a0->field10[i] = NULL;
 
     a0->mode = MODE_NORMAL;
-    a0->field4 = 0;
+    a0->currentMenuIndex = 0;
     a0->hasAnyRibbons = AnyMonHasRibbon();
-    a0->field0 = NULL;
+    a0->currentMenuCb1 = NULL;
 }
 
 static bool32 AnyMonHasRibbon(void)
@@ -596,7 +497,7 @@ static void CB2_Pokenav(void)
     UpdatePaletteFade();
 }
 
-static void VblankCb_Pokenav(void)
+static void VBlankCB_Pokenav(void)
 {
     TransferPlttBuffer();
     LoadOam();
@@ -611,13 +512,14 @@ void sub_81C742C(u8 taskId)
     switch (data[0])
     {
     case 0:
-        sub_81C76C4();
+        InitPokenavMainMenu();
         data[0] = 1;
         break;
     case 1:
-        if (sub_81C76FC())
+        // Wait for LoopedTask_InitPokenavMenu to finish
+        if (PokenavMainMenuLoopedTaskIsActive())
             break;
-        sub_81C756C(UNKNOWN_OFFSET);
+        SetActivePokenavMenu(0 + UNKNOWN_OFFSET);
         data[0] = 4;
         break;
     case 2:
@@ -628,20 +530,20 @@ void sub_81C742C(u8 taskId)
         v1 = sub_81C75E0();
         if (v1 == -1)
         {
-            sub_81C7710();
+            ShutdownPokenav();
             data[0] = 5;
         }
         else if (v1 >= UNKNOWN_OFFSET)
         {
-            gUnknown_0861F3EC[gUnknown_0203CF40->field4][6]();
-            gUnknown_0861F3EC[gUnknown_0203CF40->field4][5]();
-            if (sub_81C756C(v1))
+            PokenavMenuCallbacks[gPokenavResources->currentMenuIndex][NAVMENU_CB_UNK_6]();
+            PokenavMenuCallbacks[gPokenavResources->currentMenuIndex][NAVMENU_CB_UNK_5]();
+            if (SetActivePokenavMenu(v1))
             {
                 data[0] = 4;
             }
             else
             {
-                sub_81C7710();
+                ShutdownPokenav();
                 data[0] = 5;
             }
         }
@@ -657,12 +559,12 @@ void sub_81C742C(u8 taskId)
             data[0] = 3;
         break;
     case 5:
-        if (!sub_81C7738())
+        if (!WaitForPokenavShutdownFade())
         {
-            bool32 calledFromScript = (gUnknown_0203CF40->mode != MODE_NORMAL);
+            bool32 calledFromScript = (gPokenavResources->mode != MODE_NORMAL);
 
             sub_81C9430();
-            FreeVars();
+            FreePokenavResources();
             if (calledFromScript)
                 SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
             else
@@ -672,19 +574,19 @@ void sub_81C742C(u8 taskId)
     }
 }
 
-bool32 sub_81C756C(u32 a0)
+bool32 SetActivePokenavMenu(u32 indexWithOffset)
 {
-    u32 index = a0 - UNKNOWN_OFFSET;
+    u32 index = indexWithOffset - UNKNOWN_OFFSET;
 
     InitKeys_();
-    if (!gUnknown_0861F3EC[index][0]())
+    if (!PokenavMenuCallbacks[index][NAVMENU_CB_UNK_0]())
         return FALSE;
-    if (!gUnknown_0861F3EC[index][2]())
+    if (!PokenavMenuCallbacks[index][NAVMENU_CB_UNK_2]())
         return FALSE;
 
-    sub_81C7834(gUnknown_0861F3EC[index][3], gUnknown_0861F3EC[index][4]);
-    gUnknown_0203CF40->field0 = gUnknown_0861F3EC[index][1];
-    gUnknown_0203CF40->field4 = index;
+    sub_81C7834(PokenavMenuCallbacks[index][NAVMENU_CB_UNK_3], PokenavMenuCallbacks[index][NAVMENU_CB_UNK_4]);
+    gPokenavResources->currentMenuCb1 = PokenavMenuCallbacks[index][NAVMENU_CB_UNK_1];
+    gPokenavResources->currentMenuIndex = index;
     return TRUE;
 }
 
@@ -695,7 +597,7 @@ u32 sub_81C75D4(void)
 
 u32 sub_81C75E0(void)
 {
-    return gUnknown_0203CF40->field0();
+    return gPokenavResources->currentMenuCb1();
 }
 
 static void InitKeys_(void)
@@ -710,33 +612,33 @@ void SetVBlankCallback_(IntrCallback callback)
 
 void SetPokenavVBlankCallback(void)
 {
-    SetVBlankCallback(VblankCb_Pokenav);
+    SetVBlankCallback(VBlankCB_Pokenav);
 }
 
 void *AllocSubstruct(u32 index, u32 size)
 {
-    return gUnknown_0203CF40->field10[index] = Alloc(size);
+    return gPokenavResources->field10[index] = Alloc(size);
 }
 
-struct UnknownSubStruct_0203CF40 *GetSubstructPtr(u32 index)
+void *GetSubstructPtr(u32 index)
 {
-    return gUnknown_0203CF40->field10[index];
+    return gPokenavResources->field10[index];
 }
 
-void FreeSubstruct(u32 index)
+void FreePokenavSubstruct(u32 index)
 {
-    if (gUnknown_0203CF40->field10[index] != NULL)
-        FREE_AND_SET_NULL(gUnknown_0203CF40->field10[index]);
+    if (gPokenavResources->field10[index] != NULL)
+        FREE_AND_SET_NULL(gPokenavResources->field10[index]);
 }
 
 u16 GetPokenavMode(void)
 {
-    return gUnknown_0203CF40->mode;
+    return gPokenavResources->mode;
 }
 
 void SetPokenavMode(u16 mode)
 {
-    gUnknown_0203CF40->mode = mode;
+    gPokenavResources->mode = mode;
 }
 
 void sub_81C7694(u32 a0)
@@ -745,689 +647,15 @@ void sub_81C7694(u32 a0)
 
     if (value > 4)
         value = 0;
-    gUnknown_0203CF40->fieldA = value;
+    gPokenavResources->fieldA = value;
 }
 
 u16 sub_81C76AC(void)
 {
-    return gUnknown_0203CF40->fieldA;
+    return gPokenavResources->fieldA;
 }
 
 bool32 CanViewRibbonsMenu(void)
 {
-    return gUnknown_0203CF40->hasAnyRibbons;
-}
-
-bool32 sub_81C76C4(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = AllocSubstruct(0, 0x82C);
-    if (structPtr == NULL)
-        return FALSE;
-
-    ResetSpriteData();
-    FreeAllSpritePalettes();
-    structPtr->unkC = sub_81C7078(sub_81C7764, 1);
-    return TRUE;
-}
-
-u32 sub_81C76FC(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    return sub_81C70D8(structPtr->unkC);
-}
-
-void sub_81C7710(void)
-{
-    PlaySE(SE_PN_OFF);
-    sub_81CAADC();
-    BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
-}
-
-bool32 sub_81C7738(void)
-{
-    if (!gPaletteFade.active)
-    {
-        sub_81C99D4();
-        sub_81C7C94();
-        FreeAllWindowBuffers();
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-u32 sub_81C7764(s32 a0)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr;
-
-    switch (a0)
-    {
-    case 0:
-        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
-        FreeAllWindowBuffers();
-        ResetBgsAndClearDma3BusyFlags(0);
-        InitBgsFromTemplates(0, gUnknown_0861FA04, ARRAY_COUNT(gUnknown_0861FA04));
-        sub_8199D98();
-        reset_temp_tile_data_buffers();
-        return 1;
-    case 1:
-        structPtr = GetSubstructPtr(0);
-        decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0);
-        SetBgTilemapBuffer(0, structPtr->tilemapBuffer);
-        CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0);
-        CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20);
-        CopyBgTilemapBufferToVram(0);
-        return 0;
-    case 2:
-        if (free_temp_tile_data_buffers_if_possible())
-            return 2;
-
-        sub_81C7B74();
-        return 0;
-    case 3:
-        if (IsDma3ManagerBusyWithBgCopy())
-            return 2;
-
-        sub_81C7C28();
-        sub_81C7D28();
-        ShowBg(0);
-        return 4;
-    default:
-        return 4;
-    }
-}
-
-void sub_81C7834(void *func1, void *func2) // Fix types later.
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    structPtr->unk0 = func1;
-    structPtr->unk4 = func2;
-    structPtr->unk8 = 0;
-}
-
-void sub_81C7850(u32 a0)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    structPtr->unk8 = 0;
-    structPtr->unk0(a0);
-}
-
-u32 sub_81C786C(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    return structPtr->unk4();
-}
-
-void sub_81C7880(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    structPtr->unkC = sub_81C7078(sub_81C78D4, 4);
-}
-
-void sub_81C78A0(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    structPtr->unkC = sub_81C7078(sub_81C791C, 4);
-}
-
-bool32 sub_81C78C0(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-    return sub_81C70D8(structPtr->unkC);
-}
-
-u32 sub_81C78D4(s32 a0)
-{
-    switch (a0)
-    {
-    default:
-        return 4;
-    case 1:
-        return 0;
-    case 0:
-        return 0;
-    case 2:
-        if (ChangeBgY(0, 384, 1) >= 0x2000u)
-        {
-            ChangeBgY(0, 0x2000, 0);
-            return 4;
-        }
-
-        return 2;
-    }
-}
-
-u32 sub_81C791C(s32 a0)
-{
-    if (ChangeBgY(0, 384, 2) <= 0)
-    {
-        ChangeBgY(0, 0, 0);
-        return 4;
-    }
-    return 2;
-}
-
-void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size)
-{
-    CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size);
-}
-
-void sub_81C795C(const struct SpritePalette *palettes)
-{
-    const struct SpritePalette *current;
-    u32 index;
-
-    for (current = palettes; current->data != NULL; current++)
-    {
-        index = AllocSpritePalette(current->tag);
-        if (index == 0xFF)
-        {
-            break;
-        }
-        else
-        {
-            index = (index * 16) + 0x100;
-            CopyPaletteIntoBufferUnfaded(current->data, index, 0x20);
-        }
-    }
-}
-
-void sub_81C7990(u32 a0, u16 a1)
-{
-    CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16));
-}
-
-__attribute__((naked))
-void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 a4, u32 a5)
-{
-    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, 0xC\n\
-    str r0, [sp]\n\
-    str r1, [sp, 0x4]\n\
-    mov r10, r2\n\
-    str r3, [sp, 0x8]\n\
-    ldr r0, [sp, 0x2C]\n\
-    cmp r0, 0\n\
-    bne _081C79E4\n\
-    ldr r2, =0x001fffff\n\
-    mov r1, r10\n\
-    ands r2, r1\n\
-    ldr r0, [sp]\n\
-    b _081C79F4\n\
-    .pool\n\
-_081C79E4:\n\
-    ldr r2, [sp, 0x2C]\n\
-    ldr r0, [sp, 0x8]\n\
-    cmp r2, r0\n\
-    blt _081C7A00\n\
-    ldr r2, =0x001fffff\n\
-    mov r1, r10\n\
-    ands r2, r1\n\
-    ldr r0, [sp, 0x4]\n\
-_081C79F4:\n\
-    ldr r1, [sp, 0x30]\n\
-    bl CpuSet\n\
-    b _081C7AAE\n\
-    .pool\n\
-_081C7A00:\n\
-    movs r2, 0x1\n\
-    negs r2, r2\n\
-    add r10, r2\n\
-    b _081C7AA6\n\
-_081C7A08:\n\
-    ldr r1, [sp]\n\
-    ldrh r0, [r1]\n\
-    movs r2, 0x1F\n\
-    mov r9, r2\n\
-    mov r1, r9\n\
-    ands r1, r0\n\
-    mov r9, r1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 21\n\
-    movs r1, 0x1F\n\
-    ands r1, r2\n\
-    mov r8, r1\n\
-    lsrs r7, r0, 26\n\
-    movs r2, 0x1F\n\
-    ands r7, r2\n\
-    ldr r0, [sp, 0x4]\n\
-    ldrh r4, [r0]\n\
-    movs r0, 0x1F\n\
-    ands r0, r4\n\
-    mov r1, r9\n\
-    subs r0, r1\n\
-    lsls r0, 8\n\
-    ldr r1, [sp, 0x8]\n\
-    bl __divsi3\n\
-    ldr r2, [sp, 0x2C]\n\
-    adds r6, r0, 0\n\
-    muls r6, r2\n\
-    asrs r6, 8\n\
-    lsls r4, 16\n\
-    lsrs r0, r4, 21\n\
-    movs r1, 0x1F\n\
-    ands r0, r1\n\
-    mov r2, r8\n\
-    subs r0, r2\n\
-    lsls r0, 8\n\
-    ldr r1, [sp, 0x8]\n\
-    bl __divsi3\n\
-    ldr r1, [sp, 0x2C]\n\
-    adds r5, r0, 0\n\
-    muls r5, r1\n\
-    asrs r5, 8\n\
-    lsrs r4, 26\n\
-    movs r2, 0x1F\n\
-    ands r4, r2\n\
-    subs r4, r7\n\
-    lsls r4, 8\n\
-    adds r0, r4, 0\n\
-    ldr r1, [sp, 0x8]\n\
-    bl __divsi3\n\
-    ldr r1, [sp, 0x2C]\n\
-    muls r0, r1\n\
-    asrs r0, 8\n\
-    add r6, r9\n\
-    movs r2, 0x1F\n\
-    ands r6, r2\n\
-    add r5, r8\n\
-    ands r5, r2\n\
-    adds r0, r7, r0\n\
-    ands r0, r2\n\
-    lsls r0, 10\n\
-    lsls r5, 5\n\
-    orrs r0, r5\n\
-    orrs r0, r6\n\
-    ldr r1, [sp, 0x30]\n\
-    strh r0, [r1]\n\
-    ldr r2, [sp]\n\
-    adds r2, 0x2\n\
-    str r2, [sp]\n\
-    ldr r0, [sp, 0x4]\n\
-    adds r0, 0x2\n\
-    str r0, [sp, 0x4]\n\
-    adds r1, 0x2\n\
-    str r1, [sp, 0x30]\n\
-    movs r1, 0x1\n\
-    negs r1, r1\n\
-    add r10, r1\n\
-_081C7AA6:\n\
-    movs r0, 0x1\n\
-    negs r0, r0\n\
-    cmp r10, r0\n\
-    bne _081C7A08\n\
-_081C7AAE:\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\n\
-    .syntax divided");
-}
-
-void sub_81C7AC0(s32 a0)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    switch (a0)
-    {
-    case 0:
-        BeginNormalPaletteFade(structPtr->unk14, -2, 0, 16, RGB_BLACK);
-        break;
-    case 1:
-        BeginNormalPaletteFade(structPtr->unk14, -2, 16, 0, RGB_BLACK);
-        break;
-    case 2:
-        BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
-        break;
-    case 3:
-        BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK);
-        break;
-    }
-}
-
-bool32 IsPaletteFadeActive(void)
-{
-    return gPaletteFade.active;
-}
-
-void sub_81C7B40(void)
-{
-    BlendPalettes(0xFFFEFFFE, 16, RGB_BLACK);
-}
-
-void InitBgTemplates(const struct BgTemplate *templates, s32 count)
-{
-    s32 i;
-
-    for (i = 0; i < count; i++)
-        InitBgFromTemplate(templates++);
-}
-
-void sub_81C7B74(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    InitWindows(&gUnknown_0861FA08[0]);
-    structPtr->unk10 = 0;
-    sub_81C7BF8(structPtr->unk10);
-    PutWindowTilemap(structPtr->unk10);
-    CopyWindowToVram(structPtr->unk10, 3); // TODO: Use a defined constant here.
-}
-
-void sub_81C7BA4(u32 a0)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    sub_81C7BF8(structPtr->unk10);
-    AddTextPrinterParameterized3(structPtr->unk10, 1, 0, 1, gMenuButtonReminderColor, 0, sMenuButtonReminders[a0]);
-}
-
-bool32 IsDma3ManagerBusyWithBgCopy_(void)
-{
-    return IsDma3ManagerBusyWithBgCopy();
-}
-
-void sub_81C7BF8(u32 windowId)
-{
-    FillWindowPixelBuffer(windowId, PIXEL_FILL(4));
-    FillWindowPixelRect(windowId, PIXEL_FILL(5), 0, 0, 0x80, 1);
-}
-
-void sub_81C7C28(void)
-{
-    s32 i;
-    u8 spriteId;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    for (i = 0; i < ARRAY_COUNT(gUnknown_0861FA4C); i++)
-        LoadCompressedSpriteSheet(&gUnknown_0861FA4C[i]);
-
-    sub_81C795C(gUnknown_0861FA54);
-    structPtr->unk14 = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0));
-    spriteId = CreateSprite(&gUnknown_0861FB04, 220, 12, 0);
-    structPtr->unk18 = &gSprites[spriteId];
-}
-
-void sub_81C7C94(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    DestroySprite(structPtr->unk18);
-    FreeSpriteTilesByTag(0);
-    FreeSpritePaletteByTag(0);
-}
-
-void sub_81C7CB4(struct Sprite *sprite)
-{
-    sprite->pos2.y = (GetBgY(0) / 256u) * -1;
-}
-
-struct Sprite *sub_81C7CCC(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    structPtr->unk18->callback = SpriteCallbackDummy;
-    return structPtr->unk18;
-}
-
-void sub_81C7CE4(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    structPtr->unk18->pos1.x = 220;
-    structPtr->unk18->pos1.y = 12;
-    structPtr->unk18->callback = sub_81C7CB4;
-    structPtr->unk18->invisible = FALSE;
-    structPtr->unk18->oam.priority = 0;
-    structPtr->unk18->subpriority = 0;
-}
-
-extern const struct SpriteTemplate gUnknown_0861FB2C;
-extern const struct SpriteTemplate gUnknown_0861FB44;
-extern const struct CompressedSpriteSheet gUnknown_0861FA6C[];
-
-void sub_81C7D28(void)
-{
-    s32 i, spriteId;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    LoadCompressedSpriteSheet(&gUnknown_0861FA64);
-    AllocSpritePalette(1);
-    AllocSpritePalette(2);
-    for (i = 0; i < 2; i++)
-    {
-        spriteId = CreateSprite(&gUnknown_0861FB2C, 0, 0, 1);
-        structPtr->unk1C[i] = &gSprites[spriteId];
-        structPtr->unk1C[i]->invisible = TRUE;
-        structPtr->unk1C[i]->pos2.x = i * 64;
-
-        spriteId = CreateSprite(&gUnknown_0861FB44, 0, 0, 2);
-        structPtr->unk24[i] = &gSprites[spriteId];
-        structPtr->unk24[i]->invisible = TRUE;
-        structPtr->unk24[i]->pos2.x = i * 32;
-        structPtr->unk24[i]->pos2.y = 18;
-        structPtr->unk24[i]->oam.tileNum += (i * 8) + 64;
-    }
-}
-
-void sub_81C7DFC(u32 arg0)
-{
-    if (arg0 < 6)
-        sub_81C7E58(arg0);
-    else
-        sub_81C7F24(arg0 - 6);
-}
-
-void sub_81C7E14(u32 arg0)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    if (arg0 == 4)
-        structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 32;
-    else
-        structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 64;
-}
-
-void sub_81C7E58(u32 arg0)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr;
-    u32 size, tag;
-
-    if (arg0 >= 6)
-        return;
-
-    structPtr = GetSubstructPtr(0);
-    tag = gUnknown_0861FA6C[arg0].tag;
-    size = GetDecompressedDataSize(gUnknown_0861FA6C[arg0].data);
-    LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20);
-    LZ77UnCompWram(gUnknown_0861FA6C[arg0].data, gDecompressionBuffer);
-    RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1);
-    structPtr->unk1C[1]->oam.tileNum = GetSpriteTileStartByTag(2) + gUnknown_0861FA6C[arg0].size;
-
-    if (arg0 == 4 || arg0 == 5)
-        structPtr->unk1C[1]->pos2.x = 56;
-    else
-        structPtr->unk1C[1]->pos2.x = 64;
-}
-
-// Needed to match u32/u16 tag field difference.
-struct CompressedSpritePalette_
-{
-    const u32 *data;  // LZ77 compressed palette data
-    u32 tag;
-};
-
-extern const struct CompressedSpritePalette_ gUnknown_0861FA9C[];
-
-void sub_81C7F24(u32 arg0)
-{
-    u32 size, tag;
-
-    if (arg0 >= 7)
-        return;
-
-    tag = gUnknown_0861FA9C[arg0].tag;
-    size = GetDecompressedDataSize(gUnknown_0861FA9C[arg0].data);
-    LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(2) * 16) + 0x100, 0x20);
-    LZ77UnCompWram(gUnknown_0861FA9C[arg0].data, &gDecompressionBuffer[0x1000]);
-    RequestDma3Copy(&gDecompressionBuffer[0x1000], (void *)VRAM + 0x10800 + (GetSpriteTileStartByTag(2) * 32), size, 1);
-}
-
-void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2)
-{
-    u32 var;
-
-    if (!arg1)
-        var = 0x30;
-    else
-        var = 0x10;
-
-    if (arg0 < 6)
-        sub_81C803C(var, arg2);
-    else
-        sub_81C8088(var, arg2);
-}
-
-void sub_81C7FC4(u32 arg0, bool32 arg1)
-{
-    if (arg0 < 6)
-        sub_81C80D4(arg1);
-    else
-        sub_81C8110(arg1);
-}
-
-void sub_81C7FDC(void)
-{
-    s32 i;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    for (i = 0; i < 2; i++)
-    {
-        structPtr->unk1C[i]->invisible = TRUE;
-        structPtr->unk24[i]->invisible = TRUE;
-    }
-}
-
-bool32 sub_81C8010(void)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    if (structPtr->unk1C[0]->callback == SpriteCallbackDummy && structPtr->unk24[0]->callback == SpriteCallbackDummy)
-        return FALSE;
-    else
-        return TRUE;
-}
-
-void sub_81C803C(u32 arg0, bool32 arg1)
-{
-    s32 var1, var2, i;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    if (!arg1)
-        var1 = -96, var2 = 32;
-    else
-        var1 = 256, var2 = 160;
-
-    for (i = 0; i < 2; i++)
-    {
-        structPtr->unk1C[i]->pos1.y = arg0;
-        sub_81C814C(structPtr->unk1C[i], var1, var2, 12);
-    }
-}
-
-void sub_81C8088(u32 arg0, bool32 arg1)
-{
-    s32 var1, var2, i;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    if (!arg1)
-        var1 = -96, var2 = 16;
-    else
-        var1 = 256, var2 = 192;
-
-    for (i = 0; i < 2; i++)
-    {
-        structPtr->unk24[i]->pos1.y = arg0;
-        sub_81C814C(structPtr->unk24[i], var1, var2, 12);
-    }
-}
-
-void sub_81C80D4(bool32 arg0)
-{
-    s32 var1, var2, i;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    if (!arg0)
-        var1 = 32, var2 = -96;
-    else
-        var1 = 192, var2 = 256;
-
-    for (i = 0; i < 2; i++)
-    {
-        sub_81C814C(structPtr->unk1C[i], var1, var2, 12);
-    }
-}
-
-void sub_81C8110(bool32 arg0)
-{
-    s32 var1, var2, i;
-    struct UnknownSubStruct_0203CF40 *structPtr = GetSubstructPtr(0);
-
-    if (!arg0)
-        var1 = 16, var2 = -96;
-    else
-        var1 = 192, var2 = 256;
-
-    for (i = 0; i < 2; i++)
-    {
-        sub_81C814C(structPtr->unk24[i], var1, var2, 12);
-    }
-}
-
-void sub_81C814C(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3)
-{
-    sprite->pos1.x = arg1;
-    sprite->data[0] = arg1 * 16;
-    sprite->data[1] = (arg2 - arg1) * 16 / arg3;
-    sprite->data[2] = arg3;
-    sprite->data[7] = arg2;
-    sprite->callback = sub_81C817C;
-}
-
-void sub_81C817C(struct Sprite *sprite)
-{
-    if (sprite->data[2] != 0)
-    {
-        sprite->data[2]--;
-        sprite->data[0] += sprite->data[1];
-        sprite->pos1.x = sprite->data[0] >> 4;
-        if (sprite->pos1.x < -16 || sprite->pos1.x > 256)
-            sprite->invisible = TRUE;
-        else
-            sprite->invisible = FALSE;
-    }
-    else
-    {
-        sprite->pos1.x = sprite->data[7];
-        sprite->callback = SpriteCallbackDummy;
-    }
-}
-
-/*
-bool32 sub_81C81D4(const void *arg0, void *arg1, s32 arg3)
-{
-    struct UnknownSubStruct_0203CF40 *structPtr = AllocSubstruct(0x11, 0x8A4);
-
-    if (structPtr == NULL)
-        return FALSE;
+    return gPokenavResources->hasAnyRibbons;
 }
-*/
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
new file mode 100644
index 000000000..a0d00f1e6
--- /dev/null
+++ b/src/pokenav_main_menu.c
@@ -0,0 +1,982 @@
+#include "global.h"
+#include "pokenav.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "constants/rgb.h"
+#include "palette.h"
+#include "bg.h"
+#include "window.h"
+#include "strings.h"
+#include "graphics.h"
+#include "decompress.h"
+#include "gpu_regs.h"
+#include "menu.h"
+#include "dma3.h"
+
+enum
+{
+    POKENAV_GFX_MAIN_MENU,
+    POKENAV_GFX_CONDITION_MENU,
+    POKENAV_GFX_RIBBONS_MENU,
+    POKENAV_GFX_MATCH_CALL_MENU,
+    
+    // One of these is for the zoomed-in map, and the other is for the
+    // zoomed-out map. Don't know which is which yet.
+    POKENAV_GFX_MAP_MENU_UNK0,
+    POKENAV_GFX_MAP_MENU_UNK1,
+
+    POKENAV_GFX_PARTY_MENU,
+    POKENAV_GFX_SEARCH_MENU,
+    POKENAV_GFX_COOL_MENU,
+    POKENAV_GFX_BEAUTY_MENU,
+    POKENAV_GFX_CUTE_MENU,
+    POKENAV_GFX_SMART_MENU,
+    POKENAV_GFX_TOUGH_MENU,
+
+    POKENAV_GFX_MENUS_END
+};
+
+#define POKENAV_GFX_SUBMENUS_START POKENAV_GFX_PARTY_MENU
+
+struct PokenavMainMenuResources
+{
+    void (*unk0)(u32);
+    u32 (*unk4)(void);
+    u32 unk8;
+    u32 currentTaskId;
+    u32 unk10;
+    u32 unk14;
+    struct Sprite *spinningPokenav;
+    struct Sprite *leftHeaderSprites[2];
+    struct Sprite *submenuLeftHeaderSprites[2];
+    u8 tilemapBuffer[0x800];
+};
+
+// This struct uses a 32bit tag, and doesn't have a size field.
+// Needed to match LoadLeftHeaderGfxForSubMenu.
+struct CompressedSpriteSheetNoSize
+{
+    const u32 *data;  // LZ77 compressed palette data
+    u32 tag;
+};
+
+extern void sub_81CAADC(void);
+void CleanupPokenavMainMenuResources(void);
+void LoadLeftHeaderGfxForSubMenu(u32 arg0);
+void LoadLeftHeaderGfxForMenu(u32 arg0);
+void HideLeftHeaderSubmenuSprites(bool32 arg0);
+void HideLeftHeaderSprites(bool32 arg0);
+void ShowLeftHeaderSprites(u32 arg0, bool32 arg1);
+void ShowLeftHeaderSubmenuSprites(u32 arg0, bool32 arg1);
+void MoveLeftHeader(struct Sprite *sprite, s32 arg1, s32 arg2, s32 arg3);
+void SpriteCB_MoveLeftHeader(struct Sprite *sprite);
+void InitPokenavMainMenuResources(void);
+void InitHoennMapHeaderSprites(void);
+void sub_81C7B74(void);
+void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 a1, u32 a2);
+u32 LoopedTask_ScrollMenuHeaderDown(s32 a0);
+u32 LoopedTask_ScrollMenuHeaderUp(s32 a0);
+void sub_81C7BF8(u32 a0);
+
+
+void SpriteCB_SpinningPokenav(struct Sprite* sprite);
+u32 LoopedTask_InitPokenavMenu(s32 a0);
+
+const u16 gSpinningPokenavPaletteData[] = INCBIN_U16("graphics/pokenav/icon2.gbapal");
+const u32 gSpinningPokenavGfx[] = INCBIN_U32("graphics/pokenav/icon2.4bpp.lz");
+const u32 gUnused_SpinningPokenavGfx2[] = INCBIN_U32("graphics/pokenav/icon2_unused.4bpp.lz");
+
+const struct BgTemplate gPokenavMainMenuBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 5,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0,
+    }
+};
+
+const struct WindowTemplate gUnknown_0861FA08[2] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 22,
+        .width = 16,
+        .height = 2,
+        .paletteNum = 0,
+        .baseBlock = 0x36,
+    },
+    {
+        .bg = 0xFF,
+        .tilemapLeft = 0,
+        .tilemapTop = 0,
+        .width = 0,
+        .height = 0,
+        .paletteNum = 0,
+        .baseBlock = 0,
+    },
+};
+
+const u8 *const sMenuButtonReminders[12] =
+{
+    gText_Pokenav_ClearButtonList,
+    gText_PokenavMap_ZoomedOutButtons,
+    gText_PokenavMap_ZoomedInButtons,
+    gText_PokenavCondition_MonListButtons,
+    gText_PokenavCondition_MonStatusButtons,
+    gText_PokenavCondition_MarkingButtons,
+    gText_PokenavMatchCall_TrainerListButtons,
+    gText_PokenavMatchCall_CallMenuButtons,
+    gText_PokenavMatchCall_CheckTrainerButtons,
+    gText_PokenavRibbons_MonListButtons,
+    gText_PokenavRibbons_RibbonListButtons,
+    gText_PokenavRibbons_RibbonCheckButtons,
+};
+
+const u8 gMenuButtonReminderColor[3] =
+{
+    4, 1, 2
+};
+
+static const struct CompressedSpriteSheet gSpinningPokenavSpriteSheet[] =
+{
+    {
+        .data = gSpinningPokenavGfx,
+        .size = 0x1000,
+        .tag = 0,
+    }
+};
+
+static const struct SpritePalette gSpinningNavgearPalettes[] =
+{
+    {
+        .data = gSpinningPokenavPaletteData,
+        .tag = 0,
+    },
+    {}
+};
+
+static const struct CompressedSpriteSheet sPokenavHoennMapLeftHeaderSpriteSheet =
+{
+    .data = gPokenavLeftHeaderHoennMap_Gfx,
+    .size = 0xC00,
+    .tag = 2
+};
+
+static const struct CompressedSpriteSheet sPokenavMenuLeftHeaderSpriteSheets[] =
+{
+    [POKENAV_GFX_MAIN_MENU] = {
+        .data = gPokenavLeftHeaderMainMenu_Gfx,
+        .size = 0x20,
+        .tag = 3
+    },
+    [POKENAV_GFX_CONDITION_MENU] = {
+        .data = gPokenavLeftHeaderCondition_Gfx,
+        .size = 0x20,
+        .tag = 1
+    },
+    [POKENAV_GFX_RIBBONS_MENU] = {
+        .data = gPokenavLeftHeaderRibbons_Gfx,
+        .size = 0x20,
+        .tag = 2
+    },
+    [POKENAV_GFX_MATCH_CALL_MENU] = {
+        .data = gPokenavLeftHeaderMatchCall_Gfx,
+        .size = 0x20,
+        .tag = 4
+    },
+    [POKENAV_GFX_MAP_MENU_UNK0] = {
+        .data = gPokenavLeftHeaderHoennMap_Gfx,
+        .size = 0x20,
+        .tag = 0
+    },
+    [POKENAV_GFX_MAP_MENU_UNK1] = {
+        .data = gPokenavLeftHeaderHoennMap_Gfx,
+        .size = 0x40,
+        .tag = 0
+    }
+};
+
+static const struct CompressedSpriteSheetNoSize sPokenavSubMenuLeftHeaderSpriteSheets[] =
+{
+    [POKENAV_GFX_PARTY_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderParty_Gfx,
+        .tag = 1
+    },
+    [POKENAV_GFX_SEARCH_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderSearch_Gfx,
+        .tag = 1
+    },
+    [POKENAV_GFX_COOL_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderCool_Gfx,
+        .tag = 4
+    },
+    [POKENAV_GFX_BEAUTY_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderBeauty_Gfx,
+        .tag = 1
+    },
+    [POKENAV_GFX_CUTE_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderCute_Gfx,
+        .tag = 2
+    },
+    [POKENAV_GFX_SMART_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderSmart_Gfx,
+        .tag = 0
+    },
+    [POKENAV_GFX_TOUGH_MENU - POKENAV_GFX_SUBMENUS_START] = {
+        .data = gPokenavLeftHeaderTough_Gfx,
+        .tag = 0
+    }
+};
+
+static const struct OamData sSpinningPokenavSpriteOam =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+};
+
+static const union AnimCmd sSpinningPokenavAnims[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(16, 8),
+    ANIMCMD_FRAME(32, 8),
+    ANIMCMD_FRAME(48, 8),
+    ANIMCMD_FRAME(64, 8),
+    ANIMCMD_FRAME(80, 8),
+    ANIMCMD_FRAME(96, 8),
+    ANIMCMD_FRAME(112, 8),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpinningPokenavAnimTable[] =
+{
+    sSpinningPokenavAnims
+};
+
+static const struct SpriteTemplate sSpinningPokenavSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &sSpinningPokenavSpriteOam,
+    .anims = sSpinningPokenavAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_SpinningPokenav
+};
+
+static const struct OamData sPokenavLeftHeaderHoennMapSpriteOam =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
+    .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+};
+
+static const struct OamData sUnknown_0861FB24 =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x16),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x16),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+};
+
+static const struct SpriteTemplate sPokenavLeftHeaderHoennMapSpriteTemplate =
+{
+    .tileTag = 2,
+    .paletteTag = 1,
+    .oam = &sPokenavLeftHeaderHoennMapSpriteOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct SpriteTemplate sUnknown_0861FB44 =
+{
+    .tileTag = 2,
+    .paletteTag = 2,
+    .oam = &sUnknown_0861FB24,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+bool32 InitPokenavMainMenu(void)
+{
+    struct PokenavMainMenuResources *structPtr;
+    
+    structPtr = AllocSubstruct(0, sizeof(struct PokenavMainMenuResources));
+    if (structPtr == NULL)
+        return FALSE;
+
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    structPtr->currentTaskId = CreateLoopedTask(LoopedTask_InitPokenavMenu, 1);
+    return TRUE;
+}
+
+u32 PokenavMainMenuLoopedTaskIsActive(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    return IsLoopedTaskActive(structPtr->currentTaskId);
+}
+
+void ShutdownPokenav(void)
+{
+    PlaySE(SE_PN_OFF);
+    sub_81CAADC();
+    BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
+}
+
+bool32 WaitForPokenavShutdownFade(void)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81C99D4();
+        CleanupPokenavMainMenuResources();
+        FreeAllWindowBuffers();
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+u32 LoopedTask_InitPokenavMenu(s32 a0)
+{
+    struct PokenavMainMenuResources *structPtr;
+
+    switch (a0)
+    {
+    case 0:
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+        FreeAllWindowBuffers();
+        ResetBgsAndClearDma3BusyFlags(0);
+        InitBgsFromTemplates(0, gPokenavMainMenuBgTemplates, ARRAY_COUNT(gPokenavMainMenuBgTemplates));
+        ResetBgPositions();
+        reset_temp_tile_data_buffers();
+        return LT_INC_AND_CONTINUE;
+    case 1:
+        structPtr = GetSubstructPtr(0);
+        decompress_and_copy_tile_data_to_vram(0, &gPokenavHeader_Gfx, 0, 0, 0);
+        SetBgTilemapBuffer(0, structPtr->tilemapBuffer);
+        CopyToBgTilemapBuffer(0, &gPokenavHeader_Tilemap, 0, 0);
+        CopyPaletteIntoBufferUnfaded(gPokenavHeader_Pal, 0, 0x20);
+        CopyBgTilemapBufferToVram(0);
+        return LT_INC_AND_PAUSE;
+    case 2:
+        if (free_temp_tile_data_buffers_if_possible())
+            return LT_PAUSE;
+
+        sub_81C7B74();
+        return LT_INC_AND_PAUSE;
+    case 3:
+        if (IsDma3ManagerBusyWithBgCopy())
+            return LT_PAUSE;
+
+        InitPokenavMainMenuResources();
+        InitHoennMapHeaderSprites();
+        ShowBg(0);
+        return LT_FINISH;
+    default:
+        return LT_FINISH;
+    }
+}
+
+void sub_81C7834(void *func1, void *func2) // Fix types later.
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    structPtr->unk0 = func1;
+    structPtr->unk4 = func2;
+    structPtr->unk8 = 0;
+}
+
+void sub_81C7850(u32 a0)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    structPtr->unk8 = 0;
+    structPtr->unk0(a0);
+}
+
+u32 sub_81C786C(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    return structPtr->unk4();
+}
+
+void sub_81C7880(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    structPtr->currentTaskId = CreateLoopedTask(LoopedTask_ScrollMenuHeaderDown, 4);
+}
+
+void sub_81C78A0(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    structPtr->currentTaskId = CreateLoopedTask(LoopedTask_ScrollMenuHeaderUp, 4);
+}
+
+bool32 MainMenuLoopedTaskIsBusy(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+    return IsLoopedTaskActive(structPtr->currentTaskId);
+}
+
+u32 LoopedTask_ScrollMenuHeaderDown(s32 a0)
+{
+    switch (a0)
+    {
+    default:
+        return LT_FINISH;
+    case 1:
+        return LT_INC_AND_PAUSE;
+    case 0:
+        return LT_INC_AND_PAUSE;
+    case 2:
+        if (ChangeBgY(0, 384, 1) >= 0x2000u)
+        {
+            ChangeBgY(0, 0x2000, 0);
+            return LT_FINISH;
+        }
+
+        return LT_PAUSE;
+    }
+}
+
+u32 LoopedTask_ScrollMenuHeaderUp(s32 a0)
+{
+    if (ChangeBgY(0, 384, 2) <= 0)
+    {
+        ChangeBgY(0, 0, 0);
+        return 4;
+    }
+    return 2;
+}
+
+void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size)
+{
+    CpuCopy16(palette, gPlttBufferUnfaded + bufferOffset, size);
+}
+
+void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes)
+{
+    const struct SpritePalette *current;
+    u32 index;
+
+    for (current = palettes; current->data != NULL; current++)
+    {
+        index = AllocSpritePalette(current->tag);
+        if (index == 0xFF)
+        {
+            break;
+        }
+        else
+        {
+            index = (index * 16) + 0x100;
+            CopyPaletteIntoBufferUnfaded(current->data, index, 0x20);
+        }
+    }
+}
+
+void sub_81C7990(u32 a0, u16 a1)
+{
+    CpuFill16(a1, gPlttBufferFaded + 0x100 + (a0 * 16), 16 * sizeof(u16));
+}
+
+__attribute__((naked))
+void sub_81C79BC(u16 *a0, u16 *a1, u32 a2, u32 a3, u32 a4, u32 a5)
+{
+    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, 0xC\n\
+    str r0, [sp]\n\
+    str r1, [sp, 0x4]\n\
+    mov r10, r2\n\
+    str r3, [sp, 0x8]\n\
+    ldr r0, [sp, 0x2C]\n\
+    cmp r0, 0\n\
+    bne _081C79E4\n\
+    ldr r2, =0x001fffff\n\
+    mov r1, r10\n\
+    ands r2, r1\n\
+    ldr r0, [sp]\n\
+    b _081C79F4\n\
+    .pool\n\
+_081C79E4:\n\
+    ldr r2, [sp, 0x2C]\n\
+    ldr r0, [sp, 0x8]\n\
+    cmp r2, r0\n\
+    blt _081C7A00\n\
+    ldr r2, =0x001fffff\n\
+    mov r1, r10\n\
+    ands r2, r1\n\
+    ldr r0, [sp, 0x4]\n\
+_081C79F4:\n\
+    ldr r1, [sp, 0x30]\n\
+    bl CpuSet\n\
+    b _081C7AAE\n\
+    .pool\n\
+_081C7A00:\n\
+    movs r2, 0x1\n\
+    negs r2, r2\n\
+    add r10, r2\n\
+    b _081C7AA6\n\
+_081C7A08:\n\
+    ldr r1, [sp]\n\
+    ldrh r0, [r1]\n\
+    movs r2, 0x1F\n\
+    mov r9, r2\n\
+    mov r1, r9\n\
+    ands r1, r0\n\
+    mov r9, r1\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 21\n\
+    movs r1, 0x1F\n\
+    ands r1, r2\n\
+    mov r8, r1\n\
+    lsrs r7, r0, 26\n\
+    movs r2, 0x1F\n\
+    ands r7, r2\n\
+    ldr r0, [sp, 0x4]\n\
+    ldrh r4, [r0]\n\
+    movs r0, 0x1F\n\
+    ands r0, r4\n\
+    mov r1, r9\n\
+    subs r0, r1\n\
+    lsls r0, 8\n\
+    ldr r1, [sp, 0x8]\n\
+    bl __divsi3\n\
+    ldr r2, [sp, 0x2C]\n\
+    adds r6, r0, 0\n\
+    muls r6, r2\n\
+    asrs r6, 8\n\
+    lsls r4, 16\n\
+    lsrs r0, r4, 21\n\
+    movs r1, 0x1F\n\
+    ands r0, r1\n\
+    mov r2, r8\n\
+    subs r0, r2\n\
+    lsls r0, 8\n\
+    ldr r1, [sp, 0x8]\n\
+    bl __divsi3\n\
+    ldr r1, [sp, 0x2C]\n\
+    adds r5, r0, 0\n\
+    muls r5, r1\n\
+    asrs r5, 8\n\
+    lsrs r4, 26\n\
+    movs r2, 0x1F\n\
+    ands r4, r2\n\
+    subs r4, r7\n\
+    lsls r4, 8\n\
+    adds r0, r4, 0\n\
+    ldr r1, [sp, 0x8]\n\
+    bl __divsi3\n\
+    ldr r1, [sp, 0x2C]\n\
+    muls r0, r1\n\
+    asrs r0, 8\n\
+    add r6, r9\n\
+    movs r2, 0x1F\n\
+    ands r6, r2\n\
+    add r5, r8\n\
+    ands r5, r2\n\
+    adds r0, r7, r0\n\
+    ands r0, r2\n\
+    lsls r0, 10\n\
+    lsls r5, 5\n\
+    orrs r0, r5\n\
+    orrs r0, r6\n\
+    ldr r1, [sp, 0x30]\n\
+    strh r0, [r1]\n\
+    ldr r2, [sp]\n\
+    adds r2, 0x2\n\
+    str r2, [sp]\n\
+    ldr r0, [sp, 0x4]\n\
+    adds r0, 0x2\n\
+    str r0, [sp, 0x4]\n\
+    adds r1, 0x2\n\
+    str r1, [sp, 0x30]\n\
+    movs r1, 0x1\n\
+    negs r1, r1\n\
+    add r10, r1\n\
+_081C7AA6:\n\
+    movs r0, 0x1\n\
+    negs r0, r0\n\
+    cmp r10, r0\n\
+    bne _081C7A08\n\
+_081C7AAE:\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\n\
+    .syntax divided");
+}
+
+void sub_81C7AC0(s32 a0)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    switch (a0)
+    {
+    case 0:
+        BeginNormalPaletteFade(structPtr->unk14, -2, 0, 16, RGB_BLACK);
+        break;
+    case 1:
+        BeginNormalPaletteFade(structPtr->unk14, -2, 16, 0, RGB_BLACK);
+        break;
+    case 2:
+        BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
+        break;
+    case 3:
+        BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK);
+        break;
+    }
+}
+
+bool32 IsPaletteFadeActive(void)
+{
+    return gPaletteFade.active;
+}
+
+void sub_81C7B40(void)
+{
+    BlendPalettes(0xFFFEFFFE, 16, RGB_BLACK);
+}
+
+void InitBgTemplates(const struct BgTemplate *templates, s32 count)
+{
+    s32 i;
+
+    for (i = 0; i < count; i++)
+        InitBgFromTemplate(templates++);
+}
+
+void sub_81C7B74(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    InitWindows(&gUnknown_0861FA08[0]);
+    structPtr->unk10 = 0;
+    sub_81C7BF8(structPtr->unk10);
+    PutWindowTilemap(structPtr->unk10);
+    CopyWindowToVram(structPtr->unk10, 3); // TODO: Use a defined constant here.
+}
+
+void sub_81C7BA4(u32 a0)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    sub_81C7BF8(structPtr->unk10);
+    AddTextPrinterParameterized3(structPtr->unk10, 1, 0, 1, gMenuButtonReminderColor, 0, sMenuButtonReminders[a0]);
+}
+
+bool32 IsDma3ManagerBusyWithBgCopy_(void)
+{
+    return IsDma3ManagerBusyWithBgCopy();
+}
+
+void sub_81C7BF8(u32 windowId)
+{
+    FillWindowPixelBuffer(windowId, PIXEL_FILL(4));
+    FillWindowPixelRect(windowId, PIXEL_FILL(5), 0, 0, 0x80, 1);
+}
+
+void InitPokenavMainMenuResources(void)
+{
+    s32 i;
+    u8 spriteId;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    for (i = 0; i < ARRAY_COUNT(gSpinningPokenavSpriteSheet); i++)
+        LoadCompressedSpriteSheet(&gSpinningPokenavSpriteSheet[i]);
+
+    Pokenav_AllocAndLoadPalettes(gSpinningNavgearPalettes);
+    structPtr->unk14 = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0));
+    spriteId = CreateSprite(&sSpinningPokenavSpriteTemplate, 220, 12, 0);
+    structPtr->spinningPokenav = &gSprites[spriteId];
+}
+
+void CleanupPokenavMainMenuResources(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    DestroySprite(structPtr->spinningPokenav);
+    FreeSpriteTilesByTag(0);
+    FreeSpritePaletteByTag(0);
+}
+
+void SpriteCB_SpinningPokenav(struct Sprite *sprite)
+{
+    // If the background starts scrolling, follow it.
+    sprite->pos2.y = (GetBgY(0) / 256u) * -1;
+}
+
+struct Sprite *PauseSpinningPokenavSprite(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    structPtr->spinningPokenav->callback = SpriteCallbackDummy;
+    return structPtr->spinningPokenav;
+}
+
+void ResumeSpinningPokenavSprite(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    structPtr->spinningPokenav->pos1.x = 220;
+    structPtr->spinningPokenav->pos1.y = 12;
+    structPtr->spinningPokenav->callback = SpriteCB_SpinningPokenav;
+    structPtr->spinningPokenav->invisible = FALSE;
+    structPtr->spinningPokenav->oam.priority = 0;
+    structPtr->spinningPokenav->subpriority = 0;
+}
+
+void InitHoennMapHeaderSprites(void)
+{
+    s32 i, spriteId;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    LoadCompressedSpriteSheet(&sPokenavHoennMapLeftHeaderSpriteSheet);
+    AllocSpritePalette(1);
+    AllocSpritePalette(2);
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    {
+        spriteId = CreateSprite(&sPokenavLeftHeaderHoennMapSpriteTemplate, 0, 0, 1);
+        structPtr->leftHeaderSprites[i] = &gSprites[spriteId];
+        structPtr->leftHeaderSprites[i]->invisible = TRUE;
+        structPtr->leftHeaderSprites[i]->pos2.x = i * 64;
+
+        spriteId = CreateSprite(&sUnknown_0861FB44, 0, 0, 2);
+        structPtr->submenuLeftHeaderSprites[i] = &gSprites[spriteId];
+        structPtr->submenuLeftHeaderSprites[i]->invisible = TRUE;
+        structPtr->submenuLeftHeaderSprites[i]->pos2.x = i * 32;
+        structPtr->submenuLeftHeaderSprites[i]->pos2.y = 18;
+        structPtr->submenuLeftHeaderSprites[i]->oam.tileNum += (i * 8) + 64;
+    }
+}
+
+void LoadLeftHeaderGfxForIndex(u32 arg0)
+{
+    if (arg0 < POKENAV_GFX_SUBMENUS_START)
+        LoadLeftHeaderGfxForMenu(arg0);
+    else
+        LoadLeftHeaderGfxForSubMenu(arg0 - POKENAV_GFX_SUBMENUS_START);
+}
+
+void sub_81C7E14(u32 arg0)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    if (arg0 == 4)
+        structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 32;
+    else
+        structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + 64;
+}
+
+void LoadLeftHeaderGfxForMenu(u32 index)
+{
+    struct PokenavMainMenuResources *structPtr;
+    u32 size, tag;
+
+    if (index >= POKENAV_GFX_SUBMENUS_START)
+        return;
+
+    structPtr = GetSubstructPtr(0);
+    tag = sPokenavMenuLeftHeaderSpriteSheets[index].tag;
+    size = GetDecompressedDataSize(sPokenavMenuLeftHeaderSpriteSheets[index].data);
+    LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20);
+    LZ77UnCompWram(sPokenavMenuLeftHeaderSpriteSheets[index].data, gDecompressionBuffer);
+    RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1);
+    structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sPokenavMenuLeftHeaderSpriteSheets[index].size;
+
+    if (index == POKENAV_GFX_MAP_MENU_UNK0 || index == POKENAV_GFX_MAP_MENU_UNK1)
+        structPtr->leftHeaderSprites[1]->pos2.x = 56;
+    else
+        structPtr->leftHeaderSprites[1]->pos2.x = 64;
+}
+
+void LoadLeftHeaderGfxForSubMenu(u32 arg0)
+{
+    u32 size, tag;
+
+    if (arg0 >= POKENAV_GFX_MENUS_END - POKENAV_GFX_SUBMENUS_START)
+        return;
+
+    tag = sPokenavSubMenuLeftHeaderSpriteSheets[arg0].tag;
+    size = GetDecompressedDataSize(sPokenavSubMenuLeftHeaderSpriteSheets[arg0].data);
+    LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(2) * 16) + 0x100, 0x20);
+    LZ77UnCompWram(sPokenavSubMenuLeftHeaderSpriteSheets[arg0].data, &gDecompressionBuffer[0x1000]);
+    RequestDma3Copy(&gDecompressionBuffer[0x1000], (void *)VRAM + 0x10800 + (GetSpriteTileStartByTag(2) * 32), size, 1);
+}
+
+void sub_81C7FA0(u32 arg0, bool32 arg1, bool32 arg2)
+{
+    u32 var;
+
+    if (!arg1)
+        var = 0x30;
+    else
+        var = 0x10;
+
+    if (arg0 < 6)
+        ShowLeftHeaderSprites(var, arg2);
+    else
+        ShowLeftHeaderSubmenuSprites(var, arg2);
+}
+
+void sub_81C7FC4(u32 arg0, bool32 arg1)
+{
+    if (arg0 < 6)
+        HideLeftHeaderSprites(arg1);
+    else
+        HideLeftHeaderSubmenuSprites(arg1);
+}
+
+void sub_81C7FDC(void)
+{
+    s32 i;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    {
+        structPtr->leftHeaderSprites[i]->invisible = TRUE;
+        structPtr->submenuLeftHeaderSprites[i]->invisible = TRUE;
+    }
+}
+
+bool32 sub_81C8010(void)
+{
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    if (structPtr->leftHeaderSprites[0]->callback == SpriteCallbackDummy && structPtr->submenuLeftHeaderSprites[0]->callback == SpriteCallbackDummy)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
+{
+    s32 start, end, i;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    if (!isOnRightSide)
+        start = -96, end = 32;
+    else
+        start = 256, end = 160;
+
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    {
+        structPtr->leftHeaderSprites[i]->pos1.y = startY;
+        MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
+    }
+}
+
+void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
+{
+    s32 start, end, i;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    if (!isOnRightSide)
+        start = -96, end = 16;
+    else
+        start = 256, end = 192;
+
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
+    {
+        structPtr->submenuLeftHeaderSprites[i]->pos1.y = startY;
+        MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
+    }
+}
+
+void HideLeftHeaderSprites(bool32 isOnRightSide)
+{
+    s32 start, end, i;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    if (!isOnRightSide)
+        start = 32, end = -96;
+    else
+        start = 192, end = 256;
+
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
+    {
+        MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
+    }
+}
+
+void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide)
+{
+    s32 start, end, i;
+    struct PokenavMainMenuResources *structPtr = GetSubstructPtr(0);
+
+    if (!isOnRightSide)
+        start = 16, end = -96;
+    else
+        start = 192, end = 256;
+
+    for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
+    {
+        MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
+    }
+}
+
+void MoveLeftHeader(struct Sprite *sprite, s32 startX, s32 endX, s32 duration)
+{
+    sprite->pos1.x = startX;
+    sprite->data[0] = startX * 16;
+    sprite->data[1] = (endX - startX) * 16 / duration;
+    sprite->data[2] = duration;
+    sprite->data[7] = endX;
+    sprite->callback = SpriteCB_MoveLeftHeader;
+}
+
+void SpriteCB_MoveLeftHeader(struct Sprite *sprite)
+{
+    if (sprite->data[2] != 0)
+    {
+        sprite->data[2]--;
+        sprite->data[0] += sprite->data[1];
+        sprite->pos1.x = sprite->data[0] >> 4;
+        if (sprite->pos1.x < -16 || sprite->pos1.x > 256)
+            sprite->invisible = TRUE;
+        else
+            sprite->invisible = FALSE;
+    }
+    else
+    {
+        sprite->pos1.x = sprite->data[7];
+        sprite->callback = SpriteCallbackDummy;
+    }
+}
diff --git a/src/pokenav_match_call.c b/src/pokenav_match_call_data.c
index b775ed10e..773a5be3a 100644
--- a/src/pokenav_match_call.c
+++ b/src/pokenav_match_call_data.c
@@ -1,13 +1,12 @@
 #include "global.h"
 #include "battle_setup.h"
+#include "data.h"
 #include "event_data.h"
 #include "string_util.h"
 #include "battle.h"
 #include "gym_leader_rematch.h"
 #include "match_call.h"
 
-extern const u8 gTrainerClassNames[][13];
-
 // Static type declarations
 
 typedef struct MatchCallTextDataStruct {
@@ -73,22 +72,17 @@ struct MatchCallStruct4 {
     const match_call_text_data_t *textData;
 };
 
+// Note: Type1 and Type5 have identical struct layouts.
 struct MatchCallStruct5 {
     u8 type;
     u8 v1;
     u16 flag;
-    u16 v4;
+    u16 rematchTableIdx;
     const u8 *desc;
     const u8 *name;
     const match_call_text_data_t *textData;
 };
 
-#define MATCHCALLDEF(name, type_, ...) \
-static const struct MatchCallStruct##type_ name = { \
-    .type = type_, \
-    __VA_ARGS__ \
-};
-
 typedef union {
     const struct MatchCallStructCommon *common;
     const struct MatchCallStruct0 *type0;
@@ -328,7 +322,15 @@ static const match_call_text_data_t sMrStoneTextScripts[] = {
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sMrStoneMatchCallHeader, 0, 10, 0xffff, gMrStoneMatchCallDesc, gMrStoneMatchCallName, sMrStoneTextScripts);
+static const struct MatchCallStruct0 sMrStoneMatchCallHeader =
+{
+    .type = 0,
+    .v1 = 10,
+    .flag = 0xFFFF,
+    .desc = gMrStoneMatchCallDesc,
+    .name = gMrStoneMatchCallName,
+    .textData = sMrStoneTextScripts
+};
 
 static const match_call_text_data_t sNormanTextScripts[] = {
     { gText_Norman_Pokenav_2B5719, FLAG_ENABLE_NORMAN_MATCH_CALL,           0xFFFF },
@@ -343,9 +345,25 @@ static const match_call_text_data_t sNormanTextScripts[] = {
     { NULL,                        0xFFFF,               0xFFFF }
 };
 
-MATCHCALLDEF(sNormanMatchCallHeader, 5, 7, FLAG_ENABLE_NORMAN_MATCH_CALL, 0x45, gNormanMatchCallDesc, gNormanMatchCallName, sNormanTextScripts);
+static const struct MatchCallStruct5 sNormanMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 7,
+    .flag = FLAG_ENABLE_NORMAN_MATCH_CALL,
+    .rematchTableIdx = REMATCH_NORMAN,
+    .desc = gNormanMatchCallDesc,
+    .name = gNormanMatchCallName,
+    .textData = sNormanTextScripts
+};
 
-MATCHCALLDEF(sProfBirchMatchCallHeader, 3, 0, FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, gProfBirchMatchCallDesc, gProfBirchMatchCallName)
+static const struct MatchCallStruct3 sProfBirchMatchCallHeader =
+{
+    .type = 3,
+    .v1 = 0,
+    .flag = FLAG_ENABLE_PROF_BIRCH_MATCH_CALL,
+    .desc = gProfBirchMatchCallDesc,
+    .name = gProfBirchMatchCallName
+};
 
 static const match_call_text_data_t sMomTextScripts[] = {
     { gText_Mom_Pokenav_2B227B, 0xffff,              0xffff },
@@ -354,7 +372,15 @@ static const match_call_text_data_t sMomTextScripts[] = {
     { NULL,                     0xffff,              0xffff }
 };
 
-MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_ENABLE_MOM_MATCH_CALL, gMomMatchCallDesc, gMomMatchCallName, sMomTextScripts);
+static const struct MatchCallStruct0 sMomMatchCallHeader =
+{
+    .type = 0,
+    .v1 = 0,
+    .flag = FLAG_ENABLE_MOM_MATCH_CALL,
+    .desc = gMomMatchCallDesc,
+    .name = gMomMatchCallName,
+    .textData = sMomTextScripts
+};
 
 static const match_call_text_data_t sStevenTextScripts[] = {
     { gText_Steven_Pokenav_2B5B95, 0xffff,              0xffff },
@@ -367,7 +393,15 @@ static const match_call_text_data_t sStevenTextScripts[] = {
     { NULL,                        0xffff,              0xffff },
 };
 
-MATCHCALLDEF(sStevenMatchCallHeader, 0, 0xd5, FLAG_REGISTERED_STEVEN_POKENAV, gStevenMatchCallDesc, gStevenMatchCallName, sStevenTextScripts);
+static const struct MatchCallStruct0 sStevenMatchCallHeader =
+{
+    .type = 0,
+    .v1 = 0xD5,
+    .flag = FLAG_REGISTERED_STEVEN_POKENAV,
+    .desc = gStevenMatchCallDesc,
+    .name = gStevenMatchCallName,
+    .textData = sStevenTextScripts
+};
 
 static const match_call_text_data_t sMayTextScripts[] = {
     { gText_May_Pokenav_2B3AB3, 0xFFFF,              0xFFFF },
@@ -388,7 +422,15 @@ static const match_call_text_data_t sMayTextScripts[] = {
     { NULL,                     0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sMayMatchCallHeader, 4, MALE, FLAG_ENABLE_RIVAL_MATCH_CALL, gMayBrendanMatchCallDesc, gExpandedPlaceholder_May, sMayTextScripts);
+static const struct MatchCallStruct4 sBrendanMatchCallHeader =
+{
+    .type = 4,
+    .gender = MALE,
+    .flag = FLAG_ENABLE_RIVAL_MATCH_CALL,
+    .desc = gMayBrendanMatchCallDesc,
+    .name = gExpandedPlaceholder_May,
+    .textData = sMayTextScripts
+};
 
 static const match_call_text_data_t sBrendanTextScripts[] = {
     { gText_Brendan_Pokenav_2B43EF, 0xFFFF,              0xFFFF },
@@ -409,7 +451,15 @@ static const match_call_text_data_t sBrendanTextScripts[] = {
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sBrendanMatchCallHeader, 4, FEMALE, FLAG_ENABLE_RIVAL_MATCH_CALL, gMayBrendanMatchCallDesc, gExpandedPlaceholder_Brendan, sBrendanTextScripts);
+static const struct MatchCallStruct4 sMayMatchCallHeader =
+{
+    .type = 4,
+    .gender = FEMALE,
+    .flag = FLAG_ENABLE_RIVAL_MATCH_CALL,
+    .desc = gMayBrendanMatchCallDesc,
+    .name = gExpandedPlaceholder_Brendan,
+    .textData = sBrendanTextScripts
+};
 
 static const match_call_text_data_t sWallyTextScripts[] = {
     { gText_Wally_Pokenav_2B4DE2, 0xFFFF,     0xFFFF },
@@ -429,7 +479,16 @@ const struct MatchCallSubstruct2 sWallyAdditionalData[] = {
     { 0xFFFF,     0xD5 }
 };
 
-MATCHCALLDEF(sWallyMatchCallHeader, 2, 0, FLAG_ENABLE_WALLY_MATCH_CALL, REMATCH_WALLY_3, gWallyMatchCallDesc, sWallyTextScripts, sWallyAdditionalData);
+static const struct MatchCallStruct2 sWallyMatchCallHeader =
+{
+    .type = 2,
+    .v1 = 0,
+    .flag = FLAG_ENABLE_WALLY_MATCH_CALL,
+    .rematchTableIdx = REMATCH_WALLY_3,
+    .desc = gWallyMatchCallDesc,
+    .textData = sWallyTextScripts,
+    .v10 = sWallyAdditionalData
+};
 
 static const match_call_text_data_t sScottTextScripts[] = {
     { gText_Scott_Pokenav_2B5184, 0xFFFF,              0xFFFF },
@@ -443,7 +502,15 @@ static const match_call_text_data_t sScottTextScripts[] = {
 };
 
 
-MATCHCALLDEF(sScottMatchCallHeader, 0, 0xD5, FLAG_ENABLE_SCOTT_MATCH_CALL, gScottMatchCallDesc, gScottMatchCallName, sScottTextScripts);
+static const struct MatchCallStruct0 sScottMatchCallHeader =
+{
+    .type = 0,
+    .v1 = 0xD5,
+    .flag = FLAG_ENABLE_SCOTT_MATCH_CALL,
+    .desc = gScottMatchCallDesc,
+    .name = gScottMatchCallName,
+    .textData = sScottTextScripts
+};
 
 static const match_call_text_data_t sRoxanneTextScripts[] = {
     { gText_Roxanne_Pokenav_2B2456, 0xFFFE,              0xFFFF },
@@ -453,7 +520,16 @@ static const match_call_text_data_t sRoxanneTextScripts[] = {
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sRoxanneMatchCallHeader, 5, 10, FLAG_ENABLE_ROXANNE_MATCH_CALL, 0x41, gRoxanneMatchCallDesc, NULL, sRoxanneTextScripts);
+static const struct MatchCallStruct5 sRoxanneMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 10,
+    .flag = FLAG_ENABLE_ROXANNE_MATCH_CALL,
+    .rematchTableIdx = REMATCH_ROXANNE,
+    .desc = gRoxanneMatchCallDesc,
+    .name = NULL,
+    .textData = sRoxanneTextScripts
+};
 
 static const match_call_text_data_t sBrawlyTextScripts[] = {
     { gText_Brawly_Pokenav_2B2659, 0xFFFE,              0xFFFF },
@@ -463,7 +539,16 @@ static const match_call_text_data_t sBrawlyTextScripts[] = {
     { NULL,                        0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sBrawlyMatchCallHeader, 5, 2, FLAG_ENABLE_BRAWLY_MATCH_CALL, 0x42, gBrawlyMatchCallDesc, NULL, sBrawlyTextScripts);
+static const struct MatchCallStruct5 sBrawlyMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 2,
+    .flag = FLAG_ENABLE_BRAWLY_MATCH_CALL,
+    .rematchTableIdx = REMATCH_BRAWLY,
+    .desc = gBrawlyMatchCallDesc,
+    .name = NULL,
+    .textData = sBrawlyTextScripts
+};
 
 static const match_call_text_data_t sWattsonTextScripts[] = {
     { gText_Wattson_Pokenav_2B2912, 0xFFFE,              0xFFFF },
@@ -473,7 +558,16 @@ static const match_call_text_data_t sWattsonTextScripts[] = {
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sWattsonMatchCallHeader, 5, 9, FLAG_ENABLE_WATTSON_MATCH_CALL, 0x43, gWattsonMatchCallDesc, NULL, sWattsonTextScripts);
+static const struct MatchCallStruct5 sWattsonMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 9,
+    .flag = FLAG_ENABLE_WATTSON_MATCH_CALL,
+    .rematchTableIdx = REMATCH_WATTSON,
+    .desc = gWattsonMatchCallDesc,
+    .name = NULL,
+    .textData = sWattsonTextScripts
+};
 
 static const match_call_text_data_t sFlanneryTextScripts[] = {
     { gText_Flannery_Pokenav_2B2B4D, 0xFFFE,              0xFFFF },
@@ -483,7 +577,16 @@ static const match_call_text_data_t sFlanneryTextScripts[] = {
     { NULL,                          0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sFlanneryMatchCallHeader, 5, 3, FLAG_ENABLE_FLANNERY_MATCH_CALL, 0x44, gFlanneryMatchCallDesc, NULL, sFlanneryTextScripts);
+static const struct MatchCallStruct5 sFlanneryMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 3,
+    .flag = FLAG_ENABLE_FLANNERY_MATCH_CALL,
+    .rematchTableIdx = REMATCH_FLANNERY,
+    .desc = gFlanneryMatchCallDesc,
+    .name = NULL,
+    .textData = sFlanneryTextScripts
+};
 
 static const match_call_text_data_t sWinonaTextScripts[] = {
     { gText_Winona_Pokenav_2B2DA4, 0xFFFE,              0xFFFF },
@@ -493,7 +596,16 @@ static const match_call_text_data_t sWinonaTextScripts[] = {
     { NULL,                        0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sWinonaMatchCallHeader, 5, 11, FLAG_ENABLE_WINONA_MATCH_CALL, 0x46, gWinonaMatchCallDesc, NULL, sWinonaTextScripts);
+static const struct MatchCallStruct5 sWinonaMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 11,
+    .flag = FLAG_ENABLE_WINONA_MATCH_CALL,
+    .rematchTableIdx = REMATCH_WINONA,
+    .desc = gWinonaMatchCallDesc,
+    .name = NULL,
+    .textData = sWinonaTextScripts
+};
 
 static const match_call_text_data_t sTateLizaTextScripts[] = {
     { gText_TateLiza_Pokenav_2B2F97, 0xFFFE,              0xFFFF },
@@ -503,7 +615,16 @@ static const match_call_text_data_t sTateLizaTextScripts[] = {
     { NULL,                          0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sTateLizaMatchCallHeader, 5, 13, FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL, 0x47, gTateLizaMatchCallDesc, NULL, sTateLizaTextScripts);
+static const struct MatchCallStruct5 sTateLizaMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 13,
+    .flag = FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL,
+    .rematchTableIdx = REMATCH_TATE_AND_LIZA,
+    .desc = gTateLizaMatchCallDesc,
+    .name = NULL,
+    .textData = sTateLizaTextScripts
+};
 
 static const match_call_text_data_t sJuanTextScripts[] = {
     { gText_Juan_Pokenav_2B3249, 0xFFFE,              0xFFFF },
@@ -513,48 +634,102 @@ static const match_call_text_data_t sJuanTextScripts[] = {
     { NULL,                      0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sJuanMatchCallHeader, 5, 14, FLAG_ENABLE_JUAN_MATCH_CALL, 0x48, gJuanMatchCallDesc, NULL, sJuanTextScripts);
+static const struct MatchCallStruct5 sJuanMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 14,
+    .flag = FLAG_ENABLE_JUAN_MATCH_CALL,
+    .rematchTableIdx = REMATCH_JUAN,
+    .desc = gJuanMatchCallDesc,
+    .name = NULL,
+    .textData = sJuanTextScripts
+};
 
 static const match_call_text_data_t sSidneyTextScripts[] = {
     { gText_Sidney_Pokenav_2B34CC, 0xFFFF, 0xFFFF },
     { NULL,                        0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sSidneyMatchCallHeader, 5, 15, FLAG_REMATCH_JUAN, 0x49, gEliteFourMatchCallDesc, NULL, sSidneyTextScripts);
+static const struct MatchCallStruct5 sSidneyMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 15,
+    .flag = FLAG_REMATCH_SIDNEY,
+    .rematchTableIdx = REMATCH_SIDNEY,
+    .desc = gEliteFourMatchCallDesc,
+    .name = NULL,
+    .textData = sSidneyTextScripts
+};
 
 static const match_call_text_data_t sPhoebeTextScripts[] = {
     { gText_Phoebe_Pokenav_2B3561, 0xFFFF, 0xFFFF },
     { NULL,                        0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sPhoebeMatchCallHeader, 5, 15, FLAG_REMATCH_SIDNEY, 0x4A, gEliteFourMatchCallDesc, NULL, sPhoebeTextScripts);
+static const struct MatchCallStruct5 sPhoebeMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 15,
+    .flag = FLAG_REMATCH_PHOEBE,
+    .rematchTableIdx = REMATCH_PHOEBE,
+    .desc = gEliteFourMatchCallDesc,
+    .name = NULL,
+    .textData = sPhoebeTextScripts
+};
 
 static const match_call_text_data_t sGlaciaTextScripts[] = {
     { gText_Glacia_Pokenav_2B35E4, 0xFFFF, 0xFFFF },
     { NULL,                        0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sGlaciaMatchCallHeader, 5, 15, FLAG_REMATCH_PHOEBE, 0x4B, gEliteFourMatchCallDesc, NULL, sGlaciaTextScripts);
+static const struct MatchCallStruct5 sGlaciaMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 15,
+    .flag = FLAG_REMATCH_GLACIA,
+    .rematchTableIdx = REMATCH_GLACIA,
+    .desc = gEliteFourMatchCallDesc,
+    .name = NULL,
+    .textData = sGlaciaTextScripts
+};
 
 static const match_call_text_data_t sDrakeTextScripts[] = {
     { gText_Drake_Pokenav_2B368B, 0xFFFF, 0xFFFF },
     { NULL,                       0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sDrakeMatchCallHeader, 5, 15, FLAG_REMATCH_GLACIA, 0x4C, gEliteFourMatchCallDesc, NULL, sDrakeTextScripts);
+static const struct MatchCallStruct5 sDrakeMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 15,
+    .flag = FLAG_REMATCH_DRAKE,
+    .rematchTableIdx = REMATCH_DRAKE,
+    .desc = gEliteFourMatchCallDesc,
+    .name = NULL,
+    .textData = sDrakeTextScripts
+};
 
 static const match_call_text_data_t sWallaceTextScripts[] = {
     { gText_Wallace_Pokenav_2B3790, 0xFFFF, 0xFFFF },
     { NULL,                         0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sWallaceMatchCallHeader, 5, 15, FLAG_REMATCH_DRAKE, 0x4D, gChampionMatchCallDesc, NULL, sWallaceTextScripts);
+static const struct MatchCallStruct5 sWallaceMatchCallHeader =
+{
+    .type = 5,
+    .v1 = 15,
+    .flag = FLAG_REMATCH_WALLACE,
+    .rematchTableIdx = REMATCH_WALLACE,
+    .desc = gChampionMatchCallDesc,
+    .name = NULL,
+    .textData = sWallaceTextScripts
+};
 
 static const match_call_t sMatchCallHeaders[] = {
     {.type0 = &sMrStoneMatchCallHeader},
     {.type3 = &sProfBirchMatchCallHeader},
-    {.type4 = &sBrendanMatchCallHeader},
     {.type4 = &sMayMatchCallHeader},
+    {.type4 = &sBrendanMatchCallHeader},
     {.type2 = &sWallyMatchCallHeader},
     {.type5 = &sNormanMatchCallHeader},
     {.type0 = &sMomMatchCallHeader},
@@ -680,7 +855,7 @@ bool32 MatchCallFlagGetByIndex(u32 idx)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return FALSE;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
@@ -727,7 +902,7 @@ u8 sub_81D16DC(u32 idx)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return 0;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
@@ -771,7 +946,7 @@ bool32 MatchCall_IsRematchable(u32 idx)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return 0;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
@@ -810,13 +985,13 @@ bool32 sub_81D17E8(u32 idx)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return FALSE;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
     if (gUnknown_08625338[i](matchCall))
         return TRUE;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(sMatchCallCheckPageOverrides); i++)
     {
         if (sMatchCallCheckPageOverrides[i].idx == idx)
             return TRUE;
@@ -854,7 +1029,7 @@ u32 MatchCall_GetRematchTableIdx(u32 idx)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return REMATCH_TABLE_ENTRIES;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
@@ -891,7 +1066,7 @@ void MatchCall_GetMessage(u32 idx, u8 *dest)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
@@ -906,9 +1081,9 @@ static void MatchCall_GetMessage_Type0(match_call_t matchCall, u8 *dest)
 static void MatchCall_GetMessage_Type1(match_call_t matchCall, u8 *dest)
 {
     if (matchCall.common->type != 5)
-        sub_81D1920(matchCall.type5->textData, dest);
+        sub_81D1920(matchCall.type1->textData, dest);
     else
-        sub_81D199C(matchCall.type1->textData, matchCall.type1->rematchTableIdx, dest);
+        sub_81D199C(matchCall.type5->textData, matchCall.type5->rematchTableIdx, dest);
 }
 
 static void MatchCall_GetMessage_Type2(match_call_t matchCall, u8 *dest)
@@ -1093,7 +1268,7 @@ void sub_81D1A78(u32 idx, const u8 **desc, const u8 **name)
     match_call_t matchCall;
     u32 i;
 
-    if (idx > 20)
+    if (idx > ARRAY_COUNT(sMatchCallHeaders) - 1)
         return;
     matchCall = sMatchCallHeaders[idx];
     i = MatchCallGetFunctionIndex(matchCall);
@@ -1146,11 +1321,11 @@ const u8 *sub_81D1B40(u32 idx, u32 offset)
 {
     u32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(sMatchCallCheckPageOverrides); i++)
     {
         if (sMatchCallCheckPageOverrides[i].idx == idx)
         {
-            for (; i + 1 < 4 && sMatchCallCheckPageOverrides[i + 1].idx == idx; i++)
+            for (; i + 1 < ARRAY_COUNT(sMatchCallCheckPageOverrides) && sMatchCallCheckPageOverrides[i + 1].idx == idx; i++)
             {
                 if (!FlagGet(sMatchCallCheckPageOverrides[i + 1].v4))
                     break;
@@ -1244,7 +1419,7 @@ s32 sub_81D1BD0(u32 idx)
 {
     u32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < ARRAY_COUNT(sMatchCallCheckPageOverrides); i++)
     {
         if (sMatchCallCheckPageOverrides[i].idx == idx)
             return sMatchCallCheckPageOverrides[i].v2;
@@ -1256,7 +1431,7 @@ bool32 sub_81D1BF8(u32 idx)
 {
     s32 i;
 
-    for (i = 0; i < 21; i++)
+    for (i = 0; i < (s32)ARRAY_COUNT(sMatchCallHeaders); i++)
     {
         u32 r0 = MatchCall_GetRematchTableIdx(i);
         if (r0 != REMATCH_TABLE_ENTRIES && r0 == idx)
diff --git a/src/pokenav_match_call_ui.c b/src/pokenav_match_call_ui.c
new file mode 100644
index 000000000..c4591da37
--- /dev/null
+++ b/src/pokenav_match_call_ui.c
@@ -0,0 +1,1264 @@
+#include "global.h"
+#include "pokenav.h"
+#include "window.h"
+#include "strings.h"
+#include "text.h"
+#include "bg.h"
+#include "menu.h"
+#include "decompress.h"
+
+struct UnknownSubSubStruct_0203CF40 {
+    u8 bg;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 fontId;
+    u16 unk6;
+    u16 windowId;
+    u16 unkA;
+    u16 unkC;
+    u16 unkE;
+};
+
+struct MatchCallWindowState {
+    // The index of the element at the top of the window.
+    u16 windowTopIndex;
+    u16 listLength;
+    u16 unk4;
+    // The index of the cursor, relative to the top of the window.
+    u16 selectedIndexOffset;
+    u16 visibleEntries;
+    u16 unkA;
+    u32 unkC;
+    u32 unk10;
+};
+
+struct UnknownInnerStruct_81C81D4
+{
+    struct UnknownSubSubStruct_0203CF40 unk0;
+    u32 unk10;
+    u32 unk14;
+    u32 unk18;
+    u32 unk1C;
+    s32 unk20;
+    s32 unk24;
+    u32 unk28;
+    s32 unk2C;
+    u32 unk30;
+    void (*unk34)(u32, u8*);
+    void (*unk38)(u16, u32, u32);
+    struct Sprite *rightArrow;
+    struct Sprite *upArrow;
+    struct Sprite *downArrow;
+    u8 unkTextBuffer[0x40];
+};
+
+// Generally at index 0x11 (17)
+struct UnknownSubStruct_81C81D4
+{
+    struct UnknownInnerStruct_81C81D4 unk0;
+    u8 tilemapBuffer[0x800];
+    struct MatchCallWindowState unk888;
+    u32 unk89C;
+    u32 unk8A0;
+};
+
+struct MatchCallListTemplate
+{
+    u32 unk0;
+    u16 unk4;
+    u16 unk6;
+    u8 unk8;
+    u8 unk9;
+    u8 unkA;
+    u8 unkB;
+    u8 unkC;
+    u8 unkD;
+    u8 unkE;
+    void (*unk10)(u32, u8 *a1);
+    void (*unk14)(u16 a0, u32 a1, u32 a2);
+};
+
+extern void sub_81CBD48(u16 windowId, u32 a1);
+extern void sub_81DB620(u32 windowId, u32 a1, u32 a2, u32 a3, u32 a4);
+extern u8 *sub_81CAFD8(u16 a0, u32 a1);
+
+void sub_81C82E4(struct UnknownSubStruct_81C81D4 *a0);
+u32 sub_81C91AC(struct UnknownInnerStruct_81C81D4 *a0, const struct BgTemplate *a1, struct MatchCallListTemplate *a2, s32 a3);
+void sub_81C9160(struct MatchCallWindowState *a0, struct MatchCallListTemplate *a1);
+void SpriteCB_MatchCallUpArrow(struct Sprite *sprite);
+void SpriteCB_MatchCallDownArrow(struct Sprite *sprite);
+void SpriteCB_MatchCallRightArrow(struct Sprite *sprite);
+void ToggleMatchCallArrows(struct UnknownInnerStruct_81C81D4 *a0, u32 a1);
+void sub_81C8FE0(struct UnknownInnerStruct_81C81D4 *a0);
+void sub_81C8EF8(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1);
+void sub_81C8ED0(void);
+void sub_81C8E54(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1, u32 a2);
+void PrintMatchCallFieldNames(struct UnknownInnerStruct_81C81D4 *a0, u32 a1);
+void sub_81C8D4C(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1);
+void sub_81C8CB4(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1);
+void sub_81C8B70(struct UnknownSubSubStruct_0203CF40 *a0, u32 a1, u32 a2);
+void sub_81C8568(s32 a0, struct UnknownInnerStruct_81C81D4 *a1);
+void sub_81C83AC(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, struct UnknownInnerStruct_81C81D4 *a5);
+void sub_81C837C(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1);
+void sub_81C835C(struct UnknownSubSubStruct_0203CF40 *a0);
+u32 LoopedTask_sub_81C8254(s32 a0);
+bool32 sub_81C83E0(void);
+u32 LoopedTask_sub_81C83F0(s32 a0);
+u32 LoopedTask_sub_81C85A0(s32 a0);
+u32 LoopedTask_sub_81C8870(s32 a0);
+u32 LoopedTask_sub_81C8A28(s32 a0);
+u32 LoopedTask_sub_81C8958(s32 a0);
+
+static const u16 sMatchcallArrowPaletteData[] = INCBIN_U16("graphics/pokenav/arrows_matchcall.gbapal");
+static const u32 sMatchcallArrowSpriteSheetData[] = INCBIN_U32("graphics/pokenav/arrows_matchcall.4bpp.lz");
+
+static const u8 sPokenavColors_0861FBE4[] =
+{
+    0, 2, 5
+};
+
+static const u8 *const sMatchCallFieldNames[] =
+{
+    gText_PokenavMatchCall_Strategy,
+    gText_PokenavMatchCall_TrainerPokemon,
+    gText_PokenavMatchCall_SelfIntroduction
+};
+
+static const u8 sMatchCallFieldColors[] =
+{
+    1, 4, 5
+};
+
+static const u8 sUnknown_0861FBF7[] =
+{
+    2, 4, 6, 7, 0
+};
+
+static const struct CompressedSpriteSheet sMatchcallArrowSpriteSheets[] =
+{
+    {
+        .data = sMatchcallArrowSpriteSheetData,
+        .size = 192,
+        .tag = 0xA
+    }
+};
+
+static const struct SpritePalette sMatchcallArrowPalettes[] =
+{
+    {
+        .data = sMatchcallArrowPaletteData,
+        .tag = 0x14
+    },
+    {}
+};
+
+static const struct OamData sMatchCallRightArrowSpriteOam =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(8x16),
+    .x = 0,
+    .size = SPRITE_SIZE(8x16),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0
+};
+
+static const struct SpriteTemplate sMatchCallRightArrowSprite =
+{
+    .tileTag = 0xA,
+    .paletteTag = 0x14,
+    .oam = &sMatchCallRightArrowSpriteOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_MatchCallRightArrow
+};
+
+static const struct OamData sMatchCallUpDownArrowSpriteOam =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x8),
+    .x = 0,
+    .size = SPRITE_SIZE(16x8),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0
+};
+
+static const struct SpriteTemplate sMatchCallUpDownArrowSprite =
+{
+    .tileTag = 0xA,
+    .paletteTag = 0x14,
+    .oam = &sMatchCallUpDownArrowSpriteOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+EWRAM_DATA u32 gUnknown_0203CF44 = 0;
+
+bool32 sub_81C81D4(const struct BgTemplate *arg0, struct MatchCallListTemplate *arg1, s32 arg2)
+{
+    u32 v1;
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    
+    structPtr = AllocSubstruct(0x11, sizeof(struct UnknownSubStruct_81C81D4));
+
+    if (structPtr == NULL)
+        return FALSE;
+    
+    sub_81C9160(&structPtr->unk888, arg1);
+
+    v1 = sub_81C91AC(&structPtr->unk0, arg0, arg1, arg2);
+    if (v1 == 0)
+        return FALSE;
+    
+    CreateLoopedTask(LoopedTask_sub_81C8254, 6);
+    return TRUE;
+}
+
+bool32 sub_81C8224(void)
+{
+    return FuncIsActiveLoopedTask(LoopedTask_sub_81C8254);
+}
+
+void sub_81C8234(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+
+    structPtr = GetSubstructPtr(0x11);
+    sub_81C8FE0(&structPtr->unk0);
+    RemoveWindow(structPtr->unk0.unk0.windowId);
+    FreePokenavSubstruct(0x11);
+}
+
+u32 LoopedTask_sub_81C8254(s32 a0)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+
+    if (IsDma3ManagerBusyWithBgCopy())
+        return 2;
+    
+    structPtr = GetSubstructPtr(0x11);
+
+    switch (a0)
+    {
+        case 0:
+            sub_81C82E4(structPtr);
+            return 0;
+        case 1:
+            sub_81C835C(&structPtr->unk0.unk0);
+            return 0;
+        case 2:
+            sub_81C837C(&structPtr->unk888, &structPtr->unk0);
+            return 0;
+        case 3:
+            if (sub_81C83E0())
+            {
+                return 2;
+            }
+            else
+            {
+                sub_81C8ED0();
+                return 1;
+            }
+        case 4:
+            sub_81C8EF8(&structPtr->unk888, &structPtr->unk0);
+            return 4;
+        default:
+            return 4;
+    }
+}
+
+void sub_81C82E4(struct UnknownSubStruct_81C81D4 *a0)
+{
+    u16 v1 = (a0->unk0.unk0.unk1 << 12) | a0->unk0.unk0.unk6;
+    sub_8199DF0(a0->unk0.unk0.bg, PIXEL_FILL(1), a0->unk0.unk0.unk6, 1);
+    sub_8199DF0(a0->unk0.unk0.bg, PIXEL_FILL(4), a0->unk0.unk0.unk6 + 1, 1);
+    SetBgTilemapBuffer(a0->unk0.unk0.bg, a0->tilemapBuffer);
+    FillBgTilemapBufferRect_Palette0(a0->unk0.unk0.bg, v1, 0, 0, 32, 32);
+    ChangeBgY(a0->unk0.unk0.bg, 0, 0);
+    ChangeBgX(a0->unk0.unk0.bg, 0, 0);
+    ChangeBgY(a0->unk0.unk0.bg, a0->unk0.unk0.unk3 << 11, 2);
+    CopyBgTilemapBufferToVram(a0->unk0.unk0.bg);
+}
+
+void sub_81C835C(struct UnknownSubSubStruct_0203CF40 *a0)
+{
+    FillWindowPixelBuffer(a0->windowId, PIXEL_FILL(1));
+    PutWindowTilemap(a0->windowId);
+    CopyWindowToVram(a0->windowId, 1);
+}
+
+void sub_81C837C(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1)
+{
+    s32 v1;
+    s32 v2;
+
+    // TODO: Clean this up.
+    v1 = a0->listLength - a0->windowTopIndex;
+    v2 = a0->visibleEntries;
+    if (v1 > a0->visibleEntries)
+        v1 = v2;
+    sub_81C83AC(a0->unk10, a0->windowTopIndex, v1, a0->unkC, 0, a1);
+}
+
+void sub_81C83AC(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, struct UnknownInnerStruct_81C81D4 *a5)
+{
+    if (a2 == 0)
+        return;
+
+    a5->unk1C = a0 + a1 * a3;
+    a5->unk18 = a3;
+    a5->unk0.unkC = 0;
+    a5->unk0.unkE = a2;
+    a5->unk14 = a1;
+    a5->unk10 = a4;
+    CreateLoopedTask(LoopedTask_sub_81C83F0, 5);
+}
+
+bool32 sub_81C83E0(void)
+{
+    return FuncIsActiveLoopedTask(LoopedTask_sub_81C83F0);
+}
+
+u32 LoopedTask_sub_81C83F0(s32 a0)
+{
+    struct UnknownInnerStruct_81C81D4 *structPtr;
+    u32 v1;
+
+    structPtr = &((struct UnknownSubStruct_81C81D4*)GetSubstructPtr(0x11))->unk0;
+    switch (a0)
+    {
+    case 0:
+        v1 = (structPtr->unk0.unkA + structPtr->unk0.unkC + structPtr->unk10) & 0xF;
+        structPtr->unk34(structPtr->unk1C, structPtr->unkTextBuffer);
+        if (structPtr->unk38 != NULL)
+            // Accessing unk0.windowId as if it were a u16...?
+            // It's accessed as a u8 again in the very next line...
+            structPtr->unk38(*(u16*)(&structPtr->unk0.windowId), structPtr->unk14, v1);
+        
+        AddTextPrinterParameterized(structPtr->unk0.windowId, structPtr->unk0.fontId, structPtr->unkTextBuffer, 8, (v1 << 4) + 1, 255, NULL);
+        
+        if (++structPtr->unk0.unkC >= structPtr->unk0.unkE)
+        {
+            if (structPtr->unk38 != NULL)
+                CopyWindowToVram(structPtr->unk0.windowId, 3);
+            else
+                CopyWindowToVram(structPtr->unk0.windowId, 2);
+            return 0;
+        }
+        else
+        {
+            structPtr->unk1C += structPtr->unk18;
+            structPtr->unk14++;
+            return 3;
+        }
+    case 1:
+        if (IsDma3ManagerBusyWithBgCopy())
+            return 2;
+        else
+            return 4;
+    default:
+        return 4;
+    }
+}
+
+bool32 ShouldShowUpArrow(void)
+{
+    u16 v1;
+    s32 v2;
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+
+    return structPtr->unk888.windowTopIndex != 0;
+}
+
+bool32 ShouldShowDownArrow(void)
+{
+    struct MatchCallWindowState *subPtr;
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    subPtr = &structPtr->unk888;
+    
+    return subPtr->windowTopIndex + subPtr->visibleEntries < subPtr->listLength;
+}
+
+
+#ifdef NONMATCHING
+// This has some register renaming issues (r4, r5, and r6 are all switched around), and
+// for some reason it's creating two copies of subPtr->unk0.
+// TODO: Now I know why it's making two copies - one of them is UnknownInnerStruct_81C81D4.
+void MatchCall_MoveWindow(s32 a0, bool32 a1)
+{
+    s32 v1;
+    struct MatchCallWindowState *subPtr;
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    subPtr = &structPtr->unk888;
+
+    if (a0 < 0)
+    {
+        // This is where the issue is. subPtr->windowTopIndex is being stored in r1 and then copied to
+        // r2... and then r2 is read for the if statement, r1 is read for the function call,
+        // and then both are clobbered as expected. Between those two uses, no writes to r1/r2
+        // happen; it doesn't need to be duplicated/moved at all.
+        if (subPtr->windowTopIndex + a0 < 0)
+            v1 = -1 * subPtr->windowTopIndex;
+        else
+            v1 = a0;
+        if (a1)
+            sub_81C83AC(subPtr->unk10, subPtr->windowTopIndex + v1, v1 * -1, subPtr->unkC, v1, structPtr);
+    }
+    else if (a1)
+    {
+        
+        gUnknown_0203CF44 = subPtr->windowTopIndex + subPtr->visibleEntries;
+        if ((s32)(gUnknown_0203CF44) + a0 >= (s32)subPtr->listLength)
+            v1 = subPtr->listLength - gUnknown_0203CF44;
+        else
+            v1 = a0;
+        
+        sub_81C83AC(subPtr->unk10, gUnknown_0203CF44, v1, subPtr->unkC, subPtr->visibleEntries, structPtr);
+        // Needed to prevent GCC from combining the two sub_81C83AC calls.
+        asm("");
+    }
+    else
+    {
+        v1 = a0;
+    }
+    
+    sub_81C8568(v1, structPtr);
+    subPtr->windowTopIndex++;
+}
+#else
+NAKED
+void MatchCall_MoveWindow(s32 a0, bool32 a1)
+{
+    asm(".syntax unified\n\
+	push {r4-r7,lr}\n\
+	sub sp, 0x8\n\
+	adds r6, r0, 0\n\
+	adds r4, r1, 0\n\
+	movs r0, 0x11\n\
+	bl GetSubstructPtr\n\
+	adds r7, r0, 0\n\
+	ldr r0, =0x00000888\n\
+	adds r5, r7, r0\n\
+	cmp r6, 0\n\
+	bge _081C8524\n\
+	ldrh r1, [r5]\n\
+	adds r0, r1, r6\n\
+	cmp r0, 0\n\
+	bge _081C850A\n\
+	negs r6, r1\n\
+_081C850A:\n\
+	cmp r4, 0\n\
+	beq _081C854E\n\
+	ldr r0, [r5, 0x10]\n\
+	adds r1, r6\n\
+	negs r2, r6\n\
+	ldr r3, [r5, 0xC]\n\
+	str r6, [sp]\n\
+	str r7, [sp, 0x4]\n\
+	bl sub_81C83AC\n\
+	b _081C854E\n\
+	.pool\n\
+_081C8524:\n\
+	cmp r4, 0\n\
+	beq _081C854E\n\
+	ldr r2, =gUnknown_0203CF44\n\
+	ldrh r1, [r5]\n\
+	ldrh r0, [r5, 0x8]\n\
+	adds r4, r1, r0\n\
+	str r4, [r2]\n\
+	adds r0, r4, r6\n\
+	ldrh r1, [r5, 0x2]\n\
+	cmp r0, r1\n\
+	blt _081C853C\n\
+	subs r6, r1, r4\n\
+_081C853C:\n\
+	ldr r0, [r5, 0x10]\n\
+	ldr r3, [r5, 0xC]\n\
+	ldrh r1, [r5, 0x8]\n\
+	str r1, [sp]\n\
+	str r7, [sp, 0x4]\n\
+	adds r1, r4, 0\n\
+	adds r2, r6, 0\n\
+	bl sub_81C83AC\n\
+_081C854E:\n\
+	adds r0, r6, 0\n\
+	adds r1, r7, 0\n\
+	bl sub_81C8568\n\
+	ldrh r0, [r5]\n\
+	adds r0, r6\n\
+	strh r0, [r5]\n\
+	add sp, 0x8\n\
+	pop {r4-r7}\n\
+	pop {r0}\n\
+	bx r0\n\
+	.pool\n\
+    .syntax divided");
+}
+#endif
+
+void sub_81C8568(s32 a0, struct UnknownInnerStruct_81C81D4 *a1)
+{
+    a1->unk20 = GetBgY(a1->unk0.bg);
+    a1->unk24 = a1->unk20 + (a0 << 12);
+    if (a0 > 0)
+        a1->unk30 = 1;
+    else
+        a1->unk30 = 2;
+    a1->unk2C = a0;
+    a1->unk28 = CreateLoopedTask(LoopedTask_sub_81C85A0, 6);
+}
+
+u32 LoopedTask_sub_81C85A0(s32 a0)
+{
+    s32 y;
+    s32 v1;
+    bool32 flag;
+    struct UnknownInnerStruct_81C81D4 *structPtr;
+    structPtr = &((struct UnknownSubStruct_81C81D4 *)GetSubstructPtr(0x11))->unk0;
+    
+    switch (a0)
+    {
+    case 0:
+        if (sub_81C83E0() == FALSE)
+            return 1;
+        else
+            return 2;
+    case 1:
+        flag = FALSE;
+        y = GetBgY(structPtr->unk0.bg);
+        v1 = ChangeBgY(structPtr->unk0.bg, 0x1000, structPtr->unk30);
+        if (structPtr->unk30 == 2)
+        {
+            if ((y > structPtr->unk24 || y <= structPtr->unk20) && v1 <= structPtr->unk24)
+            {
+                flag = TRUE;
+            }
+        }
+        else
+        {
+            if ((y < structPtr->unk24 || y >= structPtr->unk20) && v1 >= structPtr->unk24)
+            {
+                flag = TRUE;
+            }
+        }
+        if (flag)
+        {
+            structPtr->unk0.unkA = (structPtr->unk0.unkA + structPtr->unk2C) & 0xF;
+            ChangeBgY(structPtr->unk0.bg, structPtr->unk24, 0);
+            return 4;
+        }
+        else
+        {
+            return 2;
+        }
+    default:
+        return 4;
+    }
+}
+
+bool32 sub_81C8630(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    return IsLoopedTaskActive(structPtr->unk0.unk28);
+}
+
+struct MatchCallWindowState *GetMatchCallWindowStruct(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    return &structPtr->unk888;
+}
+
+u32 MatchCall_MoveCursorUp(void)
+{
+    struct MatchCallWindowState *structPtr;
+    structPtr = GetMatchCallWindowStruct();
+
+    if (structPtr->selectedIndexOffset != 0)
+    {
+        structPtr->selectedIndexOffset--;
+        return 1;
+    }
+    else
+    {
+        if (ShouldShowUpArrow())
+        {
+            MatchCall_MoveWindow(-1, TRUE);
+            return 2;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+}
+
+u32 MatchCall_MoveCursorDown(void)
+{
+    struct MatchCallWindowState *structPtr;
+    structPtr = GetMatchCallWindowStruct();
+
+    if (structPtr->windowTopIndex + structPtr->selectedIndexOffset < structPtr->listLength - 1)
+    {
+        if (structPtr->selectedIndexOffset < structPtr->visibleEntries - 1)
+        {
+            structPtr->selectedIndexOffset++;
+            return 1;
+        }
+        else if (!ShouldShowDownArrow())
+        {
+            return 0;
+        }
+    }
+    else
+    {
+        return 0;
+    }
+    MatchCall_MoveWindow(1, TRUE);
+    return 2;
+}
+
+u32 MatchCall_PageUp(void)
+{
+    struct MatchCallWindowState *structPtr;
+    s32 scroll;
+    
+    structPtr = GetMatchCallWindowStruct();
+    if (ShouldShowUpArrow())
+    {
+        if (structPtr->windowTopIndex >= structPtr->visibleEntries)
+            scroll = structPtr->visibleEntries;
+        else
+            scroll = structPtr->windowTopIndex;
+        MatchCall_MoveWindow(scroll * -1, TRUE);
+        return 2;
+    }
+    else if (structPtr->selectedIndexOffset != 0)
+    {
+        structPtr->selectedIndexOffset = 0;
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+u32 MatchCall_PageDown(void)
+{
+    struct MatchCallWindowState *structPtr;
+    structPtr = GetMatchCallWindowStruct();
+
+    if (ShouldShowDownArrow())
+    {
+        s32 scroll;
+        s32 windowBottomIndex;
+        s32 v3;
+        windowBottomIndex = structPtr->windowTopIndex + structPtr->visibleEntries;
+        scroll = structPtr->unk4 - structPtr->windowTopIndex;
+        if (windowBottomIndex <= structPtr->unk4)
+            scroll = structPtr->visibleEntries;
+        MatchCall_MoveWindow(scroll, TRUE);
+        return 2;
+    }
+    else
+    {
+        s32 cursor;
+        s32 lastVisibleIndex;
+        if (structPtr->listLength >= structPtr->visibleEntries)
+        {
+            cursor = structPtr->selectedIndexOffset;
+            lastVisibleIndex = structPtr->visibleEntries;
+        }
+        else
+        {
+            cursor = structPtr->selectedIndexOffset;
+            lastVisibleIndex = structPtr->listLength;
+        }
+        lastVisibleIndex -= 1;
+        if (cursor >= lastVisibleIndex)
+        {
+            return 0;
+        }
+        else
+        {
+            structPtr->selectedIndexOffset = lastVisibleIndex;
+            return 1;
+        }
+    }
+}
+
+u32 GetSelectedMatchCall(void)
+{
+    struct MatchCallWindowState *structPtr;
+    structPtr = GetMatchCallWindowStruct();
+
+    return structPtr->windowTopIndex + structPtr->selectedIndexOffset;
+}
+
+u32 GetMatchCallListTopIndex(void)
+{
+    struct MatchCallWindowState *structPtr;
+    structPtr = GetMatchCallWindowStruct();
+    
+    return structPtr->windowTopIndex;
+}
+
+void sub_81C877C(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    structPtr->unk89C = 0;
+    structPtr->unk8A0 = CreateLoopedTask(LoopedTask_sub_81C8870, 6);
+}
+
+void sub_81C87AC(u16 a0)
+{
+    u16 temp;
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    temp = structPtr->unk888.windowTopIndex;
+    temp += a0;
+    structPtr->unk888.windowTopIndex = temp;
+    structPtr->unk89C = 0;
+    structPtr->unk8A0 = CreateLoopedTask(LoopedTask_sub_81C8958, 6);
+}
+
+void sub_81C87F0(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    structPtr->unk89C = 0;
+    structPtr->unk8A0 = CreateLoopedTask(LoopedTask_sub_81C8A28, 6);
+}
+
+bool32 sub_81C8820(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    return IsLoopedTaskActive(structPtr->unk8A0);
+}
+
+void sub_81C8838(void)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    struct MatchCallWindowState *subStr;
+    structPtr = GetSubstructPtr(0x11);
+    subStr = &structPtr->unk888;
+    structPtr->unk0.unk38(structPtr->unk0.unk0.windowId, subStr->windowTopIndex + subStr->selectedIndexOffset, (structPtr->unk0.unk0.unkA + subStr->selectedIndexOffset) & 0xF);
+    CopyWindowToVram(structPtr->unk0.unk0.windowId, 1);
+}
+
+u32 LoopedTask_sub_81C8870(s32 a0)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    u16 v1;
+    u32 v2;
+
+    // Needed to fix a register renaming issue.
+    register u16* temp asm("r1");
+    structPtr = GetSubstructPtr(0x11);
+
+    switch (a0)
+    {
+    case 0:
+        ToggleMatchCallArrows(&structPtr->unk0, 1);
+        // fall-through
+    case 1:
+        if (structPtr->unk89C != structPtr->unk888.selectedIndexOffset)
+            sub_81C8B70(&structPtr->unk0.unk0, structPtr->unk89C, 1);
+        
+        structPtr->unk89C++;
+        return 0;
+    case 2:
+        if (IsDma3ManagerBusyWithBgCopy())
+            return 2;
+        
+        if (structPtr->unk89C != structPtr->unk888.visibleEntries)
+            return 6;
+        
+        if (structPtr->unk888.selectedIndexOffset != 0)
+            sub_81C8B70(&structPtr->unk0.unk0, structPtr->unk89C, structPtr->unk888.selectedIndexOffset);
+        
+        return 0;
+    case 3:
+        if (IsDma3ManagerBusyWithBgCopy())
+            return 2;
+        temp = &structPtr->unk888.selectedIndexOffset;
+        v1 = *temp;
+        if (v1 == 0)
+            return 4;
+        
+        MatchCall_MoveWindow(v1, FALSE);
+        return 0;
+    case 4:
+         v2 = sub_81C8630();
+         if (v2)
+            return 2;
+
+        structPtr->unk888.selectedIndexOffset = v2;
+        return 4;
+    default:
+        return 4;
+    }
+}
+
+u32 LoopedTask_sub_81C8958(s32 a0)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    if (IsDma3ManagerBusyWithBgCopy())
+        return 2;
+    
+    switch (a0)
+    {
+    case 0:
+        sub_81C8CB4(&structPtr->unk888, &structPtr->unk0);
+        break;
+    case 1:
+        PrintMatchCallFieldNames(&structPtr->unk0, 0);
+        break;
+    case 2:
+        sub_81C8E54(&structPtr->unk888, &structPtr->unk0, 0);
+        break;
+    case 3:
+        PrintMatchCallFieldNames(&structPtr->unk0, 1);
+        break;
+    case 4:
+        sub_81C8E54(&structPtr->unk888, &structPtr->unk0, 1);
+        break;
+    case 5:
+        PrintMatchCallFieldNames(&structPtr->unk0, 2);
+        break;
+    case 6:
+        sub_81C8E54(&structPtr->unk888, &structPtr->unk0, 2);
+        break;
+    case 7:
+        sub_81C8E54(&structPtr->unk888, &structPtr->unk0, 3);
+        break;
+    default:
+        return 4;
+    }
+    return 0;
+}
+
+u32 LoopedTask_sub_81C8A28(s32 a0)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    struct MatchCallWindowState *subPtr888;
+    register struct UnknownInnerStruct_81C81D4 *subPtr0 asm("r2");
+    s32 v4;
+
+    if (IsDma3ManagerBusyWithBgCopy())
+    {
+        return 2;
+    }
+    
+    structPtr = GetSubstructPtr(0x11);
+    subPtr888 = &structPtr->unk888;
+    subPtr0 = &structPtr->unk0;
+
+    switch (a0)
+    {
+    default:
+        return 4;
+    case 0:
+        sub_81C8D4C(subPtr888, subPtr0);
+        return 0;
+    case 1:
+    {
+        s32 v1;
+        s32 v2;
+        u32 *v3;
+        register s32 v4 asm("r5");
+
+        v3 = &structPtr->unk89C;
+        v1 = *v3 + 1;
+        *v3 = v1;
+        if (v1 < structPtr->unk888.visibleEntries)
+        {
+            sub_81C8B70(&subPtr0->unk0, v1, 1);
+            return 2;
+        }
+
+        *v3 = 0;
+        if (subPtr888->listLength <= subPtr888->visibleEntries)
+        {
+            register u32 temp asm("r0");
+            temp = subPtr888->windowTopIndex;
+            if (temp == 0)
+                return 9;
+            v2 = temp;
+        }
+        else
+        {
+            register s32 temp asm("r1");
+            v2 = subPtr888->windowTopIndex + subPtr888->visibleEntries;
+            temp = (s32)subPtr888->listLength;
+            if (v2 <= temp)
+                return 9;
+            v2 -= temp;
+        }
+        v4 = v2 * -1;
+        sub_81C8B70(&subPtr0->unk0, v4, v2);
+        subPtr888->selectedIndexOffset = v2;
+        *v3 = v4;
+        return 0;
+    }
+    case 2:
+        MatchCall_MoveWindow(structPtr->unk89C, FALSE);
+        return 0;
+    case 3:
+        if (sub_81C8630())
+            return 2;
+        
+        structPtr->unk89C = 0;
+        return 1;
+    case 4:
+        sub_81C83AC(subPtr888->unk10, subPtr888->windowTopIndex + structPtr->unk89C, 1, subPtr888->unkC, structPtr->unk89C, &structPtr->unk0);
+        return 0;
+    case 5:
+        if (sub_81C83E0())
+            return 2;
+        
+        v4 = ++structPtr->unk89C;
+        if (v4 >= subPtr888->listLength || v4 >= subPtr888->visibleEntries)
+            return 1;
+        return 9;
+    case 6:
+        ToggleMatchCallArrows(subPtr0, 0);
+        return 4;
+    }
+}
+
+void sub_81C8B70(struct UnknownSubSubStruct_0203CF40 *a0, u32 a1, u32 a2)
+{
+    u8 *v1;
+    u32 v2;
+
+    v1 = (u8*)GetWindowAttribute(a0->windowId, WINDOW_TILE_DATA);
+    v2 = a0->unk4 * 64;
+
+    a1 = (a0->unkA + a1) & 0xF;
+    if ((s32)(a1 + a2) <= 16)
+    {
+        CpuFastFill8(PIXEL_FILL(1), v1 + a1 * v2, a2 * v2);
+        CopyWindowToVram(a0->windowId, 2);
+    }
+    else
+    {
+        u32 v3;
+        u32 v4;
+
+        v3 = 16 - a1;
+        v4 = a2 - v3;
+
+        CpuFastFill8(PIXEL_FILL(1), v1 + a1 * v2, v3 * v2);
+        CpuFastFill8(PIXEL_FILL(1), v1, v4 * v2);
+        CopyWindowToVram(a0->windowId, 2);
+    }
+
+    a2 -= 1;
+    for (a2; a2 != -1; a1 = (a1 + 1) & 0xF, a2--)
+    {
+        sub_81CBD48(a0->windowId, a1);
+    }
+
+    CopyWindowToVram(a0->windowId, 1);
+}
+
+void sub_81C8C64(struct UnknownSubSubStruct_0203CF40 *a0, u32 a1)
+{
+    u16 *v1;
+    register u32 v2 asm("r0");
+    u32 v3;
+
+    v1 = (u16*)GetBgTilemapBuffer(GetWindowAttribute(a0->windowId, WINDOW_BG));
+
+    v1 = &v1[(a0->unkA << 6) + a0->unk2 - 1];
+
+    if (a1 != 0)
+    {
+        v2 = a0->unk1 << 12;
+        v3 = a0->unk6 + 1;
+    }
+    else
+    {
+        v2 = a0->unk1 << 12;
+        v3 = a0->unk6;
+    }
+    {
+        register u16 v5 asm("r1");
+        register u32 v6 asm("r0");
+        v6 = (v3 | v2);
+        v6 = v6 << 16;
+        v5 = v6 >> 16;
+        v1[0] = v5;
+        v1[0x20] = v5;
+    }
+}
+
+void sub_81C8CB4(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1)
+{
+    u8 colors[3];
+
+
+    memcpy(colors, sPokenavColors_0861FBE4, ARRAY_COUNT(sPokenavColors_0861FBE4));
+
+    a1->unk34(a0->unk10 + a0->unkC * a0->windowTopIndex, a1->unkTextBuffer);
+    a1->unk38(a1->unk0.windowId, a0->windowTopIndex, a1->unk0.unkA);
+    FillWindowPixelRect(a1->unk0.windowId, PIXEL_FILL(4), 0, a1->unk0.unkA * 16, a1->unk0.unk4 * 8, 16);
+    AddTextPrinterParameterized3(a1->unk0.windowId, a1->unk0.fontId, 8, (a1->unk0.unkA * 16) + 1, colors, TEXT_SPEED_FF, a1->unkTextBuffer);
+    sub_81C8C64(&a1->unk0, 1);
+    CopyWindowRectToVram(a1->unk0.windowId, 3, 0, a1->unk0.unkA * 2, a1->unk0.unk4, 2);
+}
+
+void sub_81C8D4C(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1)
+{
+    a1->unk34(a0->unk10 + a0->unkC * a0->windowTopIndex, a1->unkTextBuffer);
+    FillWindowPixelRect(a1->unk0.windowId, PIXEL_FILL(1), 0, a1->unk0.unkA * 16, a1->unk0.unk4 * 8, 16);
+    AddTextPrinterParameterized(a1->unk0.windowId, a1->unk0.fontId, a1->unkTextBuffer, 8, a1->unk0.unkA * 16 + 1, TEXT_SPEED_FF, NULL);
+    sub_81C8C64(&a1->unk0, 0);
+    CopyWindowToVram(a1->unk0.windowId, 3);
+}
+
+void PrintMatchCallFieldNames(struct UnknownInnerStruct_81C81D4 *a0, u32 fieldId)
+{
+    const u8 *fieldNames[3];
+    u8 colors[3];
+    u32 r4;
+    u32 r5;
+    u32 tmp;
+    u32 one;
+
+    memcpy(fieldNames, sMatchCallFieldNames, sizeof(sMatchCallFieldNames));
+    memcpy(colors, sMatchCallFieldColors, sizeof(sMatchCallFieldColors));
+
+    r4 = a0->unk0.unkA;
+    tmp = fieldId * 2 + 1;
+    r4 += tmp;
+    r4 &= 0xF;
+    FillWindowPixelRect(a0->unk0.windowId, PIXEL_FILL(1), 0, r4 << 4, a0->unk0.unk4, 16);
+    
+    // This is a fake match. It should be this:
+    // AddTextPrinterParameterized3(a0->unk0.windowId, 7, 2, r4 << 4 + 1, colors, TEXT_SPEED_FF, fieldNames[fieldId]);
+    // But the original GCC does some clever reuse of the `1` constant that the current GCC doesn't.
+    one = 1;
+    AddTextPrinterParameterized3(a0->unk0.windowId, 7, 2, (r4 << 4) + one, colors, one - 2, fieldNames[fieldId]);
+    CopyWindowRectToVram(a0->unk0.windowId, 2, 0, r4 << 1, a0->unk0.unk4, 2);
+}
+
+void sub_81C8E54(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1, u32 a2)
+{
+    const u8 *str;
+    u32 r6;
+
+    r6 = (a1->unk0.unkA + sUnknown_0861FBF7[a2]) & 0xF;
+
+    str = sub_81CAFD8(a0->windowTopIndex, a2);
+    if (str != NULL) {
+        sub_81DB620(a1->unk0.windowId, 1, r6 * 2, a1->unk0.unk4 - 1, 2);
+        AddTextPrinterParameterized(a1->unk0.windowId, 7, str, 2, (r6 << 4) + 1, TEXT_SPEED_FF, NULL);
+        CopyWindowRectToVram(a1->unk0.windowId, 2, 0, r6 * 2, a1->unk0.unk4, 2);
+    }
+}
+
+void sub_81C8ED0(void)
+{
+    u32 i;
+    const struct CompressedSpriteSheet *ptr;
+    
+    for (i = 0, ptr = sMatchcallArrowSpriteSheets; i < ARRAY_COUNT(sMatchcallArrowSpriteSheets); ptr++, i++)
+    {
+        LoadCompressedSpriteSheet(ptr);
+    }
+    Pokenav_AllocAndLoadPalettes(sMatchcallArrowPalettes);
+}
+
+void sub_81C8EF8(struct MatchCallWindowState *a0, struct UnknownInnerStruct_81C81D4 *a1)
+{
+    register u32 spriteId asm("r3");
+    s16 temp;
+
+    spriteId = (u8)CreateSprite(&sMatchCallRightArrowSprite, a1->unk0.unk2 * 8 + 3, (a1->unk0.unk3 + 1) * 8, 7);
+    a1->rightArrow = &gSprites[spriteId];
+
+    temp = a1->unk0.unk2 * 8 + (a1->unk0.unk4 - 1) * 4;
+    spriteId = (u8)CreateSprite(&sMatchCallUpDownArrowSprite, temp, a1->unk0.unk3 * 8 + a0->visibleEntries * 16, 7);
+    a1->downArrow = &gSprites[spriteId];
+    a1->downArrow->oam.tileNum += 2;
+    a1->downArrow->callback = SpriteCB_MatchCallDownArrow;
+
+    spriteId = (u8)CreateSprite(&sMatchCallUpDownArrowSprite, temp, a1->unk0.unk3 * 8, 7);
+    a1->upArrow = &gSprites[spriteId];
+    a1->upArrow->oam.tileNum += 4;
+    a1->upArrow->callback = SpriteCB_MatchCallUpArrow;
+}
+
+void sub_81C8FE0(struct UnknownInnerStruct_81C81D4 *a0)
+{
+    DestroySprite(a0->rightArrow);
+    DestroySprite(a0->upArrow);
+    DestroySprite(a0->downArrow);
+    FreeSpriteTilesByTag(0xA);
+    FreeSpritePaletteByTag(0x14);
+}
+
+void ToggleMatchCallArrows(struct UnknownInnerStruct_81C81D4 *a0, bool32 shouldHide)
+{
+    if (shouldHide)
+    {
+        a0->rightArrow->callback = SpriteCallbackDummy;
+        a0->upArrow->callback = SpriteCallbackDummy;
+        a0->downArrow->callback = SpriteCallbackDummy;
+    }
+    else
+    {
+        a0->rightArrow->callback = SpriteCB_MatchCallRightArrow;
+        a0->upArrow->callback = SpriteCB_MatchCallUpArrow;
+        a0->downArrow->callback = SpriteCB_MatchCallDownArrow;
+    }
+    a0->rightArrow->invisible = shouldHide;
+    a0->upArrow->invisible = shouldHide;
+    a0->downArrow->invisible = shouldHide;
+}
+
+void SpriteCB_MatchCallRightArrow(struct Sprite *sprite)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    sprite->pos2.y = structPtr->unk888.selectedIndexOffset << 4;
+}
+
+void SpriteCB_MatchCallDownArrow(struct Sprite *sprite)
+{
+    if (sprite->data[7] == 0 && ShouldShowDownArrow())
+        sprite->invisible = FALSE;
+    else
+        sprite->invisible = TRUE;
+    
+    if (++sprite->data[0] > 3)
+    {
+        s16 offset;
+
+        sprite->data[0] = 0;
+        offset = (sprite->data[1] + 1) & 7;
+        sprite->data[1] = offset;
+        sprite->pos2.y = offset;
+    }
+}
+
+void SpriteCB_MatchCallUpArrow(struct Sprite *sprite)
+{
+    if (sprite->data[7] == 0 && ShouldShowUpArrow())
+        sprite->invisible = FALSE;
+    else
+        sprite->invisible = TRUE;
+    
+    if (++sprite->data[0] > 3)
+    {
+        s16 offset;
+
+        sprite->data[0] = 0;
+        offset = (sprite->data[1] + 1) & 7;
+        sprite->data[1] = offset;
+        sprite->pos2.y = -1 * offset;
+    }
+}
+
+void ToggleMatchCallVerticalArrows(bool32 shouldHide)
+{
+    struct UnknownSubStruct_81C81D4 *structPtr;
+    structPtr = GetSubstructPtr(0x11);
+    structPtr->unk0.upArrow->data[7] = shouldHide;
+    structPtr->unk0.downArrow->data[7] = shouldHide;
+}
+
+void sub_81C9160(struct MatchCallWindowState *a0, struct MatchCallListTemplate *a1)
+{
+    u32 unused1 = a0->unk10 = a1->unk0;
+    u32 v0 = a1->unk6;
+    u32 zero = 0;
+    u32 unused2 = a0->windowTopIndex = v0;
+    u32 v1 = a0->listLength = a1->unk4;
+
+    a0->unkC = a1->unk8;
+    a0->visibleEntries = a1->unkC;
+    if (a0->visibleEntries >= (u16)v1)
+    {
+        a0->windowTopIndex = 0;
+        a0->unk4 = 0;
+        a0->selectedIndexOffset = v0; 
+    }
+    else
+    {
+        s32 v2;
+        a0->unk4 = a0->listLength - a0->visibleEntries;
+        v2 = a0->windowTopIndex + a0->visibleEntries;
+        if (v2 > a0->listLength) {
+            a0->selectedIndexOffset = v2 - a0->listLength;
+            a0->windowTopIndex = v0 - a0->selectedIndexOffset;
+        }
+        else
+        {
+            a0->selectedIndexOffset = 0;
+        }
+    }
+}
+
+u32 sub_81C91AC(struct UnknownInnerStruct_81C81D4 *a0, const struct BgTemplate *a1, struct MatchCallListTemplate *a2, s32 a3)
+{
+    register u32 raw_bg asm("r4") = ((a1->bg) << 30);
+    u8 bg = raw_bg >> 30;
+    u32 unknown = 0;
+    struct WindowTemplate window;
+    u8 bg_again;
+
+    a0->unk0.bg = bg;
+    a0->unk0.unk6 = a3;
+    a0->unk34 = a2->unk10;
+    a0->unk38 = a2->unk14;
+    a0->unk0.unk1 = a2->unkD;
+    a0->unk0.unk2 = a2->unk9;
+    a0->unk0.unk3 = a2->unkB;
+    a0->unk0.unk4 = a2->unkA;
+    a0->unk0.fontId = a2->unkE;
+    
+    window.bg = raw_bg >> 30;
+    window.tilemapLeft = a2->unk9;
+    window.tilemapTop = 0;
+    window.width = a2->unkA;
+    window.height = 32;
+    window.paletteNum = a2->unkD;
+    window.baseBlock = a3 + 2;
+
+    a0->unk0.windowId = AddWindow(&window);
+    if (a0->unk0.windowId == 0xFF)
+    {
+        return 0;
+    }
+    else
+    {
+        a0->unk0.unkA = unknown;
+        a0->rightArrow = NULL;
+        a0->upArrow = NULL;
+        a0->downArrow = NULL;
+        return 1;
+    }
+}
\ No newline at end of file
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 3a16f817e..85b52e478 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -47,7 +47,7 @@ struct RecordMixingHallRecords
 
 struct PlayerRecordsRS
 {
-    struct SecretBaseRecord secretBases[SECRET_BASES_COUNT];
+    struct SecretBase secretBases[SECRET_BASES_COUNT];
     TVShow tvShows[TV_SHOWS_COUNT];
     PokeNews pokeNews[POKE_NEWS_COUNT];
     OldMan oldMan;
@@ -60,7 +60,7 @@ struct PlayerRecordsRS
 
 struct PlayerRecordsEmerald
 {
-    /* 0x0000 */ struct SecretBaseRecord secretBases[SECRET_BASES_COUNT];
+    /* 0x0000 */ struct SecretBase secretBases[SECRET_BASES_COUNT];
     /* 0x0c80 */ TVShow tvShows[TV_SHOWS_COUNT];
     /* 0x1004 */ PokeNews pokeNews[POKE_NEWS_COUNT];
     /* 0x1044 */ OldMan oldMan;
@@ -83,7 +83,7 @@ union PlayerRecords
 // Static RAM declarations
 
 static IWRAM_DATA bool8 gUnknown_03001130;
-static IWRAM_DATA struct SecretBaseRecord *sSecretBasesSave;
+static IWRAM_DATA struct SecretBase *sSecretBasesSave;
 static IWRAM_DATA TVShow *sTvShowsSave;
 static IWRAM_DATA PokeNews *sPokeNewsSave;
 static IWRAM_DATA OldMan *sOldManSave;
@@ -208,7 +208,7 @@ static void PrepareUnknownExchangePacket(struct PlayerRecordsRS *dest)
 static void PrepareExchangePacketForRubySapphire(struct PlayerRecordsRS *dest)
 {
     memcpy(dest->secretBases, sSecretBasesSave, sizeof(dest->secretBases));
-    sub_80EB18C(dest->secretBases);
+    ClearJapaneseSecretBases(dest->secretBases);
     memcpy(dest->tvShows, sTvShowsSave, sizeof(dest->tvShows));
     sub_80F1208(dest->tvShows);
     memcpy(dest->pokeNews, sPokeNewsSave, sizeof(dest->pokeNews));
@@ -226,7 +226,7 @@ static void PrepareExchangePacketForRubySapphire(struct PlayerRecordsRS *dest)
 
 static void PrepareExchangePacket(void)
 {
-    sub_80E9914();
+    SetPlayerSecretBaseParty();
     sub_80F0BB8();
     SetSrcLookupPointers();
 
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 6af849bca..ac97dfcd6 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -323,7 +323,7 @@ static bool32 RecordedBattleToSave(struct RecordedBattleSave *battleSave, struct
 
     saveSection->checksum = CalcByteArraySum((void*)(saveSection), sizeof(*saveSection) - 4);
 
-    if (sub_8153634(31, (void*)(saveSection)) != 1)
+    if (TryWriteSpecialSaveSection(SECTOR_ID_RECORDED_BATTLE, (void*)(saveSection)) != 1)
         return FALSE;
     else
         return TRUE;
@@ -492,7 +492,7 @@ bool32 MoveRecordedBattleToSaveData(void)
 
 static bool32 TryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst, struct SaveSection *saveBuffer)
 {
-    if (TryCopySpecialSaveSection(SECTOR_ID_RECORDED_BATTLE, (void*)(saveBuffer)) != 1)
+    if (TryReadSpecialSaveSection(SECTOR_ID_RECORDED_BATTLE, (void*)(saveBuffer)) != 1)
         return FALSE;
 
     memcpy(dst, saveBuffer, sizeof(struct RecordedBattleSave));
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 22214336a..46fc4cd41 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -15,9 +15,7 @@
 #include "constants/trainers.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
-#include "data2.h"
-
-extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
+#include "data.h"
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
@@ -233,7 +231,7 @@ static void CreateBattlerSprite(u8 battler)
 
             StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]);
             if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM)
-                gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
+                gSprites[gBattlerSpriteIds[battler]].anims = gMonFrontAnimsPtrTable[SPECIES_CASTFORM];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT)
         {
@@ -269,7 +267,7 @@ static void CreateBattlerSprite(u8 battler)
 
             StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]);
             if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM)
-                gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
+                gSprites[gBattlerSpriteIds[battler]].anims = gMonFrontAnimsPtrTable[SPECIES_CASTFORM];
         }
 
         gSprites[gBattlerSpriteIds[battler]].invisible = gBattleSpritesDataPtr->battlerData[battler].invisible;
diff --git a/src/rock.c b/src/rock.c
index 814b1d88b..f05816362 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -419,7 +419,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId)
     sub_80A6B30(&animBg);
     AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08D8D58C, animBg.tilesOffset);
     sub_80A6D60(&animBg, gUnknown_08D8D410, 0);
-    LoadCompressedPalette(gBattleAnimSpritePalette_261, animBg.paletteId * 16, 32);
+    LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, animBg.paletteId * 16, 32);
 
     if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         var0 = 1;
diff --git a/src/save.c b/src/save.c
index 361a88e1e..45a75b5dc 100644
--- a/src/save.c
+++ b/src/save.c
@@ -849,7 +849,7 @@ u16 sub_815355C(void)
     return 0;
 }
 
-u32 TryCopySpecialSaveSection(u8 sector, u8* dst)
+u32 TryReadSpecialSaveSection(u8 sector, u8* dst)
 {
     s32 i;
     s32 size;
@@ -858,7 +858,7 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst)
     if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE)
         return 0xFF;
     ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection));
-    if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D)
+    if (*(u32*)(&gSaveDataBuffer.data[0]) != SPECIAL_SECTION_SENTINEL)
         return 0xFF;
     // copies whole save section except u32 counter
     i = 0;
@@ -869,18 +869,18 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst)
     return 1;
 }
 
-u32 sub_8153634(u8 sector, u8* src)
+u32 TryWriteSpecialSaveSection(u8 sector, u8* src)
 {
     s32 i;
     s32 size;
     u8* savData;
     void* savDataBuffer;
 
-    if (sector != 30 && sector != 31)
+    if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE)
         return 0xFF;
 
     savDataBuffer = &gSaveDataBuffer;
-    *(u32*)(savDataBuffer) = 0xB39D;
+    *(u32*)(savDataBuffer) = SPECIAL_SECTION_SENTINEL;
 
     // copies whole save section except u32 counter
     i = 0;
diff --git a/src/scanline_effect.c b/src/scanline_effect.c
index a9ae9427b..0a4b0b8fd 100644
--- a/src/scanline_effect.c
+++ b/src/scanline_effect.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle.h"
-#include "data2.h"
+#include "data.h"
 #include "task.h"
 #include "trig.h"
 #include "scanline_effect.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 314504600..8d597b887 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -7,7 +7,7 @@
 #include "contest.h"
 #include "contest_link_80F57C4.h"
 #include "contest_painting.h"
-#include "data2.h"
+#include "data.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
 #include "event_data.h"
@@ -281,7 +281,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
+bool8 ScrCmd_returnram(struct ScriptContext *ctx)
 {
     ScriptJump(ctx, gUnknown_020375C0);
     return FALSE;
@@ -1068,7 +1068,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx)
 {
     u16 objectId = VarGet(ScriptReadHalfword(ctx));
 
-    show_sprite(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    TrySpawnEventObject(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     return FALSE;
 }
 
@@ -1078,7 +1078,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    show_sprite(objectId, mapNum, mapGroup);
+    TrySpawnEventObject(objectId, mapNum, mapGroup);
     return FALSE;
 }
 
@@ -1088,7 +1088,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx)
     u16 x = VarGet(ScriptReadHalfword(ctx));
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
-    sub_808EBA8(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y);
+    TryMoveEventObjectToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y);
     return FALSE;
 }
 
@@ -1106,7 +1106,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
 
-    sub_808F254(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    TryOverrideEventObjectTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     return FALSE;
 }
 
@@ -2215,9 +2215,9 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_cmdCF(struct ScriptContext *ctx)
+bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
 {
-    const u8* v1 = sub_8099244();
+    const u8* v1 = GetSavedRamScriptIfValid();
 
     if (v1)
     {
diff --git a/src/script.c b/src/script.c
index cb06300bf..27476dba3 100644
--- a/src/script.c
+++ b/src/script.c
@@ -386,7 +386,7 @@ const u8 *GetRamScript(u8 objectId, const u8 *script)
     }
 }
 
-bool32 sub_80991F8(void)
+bool32 ValidateSavedRamScript(void)
 {
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
     if (scriptData->magic != RAM_SCRIPT_MAGIC)
@@ -402,7 +402,7 @@ bool32 sub_80991F8(void)
     return TRUE;
 }
 
-u8 *sub_8099244(void)
+u8 *GetSavedRamScriptIfValid(void)
 {
     struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
     if (!ValidateReceivedWonderCard())
@@ -426,7 +426,7 @@ u8 *sub_8099244(void)
     }
 }
 
-void sub_80992A0(u8 *script, u16 scriptSize)
+void InitRamScript_NoEventObject(u8 *script, u16 scriptSize)
 {
     if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script))
         scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script);
diff --git a/src/script_menu.c b/src/script_menu.c
index c7523a370..082253e35 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1183,7 +1183,7 @@ static void Task_HandleMultichoiceInput(u8 taskId)
                 {
                     gSpecialVar_Result = selection;
                 }
-                sub_80E2A78(tWindowId);
+                ClearToTransparentAndRemoveWindow(tWindowId);
                 DestroyTask(taskId);
                 EnableBothScriptContexts();
             }
@@ -1219,8 +1219,6 @@ bool8 IsScriptActive(void)
 
 static void Task_HandleYesNoInput(u8 taskId)
 {
-    u8 left, top;
-
     if (gTasks[taskId].tRight < 5)
     {
         gTasks[taskId].tRight++;
@@ -1229,9 +1227,9 @@ static void Task_HandleYesNoInput(u8 taskId)
 
     switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
-    case -2:
+    case MENU_NOTHING_CHOSEN:
         return;
-    case -1:
+    case MENU_B_PRESSED:
     case 1:
         PlaySE(SE_SELECT);
         gSpecialVar_Result = 0;
@@ -1247,8 +1245,6 @@ static void Task_HandleYesNoInput(u8 taskId)
 
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount)
 {
-    u8 bottom = 0;
-
     if (FuncIsActiveTask(Task_HandleMultichoiceGridInput) == TRUE)
     {
         return FALSE;
@@ -1256,10 +1252,8 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr
     else
     {
         u8 taskId;
-        u8 unk2;
-        int width;
-        int i;
-        u8 newWidth;
+        u8 rowCount, newWidth;
+        int i, width;
 
         gSpecialVar_Result = 0xFF;
         width = 0;
@@ -1272,15 +1266,15 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr
         newWidth = convert_pixel_width_to_tile_width(width);
 
         left = sub_80E2D5C(left, columnCount * newWidth);
-        unk2 = gMultichoiceLists[multichoiceId].count / columnCount;
+        rowCount = gMultichoiceLists[multichoiceId].count / columnCount;
 
         taskId = CreateTask(Task_HandleMultichoiceGridInput, 80);
 
         gTasks[taskId].tIgnoreBPress = ignoreBPress;
-        gTasks[taskId].tWindowId = CreateWindowFromRect(left, top, columnCount * newWidth, unk2 * 2);
+        gTasks[taskId].tWindowId = CreateWindowFromRect(left, top, columnCount * newWidth, rowCount * 2);
         SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, 0);
-        sub_81997AC(gTasks[taskId].tWindowId, newWidth * 8, columnCount, unk2, gMultichoiceLists[multichoiceId].list);
-        sub_8199944(gTasks[taskId].tWindowId, newWidth * 8, columnCount, unk2, 0);
+        PrintMenuGridTable(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, gMultichoiceLists[multichoiceId].list);
+        sub_8199944(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, 0);
         CopyWindowToVram(gTasks[taskId].tWindowId, 3);
         return TRUE;
     }
@@ -1291,23 +1285,24 @@ static void Task_HandleMultichoiceGridInput(u8 taskId)
     s16 *data = gTasks[taskId].data;
     s8 selection = Menu_ProcessInputGridLayout();
 
-    if (selection != -2)
+    switch (selection)
     {
-        if (selection == -1)
-        {
-            if (tIgnoreBPress)
-                return;
-            PlaySE(SE_SELECT);
-            gSpecialVar_Result = 0x7F;
-        }
-        else
-        {
-            gSpecialVar_Result = selection;
-        }
-        sub_80E2A78(tWindowId);
-        DestroyTask(taskId);
-        EnableBothScriptContexts();
+    case MENU_NOTHING_CHOSEN:
+        return;
+    case MENU_B_PRESSED:
+        if (tIgnoreBPress)
+            return;
+        PlaySE(SE_SELECT);
+        gSpecialVar_Result = 0x7F;
+        break;
+    default:
+        gSpecialVar_Result = selection;
+        break;
     }
+
+    ClearToTransparentAndRemoveWindow(tWindowId);
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
 }
 
 #undef tWindowId
@@ -1564,7 +1559,7 @@ static void Task_PokemonPicWindow(u8 taskId)
         task->tState++;
         break;
     case 3:
-        sub_80E2A78(task->tWindowId);
+        ClearToTransparentAndRemoveWindow(task->tWindowId);
         DestroyTask(taskId);
         break;
     }
@@ -1628,7 +1623,7 @@ u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height)
     return windowId;
 }
 
-void sub_80E2A78(u8 windowId)
+void ClearToTransparentAndRemoveWindow(u8 windowId)
 {
     ClearStdWindowAndFrameToTransparent(windowId, TRUE);
     RemoveWindow(windowId);
@@ -1638,30 +1633,30 @@ static void sub_80E2A94(u8 multichoiceId)
 {
     switch (multichoiceId)
     {
-        case 77:
-            FillWindowPixelBuffer(0, PIXEL_FILL(1));
-            AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
-            break;
-        case 76:
-            FillWindowPixelBuffer(0, PIXEL_FILL(1));
-            AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
-            break;
-        case 78:
-            FillWindowPixelBuffer(0, PIXEL_FILL(1));
-            AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
-            break;
-        case 79:
-            FillWindowPixelBuffer(0, PIXEL_FILL(1));
-            AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
-            break;
-        case 75:
-            FillWindowPixelBuffer(0, PIXEL_FILL(1));
-            AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
-            break;
-        case 74:
-            FillWindowPixelBuffer(0, PIXEL_FILL(1));
-            AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
-            break;
+    case 77:
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
+        AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+        break;
+    case 76:
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
+        AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+        break;
+    case 78:
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
+        AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+        break;
+    case 79:
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
+        AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+        break;
+    case 75:
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
+        AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+        break;
+    case 74:
+        FillWindowPixelBuffer(0, PIXEL_FILL(1));
+        AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
+        break;
     }
 }
 
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c
index 66fcae51d..2c7a9c775 100755
--- a/src/script_pokemon_util_80F87D8.c
+++ b/src/script_pokemon_util_80F87D8.c
@@ -5,6 +5,7 @@
 #include "contest.h"
 #include "contest_link_80F57C4.h"
 #include "contest_painting.h"
+#include "data.h"
 #include "daycare.h"
 #include "decompress.h"
 #include "event_data.h"
@@ -35,7 +36,6 @@ extern const u16 gEventObjectPalette8[];
 extern const u16 gEventObjectPalette17[];
 extern const u16 gEventObjectPalette33[];
 extern const u16 gEventObjectPalette34[];
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 
 static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };
 
@@ -395,7 +395,7 @@ static void sub_80F8EE8(u8 taskId)
         task->data[0]++;
         break;
     case 4:
-        sub_80E2A78(gTasks[taskId].data[5]);
+        ClearToTransparentAndRemoveWindow(gTasks[taskId].data[5]);
         DestroyTask(taskId);
         break;
     }
diff --git a/src/secret_base.c b/src/secret_base.c
index e19aecba3..ac35a090a 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -35,322 +35,351 @@
 #include "window.h"
 #include "constants/bg_event_constants.h"
 #include "constants/decorations.h"
+#include "constants/event_objects.h"
+#include "constants/items.h"
 #include "constants/maps.h"
 #include "constants/map_types.h"
 #include "constants/metatile_behaviors.h"
+#include "constants/moves.h"
 #include "constants/secret_bases.h"
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/trainers.h"
 
-// Static type declarations
-
-struct SecretBaseListMenuBuffer {
+struct SecretBaseRegistryMenu
+{
     struct ListMenuItem items[11];
     u8 names[11][32];
 };
 
-struct SecretBaseRecordMixer {
-    struct SecretBaseRecord *records;
+struct SecretBaseRecordMixer
+{
+    struct SecretBase *secretBases;
     u32 version;
     u32 language;
 };
 
-// Static RAM declarations
-EWRAM_DATA u8 sCurSecretBaseId = 0;
-EWRAM_DATA bool8 gInFriendSecretBase = FALSE;
-EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL;
-
-// Static ROM declarations
-
-void sub_80E9C9C(u8 taskId);
-void game_continue(u8 taskId);
-void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu);
-void sub_80E9E00(u8 taskId);
-void sub_80E9E44(u8 taskId);
-void sub_80E9E90(u8 taskId);
-void sub_80E9F20(u8 taskId);
-void sub_80E9FB0(u8 taskId);
-void sub_80E9FFC(u8 taskId);
-void sub_80EA06C(u8 taskId);
-void sub_80EA120(u8 taskId);
-void sub_80EA13C(u8 taskId);
-void sub_80EA18C(u8 taskId);
-void task_pc_turn_off(u8 taskId);
-u8 sub_80EA20C(u8 secretBaseRecordId);
-
-// .rodata
-
-const struct {
-    u16 tile1;
-    u16 tile2;
-} gUnknown_0858CFCC[] = {
-    {0x0026, 0x0036},
-    {0x0027, 0x0037},
-    {0x01a0, 0x01a1},
-    {0x01a8, 0x01a9},
-    {0x01b0, 0x01b1},
-    {0x0208, 0x0210},
-    {0x0271, 0x0278}
+struct SecretBaseEntranceMetatiles
+{
+    u16 closedMetatileId;
+    u16 openMetatileId;
 };
 
-const u8 gUnknown_0858CFE8[] = {
-    MAP_NUM(SECRET_BASE_RED_CAVE1),    0x00, 0x01, 0x03,
-    MAP_NUM(SECRET_BASE_RED_CAVE2),    0x00, 0x05, 0x09,
-    MAP_NUM(SECRET_BASE_RED_CAVE3),    0x00, 0x01, 0x03,
-    MAP_NUM(SECRET_BASE_RED_CAVE4),    0x00, 0x07, 0x0d,
-    MAP_NUM(SECRET_BASE_BROWN_CAVE1),  0x00, 0x02, 0x03,
-    MAP_NUM(SECRET_BASE_BROWN_CAVE2),  0x00, 0x09, 0x02,
-    MAP_NUM(SECRET_BASE_BROWN_CAVE3),  0x00, 0x0d, 0x04,
-    MAP_NUM(SECRET_BASE_BROWN_CAVE4),  0x00, 0x01, 0x02,
-    MAP_NUM(SECRET_BASE_BLUE_CAVE1),   0x00, 0x01, 0x03,
-    MAP_NUM(SECRET_BASE_BLUE_CAVE2),   0x00, 0x01, 0x02,
-    MAP_NUM(SECRET_BASE_BLUE_CAVE3),   0x00, 0x03, 0x0f,
-    MAP_NUM(SECRET_BASE_BLUE_CAVE4),   0x00, 0x03, 0x0e,
-    MAP_NUM(SECRET_BASE_YELLOW_CAVE1), 0x00, 0x09, 0x03,
-    MAP_NUM(SECRET_BASE_YELLOW_CAVE2), 0x00, 0x08, 0x07,
-    MAP_NUM(SECRET_BASE_YELLOW_CAVE3), 0x00, 0x03, 0x06,
-    MAP_NUM(SECRET_BASE_YELLOW_CAVE4), 0x00, 0x05, 0x09,
-    MAP_NUM(SECRET_BASE_TREE1),        0x00, 0x02, 0x03,
-    MAP_NUM(SECRET_BASE_TREE2),        0x00, 0x05, 0x06,
-    MAP_NUM(SECRET_BASE_TREE3),        0x00, 0x0f, 0x03,
-    MAP_NUM(SECRET_BASE_TREE4),        0x00, 0x04, 0x0a,
-    MAP_NUM(SECRET_BASE_SHRUB1),       0x00, 0x03, 0x03,
-    MAP_NUM(SECRET_BASE_SHRUB2),       0x00, 0x01, 0x02,
-    MAP_NUM(SECRET_BASE_SHRUB3),       0x00, 0x07, 0x08,
-    MAP_NUM(SECRET_BASE_SHRUB4),       0x00, 0x09, 0x06
+static EWRAM_DATA u8 sCurSecretBaseId = 0;
+static EWRAM_DATA bool8 sInFriendSecretBase = FALSE;
+static EWRAM_DATA struct SecretBaseRegistryMenu *sRegistryMenu = NULL;
+
+static void Task_ShowSecretBaseRegistryMenu(u8 taskId);
+static void BuildRegistryMenuItems(u8 taskId);
+static void RegistryMenu_OnCursorMove(int unused, bool8 flag, struct ListMenu *menu);
+static void FinalizeRegistryMenu(u8 taskId);
+static void AddRegistryMenuScrollArrows(u8 taskId);
+static void HandleRegistryMenuInput(u8 taskId);
+static void ShowRegistryMenuActions(u8 taskId);
+static void HandleRegistryMenuActionsInput(u8 taskId);
+static void ShowRegistryMenuDeleteConfirmation(u8 taskId);
+static void ShowRegistryMenuDeleteYesNo(u8 taskId);
+static void DeleteRegistry_Yes(u8 taskId);
+static void DeleteRegistry_No(u8 taskId);
+static void ReturnToMainRegistryMenu(u8 taskId);
+static void GoToSecretBasePCMainMenu(u8 taskId);
+static u8 GetSecretBaseOwnerType(u8 secretBaseId);
+
+static const struct SecretBaseEntranceMetatiles sSecretBaseEntranceMetatiles[] =
+{
+    {.closedMetatileId = 0x0026, .openMetatileId = 0x0036},
+    {.closedMetatileId = 0x0027, .openMetatileId = 0x0037},
+    {.closedMetatileId = 0x01a0, .openMetatileId = 0x01a1},
+    {.closedMetatileId = 0x01a8, .openMetatileId = 0x01a9},
+    {.closedMetatileId = 0x01b0, .openMetatileId = 0x01b1},
+    {.closedMetatileId = 0x0208, .openMetatileId = 0x0210},
+    {.closedMetatileId = 0x0271, .openMetatileId = 0x0278},
 };
 
-const struct MenuAction gUnknown_0858D048[] = {
-    {gUnknown_085EA79D, {.void_u8 = sub_80E9FFC}},
-    {gText_Cancel, {.void_u8 = sub_80EA18C}}
+// mapNum, warpId, x, y
+// x, y positions are for when the player warps in for the first time (in front of the computer)
+static const u8 sSecretBaseEntrancePositions[] =
+{
+    MAP_NUM(SECRET_BASE_RED_CAVE1),    0,  1,  3,
+    MAP_NUM(SECRET_BASE_RED_CAVE2),    0,  5,  9,
+    MAP_NUM(SECRET_BASE_RED_CAVE3),    0,  1,  3,
+    MAP_NUM(SECRET_BASE_RED_CAVE4),    0,  7, 13,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE1),  0,  2,  3,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE2),  0,  9,  2,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE3),  0, 13,  4,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE4),  0,  1,  2,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE1),   0,  1,  3,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE2),   0,  1,  2,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE3),   0,  3, 15,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE4),   0,  3, 14,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE1), 0,  9,  3,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE2), 0,  8,  7,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE3), 0,  3,  6,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE4), 0,  5,  9,
+    MAP_NUM(SECRET_BASE_TREE1),        0,  2,  3,
+    MAP_NUM(SECRET_BASE_TREE2),        0,  5,  6,
+    MAP_NUM(SECRET_BASE_TREE3),        0, 15,  3,
+    MAP_NUM(SECRET_BASE_TREE4),        0,  4, 10,
+    MAP_NUM(SECRET_BASE_SHRUB1),       0,  3,  3,
+    MAP_NUM(SECRET_BASE_SHRUB2),       0,  1,  2,
+    MAP_NUM(SECRET_BASE_SHRUB3),       0,  7,  8,
+    MAP_NUM(SECRET_BASE_SHRUB4),       0,  9,  6,
 };
 
-const struct YesNoFuncTable gUnknown_0858D058 = {
-    sub_80EA120, sub_80EA13C
+static const struct MenuAction sRegistryMenuActions[] =
+{
+    {
+        .text = gText_DelRegist,
+        .func = { .void_u8 = ShowRegistryMenuDeleteConfirmation },
+    },
+    {
+        .text = gText_Cancel,
+        .func = { .void_u8 = ReturnToMainRegistryMenu },
+    },
 };
 
-const u8 gUnknown_0858D060[10] = {
-    0x23, 0x24, 0x0f, 0x1f, 0x21,
-    0x2f, 0x0e, 0x14, 0x20, 0x22
+static const struct YesNoFuncTable sDeleteRegistryYesNoFuncs =
+{
+    .yesFunc = DeleteRegistry_Yes,
+    .noFunc = DeleteRegistry_No,
 };
 
-const struct WindowTemplate gUnknown_0858D06C[] = {
-    { 0, 18, 1, 11, 18, 15, 0x01 },
-    { 0,  2, 1, 28,  4, 15, 0xc7 }
+static const u8 sSecretBaseOwnerGfxIds[10] =
+{
+    // Male
+    EVENT_OBJ_GFX_YOUNGSTER,
+    EVENT_OBJ_GFX_BUG_CATCHER,
+    EVENT_OBJ_GFX_RICH_BOY,
+    EVENT_OBJ_GFX_CAMPER,
+    EVENT_OBJ_GFX_MAN_3,
+    // Female
+    EVENT_OBJ_GFX_LASS,
+    EVENT_OBJ_GFX_GIRL_3,
+    EVENT_OBJ_GFX_WOMAN_2,
+    EVENT_OBJ_GFX_PICNICKER,
+    EVENT_OBJ_GFX_WOMAN_5,
 };
 
-const struct ListMenuTemplate gUnknown_0858D07C = {
-    NULL,
-    sub_80E9DEC,
-    NULL,
-    0, 0,
-    0, 0, 8, 0,
-    9, 2, 1, 3, FALSE, 0, FALSE, 1
+static const struct WindowTemplate sRegistryWindowTemplates[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 18,
+        .tilemapTop = 1,
+        .width = 11,
+        .height = 18,
+        .paletteNum = 15,
+        .baseBlock = 0x01,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 1,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 0xc7,
+    }
 };
 
-// .text
+static const struct ListMenuTemplate sRegistryListMenuTemplate =
+{
+    .items = NULL,
+    .moveCursorFunc = RegistryMenu_OnCursorMove,
+    .itemPrintFunc = NULL,
+    .totalItems = 0,
+    .maxShowed = 0,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 9,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = 1,
+    .cursorKind = 0,
+};
 
-void ClearSecretBase(struct SecretBaseRecord *sbr)
+static void ClearSecretBase(struct SecretBase *secretBase)
 {
     u16 i;
-
-    CpuFastFill16(0, sbr, sizeof(struct SecretBaseRecord));
-    for (i = 0; i < 7; i ++)
-    {
-        sbr->trainerName[i] = EOS;
-    }
+    CpuFastFill16(0, secretBase, sizeof(struct SecretBase));
+    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+        secretBase->trainerName[i] = EOS;
 }
 
-void ResetSecretBases(void)
+void ClearSecretBases(void)
 {
     u16 i;
-
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
-    {
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
         ClearSecretBase(&gSaveBlock1Ptr->secretBases[i]);
-    }
 }
 
-void sub_80E8B58(void)
+static void SetCurSecretBaseId(void)
 {
     sCurSecretBaseId = gSpecialVar_0x8004;
 }
 
-void sub_80E8B6C(void)
+void TrySetCurSecretBaseIndex(void)
 {
     u16 i;
 
     gSpecialVar_Result = FALSE;
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
-        if (sCurSecretBaseId != gSaveBlock1Ptr->secretBases[i].secretBaseId)
+        if (sCurSecretBaseId == gSaveBlock1Ptr->secretBases[i].secretBaseId)
         {
-            continue;
+            gSpecialVar_Result = TRUE;
+            VarSet(VAR_CURRENT_SECRET_BASE, i);
+            break;
         }
-        gSpecialVar_Result = TRUE;
-        VarSet(VAR_CURRENT_SECRET_BASE, i);
-        break;
     }
 }
 
-void sub_80E8BC8(void)
+void CheckPlayerHasSecretBase(void)
 {
-    if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0)
-    {
+    // The player's secret base is always the first in the array.
+    if (gSaveBlock1Ptr->secretBases[0].secretBaseId)
         gSpecialVar_Result = TRUE;
-    }
     else
-    {
         gSpecialVar_Result = FALSE;
-    }
 }
 
-u8 sub_80E8BF8(void)
+static u8 GetSecretBaseTypeInFrontOfPlayer_(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
     s16 behavior;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y) & 0xFFF;
     if (behavior == MB_SECRET_BASE_SPOT_RED_CAVE || behavior == MB_SECRET_BASE_SPOT_RED_CAVE_OPEN)
-    {
         return SECRET_BASE_RED_CAVE;
-    }
+
     if (behavior == MB_SECRET_BASE_SPOT_BROWN_CAVE || behavior == MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN)
-    {
         return SECRET_BASE_BROWN_CAVE;
-    }
+
     if (behavior == MB_SECRET_BASE_SPOT_BLUE_CAVE || behavior == MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN)
-    {
         return SECRET_BASE_BLUE_CAVE;
-    }
+
     if (behavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE || behavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN)
-    {
         return SECRET_BASE_YELLOW_CAVE;
-    }
-    if (behavior == MB_SECRET_BASE_SPOT_TREE_LEFT || behavior == MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN)
-    {
+
+    if (behavior == MB_SECRET_BASE_SPOT_TREE_LEFT  || behavior == MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN
+     || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT || behavior == MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN)
         return SECRET_BASE_TREE;
-    }
+
     if (behavior == MB_SECRET_BASE_SPOT_SHRUB || behavior == MB_SECRET_BASE_SPOT_SHRUB_OPEN)
-    {
         return SECRET_BASE_SHRUB;
-    }
+
     return 0;
 }
 
-void sub_80E8C98(void)
+void GetSecretBaseTypeInFrontOfPlayer(void)
 {
-    gSpecialVar_0x8007 = sub_80E8BF8();
+    gSpecialVar_0x8007 = GetSecretBaseTypeInFrontOfPlayer_();
 }
 
-void sub_80E8CB0(s16 *xPtr, s16 *yPtr, u16 tile)
+static void FindMetatileIdMapCoords(s16 *x, s16 *y, u16 metatileId)
 {
-    const struct MapLayout *mapLayout;
-    s16 x;
-    s16 y;
+    s16 i, j;
+    const struct MapLayout *mapLayout = gMapHeader.mapLayout;
 
-    mapLayout = gMapHeader.mapLayout;
-    for (y = 0; y < mapLayout->height; y ++)
+    for (j = 0; j < mapLayout->height; j++)
     {
-        for (x = 0; x < mapLayout->width; x ++)
+        for (i = 0; i < mapLayout->width; i++)
         {
-            if ((mapLayout->map[y * mapLayout->width + x] & METATILE_ID_MASK) == tile)
+            if ((mapLayout->map[j * mapLayout->width + i] & METATILE_ID_MASK) == metatileId)
             {
-                *xPtr = x;
-                *yPtr = y;
+                *x = i;
+                *y = j;
                 return;
             }
         }
     }
 }
 
-void sub_80E8D4C(void)
+// Opens or closes the secret base entrance metatile in front of the player.
+void ToggleSecretBaseEntranceMetatile(void)
 {
-    s16 x;
-    s16 y;
-    s16 tile;
     u16 i;
+    s16 x, y;
+    s16 metatileId;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
-    tile = MapGridGetMetatileIdAt(x, y);
-    for (i = 0; i < 7; i ++)
+    metatileId = MapGridGetMetatileIdAt(x, y);
+    for (i = 0; i < ARRAY_COUNT(sSecretBaseEntranceMetatiles); i++)
     {
-        if (gUnknown_0858CFCC[i].tile1 == tile)
+        if (sSecretBaseEntranceMetatiles[i].closedMetatileId == metatileId)
         {
-            MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(x, y, sSecretBaseEntranceMetatiles[i].openMetatileId | METATILE_COLLISION_MASK);
             CurrentMapDrawMetatileAt(x, y);
             return;
         }
     }
-    for (i = 0; i < 7; i ++)
+
+    for (i = 0; i < ARRAY_COUNT(sSecretBaseEntranceMetatiles); i++)
     {
-        if (gUnknown_0858CFCC[i].tile2 == tile)
+        if (sSecretBaseEntranceMetatiles[i].openMetatileId == metatileId)
         {
-            MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile1 | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(x, y, sSecretBaseEntranceMetatiles[i].closedMetatileId | METATILE_COLLISION_MASK);
             CurrentMapDrawMetatileAt(x, y);
             return;
         }
     }
 }
 
-u8 sub_80E8DF4(const u8 *src)
+static u8 GetNameLength(const u8 *secretBaseOwnerName)
 {
     u8 i;
-
-    for (i = 0; i < 7; i ++)
+    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
     {
-        if (src[i] == EOS)
-        {
+        if (secretBaseOwnerName[i] == EOS)
             return i;
-        }
     }
-    return 7;
+
+    return PLAYER_NAME_LENGTH;
 }
 
-void sub_80E8E18(void)
+void SetPlayerSecretBase(void)
 {
     u16 i;
 
     gSaveBlock1Ptr->secretBases[0].secretBaseId = sCurSecretBaseId;
-    for (i = 0; i < 4; i ++)
-    {
+    for (i = 0; i < 4; i++)
         gSaveBlock1Ptr->secretBases[0].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
-    }
+
     VarSet(VAR_CURRENT_SECRET_BASE, 0);
-    StringCopyN(gSaveBlock1Ptr->secretBases[0].trainerName, gSaveBlock2Ptr->playerName, sub_80E8DF4(gSaveBlock2Ptr->playerName));
+    StringCopyN(gSaveBlock1Ptr->secretBases[0].trainerName, gSaveBlock2Ptr->playerName, GetNameLength(gSaveBlock2Ptr->playerName));
     gSaveBlock1Ptr->secretBases[0].gender = gSaveBlock2Ptr->playerGender;
     gSaveBlock1Ptr->secretBases[0].language = GAME_LANGUAGE;
     VarSet(VAR_SECRET_BASE_MAP, gMapHeader.regionMapSectionId);
 }
 
-void sub_80E8EE0(struct MapEvents const *events)
+void SetOccupiedSecretBaseEntranceMetatiles(struct MapEvents const *events)
 {
-    u16 bgEventIndex;
-    u16 i;
-    u16 j;
-    s16 tile_id;
-    s16 x;
-    s16 y;
+    u16 bgId;
+    u16 i, j;
 
-    for (bgEventIndex = 0; bgEventIndex < events->bgEventCount; bgEventIndex ++)
+    for (bgId = 0; bgId < events->bgEventCount; bgId++)
     {
-        if (events->bgEvents[bgEventIndex].kind == BG_EVENT_SECRET_BASE)
+        if (events->bgEvents[bgId].kind == BG_EVENT_SECRET_BASE)
         {
-            for (j = 0; j < SECRET_BASES_COUNT; j ++)
+            for (j = 0; j < SECRET_BASES_COUNT; j++)
             {
-                if (gSaveBlock1Ptr->secretBases[j].secretBaseId == events->bgEvents[bgEventIndex].bgUnion.secretBaseId)
+                if (gSaveBlock1Ptr->secretBases[j].secretBaseId == events->bgEvents[bgId].bgUnion.secretBaseId)
                 {
-                    x = events->bgEvents[bgEventIndex].x + 7;
-                    y = events->bgEvents[bgEventIndex].y + 7;
-                    tile_id = MapGridGetMetatileIdAt(x, y);
-                    for (i = 0; i < 7; i ++)
+                    s16 x = events->bgEvents[bgId].x + 7;
+                    s16 y = events->bgEvents[bgId].y + 7;
+                    s16 tile_id = MapGridGetMetatileIdAt(x, y);
+                    for (i = 0; i < ARRAY_COUNT(sSecretBaseEntranceMetatiles); i++)
                     {
-                        if (gUnknown_0858CFCC[i].tile1 == tile_id)
+                        if (sSecretBaseEntranceMetatiles[i].closedMetatileId == tile_id)
                         {
-                            MapGridSetMetatileIdAt(x, y, gUnknown_0858CFCC[i].tile2 | METATILE_COLLISION_MASK);
+                            MapGridSetMetatileIdAt(x, y, sSecretBaseEntranceMetatiles[i].openMetatileId | METATILE_COLLISION_MASK);
                             break;
                         }
                     }
@@ -361,58 +390,52 @@ void sub_80E8EE0(struct MapEvents const *events)
     }
 }
 
-void sub_80E8F9C(void)
+static void SetSecretBaseWarpDestination(void)
 {
-    s8 idx;
-
-    idx = sCurSecretBaseId / 10 * 4;
-    SetWarpDestinationToMapWarp(MAP_GROUP(SECRET_BASE_RED_CAVE1), gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]);
+    s8 offset = (sCurSecretBaseId / 10) * 4;
+    SetWarpDestinationToMapWarp(MAP_GROUP(SECRET_BASE_RED_CAVE1), sSecretBaseEntrancePositions[offset], sSecretBaseEntrancePositions[offset + 1]);
 }
 
-void sub_80E8FD0(u8 taskId)
+static void Task_EnterSecretBase(u8 taskId)
 {
-    u16 secretBaseRecordId;
+    u16 secretBaseId;
 
     switch (gTasks[taskId].data[0])
     {
-        case 0:
-            if (!gPaletteFade.active)
-            {
-                gTasks[taskId].data[0] = 1;
-            }
-            break;
-        case 1:
-            secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
-            if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_10 < 255)
-            {
-                gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_10 ++;
-            }
-            sub_80E8F9C();
-            WarpIntoMap();
-            gFieldCallback = FieldCallback_ReturnToEventScript2;
-            SetMainCallback2(CB2_LoadMap);
-            DestroyTask(taskId);
-            break;
+    case 0:
+        if (!gPaletteFade.active)
+            gTasks[taskId].data[0] = 1;
+        break;
+    case 1:
+        secretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
+        if (gSaveBlock1Ptr->secretBases[secretBaseId].numTimesEntered < 255)
+            gSaveBlock1Ptr->secretBases[secretBaseId].numTimesEntered++;
+
+        SetSecretBaseWarpDestination();
+        WarpIntoMap();
+        gFieldCallback = FieldCallback_ReturnToEventScript2;
+        SetMainCallback2(CB2_LoadMap);
+        DestroyTask(taskId);
+        break;
     }
 }
 
-void sub_80E9068(void)
+void EnterSecretBase(void)
 {
-    CreateTask(sub_80E8FD0, 0);
+    CreateTask(Task_EnterSecretBase, 0);
     FadeScreen(1, 0);
     SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
-bool8 sub_80E909C(void)
+bool8 SecretBaseMapPopupEnabled(void)
 {
     if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_INIT_SECRET_BASE) == 0)
-    {
         return FALSE;
-    }
+
     return TRUE;
 }
 
-void sub_80E90C8(u8 taskId)
+static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId)
 {
     EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH);
     if (IsWeatherNotFadingIn() == TRUE)
@@ -422,189 +445,202 @@ void sub_80E90C8(u8 taskId)
     }
 }
 
-void sub_80E9108(void)
+static void EnterNewlyCreatedSecretBase_StartFadeIn(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
 
     ScriptContext2_Enable();
     HideMapNamePopUpWindow();
-    sub_80E8CB0(&x, &y, 0x220);
+    FindMetatileIdMapCoords(&x, &y, 0x220);
     x += 7;
     y += 7;
     MapGridSetMetatileIdAt(x, y, 0x220 | METATILE_COLLISION_MASK);
     CurrentMapDrawMetatileAt(x, y);
     pal_fill_black();
-    CreateTask(sub_80E90C8, 0);
+    CreateTask(EnterNewlyCreatedSecretBase_WaitFadeIn, 0);
 }
 
-void sub_80E916C(u8 taskId)
+static void Task_EnterNewlyCreatedSecretBase(u8 taskId)
 {
-    s8 idx;
-
     if (!gPaletteFade.active)
     {
-        idx = sCurSecretBaseId / 10 * 4;
-        SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gUnknown_0858CFE8[idx + 2], gUnknown_0858CFE8[idx + 3]);
+        s8 offset = sCurSecretBaseId / 10 * 4;
+        SetWarpDestination(
+            gSaveBlock1Ptr->location.mapGroup,
+            gSaveBlock1Ptr->location.mapNum,
+            -1,
+            sSecretBaseEntrancePositions[offset + 2],
+            sSecretBaseEntrancePositions[offset + 3]);
         WarpIntoMap();
-        gFieldCallback = sub_80E9108;
+        gFieldCallback = EnterNewlyCreatedSecretBase_StartFadeIn;
         SetMainCallback2(CB2_LoadMap);
         DestroyTask(taskId);
     }
 }
 
-void sub_80E91F8(void)
+void EnterNewlyCreatedSecretBase(void)
 {
-    CreateTask(sub_80E916C, 0);
-    FadeScreen(1, 0);
+    CreateTask(Task_EnterNewlyCreatedSecretBase, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
-bool8 CurrentMapIsSecretBase(void)
+bool8 CurMapIsSecretBase(void)
 {
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SECRET_BASE_RED_CAVE1) && (u8)gSaveBlock1Ptr->location.mapNum <= MAP_NUM(SECRET_BASE_SHRUB4))
-    {
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SECRET_BASE_RED_CAVE1)
+     && (u8)gSaveBlock1Ptr->location.mapNum <= MAP_NUM(SECRET_BASE_SHRUB4))
         return TRUE;
-    }
-    return FALSE;
+    else
+        return FALSE;
 }
 
-void sub_80E9238(u8 flagIn)
+void InitSecretBaseAppearance(bool8 hidePC)
 {
-    u16 curBaseId;
-    u16 x;
-    u16 y;
+    u16 secretBaseId;
+    u16 x, y;
     u8 *decorations;
     u8 *decorPos;
 
-    if (CurrentMapIsSecretBase())
+    if (CurMapIsSecretBase())
     {
-        curBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
-        decorations = gSaveBlock1Ptr->secretBases[curBaseId].decorations;
-        decorPos = gSaveBlock1Ptr->secretBases[curBaseId].decorationPos;
-        for (x = 0; x < 16; x ++)
+        secretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
+        decorations = gSaveBlock1Ptr->secretBases[secretBaseId].decorations;
+        decorPos = gSaveBlock1Ptr->secretBases[secretBaseId].decorationPositions;
+        for (x = 0; x < 16; x++)
         {
-            if (decorations[x] > 0 && decorations[x] <= 0x78 && gDecorations[decorations[x]].permission != DECORPERM_SOLID_MAT) {
-                sub_8127D38((decorPos[x] >> 4) + 7, (decorPos[x] & 0xF) + 7, decorations[x]);
-            }
+            if (decorations[x] > 0 && decorations[x] <= NUM_DECORATIONS && gDecorations[decorations[x]].permission != DECORPERM_SPRITE)
+                ShowDecorationOnMap((decorPos[x] >> 4) + 7, (decorPos[x] & 0xF) + 7, decorations[x]);
         }
-        if (curBaseId != 0)
+
+        if (secretBaseId != 0)
         {
-            sub_80E8CB0(&x, &y, 0x220);
+            // Another player's secret base. Change PC type to the "Register" PC.
+            FindMetatileIdMapCoords(&x, &y, 0x220);
             MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | METATILE_COLLISION_MASK);
         }
-        else if (flagIn == 1 && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1)
+        else if (hidePC == TRUE && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1)
         {
-            sub_80E8CB0(&x, &y, 0x220);
+            // Change PC to regular ground tile.
+            FindMetatileIdMapCoords(&x, &y, 0x220);
             MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | METATILE_COLLISION_MASK);
         }
     }
 }
 
-void sub_80E933C(void)
+void InitSecretBaseDecorationSprites(void)
 {
-    u8 *roomDecor;
-    u8 *roomDecorPos;
-    u8 decorIdx;
-    u8 objIdx;
-    u8 metatile;
+    u8 i;
+    u8 *decorations;
+    u8 *decorationPositions;
+    u8 eventObjectId;
+    u8 metatileBehavior;
     u8 category;
     u8 permission;
-    u8 nDecor;
-    u16 curBase;
+    u8 numDecorations;
 
-    objIdx = 0;
-    if (!CurrentMapIsSecretBase())
+    eventObjectId = 0;
+    if (!CurMapIsSecretBase())
     {
-        roomDecor = gSaveBlock1Ptr->playerRoomDecor;
-        roomDecorPos = gSaveBlock1Ptr->playerRoomDecorPos;
-        nDecor = 12;
+        decorations = gSaveBlock1Ptr->playerRoomDecor;
+        decorationPositions = gSaveBlock1Ptr->playerRoomDecorPos;
+        numDecorations = 12;
     }
     else
     {
-        curBase = VarGet(VAR_CURRENT_SECRET_BASE);
-        roomDecor = gSaveBlock1Ptr->secretBases[curBase].decorations;
-        roomDecorPos = gSaveBlock1Ptr->secretBases[curBase].decorationPos;
-        nDecor = 16;
+        u16 secretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
+        decorations = gSaveBlock1Ptr->secretBases[secretBaseId].decorations;
+        decorationPositions = gSaveBlock1Ptr->secretBases[secretBaseId].decorationPositions;
+        numDecorations = 16;
     }
-    for (decorIdx = 0; decorIdx < nDecor; decorIdx ++)
+
+    for (i = 0; i < numDecorations; i++)
     {
-        if (roomDecor[decorIdx] != DECOR_NONE)
+        if (decorations[i] == DECOR_NONE)
+            continue;
+        
+        permission = gDecorations[decorations[i]].permission;
+        category = gDecorations[decorations[i]].category;
+        if (permission == DECORPERM_SPRITE)
         {
-            permission = gDecorations[roomDecor[decorIdx]].permission;
-            category = gDecorations[roomDecor[decorIdx]].category;
-            if (permission == DECORPERM_SOLID_MAT)
+            for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++)
             {
-                for (objIdx = 0; objIdx < gMapHeader.events->eventObjectCount; objIdx ++)
+                if (gMapHeader.events->eventObjects[eventObjectId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004)
+                    break;
+            }
+
+            if (eventObjectId == gMapHeader.events->eventObjectCount)
+                continue;
+
+            gSpecialVar_0x8006 = decorationPositions[i] >> 4;
+            gSpecialVar_0x8007 = decorationPositions[i] & 0xF;
+            metatileBehavior = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
+            if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE
+             || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE)
+            {
+                gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[eventObjectId].graphicsId - EVENT_OBJ_GFX_VAR_0);
+                VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]);
+                gSpecialVar_Result = gMapHeader.events->eventObjects[eventObjectId].localId;
+                FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004);
+                TrySpawnEventObject(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+                TryMoveEventObjectToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
+                TryOverrideEventObjectTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+                if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0)
                 {
-                    if (gMapHeader.events->eventObjects[objIdx].flagId == gSpecialVar_0x8004 + 0xAE)
+                    if (category == DECORCAT_DOLL)
                     {
-                        break;
+                        OverrideSecretBaseDecorationSpriteScript(
+                            gSpecialVar_Result,
+                            gSaveBlock1Ptr->location.mapNum,
+                            gSaveBlock1Ptr->location.mapGroup,
+                            DECORCAT_DOLL);
                     }
-                }
-                if (objIdx == gMapHeader.events->eventObjectCount)
-                {
-                    continue;
-                }
-                gSpecialVar_0x8006 = roomDecorPos[decorIdx] >> 4;
-                gSpecialVar_0x8007 = roomDecorPos[decorIdx] & 0xF;
-                metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
-                if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE)
-                {
-                    gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].graphicsId + UNKNOWN_VAR_OFFSET_3F20;
-                    VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]);
-                    gSpecialVar_Result = gMapHeader.events->eventObjects[objIdx].localId;
-                    FlagClear(gSpecialVar_0x8004 + 0xAE);
-                    show_sprite(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-                    sub_808EBA8(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-                    sub_808F254(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-                    if (CurrentMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0)
+                    else if (category == DECORCAT_CUSHION)
                     {
-                        if (category == DECORCAT_DOLL)
-                        {
-                            sub_808F28C(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, DECORCAT_DOLL);
-                        }
-                        else if (category == DECORCAT_CUSHION)
-                        {
-                            sub_808F28C(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, DECORCAT_CUSHION);
-                        }
+                        OverrideSecretBaseDecorationSpriteScript(
+                            gSpecialVar_Result,
+                            gSaveBlock1Ptr->location.mapNum,
+                            gSaveBlock1Ptr->location.mapGroup,
+                            DECORCAT_CUSHION);
                     }
-                    gSpecialVar_0x8004 ++;
                 }
+
+                gSpecialVar_0x8004++;
             }
         }
     }
 }
 
-void sub_80E9578(void)
+void HideSecretBaseDecorationSprites(void)
 {
-    u8 objectEventIdx;
-    u16 flagId;
+    u8 eventObjectId;
+    u16 flag;
 
-    for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->eventObjectCount; objectEventIdx ++)
+    for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++)
     {
-        flagId = gMapHeader.events->eventObjects[objectEventIdx].flagId;
-        if (flagId >= FLAG_DECORATION_1 && flagId <= FLAG_DECORATION_14)
+        flag = gMapHeader.events->eventObjects[eventObjectId].flagId;
+        if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14)
         {
-            RemoveEventObjectByLocalIdAndMap(gMapHeader.events->eventObjects[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-            FlagSet(flagId);
+            RemoveEventObjectByLocalIdAndMap(
+                gMapHeader.events->eventObjects[eventObjectId].localId,
+                gSaveBlock1Ptr->location.mapNum,
+                gSaveBlock1Ptr->location.mapGroup);
+            FlagSet(flag);
         }
     }
 }
 
-void sub_80E95D4(void)
+void SetSecretBaseOwnerGfxId(void)
 {
-    VarSet(VAR_OBJ_GFX_ID_F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_CURRENT_SECRET_BASE))]);
+    VarSet(VAR_OBJ_GFX_ID_F, sSecretBaseOwnerGfxIds[GetSecretBaseOwnerType(VarGet(VAR_CURRENT_SECRET_BASE))]);
 }
 
-void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events)
+void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const struct MapEvents *events)
 {
-    s16 bgEventIdx;
-
-    for (bgEventIdx = 0; bgEventIdx < events->bgEventCount; bgEventIdx ++)
+    s16 i;
+    for (i = 0; i < events->bgEventCount; i++)
     {
-        if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[bgEventIdx].x + 7 && position->y == events->bgEvents[bgEventIdx].y + 7)
+        if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[i].x + 7 && position->y == events->bgEvents[i].y + 7)
         {
-            sCurSecretBaseId = events->bgEvents[bgEventIdx].bgUnion.secretBaseId;
+            sCurSecretBaseId = events->bgEvents[i].bgUnion.secretBaseId;
             break;
         }
     }
@@ -612,101 +648,92 @@ void sub_80E9608(const struct MapPosition *position, const struct MapEvents *eve
 
 void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events)
 {
-    sub_80E9608(position, events);
-    sub_80E8B6C();
+    SetCurSecretBaseIdFromPosition(position, events);
+    TrySetCurSecretBaseIndex();
     ScriptContext1_SetupScript(EventScript_275BB7);
 }
 
-bool8 sub_80E9680(void)
+bool8 TrySetCurSecretBase(void)
 {
-    sub_80E8B58();
-    sub_80E8B6C();
+    SetCurSecretBaseId();
+    TrySetCurSecretBaseIndex();
     if (gSpecialVar_Result == TRUE)
-    {
         return FALSE;
-    }
+
     return TRUE;
 }
 
-void sub_80E96A4(u8 taskId)
+static void Task_WarpOutOfSecretBase(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
-        case 0:
-            ScriptContext2_Enable();
-            gTasks[taskId].data[0] = 1;
-            break;
-        case 1:
-            if (!gPaletteFade.active)
-            {
-                gTasks[taskId].data[0] = 2;
-            }
-            break;
-        case 2:
-            SetWarpDestinationToDynamicWarp(0x7e);
-            WarpIntoMap();
-            gFieldCallback = mapldr_default;
-            SetMainCallback2(CB2_LoadMap);
-            ScriptContext2_Disable();
-            DestroyTask(taskId);
-            break;
+    case 0:
+        ScriptContext2_Enable();
+        gTasks[taskId].data[0] = 1;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+            gTasks[taskId].data[0] = 2;
+        break;
+    case 2:
+        SetWarpDestinationToDynamicWarp(0x7e);
+        WarpIntoMap();
+        gFieldCallback = mapldr_default;
+        SetMainCallback2(CB2_LoadMap);
+        ScriptContext2_Disable();
+        DestroyTask(taskId);
+        break;
     }
 }
 
-void sub_80E9728(void)
+static void WarpOutOfSecretBase(void)
 {
-    CreateTask(sub_80E96A4, 0);
-    FadeScreen(1, 0);
+    CreateTask(Task_WarpOutOfSecretBase, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
-void sub_80E9744(void)
+void IsCurSecretBaseOwnedByAnotherPlayer(void)
 {
     if (gSaveBlock1Ptr->secretBases[0].secretBaseId != sCurSecretBaseId)
-    {
         gSpecialVar_Result = TRUE;
-    }
     else
-    {
         gSpecialVar_Result = FALSE;
-    }
 }
 
-u8 *sub_80E9780(u8 *dest, u8 secretBaseRecordId)
+static u8 *GetSecretBaseName(u8 *dest, u8 secretBaseId)
 {
-    *StringCopyN(dest, gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerName, sub_80E8DF4(gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerName)) = EOS;
-    ConvertInternationalString(dest, gSaveBlock1Ptr->secretBases[secretBaseRecordId].language);
+    *StringCopyN(dest, gSaveBlock1Ptr->secretBases[secretBaseId].trainerName, GetNameLength(gSaveBlock1Ptr->secretBases[secretBaseId].trainerName)) = EOS;
+    ConvertInternationalString(dest, gSaveBlock1Ptr->secretBases[secretBaseId].language);
     return StringAppend(dest, gText_ApostropheSBase);
 }
 
 u8 *GetSecretBaseMapName(u8 *dest)
 {
-    return sub_80E9780(dest, VarGet(VAR_CURRENT_SECRET_BASE));
+    return GetSecretBaseName(dest, VarGet(VAR_CURRENT_SECRET_BASE));
 }
 
-void sub_80E980C(void)
+void CopyCurSecretBaseOwnerName_StrVar1(void)
 {
-    u8 secretBaseRecordId;
-    const u8 *src;
+    u8 secretBaseId;
+    const u8 *name;
 
-    secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
-    src = gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerName;
-    *StringCopyN(gStringVar1, src, sub_80E8DF4(src)) = EOS;
-    ConvertInternationalString(gStringVar1, gSaveBlock1Ptr->secretBases[secretBaseRecordId].language);
+    secretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
+    name = gSaveBlock1Ptr->secretBases[secretBaseId].trainerName;
+    *StringCopyN(gStringVar1, name, GetNameLength(name)) = EOS;
+    ConvertInternationalString(gStringVar1, gSaveBlock1Ptr->secretBases[secretBaseId].language);
 }
 
-bool8 sub_80E9878(u8 secretBaseRecordId)
+static bool8 IsSecretBaseRegistered(u8 secretBaseId)
 {
-    if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_6 != 0)
-    {
+    if (gSaveBlock1Ptr->secretBases[secretBaseId].registryStatus)
         return TRUE;
-    }
+
     return FALSE;
 }
 
-u8 sub_80E98AC(struct Pokemon *pokemon)
+static u8 GetAverageEVs(struct Pokemon *pokemon)
 {
     u16 evTotal;
-
     evTotal  = GetMonData(pokemon, MON_DATA_HP_EV);
     evTotal += GetMonData(pokemon, MON_DATA_ATK_EV);
     evTotal += GetMonData(pokemon, MON_DATA_DEF_EV);
@@ -716,173 +743,162 @@ u8 sub_80E98AC(struct Pokemon *pokemon)
     return evTotal / 6;
 }
 
-void sub_80E9914(void)
+void SetPlayerSecretBaseParty(void)
 {
-    u16 partyIdx;
+    u16 i;
     u16 moveIdx;
-    u16 sbPartyIdx;
+    u16 partyId;
     struct SecretBaseParty *party;
 
-    sbPartyIdx = 0;
+    partyId = 0;
     party = &gSaveBlock1Ptr->secretBases[0].party;
-    if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0)
+    if (gSaveBlock1Ptr->secretBases[0].secretBaseId)
     {
-        for (partyIdx = 0; partyIdx < PARTY_SIZE; partyIdx++)
+        for (i = 0; i < PARTY_SIZE; i++)
         {
-            for (moveIdx = 0; moveIdx < 4; moveIdx++)
-            {
-                party->moves[partyIdx * 4 + moveIdx] = 0;
-            }
-            party->species[partyIdx] = 0;
-            party->heldItems[partyIdx] = 0;
-            party->levels[partyIdx] = 0;
-            party->personality[partyIdx] = 0;
-            party->EVs[partyIdx] = 0;
-            if (GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES) != SPECIES_NONE
-                && !GetMonData(&gPlayerParty[partyIdx], MON_DATA_IS_EGG))
+            for (moveIdx = 0; moveIdx < MAX_MON_MOVES; moveIdx++)
+                party->moves[i * MAX_MON_MOVES + moveIdx] = MOVE_NONE;
+
+            party->species[i] = SPECIES_NONE;
+            party->heldItems[i] = ITEM_NONE;
+            party->levels[i] = 0;
+            party->personality[i] = 0;
+            party->EVs[i] = 0;
+
+            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE
+            && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
             {
-                for (moveIdx = 0; moveIdx < 4; moveIdx++)
-                {
-                    party->moves[sbPartyIdx * 4 + moveIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_MOVE1 + moveIdx);
-                }
-                party->species[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES);
-                party->heldItems[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_HELD_ITEM);
-                party->levels[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_LEVEL);
-                party->personality[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_PERSONALITY);
-                party->EVs[sbPartyIdx] = sub_80E98AC(&gPlayerParty[partyIdx]);
-                sbPartyIdx++;
+                for (moveIdx = 0; moveIdx < MAX_MON_MOVES; moveIdx++)
+                    party->moves[partyId * MAX_MON_MOVES + moveIdx] = GetMonData(&gPlayerParty[i], MON_DATA_MOVE1 + moveIdx);
+
+                party->species[partyId] = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
+                party->heldItems[partyId] = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
+                party->levels[partyId] = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+                party->personality[partyId] = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
+                party->EVs[partyId] = GetAverageEVs(&gPlayerParty[i]);
+                partyId++;
             }
         }
     }
 }
 
-void sub_80E9A90(void)
+void ClearAndLeaveSecretBase(void)
 {
-    u16 sbr_e;
-
-    sbr_e = gSaveBlock1Ptr->secretBases[0].sbr_field_e;
+    u16 temp = gSaveBlock1Ptr->secretBases[0].numSecretBasesReceived;
     ClearSecretBase(&gSaveBlock1Ptr->secretBases[0]);
-    gSaveBlock1Ptr->secretBases[0].sbr_field_e = sbr_e;
-    sub_80E9728();
+    gSaveBlock1Ptr->secretBases[0].numSecretBasesReceived = temp;
+    WarpOutOfSecretBase();
 }
 
-void sub_80E9AC0(void)
+void MoveOutOfSecretBase(void)
 {
     IncrementGameStat(GAME_STAT_MOVED_SECRET_BASE);
-    sub_80E9A90();
+    ClearAndLeaveSecretBase();
 }
 
-void sub_80E9AD0(void)
+static void ClosePlayerSecretBaseEntrance(void)
 {
     u16 i;
     u16 j;
-    s16 tile;
-    const struct MapEvents *events;
+    s16 metatileId;
+    const struct MapEvents *events = gMapHeader.events;
 
-    events = gMapHeader.events;
-    for (i = 0; i < events->bgEventCount; i ++)
+    for (i = 0; i < events->bgEventCount; i++)
     {
-        if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId)
+        if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE
+         && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId)
         {
-            tile = MapGridGetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7);
-            for (j = 0; j < 7; j ++)
+            metatileId = MapGridGetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7);
+            for (j = 0; j < 7; j++)
             {
-                if (gUnknown_0858CFCC[j].tile2 == tile)
+                if (sSecretBaseEntranceMetatiles[j].openMetatileId == metatileId)
                 {
-                    MapGridSetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7, gUnknown_0858CFCC[j].tile1 | METATILE_COLLISION_MASK);
+                    MapGridSetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7, sSecretBaseEntranceMetatiles[j].closedMetatileId | METATILE_COLLISION_MASK);
                     break;
                 }
             }
+
             DrawWholeMapView();
             break;
         }
     }
 }
 
-void sub_80E9B70(void)
+// When the player moves to a new secret base by interacting with a new secret base
+// entrance in the overworld.
+void MoveOutOfSecretBaseFromOutside(void)
 {
-    u16 sbr_e;
+    u16 temp;
 
-    sub_80E9AD0();
+    ClosePlayerSecretBaseEntrance();
     IncrementGameStat(GAME_STAT_MOVED_SECRET_BASE);
-    sbr_e = gSaveBlock1Ptr->secretBases[0].sbr_field_e;
+    temp = gSaveBlock1Ptr->secretBases[0].numSecretBasesReceived;
     ClearSecretBase(&gSaveBlock1Ptr->secretBases[0]);
-    gSaveBlock1Ptr->secretBases[0].sbr_field_e = sbr_e;
+    gSaveBlock1Ptr->secretBases[0].numSecretBasesReceived = temp;
 }
 
-u8 sub_80E9BA8(void)
+static u8 GetNumRegisteredSecretBases(void)
 {
-    u8 sum;
     s16 i;
-
-    sum = 0;
-    for (i = 1; i < SECRET_BASES_COUNT; i ++)
+    u8 count = 0;
+    for (i = 1; i < SECRET_BASES_COUNT; i++)
     {
-        if (sub_80E9878(i) == TRUE)
-        {
-            sum ++;
-        }
+        if (IsSecretBaseRegistered(i) == TRUE)
+            count++;
     }
-    return sum;
+
+    return count;
 }
 
-void sub_80E9BDC(void)
+void GetCurSecretBaseRegistrationValidity(void)
 {
-    if (sub_80E9878(VarGet(VAR_CURRENT_SECRET_BASE)) == TRUE)
-    {
+    if (IsSecretBaseRegistered(VarGet(VAR_CURRENT_SECRET_BASE)) == TRUE)
         gSpecialVar_Result = 1;
-    }
-    else if (sub_80E9BA8() > 9)
-    {
+    else if (GetNumRegisteredSecretBases() >= 10)
         gSpecialVar_Result = 2;
-    }
     else
-    {
         gSpecialVar_Result = 0;
-    }
 }
 
-void sub_80E9C2C(void)
+void ToggleCurSecretBaseRegistry(void)
 {
-    gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_6 ^= 1;
-    FlagSet(FLAG_DECORATION_16);
+    gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].registryStatus ^= 1;
+    FlagSet(FLAG_SECRET_BASE_REGISTRY_ENABLED);
 }
 
-void sub_80E9C74(void)
+void ShowSecretBaseDecorationMenu(void)
 {
-    CreateTask(sub_8126AD8, 0);
+    CreateTask(DoSecretBaseDecorationMenu, 0);
 }
 
-void sub_80E9C88(void)
+void ShowSecretBaseRegistryMenu(void)
 {
-    CreateTask(sub_80E9C9C, 0);
+    CreateTask(Task_ShowSecretBaseRegistryMenu, 0);
 }
 
-void sub_80E9C9C(u8 taskId)
+static void Task_ShowSecretBaseRegistryMenu(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     ScriptContext2_Enable();
-    data[0] = sub_80E9BA8();
+    data[0] = GetNumRegisteredSecretBases();
     if (data[0] != 0)
     {
         data[1] = 0;
         data[2] = 0;
         ClearDialogWindowAndFrame(0, 0);
-        gUnknown_0203A020 = calloc(1, sizeof(struct SecretBaseListMenuBuffer));
-        data[6] = AddWindow(&gUnknown_0858D06C[0]);
-        game_continue(taskId);
-        sub_80E9E00(taskId);
-        gTasks[taskId].func = sub_80E9E90;
+        sRegistryMenu = calloc(1, sizeof(*sRegistryMenu));
+        data[6] = AddWindow(&sRegistryWindowTemplates[0]);
+        BuildRegistryMenuItems(taskId);
+        FinalizeRegistryMenu(taskId);
+        gTasks[taskId].func = HandleRegistryMenuInput;
     }
     else
     {
-        DisplayItemMessageOnField(taskId, gText_NoRegistry, task_pc_turn_off);
+        DisplayItemMessageOnField(taskId, gText_NoRegistry, GoToSecretBasePCMainMenu);
     }
 }
 
-void game_continue(u8 taskId)
+static void BuildRegistryMenuItems(u8 taskId)
 {
     s16 *data;
     u8 i;
@@ -890,62 +906,54 @@ void game_continue(u8 taskId)
 
     data = gTasks[taskId].data;
     count = 0;
-    for (i = 1; i < SECRET_BASES_COUNT; i ++)
+    for (i = 1; i < SECRET_BASES_COUNT; i++)
     {
-        if (sub_80E9878(i))
+        if (IsSecretBaseRegistered(i))
         {
-            sub_80E9780(gUnknown_0203A020->names[count], i);
-            gUnknown_0203A020->items[count].name = gUnknown_0203A020->names[count];
-            gUnknown_0203A020->items[count].id = i;
-            count ++;
+            GetSecretBaseName(sRegistryMenu->names[count], i);
+            sRegistryMenu->items[count].name = sRegistryMenu->names[count];
+            sRegistryMenu->items[count].id = i;
+            count++;
         }
     }
-    gUnknown_0203A020->items[count].name = gText_Cancel;
-    gUnknown_0203A020->items[count].id = -2;
+
+    sRegistryMenu->items[count].name = gText_Cancel;
+    sRegistryMenu->items[count].id = -2;
     data[0] = count + 1;
     if (data[0] < 8)
-    {
         data[3] = data[0];
-    }
     else
-    {
         data[3] = 8;
-    }
-    gMultiuseListMenuTemplate = gUnknown_0858D07C;
+
+    gMultiuseListMenuTemplate = sRegistryListMenuTemplate;
     gMultiuseListMenuTemplate.windowId = data[6];
     gMultiuseListMenuTemplate.totalItems = data[0];
-    gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
+    gMultiuseListMenuTemplate.items = sRegistryMenu->items;
     gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
-void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu)
+static void RegistryMenu_OnCursorMove(int unused, bool8 flag, struct ListMenu *menu)
 {
     if (flag != TRUE)
-    {
         PlaySE(SE_SELECT);
-    }
 }
 
-void sub_80E9E00(u8 taskId)
+static void FinalizeRegistryMenu(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     SetStandardWindowBorderStyle(data[6], 0);
     data[5] = ListMenuInit(&gMultiuseListMenuTemplate, data[2], data[1]);
-    sub_80E9E44(taskId);
+    AddRegistryMenuScrollArrows(taskId);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-void sub_80E9E44(u8 taskId)
+static void AddRegistryMenuScrollArrows(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     data[8] = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xbc, 0x0c, 0x94, data[0] - data[3], 0x13f8, 0x13f8, &data[2]);
 }
 
-void sub_80E9E90(u8 taskId)
+static void HandleRegistryMenuInput(u8 taskId)
 {
     s16 *data;
     s32 input;
@@ -955,219 +963,185 @@ void sub_80E9E90(u8 taskId)
     ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);
     switch (input)
     {
-        case LIST_NOTHING_CHOSEN:
-            break;
-        case LIST_CANCEL:
-            PlaySE(SE_SELECT);
-            DestroyListMenuTask(data[5], NULL, NULL);
-            RemoveScrollIndicatorArrowPair(data[8]);
-            ClearStdWindowAndFrame(data[6], 0);
-            ClearWindowTilemap(data[6]);
-            RemoveWindow(data[6]);
-            schedule_bg_copy_tilemap_to_vram(0);
-            free(gUnknown_0203A020);
-            task_pc_turn_off(taskId);
-            break;
-        default:
-            PlaySE(SE_SELECT);
-            data[4] = input;
-            sub_80E9F20(taskId);
-            break;
+    case LIST_NOTHING_CHOSEN:
+        break;
+    case LIST_CANCEL:
+        PlaySE(SE_SELECT);
+        DestroyListMenuTask(data[5], NULL, NULL);
+        RemoveScrollIndicatorArrowPair(data[8]);
+        ClearStdWindowAndFrame(data[6], 0);
+        ClearWindowTilemap(data[6]);
+        RemoveWindow(data[6]);
+        schedule_bg_copy_tilemap_to_vram(0);
+        free(sRegistryMenu);
+        GoToSecretBasePCMainMenu(taskId);
+        break;
+    default:
+        PlaySE(SE_SELECT);
+        data[4] = input;
+        ShowRegistryMenuActions(taskId);
+        break;
     }
 }
 
-void sub_80E9F20(u8 taskId)
+static void ShowRegistryMenuActions(u8 taskId)
 {
     struct WindowTemplate template;
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     RemoveScrollIndicatorArrowPair(data[8]);
-    template = gUnknown_0858D06C[1];
-    template.width = GetMaxWidthInMenuTable(gUnknown_0858D048, 2);
+    template = sRegistryWindowTemplates[1];
+    template.width = GetMaxWidthInMenuTable(sRegistryMenuActions, 2);
     data[7] = AddWindow(&template);
     SetStandardWindowBorderStyle(data[7], 0);
-    PrintMenuTable(data[7], 2, gUnknown_0858D048);
+    PrintMenuTable(data[7], 2, sRegistryMenuActions);
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[7], 2, 0);
     schedule_bg_copy_tilemap_to_vram(0);
-    gTasks[taskId].func = sub_80E9FB0;
+    gTasks[taskId].func = HandleRegistryMenuActionsInput;
 }
 
-void sub_80E9FB0(u8 taskId)
+static void HandleRegistryMenuActionsInput(u8 taskId)
 {
-    s8 input;
-
-    input = Menu_ProcessInputNoWrap();
+    s8 input = Menu_ProcessInputNoWrap();
     switch (input)
     {
-        case MENU_B_PRESSED:
-            PlaySE(SE_SELECT);
-            sub_80EA18C(taskId);
-            break;
-        case MENU_NOTHING_CHOSEN:
-            break;
-        default:
-            PlaySE(SE_SELECT);
-            gUnknown_0858D048[input].func.void_u8(taskId);
-            break;
+    case MENU_B_PRESSED:
+        PlaySE(SE_SELECT);
+        ReturnToMainRegistryMenu(taskId);
+        break;
+    case MENU_NOTHING_CHOSEN:
+        break;
+    default:
+        PlaySE(SE_SELECT);
+        sRegistryMenuActions[input].func.void_u8(taskId);
+        break;
     }
 }
 
-void sub_80E9FFC(u8 taskId)
+static void ShowRegistryMenuDeleteConfirmation(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     ClearStdWindowAndFrame(data[6], FALSE);
     ClearStdWindowAndFrame(data[7], FALSE);
     ClearWindowTilemap(data[6]);
     ClearWindowTilemap(data[7]);
     RemoveWindow(data[7]);
     schedule_bg_copy_tilemap_to_vram(0);
-    sub_80E9780(gStringVar1, data[4]);
+    GetSecretBaseName(gStringVar1, data[4]);
     StringExpandPlaceholders(gStringVar4, gText_OkayToDeleteFromRegistry);
-    DisplayItemMessageOnField(taskId, gStringVar4, sub_80EA06C);
+    DisplayItemMessageOnField(taskId, gStringVar4, ShowRegistryMenuDeleteYesNo);
 }
 
-void sub_80EA06C(u8 taskId)
+static void ShowRegistryMenuDeleteYesNo(u8 taskId)
 {
     DisplayYesNoMenuDefaultYes();
-    DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058);
+    DoYesNoFuncWithChoice(taskId, &sDeleteRegistryYesNoFuncs);
 }
 
-void sub_80EA08C(u8 taskId)
+void DeleteRegistry_Yes_Callback(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     ClearDialogWindowAndFrame(0, 0);
     DestroyListMenuTask(data[5], &data[2], &data[1]);
-    gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0;
-    game_continue(taskId);
+    gSaveBlock1Ptr->secretBases[data[4]].registryStatus = 0;
+    BuildRegistryMenuItems(taskId);
     sub_812225C(&data[2], &data[1], data[3], data[0]);
-    sub_80E9E00(taskId);
-    gTasks[taskId].func = sub_80E9E90;
+    FinalizeRegistryMenu(taskId);
+    gTasks[taskId].func = HandleRegistryMenuInput;
 }
 
-void sub_80EA120(u8 taskId)
+static void DeleteRegistry_Yes(u8 taskId)
 {
-    DisplayItemMessageOnField(taskId, gText_RegisteredDataDeleted, sub_80EA08C);
+    DisplayItemMessageOnField(taskId, gText_RegisteredDataDeleted, DeleteRegistry_Yes_Callback);
 }
 
-void sub_80EA13C(u8 taskId)
+static void DeleteRegistry_No(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     ClearDialogWindowAndFrame(0, 0);
     DestroyListMenuTask(data[5], &data[2], &data[1]);
-    sub_80E9E00(taskId);
-    gTasks[taskId].func = sub_80E9E90;
+    FinalizeRegistryMenu(taskId);
+    gTasks[taskId].func = HandleRegistryMenuInput;
 }
 
-void sub_80EA18C(u8 taskId)
+static void ReturnToMainRegistryMenu(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
-    sub_80E9E44(taskId);
+    s16 *data = gTasks[taskId].data;
+    AddRegistryMenuScrollArrows(taskId);
     ClearStdWindowAndFrame(data[7], 0);
     ClearWindowTilemap(data[7]);
     RemoveWindow(data[7]);
     schedule_bg_copy_tilemap_to_vram(0);
-    gTasks[taskId].func = sub_80E9E90;
+    gTasks[taskId].func = HandleRegistryMenuInput;
 }
 
-void task_pc_turn_off(u8 taskId)
+static void GoToSecretBasePCMainMenu(u8 taskId)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) == 0)
-    {
         ScriptContext1_SetupScript(gUnknown_0823B4E8);
-    }
     else
-    {
         ScriptContext1_SetupScript(gUnknown_0823B5E9);
-    }
+
     DestroyTask(taskId);
 }
 
-u8 sub_80EA20C(u8 secretBaseRecordId)
+static u8 GetSecretBaseOwnerType(u8 secretBaseId)
 {
-    return (gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerId[0] % 5) + (gSaveBlock1Ptr->secretBases[secretBaseRecordId].gender * 5);
+    return (gSaveBlock1Ptr->secretBases[secretBaseId].trainerId[0] % 5)
+         + (gSaveBlock1Ptr->secretBases[secretBaseId].gender * 5);
 }
 
 const u8 *GetSecretBaseTrainerLoseText(void)
 {
-    u8 param;
-
-    param = sub_80EA20C(VarGet(VAR_CURRENT_SECRET_BASE));
-    if (param == 0)
-    {
+    u8 ownerType = GetSecretBaseOwnerType(VarGet(VAR_CURRENT_SECRET_BASE));
+    if (ownerType == 0)
         return SecretBase_RedCave1_Text_274966;
-    }
-    if (param == 1)
-    {
+    else if (ownerType == 1)
         return SecretBase_RedCave1_Text_274D13;
-    }
-    if (param == 2)
-    {
+    else if (ownerType == 2)
         return SecretBase_RedCave1_Text_274FFE;
-    }
-    if (param == 3)
-    {
+    else if (ownerType == 3)
         return SecretBase_RedCave1_Text_275367;
-    }
-    if (param == 4)
-    {
+    else if (ownerType == 4)
         return SecretBase_RedCave1_Text_2756C7;
-    }
-    if (param == 5)
-    {
+    else if (ownerType == 5)
         return SecretBase_RedCave1_Text_274B24;
-    }
-    if (param == 6)
-    {
+    else if (ownerType == 6)
         return SecretBase_RedCave1_Text_274E75;
-    }
-    if (param == 7)
-    {
+    else if (ownerType == 7)
         return SecretBase_RedCave1_Text_2751E1;
-    }
-    if (param == 8)
-    {
+    else if (ownerType == 8)
         return SecretBase_RedCave1_Text_2754F6;
-    }
-    return SecretBase_RedCave1_Text_2758CC;
+    else
+        return SecretBase_RedCave1_Text_2758CC;
 }
 
-void sub_80EA2E4(void)
+void PrepSecretBaseBattleFlags(void)
 {
-    sub_813BADC(TRUE);
+    sub_813BADC(1);
     gTrainerBattleOpponent_A = TRAINER_SECRET_BASE;
     gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_SECRET_BASE;
 }
 
 void sub_80EA30C(void)
 {
-    gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_5 = gSpecialVar_Result;
+    gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].battledOwnerToday = gSpecialVar_Result;
 }
 
-void sub_80EA354(void)
+void GetSecretBaseOwnerInteractionState(void)
 {
-    u16 secretBaseRecordId;
+    u16 secretBaseId;
     u8 i;
 
-    secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
+    secretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
     if (!FlagGet(FLAG_DAILY_SECRET_BASE))
     {
-        for (i = 0; i < SECRET_BASES_COUNT; i ++)
-        {
-            gSaveBlock1Ptr->secretBases[i].sbr_field_1_5 = FALSE;
-        }
+        for (i = 0; i < SECRET_BASES_COUNT; i++)
+            gSaveBlock1Ptr->secretBases[i].battledOwnerToday = FALSE;
+
         FlagSet(FLAG_DAILY_SECRET_BASE);
     }
-    gSpecialVar_0x8004 = sub_80EA20C(secretBaseRecordId);
-    gSpecialVar_Result = gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_5;
+    gSpecialVar_0x8004 = GetSecretBaseOwnerType(secretBaseId);
+    gSpecialVar_Result = gSaveBlock1Ptr->secretBases[secretBaseId].battledOwnerToday;
 }
 
 void SecretBasePerStepCallback(u8 taskId)
@@ -1181,318 +1155,286 @@ void SecretBasePerStepCallback(u8 taskId)
     data = gTasks[taskId].data;
     switch (data[1])
     {
-        case 0:
-            if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
+    case 0:
+        if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
+            sInFriendSecretBase = TRUE;
+        else
+            sInFriendSecretBase = FALSE;
+
+        PlayerGetDestCoords(&data[2], &data[3]);
+        data[1] = 1;
+        break;
+    case 1:
+        PlayerGetDestCoords(&x, &y);
+        if (x != data[2] || y != data[3])
+        {
+            data[2] = x;
+            data[3] = y;
+            VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1);
+            behavior = MapGridGetMetatileBehaviorAt(x, y);
+            tileId = MapGridGetMetatileIdAt(x, y);
+            if (tileId == 0x234 || tileId == 0x23C)
             {
-                gInFriendSecretBase = TRUE;
+                if (sInFriendSecretBase == TRUE)
+                {
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x20);
+                }
             }
-            else
+            else if (tileId == 0x2b8 || tileId == 0x2b9 || tileId == 0x2ba || tileId == 0x2c0 || tileId == 0x2c1 || tileId == 0x2c2 || tileId == 0x2c8 || tileId == 0x2c9 || tileId == 0x2ca)
             {
-                gInFriendSecretBase = FALSE;
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x01);
             }
-            PlayerGetDestCoords(&data[2], &data[3]);
-            data[1] = 1;
-            break;
-        case 1:
-            PlayerGetDestCoords(&x, &y);
-            if (x != data[2] || y != data[3])
+            else if (tileId == 0x239 || tileId == 0x241 || tileId == 0x251 || tileId == 0x259)
             {
-                data[2] = x;
-                data[3] = y;
-                VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1);
-                behavior = MapGridGetMetatileBehaviorAt(x, y);
-                tileId = MapGridGetMetatileIdAt(x, y);
-                if (tileId == 0x234 || tileId == 0x23C)
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x20);
-                    }
-                }
-                else if (tileId == 0x2b8 || tileId == 0x2b9 || tileId == 0x2ba || tileId == 0x2c0 || tileId == 0x2c1 || tileId == 0x2c2 || tileId == 0x2c8 || tileId == 0x2c9 || tileId == 0x2ca)
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x01);
-                    }
-                }
-                else if (tileId == 0x239 || tileId == 0x241 || tileId == 0x251 || tileId == 0x259)
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x04);
-                    }
-                }
-                else if ((behavior == 0x34 && tileId == 0x26d) || (behavior == 0x35 && MapGridGetMetatileIdAt(x, y) == 0x26a))
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x200);
-                    }
-                }
-                else if (behavior == 0xc1 && tileId == 0x23d)
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x1000);
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x2000);
-                    }
-                }
-                else if (behavior == 0x47 && tileId == 0x23e)
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x1000);
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x2000);
-                    }
-                }
-                else if (MetatileBehavior_IsSecretBaseGlitterMat(behavior) == TRUE)
-                {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x80);
-                    }
-                }
-                else if (MetatileBehavior_IsSecretBaseBalloon(behavior) == TRUE)
-                {
-                    PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y);
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        switch ((int)MapGridGetMetatileIdAt(x, y))
-                        {
-                            case 0x338:
-                            case 0x33c:
-                            case 0x340:
-                                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x02);
-                                break;
-                            case 0x228:
-                                VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x100);
-                                break;
-                        }
-                    }
-                }
-                else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE)
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x04);
+            }
+            else if ((behavior == 0x34 && tileId == 0x26d) || (behavior == 0x35 && MapGridGetMetatileIdAt(x, y) == 0x26a))
+            {
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x200);
+            }
+            else if (behavior == 0xc1 && tileId == 0x23d)
+            {
+                if (sInFriendSecretBase == TRUE)
                 {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x400);
-                    }
-                    ShatterSecretBaseBreakableDoor(x, y);
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x1000);
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x2000);
                 }
-                else if (MetatileBehavior_IsSecretBaseSoundMat(behavior) == TRUE){
-                    if (gInFriendSecretBase == TRUE) {
-                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8000);
-                    }
-                }
-                else if (MetatileBehavior_IsSecretBaseJumpMat(behavior) == TRUE)
+            }
+            else if (behavior == 0x47 && tileId == 0x23e)
+            {
+                if (sInFriendSecretBase == TRUE)
                 {
-                    if (gInFriendSecretBase == TRUE)
-                    {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4000);
-                    }
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x1000);
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) ^ 0x2000);
                 }
-                else if (MetatileBehavior_IsSecretBaseSpinMat(behavior) == TRUE)
+            }
+            else if (MetatileBehavior_IsSecretBaseGlitterMat(behavior) == TRUE)
+            {
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x80);
+            }
+            else if (MetatileBehavior_IsSecretBaseBalloon(behavior) == TRUE)
+            {
+                PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y);
+                if (sInFriendSecretBase == TRUE)
                 {
-                    if (gInFriendSecretBase == TRUE)
+                    switch ((int)MapGridGetMetatileIdAt(x, y))
                     {
-                        VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x02);
+                    case 0x338:
+                    case 0x33c:
+                    case 0x340:
+                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x02);
+                        break;
+                    case 0x228:
+                        VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x100);
+                        break;
                     }
                 }
             }
-            break;
-        case 2:
-            if (!FieldEffectActiveListContains(data[4]))
+            else if (MetatileBehavior_IsSecretBaseBreakableDoor(behavior) == TRUE)
             {
-                data[1] = 1;
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x400);
+
+                ShatterSecretBaseBreakableDoor(x, y);
             }
-            break;
+            else if (MetatileBehavior_IsSecretBaseSoundMat(behavior) == TRUE){
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8000);
+            }
+            else if (MetatileBehavior_IsSecretBaseJumpMat(behavior) == TRUE)
+            {
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4000);
+            }
+            else if (MetatileBehavior_IsSecretBaseSpinMat(behavior) == TRUE)
+            {
+                if (sInFriendSecretBase == TRUE)
+                    VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x02);
+            }
+        }
+        break;
+    case 2:
+        if (!FieldEffectActiveListContains(data[4]))
+            data[1] = 1;
+        break;
     }
 }
 
-void sub_80EA828(u8 secretBaseRecordId, struct SecretBaseRecord *base, u32 version, u32 language)
+static void SetSecretBaseDataAndLanguage(u8 secretBaseId, struct SecretBase *secretBase, u32 version, u32 language)
 {
     int stringLength;
     u8 *name;
 
-    gSaveBlock1Ptr->secretBases[secretBaseRecordId] = *base;
-    gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_6 = 2;
+    gSaveBlock1Ptr->secretBases[secretBaseId] = *secretBase;
+    gSaveBlock1Ptr->secretBases[secretBaseId].registryStatus = 2;
     if (version == VERSION_SAPPHIRE || version == VERSION_RUBY)
-    {
-        gSaveBlock1Ptr->secretBases[secretBaseRecordId].language = LANGUAGE_ENGLISH;
-    }
+        gSaveBlock1Ptr->secretBases[secretBaseId].language = LANGUAGE_ENGLISH;
+
     if (version == VERSION_EMERALD && language == LANGUAGE_JAPANESE)
     {
-        name = gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerName;
-        for (stringLength = 0; stringLength < 7; stringLength ++)
+        name = gSaveBlock1Ptr->secretBases[secretBaseId].trainerName;
+        for (stringLength = 0; stringLength < 7; stringLength++)
         {
             if (name[stringLength] == EOS)
-            {
                 break;
-            }
         }
+
         if (stringLength > 5)
-        {
-            gSaveBlock1Ptr->secretBases[secretBaseRecordId].language = LANGUAGE_ENGLISH;
-        }
+            gSaveBlock1Ptr->secretBases[secretBaseId].language = LANGUAGE_ENGLISH;
     }
 }
 
-bool8 sub_80EA8D4(struct SecretBaseRecord *sbr1, struct SecretBaseRecord *sbr2)
+static bool8 SecretBasesHaveSameTrainerId(struct SecretBase *secretBase1, struct SecretBase *secretBase2)
 {
     u8 i;
-    for (i = 0; i < 4; i ++)
+    for (i = 0; i < 4; i++)
     {
-        if (sbr1->trainerId[i] != sbr2->trainerId[i])
-        {
+        if (secretBase1->trainerId[i] != secretBase2->trainerId[i])
             return FALSE;
-        }
     }
+
     return TRUE;
 }
 
-bool8 sub_80EA904(struct SecretBaseRecord *sbr1, struct SecretBaseRecord *sbr2)
+static bool8 SecretBasesHaveSameTrainerName(struct SecretBase *sbr1, struct SecretBase *sbr2)
 {
     u8 i;
-
     for (i = 0; i < PLAYER_NAME_LENGTH && (sbr1->trainerName[i] != EOS || sbr2->trainerName[i] != EOS); i++)
     {
         if (sbr1->trainerName[i] != sbr2->trainerName[i])
-        {
             return FALSE;
-        }
     }
+
     return TRUE;
 }
 
-bool8 sub_80EA950(struct SecretBaseRecord *sbr1, struct SecretBaseRecord *sbr2)
+static bool8 SecretBasesBelongToSamePlayer(struct SecretBase *secretBase1, struct SecretBase *secretBase2)
 {
-    if (sbr1->gender == sbr2->gender && sub_80EA8D4(sbr1, sbr2) && sub_80EA904(sbr1, sbr2))
+    if (secretBase1->gender == secretBase2->gender
+     && SecretBasesHaveSameTrainerId(secretBase1, secretBase2)
+     && SecretBasesHaveSameTrainerName(secretBase1, secretBase2))
     {
         return TRUE;
     }
+
     return FALSE;
 }
 
-s16 sub_80EA990(u8 secretBaseRecordId)
+static s16 GetSecretBaseIndexFromId(u8 secretBaseId)
 {
     s16 i;
-
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
-        if (gSaveBlock1Ptr->secretBases[i].secretBaseId == secretBaseRecordId)
-        {
+        if (gSaveBlock1Ptr->secretBases[i].secretBaseId == secretBaseId)
             return i;
-        }
     }
+
     return -1;
 }
 
-u8 sub_80EA9D8(void)
+static u8 FindAvailableSecretBaseIndex(void)
 {
     s16 i;
-
-    for (i = 1; i < SECRET_BASES_COUNT; i ++)
+    for (i = 1; i < SECRET_BASES_COUNT; i++)
     {
         if (gSaveBlock1Ptr->secretBases[i].secretBaseId == 0)
-        {
             return i;
-        }
     }
+
     return 0;
 }
 
-u8 sub_80EAA18(void)
+static u8 sub_80EAA18(void)
 {
     s16 i;
-
-    for (i = 1; i < SECRET_BASES_COUNT; i ++)
+    for (i = 1; i < SECRET_BASES_COUNT; i++)
     {
-        if (gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 == 0 && gSaveBlock1Ptr->secretBases[i].sbr_field_1_0 == 0)
-        {
+        if (gSaveBlock1Ptr->secretBases[i].registryStatus == 0 && gSaveBlock1Ptr->secretBases[i].sbr_field_1_0 == 0)
             return i;
-        }
     }
+
     return 0;
 }
 
-u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language)
+static u8 sub_80EAA64(struct SecretBase *secretBase, u32 version, u32 language)
 {
-    s16 secretBaseRecordId;
+    s16 index;
 
-    if (base->secretBaseId == 0)
-    {
+    if (!secretBase->secretBaseId)
         return 0;
-    }
-    secretBaseRecordId = sub_80EA990(base->secretBaseId);
-    if (secretBaseRecordId != 0)
+
+    index = GetSecretBaseIndexFromId(secretBase->secretBaseId);
+    if (index != 0)
     {
-        if (secretBaseRecordId != -1)
+        if (index != -1)
         {
-            if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1)
-            {
+            if (gSaveBlock1Ptr->secretBases[index].sbr_field_1_0 == 1)
                 return 0;
-            }
-            if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_6 != 2 || base->sbr_field_1_0 == 1)
+
+            if (gSaveBlock1Ptr->secretBases[index].registryStatus != 2 || secretBase->sbr_field_1_0 == 1)
             {
-                sub_80EA828(secretBaseRecordId, base, version, language);
-                return secretBaseRecordId;
+                SetSecretBaseDataAndLanguage(index, secretBase, version, language);
+                return index;
             }
         }
         else
         {
-            secretBaseRecordId = sub_80EA9D8();
-            if (secretBaseRecordId != 0)
+            index = FindAvailableSecretBaseIndex();
+            if (index != 0)
             {
-                sub_80EA828(secretBaseRecordId, base, version, language);
-                return secretBaseRecordId;
+                SetSecretBaseDataAndLanguage(index, secretBase, version, language);
+                return index;
             }
-            secretBaseRecordId = sub_80EAA18();
-            if (secretBaseRecordId != 0)
+
+            index = sub_80EAA18();
+            if (index != 0)
             {
-                sub_80EA828(secretBaseRecordId, base, version, language);
-                return secretBaseRecordId;
+                SetSecretBaseDataAndLanguage(index, secretBase, version, language);
+                return index;
             }
         }
     }
     return 0;
 }
 
-void sub_80EAAF4(void)
+// Moves the registered secret bases to the beginning of the array, so that
+// they won't be forgotten during record mixing.
+static void SortSecretBasesByRegistryStatus(void)
 {
     u8 i;
     u8 j;
-    struct SecretBaseRecord base;
-    struct SecretBaseRecord *secretBases;
+    struct SecretBase *secretBases;
 
     secretBases = gSaveBlock1Ptr->secretBases;
-    for (i = 1; i < 19; i ++)
+    for (i = 1; i < 19; i++)
     {
-        for (j = i + 1; j < SECRET_BASES_COUNT; j ++)
+        for (j = i + 1; j < SECRET_BASES_COUNT; j++)
         {
-            if ((secretBases[i].sbr_field_1_6 == 0 && secretBases[j].sbr_field_1_6 == 1) || (secretBases[i].sbr_field_1_6 == 2 && secretBases[j].sbr_field_1_6 != 2))
+            if ((secretBases[i].registryStatus == 0 && secretBases[j].registryStatus == 1) || (secretBases[i].registryStatus == 2 && secretBases[j].registryStatus != 2))
             {
-                base = secretBases[i];
+                struct SecretBase temp = secretBases[i];
                 secretBases[i] = secretBases[j];
-                secretBases[j] = base;
+                secretBases[j] = temp;
             }
         }
     }
 }
 
-void sub_80EABA4(struct SecretBaseRecordMixer *mixer, u8 b)
+void sub_80EABA4(struct SecretBaseRecordMixer *mixer, u8 registryStatus)
 {
     u16 i;
-
-    for (i = 1; i < SECRET_BASES_COUNT; i ++)
+    for (i = 1; i < SECRET_BASES_COUNT; i++)
     {
-        if (mixer->records[i].sbr_field_1_6 == b)
-        {
-            sub_80EAA64(&mixer->records[i], mixer->version, mixer->language);
-        }
+        if (mixer->secretBases[i].registryStatus == registryStatus)
+            sub_80EAA64(&mixer->secretBases[i], mixer->version, mixer->language);
     }
 }
 
-bool8 DoesSecretBaseBelongToPlayer(struct SecretBaseRecord *secretBase)
+bool8 SecretBaseBelongsToPlayer(struct SecretBase *secretBase)
 {
     u8 i;
 
@@ -1503,13 +1445,13 @@ bool8 DoesSecretBaseBelongToPlayer(struct SecretBaseRecord *secretBase)
         return FALSE;
 
     // Check if the player's trainer Id matches the secret base's id.
-    for (i = 0; i < 4; i ++)
+    for (i = 0; i < 4; i++)
     {
         if (secretBase->trainerId[i] != gSaveBlock2Ptr->playerTrainerId[i])
             return FALSE;
     }
 
-    for (i = 0; i < PLAYER_NAME_LENGTH && (secretBase->trainerName[i] != EOS || gSaveBlock2Ptr->playerName[i] != EOS); i ++)
+    for (i = 0; i < PLAYER_NAME_LENGTH && (secretBase->trainerName[i] != EOS || gSaveBlock2Ptr->playerName[i] != EOS); i++)
     {
         if (secretBase->trainerName[i] != gSaveBlock2Ptr->playerName[i])
             return FALSE;
@@ -1518,16 +1460,16 @@ bool8 DoesSecretBaseBelongToPlayer(struct SecretBaseRecord *secretBase)
     return TRUE;
 }
 
-void DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(struct SecretBaseRecord *basesA, struct SecretBaseRecord *basesB, struct SecretBaseRecord *basesC)
+void DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(struct SecretBase *basesA, struct SecretBase *basesB, struct SecretBase *basesC)
 {
     u8 i;
     u8 sbFlags = 0x0;
 
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
         if (!(sbFlags & 0x1)) // 001
         {
-            if (DoesSecretBaseBelongToPlayer(&basesA[i]) == TRUE)
+            if (SecretBaseBelongsToPlayer(&basesA[i]) == TRUE)
             {
                 ClearSecretBase(&basesA[i]);
                 sbFlags |= 1;
@@ -1536,7 +1478,7 @@ void DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(struct SecretBaseR
 
         if (!(sbFlags & 0x2)) // 010
         {
-            if (DoesSecretBaseBelongToPlayer(&basesB[i]) == TRUE)
+            if (SecretBaseBelongsToPlayer(&basesB[i]) == TRUE)
             {
                 ClearSecretBase(&basesB[i]);
                 sbFlags |= 2;
@@ -1545,7 +1487,7 @@ void DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(struct SecretBaseR
 
         if (!(sbFlags & 0x4)) // 100
         {
-            if (DoesSecretBaseBelongToPlayer(&basesC[i]) == TRUE)
+            if (SecretBaseBelongsToPlayer(&basesC[i]) == TRUE)
             {
                 ClearSecretBase(&basesC[i]);
                 sbFlags |= 4;
@@ -1559,15 +1501,15 @@ void DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(struct SecretBaseR
     }
 }
 
-bool8 sub_80EAD14(struct SecretBaseRecord *base, struct SecretBaseRecord *secretBases, u8 c)
+bool8 sub_80EAD14(struct SecretBase *secretBase, struct SecretBase *secretBases, u8 c)
 {
     u8 i;
 
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
         if (secretBases[i].secretBaseId != 0)
         {
-            if (sub_80EA950(base, &secretBases[i]) == TRUE)
+            if (SecretBasesBelongToSamePlayer(secretBase, &secretBases[i]) == TRUE)
             {
                 if (c == 0)
                 {
@@ -1575,15 +1517,14 @@ bool8 sub_80EAD14(struct SecretBaseRecord *base, struct SecretBaseRecord *secret
                     return FALSE;
                 }
 
-                if (base->sbr_field_e > secretBases[i].sbr_field_e)
+                if (secretBase->numSecretBasesReceived > secretBases[i].numSecretBasesReceived)
                 {
                     ClearSecretBase(&secretBases[i]);
                     return FALSE;
                 }
 
-                secretBases[i].sbr_field_1_0 = base->sbr_field_1_0;
-
-                ClearSecretBase(base);
+                secretBases[i].sbr_field_1_0 = secretBase->sbr_field_1_0;
+                ClearSecretBase(secretBase);
                 return TRUE;
             }
         }
@@ -1592,15 +1533,15 @@ bool8 sub_80EAD14(struct SecretBaseRecord *base, struct SecretBaseRecord *secret
     return FALSE;
 }
 
-void sub_80EAD94(struct SecretBaseRecord *basesA, struct SecretBaseRecord *basesB, struct SecretBaseRecord *basesC, struct SecretBaseRecord *basesD)
+void sub_80EAD94(struct SecretBase *basesA, struct SecretBase *basesB, struct SecretBase *basesC, struct SecretBase *basesD)
 {
     u8 i;
 
-    for (i = 1; i < SECRET_BASES_COUNT; i ++)
+    for (i = 1; i < SECRET_BASES_COUNT; i++)
     {
         if (basesA[i].secretBaseId)
         {
-            if (basesA[i].sbr_field_1_6 == 1)
+            if (basesA[i].registryStatus == 1)
             {
                 basesA[i].sbr_field_1_0 = 1;
             }
@@ -1613,32 +1554,32 @@ void sub_80EAD94(struct SecretBaseRecord *basesA, struct SecretBaseRecord *bases
             }
         }
     }
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
         if (basesB[i].secretBaseId)
         {
-            basesB[i].sbr_field_1_5 = 0;
+            basesB[i].battledOwnerToday = 0;
             if (!sub_80EAD14(&basesB[i], basesC, i))
             {
                 sub_80EAD14(&basesB[i], basesD, i);
             }
         }
     }
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
         if (basesC[i].secretBaseId)
         {
-            basesC[i].sbr_field_1_5 = 0;
+            basesC[i].battledOwnerToday = 0;
             sub_80EAD14(&basesC[i], basesD, i);
         }
         if (basesD[i].secretBaseId)
         {
-            basesD[i].sbr_field_1_5 = 0;
+            basesD[i].battledOwnerToday = 0;
         }
     }
 }
 
-void sub_80EAE90(struct SecretBaseRecord *base, u32 version, u32 language)
+void sub_80EAE90(struct SecretBase *base, u32 version, u32 language)
 {
     if (base->sbr_field_1_0 == 1)
     {
@@ -1651,22 +1592,22 @@ void sub_80EAEB4(struct SecretBaseRecordMixer *mixers)
 {
     u16 i;
 
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
-        sub_80EAE90(&mixers[0].records[i], mixers[0].version, mixers[0].language);
-        sub_80EAE90(&mixers[1].records[i], mixers[1].version, mixers[1].language);
-        sub_80EAE90(&mixers[2].records[i], mixers[2].version, mixers[2].language);
+        sub_80EAE90(&mixers[0].secretBases[i], mixers[0].version, mixers[0].language);
+        sub_80EAE90(&mixers[1].secretBases[i], mixers[1].version, mixers[1].language);
+        sub_80EAE90(&mixers[2].secretBases[i], mixers[2].version, mixers[2].language);
     }
 }
 
 void sub_80EAEF4(struct SecretBaseRecordMixer *mixers)
 {
-    DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(mixers[0].records, mixers[1].records, mixers[2].records);
-    sub_80EAD94(gSaveBlock1Ptr->secretBases, mixers[0].records, mixers[1].records, mixers[2].records);
+    DeleteFirstOldBaseFromPlayerInRecordMixingFriendsRecords(mixers[0].secretBases, mixers[1].secretBases, mixers[2].secretBases);
+    sub_80EAD94(gSaveBlock1Ptr->secretBases, mixers[0].secretBases, mixers[1].secretBases, mixers[2].secretBases);
     sub_80EAEB4(mixers);
-    sub_80EAA64(mixers[0].records, mixers[0].version, mixers[0].language);
-    sub_80EAA64(mixers[1].records, mixers[1].version, mixers[1].language);
-    sub_80EAA64(mixers[2].records, mixers[2].version, mixers[2].language);
+    sub_80EAA64(mixers[0].secretBases, mixers[0].version, mixers[0].language);
+    sub_80EAA64(mixers[1].secretBases, mixers[1].version, mixers[1].language);
+    sub_80EAA64(mixers[2].secretBases, mixers[2].version, mixers[2].language);
     sub_80EABA4(&mixers[0], 1);
     sub_80EABA4(&mixers[1], 1);
     sub_80EABA4(&mixers[2], 1);
@@ -1675,7 +1616,7 @@ void sub_80EAEF4(struct SecretBaseRecordMixer *mixers)
     sub_80EABA4(&mixers[2], 0);
 }
 
-void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
+void ReceiveSecretBasesData(void *secretBases, size_t recordSize, u8 linkIdx)
 {
     struct SecretBaseRecordMixer mixers[3];
     u16 i;
@@ -1684,95 +1625,97 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
     {
         switch (GetLinkPlayerCount())
         {
-            case 2:
-                memset(records + 2 * recordSize, 0, recordSize);
-                memset(records + 3 * recordSize, 0, recordSize);
-                break;
-            case 3:
-                memset(records + 3 * recordSize, 0, recordSize);
-                break;
+        case 2:
+            memset(secretBases + 2 * recordSize, 0, recordSize);
+            memset(secretBases + 3 * recordSize, 0, recordSize);
+            break;
+        case 3:
+            memset(secretBases + 3 * recordSize, 0, recordSize);
+            break;
         }
+
         switch (linkIdx)
         {
-            case 0:
-                mixers[0].records = records + 1 * recordSize;
-                mixers[0].version = gLinkPlayers[1].version & 0xFF;
-                mixers[0].language = gLinkPlayers[1].language;
-                mixers[1].records = records + 2 * recordSize;
-                mixers[1].version = gLinkPlayers[2].version & 0xFF;
-                mixers[1].language = gLinkPlayers[2].language;
-                mixers[2].records = records + 3 * recordSize;
-                mixers[2].version = gLinkPlayers[3].version & 0xFF;
-                mixers[2].language = gLinkPlayers[3].language;
-                break;
-            case 1:
-                mixers[0].records = records + 2 * recordSize;
-                mixers[0].version = gLinkPlayers[2].version & 0xFF;
-                mixers[0].language = gLinkPlayers[2].language;
-                mixers[1].records = records + 3 * recordSize;
-                mixers[1].version = gLinkPlayers[3].version & 0xFF;
-                mixers[1].language = gLinkPlayers[3].language;
-                mixers[2].records = records + 0 * recordSize;
-                mixers[2].version = gLinkPlayers[0].version & 0xFF;
-                mixers[2].language = gLinkPlayers[0].language;
-                break;
-            case 2:
-                mixers[0].records = records + 3 * recordSize;
-                mixers[0].version = gLinkPlayers[3].version & 0xFF;
-                mixers[0].language = gLinkPlayers[3].language;
-                mixers[1].records = records + 0 * recordSize;
-                mixers[1].version = gLinkPlayers[0].version & 0xFF;
-                mixers[1].language = gLinkPlayers[0].language;
-                mixers[2].records = records + 1 * recordSize;
-                mixers[2].version = gLinkPlayers[1].version & 0xFF;
-                mixers[2].language = gLinkPlayers[1].language;
-                break;
-            case 3:
-                mixers[0].records = records + 0 * recordSize;
-                mixers[0].version = gLinkPlayers[0].version & 0xFF;
-                mixers[0].language = gLinkPlayers[0].language;
-                mixers[1].records = records + 1 * recordSize;
-                mixers[1].version = gLinkPlayers[1].version & 0xFF;
-                mixers[1].language = gLinkPlayers[1].language;
-                mixers[2].records = records + 2 * recordSize;
-                mixers[2].version = gLinkPlayers[2].version & 0xFF;
-                mixers[2].language = gLinkPlayers[2].language;
-                break;
+        case 0:
+            mixers[0].secretBases = secretBases + 1 * recordSize;
+            mixers[0].version = gLinkPlayers[1].version & 0xFF;
+            mixers[0].language = gLinkPlayers[1].language;
+            mixers[1].secretBases = secretBases + 2 * recordSize;
+            mixers[1].version = gLinkPlayers[2].version & 0xFF;
+            mixers[1].language = gLinkPlayers[2].language;
+            mixers[2].secretBases = secretBases + 3 * recordSize;
+            mixers[2].version = gLinkPlayers[3].version & 0xFF;
+            mixers[2].language = gLinkPlayers[3].language;
+            break;
+        case 1:
+            mixers[0].secretBases = secretBases + 2 * recordSize;
+            mixers[0].version = gLinkPlayers[2].version & 0xFF;
+            mixers[0].language = gLinkPlayers[2].language;
+            mixers[1].secretBases = secretBases + 3 * recordSize;
+            mixers[1].version = gLinkPlayers[3].version & 0xFF;
+            mixers[1].language = gLinkPlayers[3].language;
+            mixers[2].secretBases = secretBases + 0 * recordSize;
+            mixers[2].version = gLinkPlayers[0].version & 0xFF;
+            mixers[2].language = gLinkPlayers[0].language;
+            break;
+        case 2:
+            mixers[0].secretBases = secretBases + 3 * recordSize;
+            mixers[0].version = gLinkPlayers[3].version & 0xFF;
+            mixers[0].language = gLinkPlayers[3].language;
+            mixers[1].secretBases = secretBases + 0 * recordSize;
+            mixers[1].version = gLinkPlayers[0].version & 0xFF;
+            mixers[1].language = gLinkPlayers[0].language;
+            mixers[2].secretBases = secretBases + 1 * recordSize;
+            mixers[2].version = gLinkPlayers[1].version & 0xFF;
+            mixers[2].language = gLinkPlayers[1].language;
+            break;
+        case 3:
+            mixers[0].secretBases = secretBases + 0 * recordSize;
+            mixers[0].version = gLinkPlayers[0].version & 0xFF;
+            mixers[0].language = gLinkPlayers[0].language;
+            mixers[1].secretBases = secretBases + 1 * recordSize;
+            mixers[1].version = gLinkPlayers[1].version & 0xFF;
+            mixers[1].language = gLinkPlayers[1].language;
+            mixers[2].secretBases = secretBases + 2 * recordSize;
+            mixers[2].version = gLinkPlayers[2].version & 0xFF;
+            mixers[2].language = gLinkPlayers[2].language;
+            break;
         }
+
         sub_80EAEF4(mixers);
-        for (i = 1; i < SECRET_BASES_COUNT; i ++)
+        for (i = 1; i < SECRET_BASES_COUNT; i++)
         {
             if (gSaveBlock1Ptr->secretBases[i].sbr_field_1_0 == 1)
             {
-                gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 1;
+                gSaveBlock1Ptr->secretBases[i].registryStatus = 1;
                 gSaveBlock1Ptr->secretBases[i].sbr_field_1_0 = 0;
             }
         }
-        sub_80EAAF4();
-        for (i = 1; i < SECRET_BASES_COUNT; i ++)
+
+        SortSecretBasesByRegistryStatus();
+        for (i = 1; i < SECRET_BASES_COUNT; i++)
         {
-            if (gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 == 2)
+            if (gSaveBlock1Ptr->secretBases[i].registryStatus == 2)
             {
-                gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0;
+                gSaveBlock1Ptr->secretBases[i].registryStatus = 0;
             }
         }
-        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF)
+
+        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0
+         && gSaveBlock1Ptr->secretBases[0].numSecretBasesReceived != 0xFFFF)
         {
-            gSaveBlock1Ptr->secretBases[0].sbr_field_e ++;
+            gSaveBlock1Ptr->secretBases[0].numSecretBasesReceived++;
         }
     }
 }
 
-void sub_80EB18C(struct SecretBaseRecord *bases)
+void ClearJapaneseSecretBases(struct SecretBase *bases)
 {
     u32 i;
-
-    for (i = 0; i < SECRET_BASES_COUNT; i ++)
+    for (i = 0; i < SECRET_BASES_COUNT; i++)
     {
         if (bases[i].language == LANGUAGE_JAPANESE)
-        {
             ClearSecretBase(&bases[i]);
-        }
     }
 }
 
@@ -1783,22 +1726,19 @@ void sub_80EB1AC(void)
     VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, 0);
     VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, 0);
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-    {
         VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, TRUE);
-    }
     else
-    {
         VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
-    }
-    gInFriendSecretBase = FALSE;
+
+    sInFriendSecretBase = FALSE;
 }
 
 void sub_80EB218(void)
 {
-    if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && gInFriendSecretBase == TRUE && !CurrentMapIsSecretBase())
+    if (VarGet(VAR_SECRET_BASE_IS_NOT_LOCAL) && sInFriendSecretBase == TRUE && !CurMapIsSecretBase())
     {
         VarSet(VAR_SECRET_BASE_IS_NOT_LOCAL, FALSE);
-        gInFriendSecretBase = FALSE;
+        sInFriendSecretBase = FALSE;
         sub_80EEA70();
         VarSet(VAR_SECRET_BASE_STEP_COUNTER, 0);
         VarSet(VAR_SECRET_BASE_LAST_ITEM_USED, 0);
@@ -1811,17 +1751,13 @@ void sub_80EB218(void)
 void sub_80EB290(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-    {
         VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x800);
-    }
 }
 
 void sub_80EB2C8(void)
 {
     if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-    {
         VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x400);
-    }
 }
 
 void sub_80EB300(void)
@@ -1864,10 +1800,9 @@ void sub_80EB438(void)
     }
 }
 
-void sub_80EB498(void)
+void SetSecretBaseSecretsTvFlags_Poster(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     switch (MapGridGetMetatileIdAt(x, y))
@@ -1888,27 +1823,23 @@ void sub_80EB498(void)
         case 0x333:
         case 0x334:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x4000);
-            }
             break;
     }
 }
 
-void sub_80EB56C(void)
+void SetSecretBaseSecretsTvFlags_MiscFurnature(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     switch (MapGridGetMetatileIdAt(x, y))
     {
         case 0x28a:
         case 0x28b:
+            // Bird Statue
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x40);
-            }
             break;
         case 0x2d8:
         case 0x2d9:
@@ -1928,32 +1859,28 @@ void sub_80EB56C(void)
         case 0x2f9:
         case 0x2fa:
         case 0x2fb:
+            // Plants
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | 0x8);
-            }
             break;
         case 0x22c:
         case 0x233:
+            // Fence
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x40);
-            }
             break;
         case 0x288:
         case 0x289:
+            // Tire
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x100);
-            }
             break;
         case 0x22d:
         case 0x22e:
         case 0x22f:
+            // Bricks
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x10);
-            }
             break;
         case 0x287:
         case 0x28f:
@@ -1978,18 +1905,16 @@ void sub_80EB56C(void)
         case 0x2cd:
         case 0x2ce:
         case 0x2cf:
+            // Tables
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8);
-            }
             break;
     }
 }
 
-void sub_80EB9E0(void)
+void SetSecretBaseSecretsTvFlags_LargeDecorationSpot(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     switch (MapGridGetMetatileIdAt(x, y))
@@ -2006,17 +1931,14 @@ void sub_80EB9E0(void)
         case 0x2c3:
         case 0x2c6:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8);
-            }
             break;
     }
 }
 
-void sub_80EBB28(void)
+void SetSecretBaseSecretsTvFlags_SmallDecorationSpot(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     switch (MapGridGetMetatileIdAt(x, y))
@@ -2044,42 +1966,34 @@ void sub_80EBB28(void)
         case 0x2c5:
         case 0x2c7:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x8);
-            }
             break;
         case 0x280:
         case 0x281:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x100);
-            }
             break;
         case 0x225:
         case 0x226:
         case 0x227:
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x10);
-            }
             break;
     }
 }
 
-void sub_80EBE7C(void)
+void SetSecretBaseSecretsTvFlags_SandOrnament(void)
 {
-    s16 x;
-    s16 y;
+    s16 x, y;
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     switch ((int)MapGridGetMetatileIdAt(x, y))
     {
         case 0x28d:
         case 0x28e:
+            // Sand Ornament
             if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
-            {
                 VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | 0x4);
-            }
             break;
     }
 }
diff --git a/src/shop.c b/src/shop.c
index 0d6ee00f8..c9bf4fb58 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
diff --git a/src/smokescreen.c b/src/smokescreen.c
index d9780bbb6..61e011451 100644
--- a/src/smokescreen.c
+++ b/src/smokescreen.c
@@ -1,11 +1,15 @@
 #include "global.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "sprite.h"
 #include "util.h"
 
 static void sub_8075370(struct Sprite *);
 
+extern const struct CompressedSpriteSheet gUnknown_0831C620;
+extern const struct CompressedSpritePalette gUnknown_0831C628;
+extern const struct SpriteTemplate gUnknown_0831C688;
+
 u8 sub_807521C(s16 x, s16 y, u8 a3)
 {
     u8 mainSpriteId;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index c4cb07d6a..886daa45a 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "gpu_regs.h"
diff --git a/src/strings.c b/src/strings.c
index 577d26f5c..ac7a32709 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -529,7 +529,7 @@ const u8 gText_ApostropheSBase[] = _("'s BASE");
 const u8 gText_OkayToDeleteFromRegistry[] = _("Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?");
 const u8 gText_RegisteredDataDeleted[] = _("The registered data was deleted.{PAUSE_UNTIL_PRESS}");
 const u8 gText_NoRegistry[] = _("There is no REGISTRY.{PAUSE_UNTIL_PRESS}");
-const u8 gUnknown_085EA79D[] = _("DEL REGIST.");
+const u8 gText_DelRegist[] = _("DEL REGIST.");
 const u8 gUnknown_085EA7A9[] = _("{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}");
 const u8 gText_Decorate[] = _("DECORATE");
 const u8 gText_PutAway[] = _("PUT AWAY");
@@ -962,21 +962,21 @@ const u8 gUnknown_085EBE7D[] = _("DETAIL");
 const u8 gUnknown_085EBE84[] = _("CALL");
 const u8 gUnknown_085EBE89[] = _("EXIT");
 const u8 gUnknown_085EBE8E[] = _("Can't call opponent here.");
-const u8 gUnknown_085EBEA8[] = _("STRATEGY");
-const u8 gUnknown_085EBEB1[] = _("TRAINER'S POKéMON");
-const u8 gUnknown_085EBEC3[] = _("SELF-INTRODUCTION");
-const u8 gText_Navgear_ClearButtonList[] = _("{CLEAR 0x80}");
-const u8 gText_NavgearMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL");
-const u8 gText_NavgearMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL");
-const u8 gText_NavgearCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL");
-const u8 gText_NavgearCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL");
-const u8 gText_NavgearCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL");
-const u8 gText_NavgearMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL");
-const u8 gText_NavgearMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL");
-const u8 gText_NavgearMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL");
-const u8 gText_NavgearRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL");
-const u8 gText_NavgearRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL");
-const u8 gText_NavgearRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL");
+const u8 gText_PokenavMatchCall_Strategy[] = _("STRATEGY");
+const u8 gText_PokenavMatchCall_TrainerPokemon[] = _("TRAINER'S POKéMON");
+const u8 gText_PokenavMatchCall_SelfIntroduction[] = _("SELF-INTRODUCTION");
+const u8 gText_Pokenav_ClearButtonList[] = _("{CLEAR 0x80}");
+const u8 gText_PokenavMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL");
+const u8 gText_PokenavMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL");
+const u8 gText_PokenavCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL");
+const u8 gText_PokenavCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL");
+const u8 gText_PokenavCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL");
+const u8 gText_PokenavMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL");
+const u8 gText_PokenavMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL");
+const u8 gText_PokenavMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL");
+const u8 gText_PokenavRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL");
+const u8 gText_PokenavRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL");
+const u8 gText_PokenavRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL");
 const u8 gText_NatureSlash[] = _("NATURE/");
 const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!");
 const u8 gText_InParty[] = _("IN PARTY");
diff --git a/src/trade.c b/src/trade.c
index 6f1f6e853..d97325174 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -4,7 +4,7 @@
 #include "battle_interface.h"
 #include "bg.h"
 #include "cable_club.h"
-#include "data2.h"
+#include "data.h"
 #include "daycare.h"
 #include "decompress.h"
 #include "event_data.h"
@@ -1384,10 +1384,6 @@ static const u8 gUnknown_08339090[][2] =
     {0,  0}
 };
 
-// external to this file
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct MonCoords gMonFrontPicCoords[];
-
 static bool8 sub_8077170(const void *a0, u32 a1)
 {
     if (gUnknown_02022C2C == 29)
diff --git a/src/trader.c b/src/trader.c
index 97bc4626f..dcf1fa076 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -142,7 +142,7 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void)
 
     for (i = 0; i < 8; i++)
     {
-        if (CountDecorationCategoryN(i))
+        if (GetNumOwnedDecorationsInCategory(i))
         {
             gSpecialVar_Result = FALSE;
             return;
@@ -157,21 +157,21 @@ void ScrSpecial_IsDecorationFull(void)
     if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
         && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1)
     {
-        sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category);
+        CopyDecorationCategoryName(gStringVar2, gDecorations[gSpecialVar_0x8004].category);
         gSpecialVar_Result = TRUE;
     }
 }
 
 void ScrSpecial_TraderMenuGiveDecoration(void)
 {
-    CreateTask(sub_8127208, 0);
+    CreateTask(ShowDecorationCategoriesWindow, 0);
 }
 
 void sub_8133DA0(u8 taskId)
 {
     if (IsSelectedDecorInThePC() == TRUE)
     {
-        gSpecialVar_0x8006 = gCurDecorInventoryItems[gCurDecorationIndex];
+        gSpecialVar_0x8006 = gCurDecorationItems[gCurDecorationIndex];
         StringCopy(gStringVar3, gDecorations[gSpecialVar_0x8004].name);
         StringCopy(gStringVar2, gDecorations[gSpecialVar_0x8006].name);
     }
@@ -183,7 +183,7 @@ void sub_8133DA0(u8 taskId)
     EnableBothScriptContexts();
 }
 
-void sub_8133E1C(u8 taskId)
+void ExitTraderMenu(u8 taskId)
 {
     gSpecialVar_0x8006 = 0;
     DestroyTask(taskId);
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index eafd1eb3d..650a748cb 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -428,7 +428,7 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId)
 static void TrainerHillStartChallenge(void)
 {
     nullsub_2();
-    if (!sub_81D3B34())
+    if (!ReadTrainerHillAndValidate())
         gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 1;
     else
         gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 0;
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 8172f09e6..6824e8747 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -6,21 +6,10 @@
 #include "palette.h"
 #include "decompress.h"
 #include "trainer_pokemon_sprites.h"
-#include "data2.h"
+#include "data.h"
 #include "pokemon.h"
 #include "constants/trainers.h"
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES];
-extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES];
-extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
-extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const union AffineAnimCmd *const gUnknown_082FF618[];
-extern const union AffineAnimCmd *const gUnknown_082FF694[];
-extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[];
-extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
-extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
-
 // Static type declarations
 
 struct PicData
@@ -149,7 +138,7 @@ static void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 pale
 static void AssignSpriteAnimsTable(bool8 isTrainer)
 {
     if (!isTrainer)
-        sCreatingSpriteTemplate.anims = gPlayerMonSpriteAnimsTable;
+        sCreatingSpriteTemplate.anims = gUnknown_082FF70C;
     else
         sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
 }
@@ -270,7 +259,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
         images[j].size = 0x800;
     }
     sCreatingSpriteTemplate.tileTag = 0xFFFF;
-    sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species];
+    sCreatingSpriteTemplate.anims = gMonFrontAnimsPtrTable[species];
     sCreatingSpriteTemplate.images = images;
     if (flags2 == 0x01)
     {
diff --git a/src/tv.c b/src/tv.c
index 17243a456..01b43f100 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -37,7 +37,7 @@
 #include "decoration.h"
 #include "secret_base.h"
 #include "tv.h"
-#include "data2.h"
+#include "data.h"
 #include "constants/layouts.h"
 #include "constants/metatile_behaviors.h"
 
@@ -2567,7 +2567,7 @@ void sub_80EEA70(void)
             show->secretBaseSecrets.active = FALSE;
             StringCopy(show->secretBaseSecrets.playerName, gSaveBlock2Ptr->playerName);
             show->secretBaseSecrets.stepsInBase = VarGet(VAR_SECRET_BASE_STEP_COUNTER);
-            sub_80E980C();
+            CopyCurSecretBaseOwnerName_StrVar1();
             StringCopy(strbuf, gStringVar1);
             StripExtCtrlCodes(strbuf);
             StringCopy(show->secretBaseSecrets.baseOwnersName, strbuf);
@@ -7366,7 +7366,7 @@ u8 TVShowGetFlagCount(TVShow *show)
     return tot;
 }
 
-u8 TVShowGetStateForFlagNumber(TVShow *show, u8 a1)
+static u8 SecretBaseSecrets_GetStateForFlagNumber(TVShow *show, u8 a1)
 {
     u8 i;
     u8 tot;
@@ -7409,7 +7409,7 @@ static void DoTVShowSecretBaseSecrets(void)
             {
                 show->secretBaseSecrets.savedState = 1;
                 sTVSecretBaseSecretsRandomValues[0] = Random() % bitCount;
-                sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]);
+                sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[0]);
             }
             break;
         case 1:
@@ -7424,11 +7424,11 @@ static void DoTVShowSecretBaseSecrets(void)
                     show->secretBaseSecrets.savedState = 2;
                     if (sTVSecretBaseSecretsRandomValues[0] == 0)
                     {
-                        sTVShowState = TVShowGetStateForFlagNumber(show, 1);
+                        sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, 1);
                     }
                     else
                     {
-                        sTVShowState = TVShowGetStateForFlagNumber(show, 0);
+                        sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, 0);
                     }
                     break;
                 default:
@@ -7441,7 +7441,7 @@ static void DoTVShowSecretBaseSecrets(void)
                         }
                     }
                     show->secretBaseSecrets.savedState = 2;
-                    sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]);
+                    sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[1]);
                     break;
             }
             break;
@@ -7463,7 +7463,7 @@ static void DoTVShowSecretBaseSecrets(void)
                     }
                 }
                 show->secretBaseSecrets.savedState = 3;
-                sTVShowState = TVShowGetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]);
+                sTVShowState = SecretBaseSecrets_GetStateForFlagNumber(show, sTVSecretBaseSecretsRandomValues[2]);
             }
             break;
         case 3:
diff --git a/src/union_room.c b/src/union_room.c
index c708c12d8..6e7c0965d 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -32,7 +32,7 @@
 #include "palette.h"
 #include "decompress.h"
 #include "start_menu.h"
-#include "data2.h"
+#include "data.h"
 #include "field_screen_effect.h"
 #include "script_pokemon_util_80F87D8.h"
 #include "international_string_util.h"
@@ -47,6 +47,7 @@
 #include "berry_crush.h"
 #include "mystery_gift.h"
 #include "union_room_player_avatar.h"
+#include "pokemon_jump.h"
 
 EWRAM_DATA u8 gUnknown_02022C20[12] = {};
 EWRAM_DATA u8 gUnknown_02022C2C = 0;
@@ -62,8 +63,6 @@ EWRAM_DATA struct TradeUnkStruct gUnknown_02022C40 = {};
 IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0;
 IWRAM_DATA struct UnkStruct_Group *gUnknown_03000DA4;
 IWRAM_DATA struct UnkStruct_URoom *gUnknown_03000DA8;
-IWRAM_DATA void *gUnknown_03000DAC;
-IWRAM_DATA bool32 gUnknown_03000DB0;
 
 // this file's functions
 void sub_80173E0(u8 windowId, u8 arg1, const u8 *str, u8 arg3, u8 arg4, u8 arg5);
@@ -99,7 +98,6 @@ bool32 sub_8017678(struct UnkStruct_Shared *arg0, struct UnkStruct_Shared *arg1)
 u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId);
 void sub_801807C(struct TradeUnkStruct *arg0);
 void sub_801AC54(void);
-void sub_802A9A8(u8 monId, MainCallback callback);
 void sub_802493C(u8 monId, MainCallback callback);
 void sub_80149D8(void);
 void MG_DrawTextBorder(u8 windowId);
@@ -2334,7 +2332,7 @@ void sub_8013F90(u8 taskId)
         if (GetBlockReceivedStatus() == 3)
         {
             gEnemyParty[0] = *(struct Pokemon*)(gBlockRecvBuffer[GetMultiplayerId() ^ 1]);
-            IncrementGameStat(GAME_STAT_50);
+            IncrementGameStat(GAME_STAT_NUM_UNION_ROOM_BATTLES);
             ResetBlockReceivedFlags();
             gTasks[taskId].data[0]++;
         }
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
new file mode 100644
index 000000000..9d9f9dcf3
--- /dev/null
+++ b/src/union_room_battle.c
@@ -0,0 +1,631 @@
+#include "global.h"
+#include "battle.h"
+#include "task.h"
+#include "text.h"
+#include "main.h"
+#include "bg.h"
+#include "palette.h"
+#include "gpu_regs.h"
+#include "alloc.h"
+#include "menu.h"
+#include "window.h"
+#include "text_window.h"
+#include "scanline_effect.h"
+#include "m4a.h"
+#include "dynamic_placeholder_text_util.h"
+#include "overworld.h"
+#include "strings.h"
+#include "string_util.h"
+#include "international_string_util.h"
+#include "sound.h"
+#include "constants/songs.h"
+#include "party_menu.h"
+#include "battle_setup.h"
+#include "link.h"
+#include "union_room.h"
+#include "union_room_battle.h"
+
+struct UnkStruct_3000DAC
+{
+    /*0x00*/ u32 unk00[4];
+    /*0x10*/ u32 unk10[4];
+    /*0x20*/ u32 unk20[16];
+    /*0x60*/ u8 taskId;
+    /*0x61*/ u8 unk61;
+    /*0x62*/ u8 filler_62[10];
+};
+
+struct UnkStruct_2022C6C
+{
+    s16 a0;
+};
+
+IWRAM_DATA struct UnkStruct_3000DAC * gUnknown_03000DAC;
+IWRAM_DATA bool32 gUnknown_03000DB0;
+
+EWRAM_DATA struct UnkStruct_2022C6C * gUnknown_02022C6C = NULL;
+
+void sub_801A43C(void);
+void sub_801A6C0(u8 taskId);
+static void sub_801A8B0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 mode);
+bool32 sub_801AA30(u32 * a0, u32 * a1, u32 * a2, u8 taskId);
+
+const u16 gWirelessInfoScreenPal[] = INCBIN_U16("graphics/interface/wireless_info_screen.gbapal");
+const u32 gWirelessInfoScreenGfx[] = INCBIN_U32("graphics/interface/wireless_info_screen.4bpp.lz");
+const u32 gWirelessInfoScreenTilemap[] = INCBIN_U32("graphics/interface/wireless_info_screen.bin.lz");
+
+const struct BgTemplate gUnknown_082F0D34[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 0x1F,
+        .priority = 0
+    }, {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 0x08,
+        .priority = 1
+    }
+};
+
+const struct WindowTemplate gUnknown_082F0D3C[] = {
+    {
+        .bg = 0x00,
+        .tilemapLeft = 0x03,
+        .tilemapTop = 0x00,
+        .width = 0x18,
+        .height = 0x03,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001
+    }, {
+        .bg = 0x00,
+        .tilemapLeft = 0x03,
+        .tilemapTop = 0x04,
+        .width = 0x15,
+        .height = 0x0f,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0049
+    }, {
+        .bg = 0x00,
+        .tilemapLeft = 0x18,
+        .tilemapTop = 0x04,
+        .width = 0x03,
+        .height = 0x0f,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0184
+    },
+    { 0xFF }
+};
+
+const u8 *const gUnknown_082F0D5C[] = {
+    gText_WirelessCommStatus,
+    gText_PeopleTrading,
+    gText_PeopleBattling,
+    gText_PeopleInUnionRoom,
+    gText_PeopleCommunicating
+};
+
+const u8 gUnknown_082F0D70[][3] = {
+    {0x01, 0x01, 0x02},
+    {0x02, 0x01, 0x02},
+    {0x03, 0x01, 0x04},
+    {0x04, 0x00, 0x02},
+    {0x06, 0x03, 0x02},
+    {0x07, 0x03, 0x02},
+    {0x09, 0x03, 0x00},
+    {0x0a, 0x03, 0x00},
+    {0x0b, 0x03, 0x00},
+    {0x0c, 0xff, 0x00},
+    {0x0d, 0x00, 0x00},
+    {0x10, 0x03, 0x00},
+    {0x0f, 0x03, 0x00},
+    {0x40, 0x02, 0x01},
+    {0x41, 0x02, 0x02},
+    {0x44, 0x02, 0x02},
+    {0x45, 0x02, 0x00},
+    {0x48, 0x02, 0x02},
+    {0x54, 0x02, 0x01},
+    {0x53, 0x02, 0x02},
+    {0x51, 0x02, 0x01},
+    {0x52, 0x02, 0x01},
+    {0x15, 0x03, 0x02},
+    {0x16, 0x03, 0x02},
+    {0x17, 0x03, 0x00},
+    {0x18, 0x03, 0x00},
+    {0x19, 0x03, 0x00},
+    {0x1a, 0x03, 0x00},
+    {0x1b, 0x03, 0x00},
+    {0x1c, 0x01, 0x02},
+    {0x0e, 0x01, 0x02}
+};
+
+const struct BgTemplate gUnknown_082F0DD0[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31
+    }
+};
+
+const struct WindowTemplate gUnknown_082F0DD4[] = {
+    {
+        .bg = 0,
+        .tilemapLeft = 3,
+        .tilemapTop = 15,
+        .width = 24,
+        .height = 4,
+        .paletteNum = 0xE,
+        .baseBlock = 0x014
+    },
+    { 0xFF }
+};
+
+const u8 gUnknown_082F0DE4[] = { 1, 2, 3 };
+
+void sub_801A3F4(void)
+{
+    if (!IsDma3ManagerBusyWithBgCopy())
+    {
+        RunTasks();
+        RunTextPrinters();
+        AnimateSprites();
+        BuildOamBuffer();
+        UpdatePaletteFade();
+    }
+}
+
+void sub_801A418(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_801A42C(void)
+{
+    SetMainCallback2(sub_801A43C);
+}
+
+void sub_801A43C(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
+    gUnknown_03000DAC = AllocZeroed(sizeof(struct UnkStruct_3000DAC));
+    SetVBlankCallback(NULL);
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_082F0D34, ARRAY_COUNT(gUnknown_082F0D34));
+    SetBgTilemapBuffer(1, Alloc(0x800));
+    SetBgTilemapBuffer(0, Alloc(0x800));
+    DecompressAndLoadBgGfxUsingHeap(1, gWirelessInfoScreenGfx, 0, 0, 0);
+    CopyToBgTilemapBuffer(1, gWirelessInfoScreenTilemap, 0, 0);
+    InitWindows(gUnknown_082F0D3C);
+    DeactivateAllTextPrinters();
+    ResetPaletteFade();
+    ResetSpriteData();
+    ResetTasks();
+    ScanlineEffect_Stop();
+    m4aSoundVSyncOn();
+    SetVBlankCallback(sub_801A418);
+    gUnknown_03000DAC->taskId = CreateTask(sub_801A6C0, 0);
+    gUnknown_03000DAC->unk61 = sub_8013C40();
+    gUnknown_03000DAC->unk10[3] = 1;
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    LoadPalette(gWirelessInfoScreenPal, 0x00, 0x20);
+    Menu_LoadStdPalAt(0xF0);
+    DynamicPlaceholderTextUtil_Reset();
+    FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x0F);
+    CopyBgTilemapBufferToVram(1);
+    SetMainCallback2(sub_801A3F4);
+    RunTasks();
+    RunTextPrinters();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void sub_801A584(void)
+{
+    s32 i;
+    FreeAllWindowBuffers();
+    for (i = 0; i < 2; i++)
+    {
+        Free(GetBgTilemapBuffer(i));
+    }
+    Free(gUnknown_03000DAC);
+    SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
+}
+
+void sub_801A5BC(s16 * a0, s16 * a1)
+{
+    if (++(*a0) > 5)
+    {
+        if (++(*a1) == 14)
+        {
+            *a1 = 0;
+        }
+        *a0 = 0;
+    }
+    LoadPalette(gWirelessInfoScreenPal + 16 * (*a1 + 2), 0, 0x10);
+}
+
+void sub_801A600(void)
+{
+    s32 i;
+    FillWindowPixelBuffer(0, 0);
+    FillWindowPixelBuffer(1, 0);
+    FillWindowPixelBuffer(2, 0);
+    sub_801A8B0(0, 1, gUnknown_082F0D5C[0], GetStringCenterAlignXOffset(1, gUnknown_082F0D5C[0], 0xC0), 6, 3);
+    for (i = 0; i < 3; i++)
+    {
+        sub_801A8B0(1, 1, gUnknown_082F0D5C[i + 1], 0, 30 * i + 8, 1);
+    }
+    sub_801A8B0(1, 1, gUnknown_082F0D5C[i + 1], 0, 30 * i + 8, 2);
+    PutWindowTilemap(0);
+    CopyWindowToVram(0, 2);
+    PutWindowTilemap(1);
+    CopyWindowToVram(1, 2);
+}
+
+void sub_801A6C0(u8 taskId)
+{
+    s32 i;
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        sub_801A600();
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        ShowBg(1);
+        CopyBgTilemapBufferToVram(0);
+        ShowBg(0);
+        gTasks[taskId].data[0]++;
+        break;
+    case 2:
+        if (!gPaletteFade.active)
+        {
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 3:
+        if (sub_801AA30(gUnknown_03000DAC->unk00, gUnknown_03000DAC->unk10, gUnknown_03000DAC->unk20, gUnknown_03000DAC->unk61))
+        {
+            FillWindowPixelBuffer(2, 0);
+            for (i = 0; i < 4; i++)
+            {
+                ConvertIntToDecimalStringN(gStringVar4, gUnknown_03000DAC->unk00[i], STR_CONV_MODE_RIGHT_ALIGN, 2);
+                if (i != 3)
+                {
+                    sub_801A8B0(2, 1, gStringVar4, 12, 30 * i + 8, 1);
+                }
+                else
+                {
+                    sub_801A8B0(2, 1, gStringVar4, 12, 98, 2);
+                }
+            }
+            PutWindowTilemap(2);
+            CopyWindowToVram(2, 3);
+        }
+        if (({gMain.newKeys & A_BUTTON;}) || ({gMain.newKeys & B_BUTTON;}))
+        {
+            PlaySE(SE_SELECT);
+            gTasks[gUnknown_03000DAC->unk61].data[15] = 0xFF;
+            gTasks[taskId].data[0]++;
+        }
+        sub_801A5BC(&gTasks[taskId].data[7], &gTasks[taskId].data[8]);
+        break;
+    case 4:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        gTasks[taskId].data[0]++;
+        break;
+    case 5:
+        if (!gPaletteFade.active)
+        {
+            SetMainCallback2(sub_801A584);
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+static void sub_801A8B0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 mode)
+{
+    u8 color[3];
+
+    switch (mode)
+    {
+    case 0:
+        color[0] = 0;
+        color[1] = 2;
+        color[2] = 3;
+        break;
+    case 1:
+        color[0] = 0;
+        color[1] = 1;
+        color[2] = 3;
+        break;
+    case 2:
+        color[0] = 0;
+        color[1] = 4;
+        color[2] = 5;
+        break;
+    case 3:
+        color[0] = 0;
+        color[1] = 7;
+        color[2] = 6;
+        break;
+    case 4:
+        color[0] = 0;
+        color[1] = 1;
+        color[2] = 2;
+        break;
+    }
+
+    AddTextPrinterParameterized4(windowId, fontId, x, y, 0, 0, color, -1, str);
+}
+
+u32 sub_801A960(struct UnkStruct_x20 * a0, u32 * a1)
+{
+    s32 i, j, r2;
+    u32 result = a0->unk.field_0.unk_0a_0;
+
+    for (i = 0; i < (unsigned)ARRAY_COUNT(gUnknown_082F0D70); i++)
+    {
+        if (result != gUnknown_082F0D70[i][0])
+        {
+            continue;
+        }
+        if (a0->field_1A_0 != 1)
+        {
+            continue;
+        }
+        if (gUnknown_082F0D70[i][2] == 0)
+        {
+            r2 = 0;
+            for (j = 0; j < 4; j++)
+            {
+                if (a0->unk.field_0.unk_04[j] != 0)
+                {
+                    r2++;
+                }
+            }
+            r2++;
+            a1[gUnknown_082F0D70[i][1]] += r2;
+        }
+        else
+        {
+            a1[gUnknown_082F0D70[i][1]] += gUnknown_082F0D70[i][2];
+        }
+    }
+    return result;
+}
+
+bool32 sub_801AA08(u32 * a0, u32 * a1)
+{
+    s32 i;
+    for (i = 0; i < 4; i++)
+    {
+        if (a0[i] != a1[i])
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool32 sub_801AA30(u32 * a0, u32 * a1, u32 * a2, u8 taskId)
+{
+    bool32 r8 = FALSE;
+    u32 sp0[4] = {0, 0, 0, 0};
+    struct UnkStruct_x20 ** data = (void *)gTasks[taskId].data;
+    s32 i;
+
+    for (i = 0; i < 16; i++)
+    {
+        u32 r1 = sub_801A960(&(*data)[i], sp0);
+        if (r1 != a2[i])
+        {
+            a2[i] = r1;
+            r8 = TRUE;
+        }
+    }
+    if (sub_801AA08(sp0, a1) == 0)
+    {
+        if (r8 != TRUE)
+        {
+            return FALSE;
+        }
+    }
+    else
+    {
+        memcpy(a0, sp0, sizeof(sp0));
+        memcpy(a1, sp0, sizeof(sp0));
+        a0[3] = a0[0] + a0[1] + a0[2] + a0[3];
+    }
+    return TRUE;
+}
+
+void sub_801AAD4(void)
+{
+    s32 i;
+    sub_8014210(10);
+    for (i = 0; i < 2; i++)
+    {
+        gEnemyParty[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1];
+    }
+    for (i = 0; i < 6; i++)
+    {
+        ZeroMonData(&gPlayerParty[i]);
+    }
+    for (i = 0; i < 2; i++)
+    {
+        gPlayerParty[i] = gEnemyParty[i];
+    }
+    IncrementGameStat(GAME_STAT_NUM_UNION_ROOM_BATTLES);
+    CalculatePlayerPartyCount();
+    gTrainerBattleOpponent_A = 0xC00;
+    SetMainCallback2(CB2_InitBattle);
+}
+
+void sub_801AB68(u8 windowId, const u8 * str, u8 x, u8 y, s32 speed)
+{
+    s32 letterSpacing = 0;
+    s32 lineSpacing = 1;
+    FillWindowPixelBuffer(windowId, (gUnknown_082F0DE4[0] << 4) | gUnknown_082F0DE4[0]);
+    AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, lineSpacing, gUnknown_082F0DE4, speed, str);
+}
+
+bool32 sub_801ABDC(s16 * state, const u8 * str, s32 speed)
+{
+    switch (*state)
+    {
+    case 0:
+        DrawTextBorderOuter(0, 0x001, 0xD);
+        sub_801AB68(0, str, 0, 1, speed);
+        PutWindowTilemap(0);
+        CopyWindowToVram(0, 3);
+        (*state)++;
+        break;
+    case 1:
+        if (!IsTextPrinterActive(0))
+        {
+            *state = 0;
+            return TRUE;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+void sub_801AC40(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_801AC54(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
+        gUnknown_02022C6C = AllocZeroed(4);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        ResetTasks();
+        ResetBgsAndClearDma3BusyFlags(0);
+        InitBgsFromTemplates(0, gUnknown_082F0DD0, 1);
+        reset_temp_tile_data_buffers();
+        if (!InitWindows(gUnknown_082F0DD4))
+        {
+            return;
+        }
+        DeactivateAllTextPrinters();
+        ClearWindowTilemap(0);
+        FillWindowPixelBuffer(0, 0x00);
+        FillWindowPixelBuffer(0, 0x11);
+        FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF);
+        LoadUserWindowBorderGfx(0, 1, 0xD0);
+        LoadUserWindowBorderGfx_(0, 1, 0xD0);
+        sub_819789C();
+        SetVBlankCallback(sub_801AC40);
+        gMain.state++;
+        break;
+    case 1:
+        if (sub_801ABDC(&gUnknown_02022C6C->a0, gText_CommStandbyAwaitingOtherPlayer, 0))
+        {
+            gMain.state++;
+        }
+        break;
+    case 2:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        ShowBg(0);
+        gMain.state++;
+        break;
+    case 3:
+        if (!UpdatePaletteFade())
+        {
+            memset(gBlockSendBuffer, 0, 0x20);
+            if (gSelectedOrderFromParty[0] == -gSelectedOrderFromParty[1])
+            {
+                gBlockSendBuffer[0] = 0x52;
+            }
+            else
+            {
+                gBlockSendBuffer[0] = 0x51;
+            }
+            SendBlock(0, gBlockSendBuffer, 0x20);
+            gMain.state++;
+        }
+        break;
+    case 4:
+        if (GetBlockReceivedStatus() == 3)
+        {
+            if (gBlockRecvBuffer[0][0] == 0x51 && gBlockRecvBuffer[1][0] == 0x51)
+            {
+                BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+                gMain.state = 50;
+            }
+            else
+            {
+                sub_800AC34();
+                if (gBlockRecvBuffer[GetMultiplayerId()][0] == 0x52)
+                {
+                    gMain.state = 6;
+                }
+                else
+                {
+                    gMain.state = 8;
+                }
+            }
+            ResetBlockReceivedFlags();
+        }
+        break;
+    case 50:
+        if (!UpdatePaletteFade())
+        {
+            sub_800ADF8();
+            gMain.state++;
+        }
+        break;
+    case 51:
+        if (IsLinkTaskFinished())
+        {
+            SetMainCallback2(sub_801AAD4);
+        }
+        break;
+    case 6:
+        if (gReceivedRemoteLinkPlayers == 0)
+        {
+            gMain.state++;
+        }
+        break;
+    case 7:
+        if (sub_801ABDC(&gUnknown_02022C6C->a0, gText_RefusedBattle, 1))
+        {
+            SetMainCallback2(CB2_ReturnToField);
+        }
+        break;
+    case 8:
+        if (gReceivedRemoteLinkPlayers == 0)
+        {
+            gMain.state++;
+        }
+        break;
+    case 9:
+        if (sub_801ABDC(&gUnknown_02022C6C->a0, gText_BattleWasRefused, 1))
+        {
+            SetMainCallback2(CB2_ReturnToField);
+        }
+        break;
+    }
+    RunTasks();
+    RunTextPrinters();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 55f826066..4afeb99cf 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -190,30 +190,359 @@ static void sub_80209E0(void);
 static bool32 sub_8020A1C(void);
 static void sub_80207C0(s16);
 static void sub_8020818(s16);
+static bool32 sub_801F658(u8 *state);
+static bool32 sub_801F6F8(u8 *state);
+static bool32 sub_801F730(u8 *state);
+static bool32 sub_801F768(u8 *state);
+static bool32 sub_801F7D4(u8 *state);
+static bool32 sub_801F7E0(u8 *state);
+static bool32 sub_801F82C(u8 *state);
+static bool32 sub_801F870(u8 *state);
+static bool32 sub_801F8DC(u8 *state);
+static bool32 sub_801F984(u8 *state);
+static bool32 sub_801FA2C(u8 *state);
+static bool32 sub_801FA68(u8 *state);
+static bool32 sub_801FB44(u8 *state);
+static bool32 sub_801FB70(u8 *state);
+static bool32 sub_801FBB4(u8 *state);
+static bool32 sub_801FBF8(u8 *state);
+static bool32 sub_801FC4C(u8 *state);
+static bool32 sub_801FC9C(u8 *state);
+static bool32 sub_801FCEC(u8 *state);
+static bool32 sub_801FD30(u8 *state);
+static bool32 sub_801FD88(u8 *state);
+static void sub_8020ABC(struct Sprite *sprite);
+static void sub_8020AF4(struct Sprite *sprite);
+
+EWRAM_DATA struct UnionRoomChat *gUnknown_02022C84 = NULL;
+EWRAM_DATA struct UnionRoomChat2 *gUnknown_02022C88 = NULL;
+EWRAM_DATA struct UnionRoomChat3 *gUnknown_02022C8C = NULL;
 
-extern struct UnionRoomChat *gUnknown_02022C84;
-extern struct UnionRoomChat2 *gUnknown_02022C88;
-extern struct UnionRoomChat3 *gUnknown_02022C8C;
-
-extern const u8 *const gUnknown_082F2BA8[][10];
-extern const u8 gUnknown_082F2AA8[];
-extern const struct BgTemplate gUnknown_082F2C60[4];
-extern const struct WindowTemplate gUnknown_082F2C70[];
-extern const struct Unk82F2C98 gUnknown_082F2C98[];
-extern const struct Unk82F2D40 gUnknown_082F2D40[];
-extern const u8 gText_Ellipsis[];
-extern const struct MenuAction gUnknown_082F2DC8[];
-extern const u16 gUnknown_082F2C20[];
-extern const u16 gUnknown_082F2C40[];
-extern const struct CompressedSpriteSheet gUnknown_082F3134[];
-extern const struct SpritePalette gUnknown_082F315C;
-extern const struct SpriteTemplate gUnknown_082F319C;
-extern const u16 gUnknown_082F2DF0[];
-extern const struct SpriteTemplate gUnknown_082F31BC;
-extern const struct SpriteTemplate gUnknown_082F31D4;
-extern const struct SpriteTemplate gUnknown_082F322C;
-extern const struct SpriteTemplate gUnknown_082F3244;
+void (*const gUnknown_082F2A7C[])(void) =
+    {
+        sub_801DFAC,
+        sub_801E030,
+        sub_801E120,
+        sub_801E240,
+        sub_801E764,
+        sub_801E838,
+        sub_801E460,
+        sub_801E5C4,
+        sub_801E668,
+        sub_801E978,
+    };
+
+static const u8 sUnknown_082F2AA4[] = {9, 9, 9, 9};
+
+static const u8 gUnknown_082F2AA8[] = {
+    CHAR_SPACE, 0x16, 0x17, 0x68, 0x19, 0x1A, 0x1B, 0x1C,
+    0x1D, 0x1E, CHAR_SPACE, 0x20, 0x21, 0x22, 0x23, 0x24,
+    0x25, 0x26, 0x27, 0x28, 0x29, 0x15, 0x01, 0x02,
+    CHAR_SPACE, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, CHAR_SPACE,
+    0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12,
+    0x13, 0x14, 0x2A, 0x2B, 0x2C, 0x2D, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, 0x35, 0x36, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, 0x53, 0x54, 0x55, 0x56, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, 0x6F, 0x5B, 0x5C, 0x5D, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    0x03, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, 0x5A,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, 0x84, 0x85, 0x86, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE,
+    0xA0, CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, CHAR_5, CHAR_6,
+    CHAR_7, CHAR_8, CHAR_9, CHAR_EXCL_MARK, CHAR_QUESTION_MARK, CHAR_PERIOD, CHAR_HYPHEN, 0xAF,
+    CHAR_ELLIPSIS, CHAR_DBL_QUOT_LEFT, CHAR_DBL_QUOT_RIGHT, CHAR_SGL_QUOT_LEFT, CHAR_SGL_QUOT_RIGHT, CHAR_MALE, CHAR_FEMALE, CHAR_CURRENCY,
+    CHAR_COMMA, CHAR_MULT_SIGN, CHAR_SLASH, CHAR_a, CHAR_b, CHAR_c, CHAR_d, CHAR_e,
+    CHAR_f, CHAR_g, CHAR_h, CHAR_i, CHAR_j, CHAR_k, CHAR_l, CHAR_m,
+    CHAR_n, CHAR_o, CHAR_p, CHAR_q, CHAR_r, CHAR_s, CHAR_t, CHAR_u,
+    CHAR_v, CHAR_w, CHAR_x, CHAR_y, CHAR_z, CHAR_A, CHAR_B, CHAR_C,
+    CHAR_D, CHAR_E, CHAR_F, CHAR_G, CHAR_H, CHAR_I, CHAR_J, CHAR_K,
+    CHAR_L, CHAR_M, CHAR_N, CHAR_O, CHAR_P, CHAR_Q, CHAR_R, CHAR_S,
+    CHAR_T, CHAR_U, CHAR_V, CHAR_W, CHAR_X, CHAR_Y, CHAR_Z, 0xEF,
+    CHAR_COLON, 0xF4, 0xF5, 0xF6, 0xF1, 0xF2, 0xF3, CHAR_SPACE,
+    CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE
+};
+
+const u8 *const gUnknown_082F2BA8[][10] = {
+    {gUnknown_0862B9F9, gUnknown_0862B9FF, gUnknown_0862BA05, gUnknown_0862BA0B, gUnknown_0862BA11, gUnknown_0862BA17, gUnknown_0862BA1D, gUnknown_0862BA23, gUnknown_0862BA29, gUnknown_0862BA2F},
+    {gUnknown_0862BA35, gUnknown_0862BA3B, gUnknown_0862BA41, gUnknown_0862BA47, gUnknown_0862BA4D, gUnknown_0862BA53, gUnknown_0862BA59, gUnknown_0862BA5F, gUnknown_0862BA65, gUnknown_0862BA6B},
+    {gUnknown_0862BA79, gUnknown_0862BA84, gUnknown_0862BA8F, gUnknown_0862BA9A, gUnknown_0862BAA3, gUnknown_0862BAAE, gUnknown_0862BAB9, gUnknown_0862BAC4, gUnknown_0862BACF, gUnknown_0862BADA}
+};
+
+const u16 gUnknown_082F2C20[] = INCBIN_U16("graphics/interface/unk_palette1.gbapal");
+const u16 gUnknown_082F2C40[] = INCBIN_U16("graphics/interface/unk_palette2.gbapal");
+
+const struct BgTemplate gUnknown_082F2C60[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 7,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }, {
+        .bg = 1,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    }, {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 23,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    }, {
+        .bg = 3,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 15,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 1
+    }
+};
+
+const struct WindowTemplate gUnknown_082F2C70[] = {
+    {
+        .bg = 0x03,
+        .tilemapLeft = 0x08,
+        .tilemapTop = 0x01,
+        .width = 0x15,
+        .height = 0x13,
+        .paletteNum = 0x0f,
+        .baseBlock = 0x0001,
+    }, {
+        .bg = 0x01,
+        .tilemapLeft = 0x09,
+        .tilemapTop = 0x12,
+        .width = 0x0f,
+        .height = 0x02,
+        .paletteNum = 0x0c,
+        .baseBlock = 0x007a,
+    }, {
+        .bg = 0x01,
+        .tilemapLeft = 0x00,
+        .tilemapTop = 0x02,
+        .width = 0x06,
+        .height = 0x0f,
+        .paletteNum = 0x07,
+        .baseBlock = 0x0020,
+    }, {
+        .bg = 0x00,
+        .tilemapLeft = 0x01,
+        .tilemapTop = 0x02,
+        .width = 0x07,
+        .height = 0x09,
+        .paletteNum = 0x0e,
+        .baseBlock = 0x0013,
+    }, { 0xFF }
+};
+
+const struct Unk82F2C98 gUnknown_082F2C98[] = {
+    {0x00000000, sub_801F658},
+    {0x00000003, sub_801F6F8},
+    {0x00000004, sub_801F730},
+    {0x00000005, sub_801F768},
+    {0x00000001, sub_801F7D4},
+    {0x00000006, sub_801F7E0},
+    {0x00000007, sub_801F82C},
+    {0x00000008, sub_801F870},
+    {0x00000009, sub_801F8DC},
+    {0x0000000a, sub_801F984},
+    {0x0000000b, sub_801FA2C},
+    {0x0000000c, sub_801FA68},
+    {0x00000002, sub_801FB44},
+    {0x0000000d, sub_801FB70},
+    {0x00000012, sub_801FBB4},
+    {0x00000013, sub_801FBF8},
+    {0x0000000e, sub_801FC4C},
+    {0x0000000f, sub_801FC9C},
+    {0x00000010, sub_801FCEC},
+    {0x00000011, sub_801FD30},
+    {0x00000014, sub_801FD88}
+};
+
+const struct Unk82F2D40 gUnknown_082F2D40[] = {
+    {gText_QuitChatting, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00},
+    {gText_RegisterTextWhere, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00},
+    {gText_RegisterTextHere, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00},
+    {gText_InputText, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00},
+    {gText_ExitingChat, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00},
+    {gText_LeaderLeftEndingChat, 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00},
+    {gText_RegisteredTextChanged, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01},
+    {gText_AlreadySavedFile_Unused, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01},
+    {gText_SavingDontTurnOff_Unused, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01},
+    {gText_PlayerSavedGame_Unused, 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01},
+    {gText_IfLeaderLeavesChatEnds, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01}
+};
 
+const u8 gText_Ellipsis[] = _("…");
+
+const struct MenuAction gUnknown_082F2DC8[] = {
+    {gText_Upper, NULL},
+    {gText_Lower, NULL},
+    {gText_Symbols, NULL},
+    {gText_Register2, NULL},
+    {gText_Exit2, NULL},
+};
+
+const u16 gUnknown_082F2DF0[] = INCBIN_U16("graphics/interface/unk_palette3.gbapal");
+const u32 gUnknown_082F2E10[] = INCBIN_U32("graphics/interface/unk_cursor.4bpp.lz");
+const u32 gUnknown_082F3094[] = INCBIN_U32("graphics/interface/unk_dash.4bpp.lz");
+const u32 gUnknown_082F30B4[] = INCBIN_U32("graphics/interface/unk_cursor_arrow.4bpp.lz");
+const u32 gUnknown_082F30E0[] = INCBIN_U32("graphics/interface/unk_rbutton.4bpp.lz");
+
+const struct CompressedSpriteSheet gUnknown_082F3134[] = {
+    {gUnknown_082F2E10, 0x1000, 0x0000},
+    {gUnknown_082F30B4, 0x0040, 0x0001},
+    {gUnknown_082F3094, 0x0040, 0x0002},
+    {gUnknown_082F30E0, 0x0080, 0x0003},
+    {gUnknown_08DD4CF8, 0x0400, 0x0004}
+};
+
+const struct SpritePalette gUnknown_082F315C = {
+    gUnknown_082F2DF0, 0x0000
+};
+
+const struct OamData gUnknown_082F3164 = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 3,
+    .priority = 1
+};
+
+const union AnimCmd gUnknown_082F316C[] = {
+    ANIMCMD_FRAME(0x00, 30),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_082F3174[] = {
+    ANIMCMD_FRAME(0x20, 30),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_082F317C[] = {
+    ANIMCMD_FRAME(0x40, 30),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_082F3184[] = {
+    ANIMCMD_FRAME(0x60, 30),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gUnknown_082F318C[] = {
+    gUnknown_082F316C,
+    gUnknown_082F3174,
+    gUnknown_082F317C,
+    gUnknown_082F3184
+};
+
+const struct SpriteTemplate gUnknown_082F319C = {
+    .tileTag = 0x0000,
+    .paletteTag = 0x0000,
+    .oam = &gUnknown_082F3164,
+    .anims = gUnknown_082F318C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct OamData gUnknown_082F31B4 = {
+    .shape = ST_OAM_V_RECTANGLE,
+    .size = 0,
+    .priority = 2
+};
+
+const struct SpriteTemplate gUnknown_082F31BC = {
+    .tileTag = 0x0002,
+    .paletteTag = 0x0000,
+    .oam = &gUnknown_082F31B4,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8020ABC
+};
+
+const struct SpriteTemplate gUnknown_082F31D4 = {
+    .tileTag = 0x0001,
+    .paletteTag = 0x0000,
+    .oam = &gUnknown_082F31B4,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8020AF4
+};
+
+const struct OamData gUnknown_082F31EC = {
+    .shape = ST_OAM_SQUARE,
+    .size = 1,
+    .priority = 2
+};
+
+const struct OamData gUnknown_082F31F4 = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 2,
+    .priority = 2
+};
+
+const union AnimCmd gUnknown_082F31FC[] = {
+    ANIMCMD_FRAME(0x00, 2),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_082F3204[] = {
+    ANIMCMD_FRAME(0x08, 2),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_082F320C[] = {
+    ANIMCMD_FRAME(0x10, 2),
+    ANIMCMD_END
+};
+
+const union AnimCmd gUnknown_082F3214[] = {
+    ANIMCMD_FRAME(0x18, 2),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gUnknown_082F321C[] = {
+    gUnknown_082F31FC,
+    gUnknown_082F3204,
+    gUnknown_082F320C,
+    gUnknown_082F3214
+};
+
+const struct SpriteTemplate gUnknown_082F322C = {
+    .tileTag = 0x0003,
+    .paletteTag = 0x0000,
+    .oam = &gUnknown_082F31EC,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct SpriteTemplate gUnknown_082F3244 = {
+    .tileTag = 0x0004,
+    .paletteTag = 0x0000,
+    .oam = &gUnknown_082F31F4,
+    .anims = gUnknown_082F321C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
 
 void sub_801DD98(void)
 {
@@ -305,20 +634,6 @@ static void sub_801DF38(void)
     UpdatePaletteFade();
 }
 
-void (*const gUnknown_082F2A7C[])(void) =
-{
-    sub_801DFAC,
-    sub_801E030,
-    sub_801E120,
-    sub_801E240,
-    sub_801E764,
-    sub_801E838,
-    sub_801E460,
-    sub_801E5C4,
-    sub_801E668,
-    sub_801E978,
-};
-
 static void sub_801DF54(u8 taskId)
 {
     switch (gUnknown_02022C84->unk17)
@@ -939,8 +1254,6 @@ static void sub_801EBD4(u16 arg0)
     gUnknown_02022C84->unk6 = 0;
 }
 
-static const u8 sUnknown_082F2AA4[] = {9, 9, 9, 9};
-
 static bool32 sub_801EBE4(void)
 {
     if (!(gMain.newAndRepeatedKeys & DPAD_UP))
@@ -2566,7 +2879,7 @@ static void sub_8020A68(void)
     gUnknown_02022C8C->unk4 = &gSprites[spriteId];
 }
 
-void sub_8020ABC(struct Sprite *sprite)
+static void sub_8020ABC(struct Sprite *sprite)
 {
     int var0 = sub_801F198();
     if (var0 == 15)
@@ -2580,7 +2893,7 @@ void sub_8020ABC(struct Sprite *sprite)
     }
 }
 
-void sub_8020AF4(struct Sprite *sprite)
+static void sub_8020AF4(struct Sprite *sprite)
 {
     if (++sprite->data[0] > 4)
     {
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index 61be86a37..4c302c5eb 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -125,7 +125,7 @@ static void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId)
 
 static void CreateUnionRoomPlayerEventObject(u32 playerIdx)
 {
-    show_sprite(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    TrySpawnEventObject(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
 }
 
 static void RemoveUnionRoomPlayerEventObject(u32 playerIdx)
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 4eaf60be4..f28b651cc 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -21,6 +21,8 @@
 #include "menu.h"
 #include "gpu_regs.h"
 #include "graphics.h"
+#include "pokemon_summary_screen.h"
+#include "item_menu.h"
 
 struct UsePokeblockSubStruct
 {
@@ -83,8 +85,6 @@ struct UsePokeblockStruct
     /*0x7FD0*/ struct UsePokeblockSubStruct info;
 };
 
-extern u16 gKeyRepeatStartDelay;
-
 extern void sub_81D21DC(u8);
 
 // this file's functions
@@ -133,7 +133,6 @@ void sub_8168168(struct Sprite *sprite);
 
 extern const struct BgTemplate gUnknown_085DFCCC[4];
 extern const struct WindowTemplate gUnknown_085DFCDC[];
-extern u16 gSpecialVar_ItemId;
 extern const struct WindowTemplate sUsePokeblockYesNoWinTemplate[];
 extern const u8* sContestStatNames[];
 extern const u32 gUnknown_085DFCB0[];
@@ -152,8 +151,6 @@ extern const u8 gUnknown_085DFCC9[];
 extern const struct SpritePalette gUnknown_085DFDB8;
 extern const struct SpriteTemplate gUnknown_085DFDA0;
 
-extern const u8 *const gNatureNamePointers[];
-
 // ram variables
 EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
 EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL;
diff --git a/src/util.c b/src/util.c
index 47112774a..8aa54857a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -218,7 +218,7 @@ int CountTrailingZeroBits(u32 value)
     return 0;
 }
 
-u16 CalcCRC16(u8 *data, s32 length)
+u16 CalcCRC16(const u8 *data, s32 length)
 {
     u16 i, j;
     u16 crc = 0x1121;
@@ -237,7 +237,7 @@ u16 CalcCRC16(u8 *data, s32 length)
     return ~crc;
 }
 
-u16 CalcCRC16WithTable(u8 *data, u32 length)
+u16 CalcCRC16WithTable(const u8 *data, u32 length)
 {
     u16 i;
     u16 crc = 0x1121;
diff --git a/src/water.c b/src/water.c
index 20bf2542d..9aa08bf01 100644
--- a/src/water.c
+++ b/src/water.c
@@ -483,7 +483,7 @@ extern const struct SpriteTemplate gUnknown_08597388;
 void AnimTask_CreateRaindrops(u8 taskId)
 {
     u8 x, y;
-    
+
     if (gTasks[taskId].data[0] == 0)
     {
         gTasks[taskId].data[1] = gBattleAnimArgs[0];
@@ -520,7 +520,7 @@ void sub_8107228(struct Sprite *sprite)
 void sub_8107260(struct Sprite *sprite)
 {
     u8 spriteId;
-    
+
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0];
@@ -559,7 +559,7 @@ void sub_8107380(struct Sprite *sprite)
     u8 otherSpriteId = sprite->data[5];
     u8 timer = gSprites[otherSpriteId].data[4];
     u16 trigIndex = gSprites[otherSpriteId].data[3];
-    
+
     sprite->data[0] = 1;
     AnimTranslateLinear(sprite);
     sprite->pos2.x += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]);
@@ -593,7 +593,7 @@ void sub_8107430(struct Sprite *sprite)
 void sub_810744C(struct Sprite *sprite)
 {
     s16 unkArg;
-    
+
     InitSpritePosToAnimAttacker(sprite, TRUE);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         unkArg = -gBattleAnimArgs[2];
@@ -636,7 +636,7 @@ void sub_810756C(u8 taskId)
     u16 *palPtr1;
     u16 *palPtr2;
     u16 rgbBuffer;
-    
+
     if (++gTasks[taskId].data[10] == 3)
     {
         gTasks[taskId].data[10] = 0;
@@ -724,7 +724,7 @@ _081075DE:\n\
 void sub_81075EC(struct Sprite *sprite)
 {
     u16 retArg;
-    
+
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = 30;
     sprite->data[1] = sprite->pos1.x;
@@ -781,7 +781,7 @@ void sub_81076F4(u8 taskId)
 void sub_8107730(struct Sprite *sprite)
 {
     u8 priority;
-    
+
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     sprite->pos2.y = -10;
@@ -797,7 +797,7 @@ void sub_8107730(struct Sprite *sprite)
         {
             sprite->pos2.x = -10;
             sprite->subpriority = priority - 2;
-        }   
+        }
     }
     else
     {
@@ -876,7 +876,7 @@ void AnimTask_CreateSurfWave(u8 taskId)
 {
     struct BattleAnimBgData animBg;
     u8 taskId2;
-    
+
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
     SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
@@ -894,9 +894,9 @@ void AnimTask_CreateSurfWave(u8 taskId)
     {
         sub_80A6D60(&animBg, gUnknown_08D963A4, 1);
     }
-    AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBackgroundImage_Surf, animBg.tilesOffset);
+    AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Surf, animBg.tilesOffset);
     if (gBattleAnimArgs[0] == 0)
-        LoadCompressedPalette(gBattleAnimBackgroundPalette_Surf, animBg.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleAnimBgPalette_Surf, animBg.paletteId * 16, 32);
     else
         LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, animBg.paletteId * 16, 32);
     taskId2 = CreateTask(sub_8107D58, gTasks[taskId].priority + 1);
@@ -1009,7 +1009,7 @@ _081079E0:\n\
 _081079EA:\n\
 	mov r0, sp\n\
 	ldrb r0, [r0, 0x9]\n\
-	ldr r1, =gBattleAnimBackgroundImage_Surf\n\
+	ldr r1, =gBattleAnimBgImage_Surf\n\
 	mov r2, sp\n\
 	ldrh r2, [r2, 0xA]\n\
 	bl AnimLoadCompressedBgGfx\n\
@@ -1018,7 +1018,7 @@ _081079EA:\n\
 	ldrsh r0, [r0, r1]\n\
 	cmp r0, 0\n\
 	bne _08107A24\n\
-	ldr r0, =gBattleAnimBackgroundPalette_Surf\n\
+	ldr r0, =gBattleAnimBgPalette_Surf\n\
 	mov r1, sp\n\
 	ldrb r1, [r1, 0x8]\n\
 	lsls r1, 4\n\
@@ -1182,7 +1182,7 @@ void sub_8107B84(u8 taskId)
     s16 unkUse;
     u32 palOffset;
     u16 palNum;
-    
+
     *BGptrX += gTasks[taskId].data[0];
     *BGptrY += gTasks[taskId].data[1];
     sub_80A6B30(&animBg);
@@ -1412,7 +1412,7 @@ void sub_8107D58(u8 taskId)
     struct ScanlineEffectParams params;
     struct Task *task = &gTasks[taskId];
     // u16 *scanlineBuffer;
-    
+
     switch (task->data[0])
     {
         case 0:
@@ -1883,7 +1883,7 @@ void sub_8108034(struct Sprite *sprite)
 {
     s16 randData;
     s16 randData2;
-    
+
     sprite->oam.tileNum += 8;
     InitSpritePosToAnimTarget(sprite, TRUE);
     randData = (Random2() & 0xFF) | 256;
@@ -1911,7 +1911,7 @@ void sub_8108098(struct Sprite *sprite)
 void sub_81080E4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    
+
     task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
     task->data[5] = gSprites[task->data[15]].pos1.y;
     task->data[1] = sub_8108384();
@@ -1922,7 +1922,7 @@ void sub_81080E4(u8 taskId)
 void sub_8108140(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    
+
     switch (task->data[0])
     {
         case 0:
@@ -2011,7 +2011,7 @@ u8 sub_8108384(void)
     u16 maxhp;
     u16 partyIndex;
     struct Pokemon *slot;
-    
+
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
         partyIndex = gBattlerPartyIndexes[gBattleAnimAttacker];
@@ -2045,7 +2045,7 @@ void sub_8108408(struct Task *task, u8 taskId)
     u8 subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 1;
     s16 increment = 4 - task->data[1];
     u8 spriteId;
-    
+
     if (increment <= 0)
         increment = 1;
     for (i = 0; i < 20; i += increment)
@@ -2094,7 +2094,7 @@ void sub_810851C(struct Sprite *sprite)
 void sub_81085C8(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    
+
     task->data[1] = sub_8108384();
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
@@ -2116,7 +2116,7 @@ void sub_810862C(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     u8 taskId2;
-    
+
     switch (task->data[0])
     {
         case 0:
@@ -2159,7 +2159,7 @@ void sub_810871C(struct Task *task, u8 taskId)
 {
     u16 yPosArg = ((gSineTable[task->data[8]] + 3) >> 4) + task->data[6];
     u8 spriteId = CreateSprite(&gUnknown_08595268, task->data[7], 0, 0);
-    
+
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].callback = sub_81087C0;
@@ -2212,7 +2212,7 @@ void sub_810886C(struct Sprite *sprite)
 void sub_81088E4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    
+
     task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
     task->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     task->data[7] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) ? 1 : -1;
@@ -2229,7 +2229,7 @@ void sub_81088E4(u8 taskId)
 void sub_8108978(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    
+
     switch (task->data[0])
     {
         case 0:
@@ -2298,7 +2298,7 @@ void sub_8108978(u8 taskId)
 void sub_8108AC0(struct Task *task)
 {
     u8 spriteId;
-    
+
     if (++task->data[2] > 1)
     {
         task->data[2] = 0;
@@ -2334,7 +2334,7 @@ void sub_8108B2C(struct Sprite *sprite)
 void sub_8108B94(struct Sprite *sprite)
 {
     u16 i;
-    
+
     if (TranslateAnimHorizontalArc(sprite))
     {
         for (i = 0; i < NUM_TASKS; i++)
@@ -2397,7 +2397,7 @@ void sub_8108CDC(struct Sprite *sprite)
 {
     int xDiff = sprite->data[1] - sprite->pos1.x;
     int yDiff = sprite->data[2] - sprite->pos1.y;
-    
+
     sprite->pos2.x = (sprite->data[0] * xDiff) / sprite->data[3];
     sprite->pos2.y = (sprite->data[0] * yDiff) / sprite->data[3];
     if (++sprite->data[5] == sprite->data[4])
@@ -2420,7 +2420,7 @@ void sub_8108D54(struct Sprite *sprite, int xDiff, int yDiff)
     s16 randomSomethingX = -xDiff + (Random2() % 10) - 5;
     s16 i;
     u8 spriteId;
-    
+
     for (i = 0; i <= 0; i++)
     {
         spriteId = CreateSprite(&gUnknown_08595310, combinedX, combinedY + something, 130);