Merge branch 'master' into dodrio_berry_picking

27 files changed, 22294 insertions, 15471 deletions

diff --git a/src/data/.gitignore b/src/data/.gitignore
new file mode 100755
index 000000000..eaf9e1f6d
--- /dev/null
+++ b/src/data/.gitignore
@@ -0,0 +1 @@
+wild_encounters.h
diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index ef1fdba9f..010559e3b 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -183,7 +183,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("POOCHY"),
         .trainerName = _("JIMMY"),
         .trainerGfxId = EVENT_OBJ_GFX_BOY_1,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -212,7 +212,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MUSILLE"),
         .trainerName = _("EDITH"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -241,7 +241,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DUSTER"),
         .trainerName = _("EVAN"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -270,7 +270,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DOTS"),
         .trainerName = _("KELSEY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -299,7 +299,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TATAY"),
         .trainerName = _("MADISON"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -328,7 +328,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NINDA"),
         .trainerName = _("RAYMOND"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -357,7 +357,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SMISH"),
         .trainerName = _("GRANT"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -386,7 +386,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLEAL"),
         .trainerName = _("PAIGE"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -415,7 +415,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLOKTH"),
         .trainerName = _("ALEC"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -444,7 +444,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WHIRIS"),
         .trainerName = _("SYDNEY"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -473,7 +473,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MAHITA"),
         .trainerName = _("MORRIS"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x8010FFF,
+        .aiChecks = 0x8010FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -502,7 +502,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RONAR"),
         .trainerName = _("MARIAH"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x8008FFF,
+        .aiChecks = 0x8008FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -531,7 +531,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BATRO"),
         .trainerName = _("RUSSELL"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x90004FFF,
+        .aiChecks = 0x90004FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -560,7 +560,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GULIN"),
         .trainerName = _("MELANIE"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x40002FFF,
+        .aiChecks = 0x40002FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -589,7 +589,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RIKELEC"),
         .trainerName = _("CHANCE"),
         .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY,
-        .flags = 0x80001FFF,
+        .aiChecks = 0x80001FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -618,7 +618,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BULBY"),
         .trainerName = _("AGATHA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -647,7 +647,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("FUTTERBE"),
         .trainerName = _("BEAU"),
         .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -676,7 +676,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PIDEOT"),
         .trainerName = _("KAY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -705,7 +705,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DIGLE"),
         .trainerName = _("CALE"),
         .trainerGfxId = EVENT_OBJ_GFX_HIKER,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -734,7 +734,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WAGIL"),
         .trainerName = _("CAITLIN"),
         .trainerGfxId = EVENT_OBJ_GFX_TUBER_F,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -763,7 +763,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TOTDIL"),
         .trainerName = _("COLBY"),
         .trainerGfxId = EVENT_OBJ_GFX_NINJA_BOY,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -792,7 +792,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BALEDY"),
         .trainerName = _("KYLIE"),
         .trainerGfxId = EVENT_OBJ_GFX_BEAUTY,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -821,7 +821,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BIRDLY"),
         .trainerName = _("LIAM"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_5,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -850,7 +850,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TARVITAR"),
         .trainerName = _("MILO"),
         .trainerGfxId = EVENT_OBJ_GFX_MANIAC,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_NORMAL,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -879,7 +879,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RELIA"),
         .trainerName = _("KARINA"),
         .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
-        .flags = 0x24000FFF,
+        .aiChecks = 0x24000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -908,7 +908,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DUODO"),
         .trainerName = _("BOBBY"),
         .trainerGfxId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -937,7 +937,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PINCHIN"),
         .trainerName = _("CLAIRE"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x81000FFF,
+        .aiChecks = 0x81000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -966,7 +966,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NACAC"),
         .trainerName = _("WILLIE"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x80800FFF,
+        .aiChecks = 0x80800FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -995,7 +995,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SHRAND"),
         .trainerName = _("CASSIDY"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x10400FFF,
+        .aiChecks = 0x10400FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1024,7 +1024,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TOYBAL"),
         .trainerName = _("MORGAN"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x8200FFF,
+        .aiChecks = 0x8200FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1053,7 +1053,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CHAMCHAM"),
         .trainerName = _("SUMMER"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x10100FFF,
+        .aiChecks = 0x10100FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1082,7 +1082,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SPININ"),
         .trainerName = _("MILES"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x80080FFF,
+        .aiChecks = 0x80080FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1111,7 +1111,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SWABY"),
         .trainerName = _("AUDREY"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0xA0040FFF,
+        .aiChecks = 0xA0040FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1140,7 +1140,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("POINKER"),
         .trainerName = _("AVERY"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1169,7 +1169,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KECON"),
         .trainerName = _("ARIANA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x80010FFF,
+        .aiChecks = 0x80010FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1198,7 +1198,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GOLDEN"),
         .trainerName = _("ASHTON"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x80008FFF,
+        .aiChecks = 0x80008FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1227,7 +1227,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BOBOACH"),
         .trainerName = _("SANDRA"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x80004FFF,
+        .aiChecks = 0x80004FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1256,7 +1256,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CORPY"),
         .trainerName = _("CARSON"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x8002FFF,
+        .aiChecks = 0x8002FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1285,7 +1285,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TADO"),
         .trainerName = _("KATRINA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x8001FFF,
+        .aiChecks = 0x8001FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1314,7 +1314,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BROWLO"),
         .trainerName = _("LUKE"),
         .trainerGfxId = EVENT_OBJ_GFX_FAT_MAN,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1343,7 +1343,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("FETCHIN"),
         .trainerName = _("RAUL"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_5,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1372,7 +1372,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SEELEY"),
         .trainerName = _("JADA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1401,7 +1401,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DROWZIN"),
         .trainerName = _("ZEEK"),
         .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1430,7 +1430,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("HITEMON"),
         .trainerName = _("DIEGO"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1459,7 +1459,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BLISS"),
         .trainerName = _("ALIYAH"),
         .trainerGfxId = EVENT_OBJ_GFX_TEALA,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1488,7 +1488,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KIDLEK"),
         .trainerName = _("NATALIA"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1517,7 +1517,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SNUBBINS"),
         .trainerName = _("DEVIN"),
         .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1546,7 +1546,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DREAVIS"),
         .trainerName = _("TYLOR"),
         .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_SUPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1575,7 +1575,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LAIRN"),
         .trainerName = _("RONNIE"),
         .trainerGfxId = EVENT_OBJ_GFX_HIKER,
-        .flags = 0x84000FFF,
+        .aiChecks = 0x84000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1604,7 +1604,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SHIFTY"),
         .trainerName = _("CLAUDIA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1633,7 +1633,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NINAS"),
         .trainerName = _("ELIAS"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x81000FFF,
+        .aiChecks = 0x81000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1662,7 +1662,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WELOW"),
         .trainerName = _("JADE"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x80800FFF,
+        .aiChecks = 0x80800FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1691,7 +1691,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("YENA"),
         .trainerName = _("FRANCIS"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1720,7 +1720,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TIFLY"),
         .trainerName = _("ALISHA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x80200FFF,
+        .aiChecks = 0x80200FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1749,7 +1749,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KINGSEA"),
         .trainerName = _("SAUL"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x80100FFF,
+        .aiChecks = 0x80100FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1778,7 +1778,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CASTER"),
         .trainerName = _("FELICIA"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0x80080FFF,
+        .aiChecks = 0x80080FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -1807,7 +1807,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CHOKEM"),
         .trainerName = _("EMILIO"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x80040FFF,
+        .aiChecks = 0x80040FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -1836,7 +1836,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LOMBE"),
         .trainerName = _("KARLA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1865,7 +1865,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("VIPES"),
         .trainerName = _("DARRYL"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x80010FFF,
+        .aiChecks = 0x80010FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1894,7 +1894,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MERAIL"),
         .trainerName = _("SELENA"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F,
-        .flags = 0x80008FFF,
+        .aiChecks = 0x80008FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1923,7 +1923,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KARPAG"),
         .trainerName = _("NOEL"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x80004FFF,
+        .aiChecks = 0x80004FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -1952,7 +1952,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LUNONE"),
         .trainerName = _("LACEY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x80002FFF,
+        .aiChecks = 0x80002FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -1981,7 +1981,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("ABSO"),
         .trainerName = _("CORBIN"),
         .trainerGfxId = EVENT_OBJ_GFX_MANIAC,
-        .flags = 0x80001FFF,
+        .aiChecks = 0x80001FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2010,7 +2010,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("EGGSOR"),
         .trainerName = _("GRACIE"),
         .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2039,7 +2039,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CUBIN"),
         .trainerName = _("COLTIN"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_4, 
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2068,7 +2068,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("HITMON"),
         .trainerName = _("ELLIE"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2097,7 +2097,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SURTLE"),
         .trainerName = _("MARCUS"),
         .trainerGfxId = EVENT_OBJ_GFX_SAILOR,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2126,7 +2126,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("KHANKAN"),
         .trainerName = _("KIARA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_3,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2155,7 +2155,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PINOC"),
         .trainerName = _("BRYCE"),
         .trainerGfxId = EVENT_OBJ_GFX_BUG_CATCHER,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2184,7 +2184,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DILTOT"),
         .trainerName = _("JAMIE"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2213,7 +2213,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DOOMOND"),
         .trainerName = _("JORGE"),
         .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2242,7 +2242,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MILKAN"),
         .trainerName = _("DEVON"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_M,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2271,7 +2271,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RADOS"),
         .trainerName = _("JUSTINA"),
         .trainerGfxId = EVENT_OBJ_GFX_PICNICKER,
-        .flags = 0x84000FFF,
+        .aiChecks = 0x84000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2300,7 +2300,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LOUDERD"),
         .trainerName = _("RALPH"),
         .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2329,7 +2329,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SITTY"),
         .trainerName = _("ROSA"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_1,
-        .flags = 0x81000FFF,
+        .aiChecks = 0x81000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2358,7 +2358,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLING"),
         .trainerName = _("KEATON"),
         .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY,
-        .flags = 0x80800FFF,
+        .aiChecks = 0x80800FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2387,7 +2387,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("TARIA"),
         .trainerName = _("MAYRA"),
         .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2416,7 +2416,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LIRKI"),
         .trainerName = _("LAMAR"),
         .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY,
-        .flags = 0x80200FFF,
+        .aiChecks = 0x80200FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2445,7 +2445,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("BLOSSOM"),
         .trainerName = _("AUBREY"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4,
-        .flags = 0x80100FFF,
+        .aiChecks = 0x80100FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2474,7 +2474,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("EYESAB"),
         .trainerName = _("NIGEL"),
         .trainerGfxId = EVENT_OBJ_GFX_CAMPER,
-        .flags = 0x80080FFF,
+        .aiChecks = 0x80080FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2503,7 +2503,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("UTAN"),
         .trainerName = _("CAMILLE"),
         .trainerGfxId = EVENT_OBJ_GFX_LASS,
-        .flags = 0x80040FFF,
+        .aiChecks = 0x80040FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2532,7 +2532,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("PEDOS"),
         .trainerName = _("DEON"),
         .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M,
-        .flags = 0x80020FFF,
+        .aiChecks = 0x80020FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2561,7 +2561,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("LUVIS"),
         .trainerName = _("JANELLE"),
         .trainerGfxId = EVENT_OBJ_GFX_GIRL_2,
-        .flags = 0x80010FFF,
+        .aiChecks = 0x80010FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2590,7 +2590,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("HEROSS"),
         .trainerName = _("HEATH"),
         .trainerGfxId = EVENT_OBJ_GFX_MAN_3,
-        .flags = 0x80008FFF,
+        .aiChecks = 0x80008FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2619,7 +2619,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("RODLECT"),
         .trainerName = _("SASHA"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x80004FFF,
+        .aiChecks = 0x80004FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2648,7 +2648,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("CHUPY"),
         .trainerName = _("FRANKIE"),
         .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER,
-        .flags = 0x80002FFF,
+        .aiChecks = 0x80002FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2677,7 +2677,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("WOBET"),
         .trainerName = _("HELEN"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1,
-        .flags = 0x80001FFF,
+        .aiChecks = 0x80001FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2706,7 +2706,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GAREN"),
         .trainerName = _("CAMILE"),
         .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC,
-        .flags = 0xC000FFF,
+        .aiChecks = 0xC000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2735,7 +2735,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GONPOR"),
         .trainerName = _("MARTIN"),
         .trainerGfxId = EVENT_OBJ_GFX_SCIENTIST_1,
-        .flags = 0x82000FFF,
+        .aiChecks = 0x82000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2764,7 +2764,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("DRITE"),
         .trainerName = _("SERGIO"),
         .trainerGfxId = EVENT_OBJ_GFX_BOY_1,
-        .flags = 0x21000FFF,
+        .aiChecks = 0x21000FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
@@ -2793,7 +2793,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("MEOWY"),
         .trainerName = _("KAILEY"),
         .trainerGfxId = EVENT_OBJ_GFX_TWIN,
-        .flags = 0x20800FFF,
+        .aiChecks = 0x20800FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2822,7 +2822,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("NYX"),
         .trainerName = _("PERLA"),
         .trainerGfxId = EVENT_OBJ_GFX_BEAUTY,
-        .flags = 0x80400FFF,
+        .aiChecks = 0x80400FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = TRUE,
@@ -2851,7 +2851,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("GEPITO"),
         .trainerName = _("CLARA"),
         .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2,
-        .flags = 0x10200FFF,
+        .aiChecks = 0x10200FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2880,7 +2880,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SPEON"),
         .trainerName = _("JAKOB"),
         .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M,
-        .flags = 0x20100FFF,
+        .aiChecks = 0x20100FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = TRUE,
@@ -2909,7 +2909,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("SLOWGO"),
         .trainerName = _("TREY"),
         .trainerGfxId = EVENT_OBJ_GFX_SAILOR,
-        .flags = 0x8080FFF,
+        .aiChecks = 0x8080FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = FALSE,
         .aiPool_Beauty = FALSE,
@@ -2938,7 +2938,7 @@ const struct ContestPokemon gContestOpponents[] =
         .nickname = _("URSING"),
         .trainerName = _("LANE"),
         .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT,
-        .flags = 0x40040FFF,
+        .aiChecks = 0x40040FFF,
         .whichRank = CONTEST_RANK_MASTER,
         .aiPool_Cool = TRUE,
         .aiPool_Beauty = FALSE,
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/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h
index f5ef15af9..27d5b1f9a 100755
--- a/src/data/field_event_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -423,142 +423,143 @@ const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_
 const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
 
 const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
-    gEventObjectPicTable_CheriBerryTree,
-    gEventObjectPicTable_ChestoBerryTree,
-    gEventObjectPicTable_PechaBerryTree,
-    gEventObjectPicTable_RawstBerryTree,
-    gEventObjectPicTable_AspearBerryTree,
-    gEventObjectPicTable_LeppaBerryTree,
-    gEventObjectPicTable_OranBerryTree,
-    gEventObjectPicTable_PersimBerryTree,
-    gEventObjectPicTable_LumBerryTree,
-    gEventObjectPicTable_SitrusBerryTree,
-    gEventObjectPicTable_FigyBerryTree,
-    gEventObjectPicTable_WikiBerryTree,
-    gEventObjectPicTable_MagoBerryTree,
-    gEventObjectPicTable_AguavBerryTree,
-    gEventObjectPicTable_IapapaBerryTree,
-    gEventObjectPicTable_RazzBerryTree,
-    gEventObjectPicTable_RazzBerryTree,
-    gEventObjectPicTable_MagoBerryTree,
-    gEventObjectPicTable_WepearBerryTree,
-    gEventObjectPicTable_IapapaBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_KelpsyBerryTree,
-    gEventObjectPicTable_WepearBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_GrepaBerryTree,
-    gEventObjectPicTable_TamatoBerryTree,
-    gEventObjectPicTable_CornnBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_RabutaBerryTree,
-    gEventObjectPicTable_NomelBerryTree,
-    gEventObjectPicTable_SpelonBerryTree,
-    gEventObjectPicTable_PamtreBerryTree,
-    gEventObjectPicTable_RabutaBerryTree,
-    gEventObjectPicTable_DurinBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_LiechiBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_AguavBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_GrepaBerryTree,
-    gEventObjectPicTable_LansatBerryTree,
-    gEventObjectPicTable_CornnBerryTree,
-    gEventObjectPicTable_DurinBerryTree,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
 };
 
 const u8 *const gBerryTreePaletteSlotTablePointers[] = {
-    gBerryTreePaletteSlotTable_Cheri,
-    gBerryTreePaletteSlotTable_Chesto,
-    gBerryTreePaletteSlotTable_Pecha,
-    gBerryTreePaletteSlotTable_Rawst,
-    gBerryTreePaletteSlotTable_Aspear,
-    gBerryTreePaletteSlotTable_Leppa,
-    gBerryTreePaletteSlotTable_Oran,
-    gBerryTreePaletteSlotTable_Persim,
-    gBerryTreePaletteSlotTable_Lum,
-    gBerryTreePaletteSlotTable_Sitrus,
-    gBerryTreePaletteSlotTable_Figy,
-    gBerryTreePaletteSlotTable_Wiki,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Kelpsy,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Tamato,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Nomel,
-    gBerryTreePaletteSlotTable_Spelon,
-    gBerryTreePaletteSlotTable_Pamtre,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Durin,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Liechi,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Lansat,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Durin,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
 };
 
 const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    // 3 unused berries.
+    [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
 };
diff --git a/src/data/items.h b/src/data/items.h
index 7d7caa289..4d262e683 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -5,16 +5,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -25,14 +19,9 @@ const struct Item gItems[] =
         .name = _("MASTER BALL"),
         .itemId = ITEM_MASTER_BALL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMasterBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMasterBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 0,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 0,
@@ -43,14 +32,9 @@ const struct Item gItems[] =
         .name = _("ULTRA BALL"),
         .itemId = ITEM_ULTRA_BALL,
         .price = 1200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gUltraBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sUltraBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 1,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 1,
@@ -61,14 +45,9 @@ const struct Item gItems[] =
         .name = _("GREAT BALL"),
         .itemId = ITEM_GREAT_BALL,
         .price = 600,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGreatBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGreatBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 2,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 2,
@@ -79,14 +58,9 @@ const struct Item gItems[] =
         .name = _("POKé BALL"),
         .itemId = ITEM_POKE_BALL,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPokeBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPokeBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 3,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 3,
@@ -97,14 +71,9 @@ const struct Item gItems[] =
         .name = _("SAFARI BALL"),
         .itemId = ITEM_SAFARI_BALL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSafariBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSafariBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 4,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 4,
@@ -115,14 +84,9 @@ const struct Item gItems[] =
         .name = _("NET BALL"),
         .itemId = ITEM_NET_BALL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gNetBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sNetBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 5,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 5,
@@ -133,14 +97,9 @@ const struct Item gItems[] =
         .name = _("DIVE BALL"),
         .itemId = ITEM_DIVE_BALL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDiveBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDiveBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 6,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 6,
@@ -151,14 +110,9 @@ const struct Item gItems[] =
         .name = _("NEST BALL"),
         .itemId = ITEM_NEST_BALL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gNestBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sNestBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 7,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 7,
@@ -169,14 +123,9 @@ const struct Item gItems[] =
         .name = _("REPEAT BALL"),
         .itemId = ITEM_REPEAT_BALL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRepeatBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRepeatBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 8,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 8,
@@ -187,14 +136,9 @@ const struct Item gItems[] =
         .name = _("TIMER BALL"),
         .itemId = ITEM_TIMER_BALL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTimerBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTimerBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 9,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 9,
@@ -205,14 +149,9 @@ const struct Item gItems[] =
         .name = _("LUXURY BALL"),
         .itemId = ITEM_LUXURY_BALL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gLuxuryBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLuxuryBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 10,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 10,
@@ -223,14 +162,9 @@ const struct Item gItems[] =
         .name = _("PREMIER BALL"),
         .itemId = ITEM_PREMIER_BALL,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPremierBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPremierBallDesc,
         .pocket = POCKET_POKE_BALLS,
         .type = 11,
-        .fieldUseFunc = NULL,
         .battleUsage = 2,
         .battleUseFunc = ItemUseInBattle_PokeBall,
         .secondaryId = 11,
@@ -243,11 +177,8 @@ const struct Item gItems[] =
         .name = _("POTION"),
         .itemId = ITEM_POTION,
         .price = 300,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 20,
-        .description = gPotionItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPotionDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -261,11 +192,7 @@ const struct Item gItems[] =
         .name = _("ANTIDOTE"),
         .itemId = ITEM_ANTIDOTE,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gAntidoteItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sAntidoteDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -279,11 +206,7 @@ const struct Item gItems[] =
         .name = _("BURN HEAL"),
         .itemId = ITEM_BURN_HEAL,
         .price = 250,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBurnHealItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBurnHealDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -297,11 +220,7 @@ const struct Item gItems[] =
         .name = _("ICE HEAL"),
         .itemId = ITEM_ICE_HEAL,
         .price = 250,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gIceHealItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sIceHealDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -315,11 +234,7 @@ const struct Item gItems[] =
         .name = _("AWAKENING"),
         .itemId = ITEM_AWAKENING,
         .price = 250,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gAwakeningItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sAwakeningDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -333,11 +248,7 @@ const struct Item gItems[] =
         .name = _("PARLYZ HEAL"),
         .itemId = ITEM_PARALYZE_HEAL,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gParalyzeHealItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sParalyzeHealDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -351,11 +262,8 @@ const struct Item gItems[] =
         .name = _("FULL RESTORE"),
         .itemId = ITEM_FULL_RESTORE,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 255,
-        .description = gFullRestoreItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFullRestoreDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -369,11 +277,8 @@ const struct Item gItems[] =
         .name = _("MAX POTION"),
         .itemId = ITEM_MAX_POTION,
         .price = 2500,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 255,
-        .description = gMaxPotionItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMaxPotionDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -387,11 +292,8 @@ const struct Item gItems[] =
         .name = _("HYPER POTION"),
         .itemId = ITEM_HYPER_POTION,
         .price = 1200,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 200,
-        .description = gHyperPotionItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHyperPotionDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -405,11 +307,8 @@ const struct Item gItems[] =
         .name = _("SUPER POTION"),
         .itemId = ITEM_SUPER_POTION,
         .price = 700,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 50,
-        .description = gSuperPotionItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSuperPotionDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -423,11 +322,7 @@ const struct Item gItems[] =
         .name = _("FULL HEAL"),
         .itemId = ITEM_FULL_HEAL,
         .price = 600,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gFullHealItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFullHealDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -441,11 +336,7 @@ const struct Item gItems[] =
         .name = _("REVIVE"),
         .itemId = ITEM_REVIVE,
         .price = 1500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gReviveItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sReviveDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -459,11 +350,7 @@ const struct Item gItems[] =
         .name = _("MAX REVIVE"),
         .itemId = ITEM_MAX_REVIVE,
         .price = 4000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMaxReviveItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMaxReviveDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -477,11 +364,8 @@ const struct Item gItems[] =
         .name = _("FRESH WATER"),
         .itemId = ITEM_FRESH_WATER,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 50,
-        .description = gFreshWaterItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFreshWaterDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -495,11 +379,8 @@ const struct Item gItems[] =
         .name = _("SODA POP"),
         .itemId = ITEM_SODA_POP,
         .price = 300,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 60,
-        .description = gSodaPopItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSodaPopDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -513,11 +394,8 @@ const struct Item gItems[] =
         .name = _("LEMONADE"),
         .itemId = ITEM_LEMONADE,
         .price = 350,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 80,
-        .description = gLemonadeItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLemonadeDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -531,11 +409,8 @@ const struct Item gItems[] =
         .name = _("MOOMOO MILK"),
         .itemId = ITEM_MOOMOO_MILK,
         .price = 500,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 100,
-        .description = gMoomooMilkItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMoomooMilkDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -549,11 +424,7 @@ const struct Item gItems[] =
         .name = _("ENERGYPOWDER"),
         .itemId = ITEM_ENERGY_POWDER,
         .price = 500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gEnergyPowderItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sEnergyPowderDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -567,11 +438,7 @@ const struct Item gItems[] =
         .name = _("ENERGY ROOT"),
         .itemId = ITEM_ENERGY_ROOT,
         .price = 800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gEnergyRootItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sEnergyRootDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -585,11 +452,7 @@ const struct Item gItems[] =
         .name = _("HEAL POWDER"),
         .itemId = ITEM_HEAL_POWDER,
         .price = 450,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHealPowderItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHealPowderDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -603,11 +466,7 @@ const struct Item gItems[] =
         .name = _("REVIVAL HERB"),
         .itemId = ITEM_REVIVAL_HERB,
         .price = 2800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRevivalHerbItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRevivalHerbDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -621,11 +480,8 @@ const struct Item gItems[] =
         .name = _("ETHER"),
         .itemId = ITEM_ETHER,
         .price = 1200,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 10,
-        .description = gEtherItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sEtherDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPRecovery,
@@ -639,11 +495,8 @@ const struct Item gItems[] =
         .name = _("MAX ETHER"),
         .itemId = ITEM_MAX_ETHER,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 255,
-        .description = gMaxEtherItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMaxEtherDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPRecovery,
@@ -657,11 +510,8 @@ const struct Item gItems[] =
         .name = _("ELIXIR"),
         .itemId = ITEM_ELIXIR,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 10,
-        .description = gElixirItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sElixirDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPRecovery,
@@ -675,11 +525,8 @@ const struct Item gItems[] =
         .name = _("MAX ELIXIR"),
         .itemId = ITEM_MAX_ELIXIR,
         .price = 4500,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 255,
-        .description = gMaxElixirItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMaxElixirDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPRecovery,
@@ -693,11 +540,7 @@ const struct Item gItems[] =
         .name = _("LAVA COOKIE"),
         .itemId = ITEM_LAVA_COOKIE,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gLavaCookieItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLavaCookieDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -711,11 +554,7 @@ const struct Item gItems[] =
         .name = _("BLUE FLUTE"),
         .itemId = ITEM_BLUE_FLUTE,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBlueFluteItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlueFluteDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -729,11 +568,7 @@ const struct Item gItems[] =
         .name = _("YELLOW FLUTE"),
         .itemId = ITEM_YELLOW_FLUTE,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gYellowFluteItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sYellowFluteDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -747,11 +582,7 @@ const struct Item gItems[] =
         .name = _("RED FLUTE"),
         .itemId = ITEM_RED_FLUTE,
         .price = 300,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRedFluteItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRedFluteDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -765,16 +596,11 @@ const struct Item gItems[] =
         .name = _("BLACK FLUTE"),
         .itemId = ITEM_BLACK_FLUTE,
         .price = 400,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 50,
-        .description = gBlackFluteItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlackFluteDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -783,16 +609,11 @@ const struct Item gItems[] =
         .name = _("WHITE FLUTE"),
         .itemId = ITEM_WHITE_FLUTE,
         .price = 500,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 150,
-        .description = gWhiteFluteItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWhiteFluteDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -803,9 +624,7 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
         .holdEffectParam = 20,
-        .description = gBerryJuiceItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBerryJuiceDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -819,16 +638,10 @@ const struct Item gItems[] =
         .name = _("SACRED ASH"),
         .itemId = ITEM_SACRED_ASH,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSacredAshItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSacredAshDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_SacredAsh,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -839,16 +652,10 @@ const struct Item gItems[] =
         .name = _("SHOAL SALT"),
         .itemId = ITEM_SHOAL_SALT,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gShoalSaltItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sShoalSaltDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -857,16 +664,10 @@ const struct Item gItems[] =
         .name = _("SHOAL SHELL"),
         .itemId = ITEM_SHOAL_SHELL,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gShoalShellItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sShoalShellDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -875,16 +676,10 @@ const struct Item gItems[] =
         .name = _("RED SHARD"),
         .itemId = ITEM_RED_SHARD,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRedShardItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRedShardDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -893,16 +688,10 @@ const struct Item gItems[] =
         .name = _("BLUE SHARD"),
         .itemId = ITEM_BLUE_SHARD,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBlueShardItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlueShardDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -911,16 +700,10 @@ const struct Item gItems[] =
         .name = _("YELLOW SHARD"),
         .itemId = ITEM_YELLOW_SHARD,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gYellowShardItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sYellowShardDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -929,16 +712,10 @@ const struct Item gItems[] =
         .name = _("GREEN SHARD"),
         .itemId = ITEM_GREEN_SHARD,
         .price = 200,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGreenShardItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGreenShardDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -947,16 +724,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -965,16 +736,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -983,16 +748,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1001,16 +760,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1019,16 +772,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1037,16 +784,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1055,16 +796,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1073,16 +808,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1091,16 +820,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1109,16 +832,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1127,16 +844,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1147,16 +858,10 @@ const struct Item gItems[] =
         .name = _("HP UP"),
         .itemId = ITEM_HP_UP,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHPUpItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHPUpDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1165,16 +870,10 @@ const struct Item gItems[] =
         .name = _("PROTEIN"),
         .itemId = ITEM_PROTEIN,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gProteinItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sProteinDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1183,16 +882,10 @@ const struct Item gItems[] =
         .name = _("IRON"),
         .itemId = ITEM_IRON,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gIronItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sIronDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1201,16 +894,10 @@ const struct Item gItems[] =
         .name = _("CARBOS"),
         .itemId = ITEM_CARBOS,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gCarbosItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sCarbosDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1219,16 +906,10 @@ const struct Item gItems[] =
         .name = _("CALCIUM"),
         .itemId = ITEM_CALCIUM,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gCalciumItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sCalciumDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1237,16 +918,10 @@ const struct Item gItems[] =
         .name = _("RARE CANDY"),
         .itemId = ITEM_RARE_CANDY,
         .price = 4800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRareCandyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRareCandyDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_RareCandy,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1255,16 +930,10 @@ const struct Item gItems[] =
         .name = _("PP UP"),
         .itemId = ITEM_PP_UP,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPPUpItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPPUpDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPUp,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1273,16 +942,10 @@ const struct Item gItems[] =
         .name = _("ZINC"),
         .itemId = ITEM_ZINC,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gZincItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sZincDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1291,16 +954,10 @@ const struct Item gItems[] =
         .name = _("PP MAX"),
         .itemId = ITEM_PP_MAX,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPPMaxItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPPMaxDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPUp,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1309,16 +966,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1329,11 +980,7 @@ const struct Item gItems[] =
         .name = _("GUARD SPEC."),
         .itemId = ITEM_GUARD_SPEC,
         .price = 700,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGuardSpecItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGuardSpecDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1347,11 +994,7 @@ const struct Item gItems[] =
         .name = _("DIRE HIT"),
         .itemId = ITEM_DIRE_HIT,
         .price = 650,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDireHitItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDireHitDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1365,11 +1008,7 @@ const struct Item gItems[] =
         .name = _("X ATTACK"),
         .itemId = ITEM_X_ATTACK,
         .price = 500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gXAttackItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sXAttackDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1383,11 +1022,7 @@ const struct Item gItems[] =
         .name = _("X DEFEND"),
         .itemId = ITEM_X_DEFEND,
         .price = 550,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gXDefendItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sXDefendDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1401,11 +1036,7 @@ const struct Item gItems[] =
         .name = _("X SPEED"),
         .itemId = ITEM_X_SPEED,
         .price = 350,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gXSpeedItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sXSpeedDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1419,11 +1050,7 @@ const struct Item gItems[] =
         .name = _("X ACCURACY"),
         .itemId = ITEM_X_ACCURACY,
         .price = 950,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gXAccuracyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sXAccuracyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1437,11 +1064,7 @@ const struct Item gItems[] =
         .name = _("X SPECIAL"),
         .itemId = ITEM_X_SPECIAL,
         .price = 350,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gXSpecialItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sXSpecialDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1455,11 +1078,7 @@ const struct Item gItems[] =
         .name = _("POKé DOLL"),
         .itemId = ITEM_POKE_DOLL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPokeDollItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPokeDollDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1473,11 +1092,7 @@ const struct Item gItems[] =
         .name = _("FLUFFY TAIL"),
         .itemId = ITEM_FLUFFY_TAIL,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gFluffyTailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFluffyTailDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -1491,16 +1106,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1511,16 +1120,11 @@ const struct Item gItems[] =
         .name = _("SUPER REPEL"),
         .itemId = ITEM_SUPER_REPEL,
         .price = 500,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 200,
-        .description = gSuperRepelItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSuperRepelDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_Repel,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1529,16 +1133,11 @@ const struct Item gItems[] =
         .name = _("MAX REPEL"),
         .itemId = ITEM_MAX_REPEL,
         .price = 700,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 250,
-        .description = gMaxRepelItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMaxRepelDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_Repel,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1547,16 +1146,10 @@ const struct Item gItems[] =
         .name = _("ESCAPE ROPE"),
         .itemId = ITEM_ESCAPE_ROPE,
         .price = 550,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gEscapeRopeItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sEscapeRopeDesc,
         .pocket = POCKET_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_EscapeRope,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1565,16 +1158,11 @@ const struct Item gItems[] =
         .name = _("REPEL"),
         .itemId = ITEM_REPEL,
         .price = 350,
-        .holdEffect = HOLD_EFFECT_NONE,
         .holdEffectParam = 100,
-        .description = gRepelItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRepelDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_Repel,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1583,16 +1171,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1601,16 +1183,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1619,16 +1195,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1637,16 +1207,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1655,16 +1219,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1673,16 +1231,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1693,16 +1245,10 @@ const struct Item gItems[] =
         .name = _("SUN STONE"),
         .itemId = ITEM_SUN_STONE,
         .price = 2100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSunStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSunStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1711,16 +1257,10 @@ const struct Item gItems[] =
         .name = _("MOON STONE"),
         .itemId = ITEM_MOON_STONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMoonStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMoonStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1729,16 +1269,10 @@ const struct Item gItems[] =
         .name = _("FIRE STONE"),
         .itemId = ITEM_FIRE_STONE,
         .price = 2100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gFireStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFireStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1747,16 +1281,10 @@ const struct Item gItems[] =
         .name = _("THUNDERSTONE"),
         .itemId = ITEM_THUNDER_STONE,
         .price = 2100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gThunderStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sThunderStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1765,16 +1293,10 @@ const struct Item gItems[] =
         .name = _("WATER STONE"),
         .itemId = ITEM_WATER_STONE,
         .price = 2100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gWaterStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWaterStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1783,16 +1305,10 @@ const struct Item gItems[] =
         .name = _("LEAF STONE"),
         .itemId = ITEM_LEAF_STONE,
         .price = 2100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gLeafStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLeafStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1801,16 +1317,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1819,16 +1329,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1837,16 +1341,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1855,16 +1353,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1875,16 +1367,10 @@ const struct Item gItems[] =
         .name = _("TINYMUSHROOM"),
         .itemId = ITEM_TINY_MUSHROOM,
         .price = 500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTinyMushroomItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTinyMushroomDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1893,16 +1379,10 @@ const struct Item gItems[] =
         .name = _("BIG MUSHROOM"),
         .itemId = ITEM_BIG_MUSHROOM,
         .price = 5000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBigMushroomItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBigMushroomDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1911,16 +1391,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1929,16 +1403,10 @@ const struct Item gItems[] =
         .name = _("PEARL"),
         .itemId = ITEM_PEARL,
         .price = 1400,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPearlItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPearlDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1947,16 +1415,10 @@ const struct Item gItems[] =
         .name = _("BIG PEARL"),
         .itemId = ITEM_BIG_PEARL,
         .price = 7500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBigPearlItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBigPearlDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1965,16 +1427,10 @@ const struct Item gItems[] =
         .name = _("STARDUST"),
         .itemId = ITEM_STARDUST,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gStardustItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sStardustDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -1983,16 +1439,10 @@ const struct Item gItems[] =
         .name = _("STAR PIECE"),
         .itemId = ITEM_STAR_PIECE,
         .price = 9800,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gStarPieceItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sStarPieceDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2001,16 +1451,10 @@ const struct Item gItems[] =
         .name = _("NUGGET"),
         .itemId = ITEM_NUGGET,
         .price = 10000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gNuggetItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sNuggetDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2019,16 +1463,10 @@ const struct Item gItems[] =
         .name = _("HEART SCALE"),
         .itemId = ITEM_HEART_SCALE,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHeartScaleItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHeartScaleDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2037,16 +1475,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2055,16 +1487,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2073,16 +1499,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2091,16 +1511,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2109,16 +1523,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2127,16 +1535,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2145,16 +1547,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2163,16 +1559,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2181,16 +1571,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2200,16 +1584,10 @@ const struct Item gItems[] =
         .name = _("ORANGE MAIL"),
         .itemId = ITEM_ORANGE_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gOrangeMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sOrangeMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2218,16 +1596,10 @@ const struct Item gItems[] =
         .name = _("HARBOR MAIL"),
         .itemId = ITEM_HARBOR_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHarborMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHarborMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 1,
     },
 
@@ -2236,16 +1608,10 @@ const struct Item gItems[] =
         .name = _("GLITTER MAIL"),
         .itemId = ITEM_GLITTER_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGlitterMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGlitterMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 2,
     },
 
@@ -2254,16 +1620,10 @@ const struct Item gItems[] =
         .name = _("MECH MAIL"),
         .itemId = ITEM_MECH_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMechMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMechMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 3,
     },
 
@@ -2272,16 +1632,10 @@ const struct Item gItems[] =
         .name = _("WOOD MAIL"),
         .itemId = ITEM_WOOD_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gWoodMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWoodMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 4,
     },
 
@@ -2290,16 +1644,10 @@ const struct Item gItems[] =
         .name = _("WAVE MAIL"),
         .itemId = ITEM_WAVE_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gWaveMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWaveMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 5,
     },
 
@@ -2308,16 +1656,10 @@ const struct Item gItems[] =
         .name = _("BEAD MAIL"),
         .itemId = ITEM_BEAD_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBeadMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBeadMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 6,
     },
 
@@ -2326,16 +1668,10 @@ const struct Item gItems[] =
         .name = _("SHADOW MAIL"),
         .itemId = ITEM_SHADOW_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gShadowMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sShadowMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 7,
     },
 
@@ -2344,16 +1680,10 @@ const struct Item gItems[] =
         .name = _("TROPIC MAIL"),
         .itemId = ITEM_TROPIC_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTropicMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTropicMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 8,
     },
 
@@ -2362,16 +1692,10 @@ const struct Item gItems[] =
         .name = _("DREAM MAIL"),
         .itemId = ITEM_DREAM_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDreamMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDreamMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 9,
     },
 
@@ -2380,16 +1704,10 @@ const struct Item gItems[] =
         .name = _("FAB MAIL"),
         .itemId = ITEM_FAB_MAIL,
         .price = 50,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gFabMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFabMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 10,
     },
 
@@ -2398,16 +1716,10 @@ const struct Item gItems[] =
         .name = _("RETRO MAIL"),
         .itemId = ITEM_RETRO_MAIL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRetroMailItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRetroMailDesc,
         .pocket = POCKET_ITEMS,
         .type = 0,
         .fieldUseFunc = ItemUseOutOfBattle_Mail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 11,
     },
 
@@ -2419,10 +1731,7 @@ const struct Item gItems[] =
         .itemId = ITEM_CHERI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_PAR,
-        .holdEffectParam = 0,
-        .description = gCheriBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sCheriBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2437,10 +1746,7 @@ const struct Item gItems[] =
         .itemId = ITEM_CHESTO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_SLP,
-        .holdEffectParam = 0,
-        .description = gChestoBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sChestoBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2455,10 +1761,7 @@ const struct Item gItems[] =
         .itemId = ITEM_PECHA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_PSN,
-        .holdEffectParam = 0,
-        .description = gPechaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPechaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2473,10 +1776,7 @@ const struct Item gItems[] =
         .itemId = ITEM_RAWST_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_BRN,
-        .holdEffectParam = 0,
-        .description = gRawstBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRawstBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2491,10 +1791,7 @@ const struct Item gItems[] =
         .itemId = ITEM_ASPEAR_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_FRZ,
-        .holdEffectParam = 0,
-        .description = gAspearBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sAspearBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2510,9 +1807,7 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_PP,
         .holdEffectParam = 10,
-        .description = gLeppaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLeppaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_PPRecovery,
@@ -2528,9 +1823,7 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
         .holdEffectParam = 10,
-        .description = gOranBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sOranBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2545,10 +1838,7 @@ const struct Item gItems[] =
         .itemId = ITEM_PERSIM_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_CONFUSION,
-        .holdEffectParam = 0,
-        .description = gPersimBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPersimBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@@ -2563,10 +1853,7 @@ const struct Item gItems[] =
         .itemId = ITEM_LUM_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_STATUS,
-        .holdEffectParam = 0,
-        .description = gLumBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLumBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2582,9 +1869,7 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
         .holdEffectParam = 30,
-        .description = gSitrusBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSitrusBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
@@ -2600,14 +1885,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SPICY,
         .holdEffectParam = 8,
-        .description = gFigyBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFigyBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2618,14 +1899,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_DRY,
         .holdEffectParam = 8,
-        .description = gWikiBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWikiBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2636,14 +1913,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SWEET,
         .holdEffectParam = 8,
-        .description = gMagoBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMagoBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2654,14 +1927,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_BITTER,
         .holdEffectParam = 8,
-        .description = gAguavBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sAguavBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2672,14 +1941,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SOUR,
         .holdEffectParam = 8,
-        .description = gIapapaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sIapapaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2688,16 +1953,10 @@ const struct Item gItems[] =
         .name = _("RAZZ BERRY"),
         .itemId = ITEM_RAZZ_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRazzBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRazzBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2706,16 +1965,10 @@ const struct Item gItems[] =
         .name = _("BLUK BERRY"),
         .itemId = ITEM_BLUK_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBlukBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlukBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2724,16 +1977,10 @@ const struct Item gItems[] =
         .name = _("NANAB BERRY"),
         .itemId = ITEM_NANAB_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gNanabBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sNanabBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2742,16 +1989,10 @@ const struct Item gItems[] =
         .name = _("WEPEAR BERRY"),
         .itemId = ITEM_WEPEAR_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gWepearBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWepearBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2760,16 +2001,10 @@ const struct Item gItems[] =
         .name = _("PINAP BERRY"),
         .itemId = ITEM_PINAP_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPinapBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPinapBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2778,16 +2013,10 @@ const struct Item gItems[] =
         .name = _("POMEG BERRY"),
         .itemId = ITEM_POMEG_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPomegBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPomegBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_ReduceEV,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2796,16 +2025,10 @@ const struct Item gItems[] =
         .name = _("KELPSY BERRY"),
         .itemId = ITEM_KELPSY_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gKelpsyBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sKelpsyBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_ReduceEV,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2814,16 +2037,10 @@ const struct Item gItems[] =
         .name = _("QUALOT BERRY"),
         .itemId = ITEM_QUALOT_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gQualotBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sQualotBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_ReduceEV,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2832,16 +2049,10 @@ const struct Item gItems[] =
         .name = _("HONDEW BERRY"),
         .itemId = ITEM_HONDEW_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHondewBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHondewBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_ReduceEV,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2850,16 +2061,10 @@ const struct Item gItems[] =
         .name = _("GREPA BERRY"),
         .itemId = ITEM_GREPA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGrepaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGrepaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_ReduceEV,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2868,16 +2073,10 @@ const struct Item gItems[] =
         .name = _("TAMATO BERRY"),
         .itemId = ITEM_TAMATO_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTamatoBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTamatoBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_ReduceEV,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2886,16 +2085,10 @@ const struct Item gItems[] =
         .name = _("CORNN BERRY"),
         .itemId = ITEM_CORNN_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gCornnBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sCornnBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2904,16 +2097,10 @@ const struct Item gItems[] =
         .name = _("MAGOST BERRY"),
         .itemId = ITEM_MAGOST_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMagostBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMagostBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2922,16 +2109,10 @@ const struct Item gItems[] =
         .name = _("RABUTA BERRY"),
         .itemId = ITEM_RABUTA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRabutaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRabutaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2940,16 +2121,10 @@ const struct Item gItems[] =
         .name = _("NOMEL BERRY"),
         .itemId = ITEM_NOMEL_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gNomelBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sNomelBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2958,16 +2133,10 @@ const struct Item gItems[] =
         .name = _("SPELON BERRY"),
         .itemId = ITEM_SPELON_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSpelonBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSpelonBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2976,16 +2145,10 @@ const struct Item gItems[] =
         .name = _("PAMTRE BERRY"),
         .itemId = ITEM_PAMTRE_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPamtreBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPamtreBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -2994,16 +2157,10 @@ const struct Item gItems[] =
         .name = _("WATMEL BERRY"),
         .itemId = ITEM_WATMEL_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gWatmelBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWatmelBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3012,16 +2169,10 @@ const struct Item gItems[] =
         .name = _("DURIN BERRY"),
         .itemId = ITEM_DURIN_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDurinBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDurinBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3030,16 +2181,10 @@ const struct Item gItems[] =
         .name = _("BELUE BERRY"),
         .itemId = ITEM_BELUE_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBelueBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBelueBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3050,14 +2195,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_ATTACK_UP,
         .holdEffectParam = 4,
-        .description = gLiechiBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLiechiBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3068,14 +2209,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_DEFENSE_UP,
         .holdEffectParam = 4,
-        .description = gGanlonBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGanlonBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3086,14 +2223,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_SPEED_UP,
         .holdEffectParam = 4,
-        .description = gSalacBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSalacBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3104,14 +2237,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_SP_ATTACK_UP,
         .holdEffectParam = 4,
-        .description = gPetayaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPetayaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3122,14 +2251,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_SP_DEFENSE_UP,
         .holdEffectParam = 4,
-        .description = gApicotBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sApicotBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3140,14 +2265,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_CRITICAL_UP,
         .holdEffectParam = 4,
-        .description = gLansatBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLansatBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3158,14 +2279,10 @@ const struct Item gItems[] =
         .price = 20,
         .holdEffect = HOLD_EFFECT_RANDOM_STAT_UP,
         .holdEffectParam = 4,
-        .description = gStarfBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sStarfBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3174,11 +2291,7 @@ const struct Item gItems[] =
         .name = _("ENIGMA BERRY"),
         .itemId = ITEM_ENIGMA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gEnigmaBerryItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sEnigmaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry,
@@ -3192,16 +2305,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3210,16 +2317,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3228,16 +2329,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3250,14 +2345,10 @@ const struct Item gItems[] =
         .price = 10,
         .holdEffect = HOLD_EFFECT_EVASION_UP,
         .holdEffectParam = 10,
-        .description = gBrightPowderItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBrightPowderDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3267,15 +2358,10 @@ const struct Item gItems[] =
         .itemId = ITEM_WHITE_HERB,
         .price = 100,
         .holdEffect = HOLD_EFFECT_RESTORE_STATS,
-        .holdEffectParam = 0,
-        .description = gWhiteHerbItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sWhiteHerbDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3285,15 +2371,10 @@ const struct Item gItems[] =
         .itemId = ITEM_MACHO_BRACE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_MACHO_BRACE,
-        .holdEffectParam = 0,
-        .description = gMachoBraceItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMachoBraceDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3303,15 +2384,10 @@ const struct Item gItems[] =
         .itemId = ITEM_EXP_SHARE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_EXP_SHARE,
-        .holdEffectParam = 0,
-        .description = gExpShareItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sExpShareDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3322,14 +2398,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_QUICK_CLAW,
         .holdEffectParam = 20,
-        .description = gQuickClawItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sQuickClawDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3339,15 +2411,10 @@ const struct Item gItems[] =
         .itemId = ITEM_SOOTHE_BELL,
         .price = 100,
         .holdEffect = HOLD_EFFECT_HAPPINESS_UP,
-        .holdEffectParam = 0,
-        .description = gSootheBellItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSootheBellDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3357,15 +2424,10 @@ const struct Item gItems[] =
         .itemId = ITEM_MENTAL_HERB,
         .price = 100,
         .holdEffect = HOLD_EFFECT_CURE_ATTRACT,
-        .holdEffectParam = 0,
-        .description = gMentalHerbItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMentalHerbDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3375,15 +2437,10 @@ const struct Item gItems[] =
         .itemId = ITEM_CHOICE_BAND,
         .price = 100,
         .holdEffect = HOLD_EFFECT_CHOICE_BAND,
-        .holdEffectParam = 0,
-        .description = gChoiceBandItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sChoiceBandDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3394,14 +2451,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_FLINCH,
         .holdEffectParam = 10,
-        .description = gKingsRockItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sKingsRockDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3412,14 +2465,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_BUG_POWER,
         .holdEffectParam = 10,
-        .description = gSilverPowderItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSilverPowderDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3430,14 +2479,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
         .holdEffectParam = 10,
-        .description = gAmuletCoinItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sAmuletCoinDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3447,15 +2492,10 @@ const struct Item gItems[] =
         .itemId = ITEM_CLEANSE_TAG,
         .price = 200,
         .holdEffect = HOLD_EFFECT_REPEL,
-        .holdEffectParam = 0,
-        .description = gCleanseTagItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sCleanseTagDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3465,15 +2505,10 @@ const struct Item gItems[] =
         .itemId = ITEM_SOUL_DEW,
         .price = 200,
         .holdEffect = HOLD_EFFECT_SOUL_DEW,
-        .holdEffectParam = 0,
-        .description = gSoulDewItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSoulDewDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3483,15 +2518,10 @@ const struct Item gItems[] =
         .itemId = ITEM_DEEP_SEA_TOOTH,
         .price = 200,
         .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH,
-        .holdEffectParam = 0,
-        .description = gDeepSeaToothItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDeepSeaToothDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3501,15 +2531,10 @@ const struct Item gItems[] =
         .itemId = ITEM_DEEP_SEA_SCALE,
         .price = 200,
         .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE,
-        .holdEffectParam = 0,
-        .description = gDeepSeaScaleItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDeepSeaScaleDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3519,15 +2544,10 @@ const struct Item gItems[] =
         .itemId = ITEM_SMOKE_BALL,
         .price = 200,
         .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN,
-        .holdEffectParam = 0,
-        .description = gSmokeBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSmokeBallDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3537,15 +2557,10 @@ const struct Item gItems[] =
         .itemId = ITEM_EVERSTONE,
         .price = 200,
         .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE,
-        .holdEffectParam = 0,
-        .description = gEverstoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sEverstoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3556,14 +2571,10 @@ const struct Item gItems[] =
         .price = 200,
         .holdEffect = HOLD_EFFECT_FOCUS_BAND,
         .holdEffectParam = 10,
-        .description = gFocusBandItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sFocusBandDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3573,15 +2584,10 @@ const struct Item gItems[] =
         .itemId = ITEM_LUCKY_EGG,
         .price = 200,
         .holdEffect = HOLD_EFFECT_LUCKY_EGG,
-        .holdEffectParam = 0,
-        .description = gLuckyEggItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLuckyEggDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3591,15 +2597,10 @@ const struct Item gItems[] =
         .itemId = ITEM_SCOPE_LENS,
         .price = 200,
         .holdEffect = HOLD_EFFECT_SCOPE_LENS,
-        .holdEffectParam = 0,
-        .description = gScopeLensItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sScopeLensDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3610,14 +2611,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_STEEL_POWER,
         .holdEffectParam = 10,
-        .description = gMetalCoatItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMetalCoatDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3628,14 +2625,10 @@ const struct Item gItems[] =
         .price = 200,
         .holdEffect = HOLD_EFFECT_LEFTOVERS,
         .holdEffectParam = 10,
-        .description = gLeftoversItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLeftoversDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3646,14 +2639,10 @@ const struct Item gItems[] =
         .price = 2100,
         .holdEffect = HOLD_EFFECT_DRAGON_SCALE,
         .holdEffectParam = 10,
-        .description = gDragonScaleItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDragonScaleDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3663,15 +2652,10 @@ const struct Item gItems[] =
         .itemId = ITEM_LIGHT_BALL,
         .price = 100,
         .holdEffect = HOLD_EFFECT_LIGHT_BALL,
-        .holdEffectParam = 0,
-        .description = gLightBallItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLightBallDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3682,14 +2666,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_GROUND_POWER,
         .holdEffectParam = 10,
-        .description = gSoftSandItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSoftSandDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3700,14 +2680,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_ROCK_POWER,
         .holdEffectParam = 10,
-        .description = gHardStoneItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sHardStoneDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3718,14 +2694,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_GRASS_POWER,
         .holdEffectParam = 10,
-        .description = gMiracleSeedItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMiracleSeedDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3736,14 +2708,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_DARK_POWER,
         .holdEffectParam = 10,
-        .description = gBlackGlassesItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlackGlassesDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3754,14 +2722,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_FIGHTING_POWER,
         .holdEffectParam = 10,
-        .description = gBlackBeltItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlackBeltDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3772,14 +2736,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_ELECTRIC_POWER,
         .holdEffectParam = 10,
-        .description = gMagnetItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMagnetDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3790,14 +2750,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
         .holdEffectParam = 10,
-        .description = gMysticWaterItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMysticWaterDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3808,14 +2764,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_FLYING_POWER,
         .holdEffectParam = 10,
-        .description = gSharpBeakItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSharpBeakDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3826,14 +2778,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_POISON_POWER,
         .holdEffectParam = 10,
-        .description = gPoisonBarbItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPoisonBarbDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3844,14 +2792,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_ICE_POWER,
         .holdEffectParam = 10,
-        .description = gNeverMeltIceItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sNeverMeltIceDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3862,14 +2806,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_GHOST_POWER,
         .holdEffectParam = 10,
-        .description = gSpellTagItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSpellTagDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3880,14 +2820,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_PSYCHIC_POWER,
         .holdEffectParam = 10,
-        .description = gTwistedSpoonItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTwistedSpoonDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3898,14 +2834,10 @@ const struct Item gItems[] =
         .price = 9800,
         .holdEffect = HOLD_EFFECT_FIRE_POWER,
         .holdEffectParam = 10,
-        .description = gCharcoalItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sCharcoalDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3916,14 +2848,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_DRAGON_POWER,
         .holdEffectParam = 10,
-        .description = gDragonFangItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDragonFangDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3934,14 +2862,10 @@ const struct Item gItems[] =
         .price = 100,
         .holdEffect = HOLD_EFFECT_NORMAL_POWER,
         .holdEffectParam = 10,
-        .description = gSilkScarfItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSilkScarfDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3951,15 +2875,10 @@ const struct Item gItems[] =
         .itemId = ITEM_UP_GRADE,
         .price = 2100,
         .holdEffect = HOLD_EFFECT_UP_GRADE,
-        .holdEffectParam = 0,
-        .description = gUpGradeItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sUpGradeDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3970,14 +2889,10 @@ const struct Item gItems[] =
         .price = 200,
         .holdEffect = HOLD_EFFECT_SHELL_BELL,
         .holdEffectParam = 8,
-        .description = gShellBellItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sShellBellDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -3988,14 +2903,10 @@ const struct Item gItems[] =
         .price = 9600,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
         .holdEffectParam = 5,
-        .description = gSeaIncenseItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sSeaIncenseDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4006,14 +2917,10 @@ const struct Item gItems[] =
         .price = 9600,
         .holdEffect = HOLD_EFFECT_EVASION_UP,
         .holdEffectParam = 5,
-        .description = gLaxIncenseItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLaxIncenseDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4023,15 +2930,10 @@ const struct Item gItems[] =
         .itemId = ITEM_LUCKY_PUNCH,
         .price = 10,
         .holdEffect = HOLD_EFFECT_LUCKY_PUNCH,
-        .holdEffectParam = 0,
-        .description = gLuckyPunchItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sLuckyPunchDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4041,15 +2943,10 @@ const struct Item gItems[] =
         .itemId = ITEM_METAL_POWDER,
         .price = 10,
         .holdEffect = HOLD_EFFECT_METAL_POWDER,
-        .holdEffectParam = 0,
-        .description = gMetalPowderItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sMetalPowderDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4059,15 +2956,10 @@ const struct Item gItems[] =
         .itemId = ITEM_THICK_CLUB,
         .price = 500,
         .holdEffect = HOLD_EFFECT_THICK_CLUB,
-        .holdEffectParam = 0,
-        .description = gThickClubItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sThickClubDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4077,15 +2969,10 @@ const struct Item gItems[] =
         .itemId = ITEM_STICK,
         .price = 200,
         .holdEffect = HOLD_EFFECT_STICK,
-        .holdEffectParam = 0,
-        .description = gStickItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sStickDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4094,16 +2981,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4112,16 +2993,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4130,16 +3005,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4148,16 +3017,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4166,16 +3029,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4184,16 +3041,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4202,16 +3053,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4220,16 +3065,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4238,16 +3077,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4256,16 +3089,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4274,16 +3101,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4292,16 +3113,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4310,16 +3125,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4328,16 +3137,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4346,16 +3149,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4364,16 +3161,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4382,16 +3173,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4400,16 +3185,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4418,16 +3197,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4436,16 +3209,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4454,16 +3221,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4472,16 +3233,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4490,16 +3245,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4508,16 +3257,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4526,16 +3269,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4544,16 +3281,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4562,16 +3293,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4580,16 +3305,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4598,16 +3317,10 @@ const struct Item gItems[] =
         .name = _("RED SCARF"),
         .itemId = ITEM_RED_SCARF,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRedScarfItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sRedScarfDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4616,16 +3329,10 @@ const struct Item gItems[] =
         .name = _("BLUE SCARF"),
         .itemId = ITEM_BLUE_SCARF,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBlueScarfItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sBlueScarfDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4634,16 +3341,10 @@ const struct Item gItems[] =
         .name = _("PINK SCARF"),
         .itemId = ITEM_PINK_SCARF,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPinkScarfItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sPinkScarfDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4652,16 +3353,10 @@ const struct Item gItems[] =
         .name = _("GREEN SCARF"),
         .itemId = ITEM_GREEN_SCARF,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGreenScarfItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sGreenScarfDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4670,16 +3365,10 @@ const struct Item gItems[] =
         .name = _("YELLOW SCARF"),
         .itemId = ITEM_YELLOW_SCARF,
         .price = 100,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gYellowScarfItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sYellowScarfDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4690,16 +3379,12 @@ const struct Item gItems[] =
         .name = _("MACH BIKE"),
         .itemId = ITEM_MACH_BIKE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMachBikeItemDescription,
+        .description = sMachBikeDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Bike,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4708,16 +3393,11 @@ const struct Item gItems[] =
         .name = _("COIN CASE"),
         .itemId = ITEM_COIN_CASE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gCoinCaseItemDescription,
+        .description = sCoinCaseDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CoinCase,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4726,16 +3406,12 @@ const struct Item gItems[] =
         .name = _("ITEMFINDER"),
         .itemId = ITEM_ITEMFINDER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gItemfinderItemDescription,
+        .description = sItemfinderDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Itemfinder,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4744,16 +3420,12 @@ const struct Item gItems[] =
         .name = _("OLD ROD"),
         .itemId = ITEM_OLD_ROD,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gOldRodItemDescription,
+        .description = sOldRodDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Rod,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4762,16 +3434,12 @@ const struct Item gItems[] =
         .name = _("GOOD ROD"),
         .itemId = ITEM_GOOD_ROD,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGoodRodItemDescription,
+        .description = sGoodRodDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Rod,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 1,
     },
 
@@ -4780,16 +3448,12 @@ const struct Item gItems[] =
         .name = _("SUPER ROD"),
         .itemId = ITEM_SUPER_ROD,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSuperRodItemDescription,
+        .description = sSuperRodDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Rod,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 2,
     },
 
@@ -4798,16 +3462,11 @@ const struct Item gItems[] =
         .name = _("S.S. TICKET"),
         .itemId = ITEM_SS_TICKET,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSSTicketItemDescription,
+        .description = sSSTicketDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4816,16 +3475,11 @@ const struct Item gItems[] =
         .name = _("CONTEST PASS"),
         .itemId = ITEM_CONTEST_PASS,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gContestPassItemDescription,
+        .description = sContestPassDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4834,16 +3488,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4852,16 +3500,11 @@ const struct Item gItems[] =
         .name = _("WAILMER PAIL"),
         .itemId = ITEM_WAILMER_PAIL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gWailmerPailItemDescription,
+        .description = sWailmerPailDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_WailmerPail,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4870,16 +3513,11 @@ const struct Item gItems[] =
         .name = _("DEVON GOODS"),
         .itemId = ITEM_DEVON_GOODS,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDevonGoodsItemDescription,
+        .description = sDevonGoodsDesc,
         .importance = 2,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4888,16 +3526,11 @@ const struct Item gItems[] =
         .name = _("SOOT SACK"),
         .itemId = ITEM_SOOT_SACK,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSootSackItemDescription,
+        .description = sSootSackDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4906,16 +3539,11 @@ const struct Item gItems[] =
         .name = _("BASEMENT KEY"),
         .itemId = ITEM_BASEMENT_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBasementKeyItemDescription,
+        .description = sBasementKeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4924,16 +3552,12 @@ const struct Item gItems[] =
         .name = _("ACRO BIKE"),
         .itemId = ITEM_ACRO_BIKE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gAcroBikeItemDescription,
+        .description = sAcroBikeDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_Bike,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 1,
     },
 
@@ -4942,16 +3566,12 @@ const struct Item gItems[] =
         .name = _("{POKEBLOCK} CASE"),
         .itemId = ITEM_POKEBLOCK_CASE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPokeblockCaseItemDescription,
+        .description = sPokeblockCaseDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 3,
         .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4960,16 +3580,11 @@ const struct Item gItems[] =
         .name = _("LETTER"),
         .itemId = ITEM_LETTER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gLetterItemDescription,
+        .description = sLetterDesc,
         .importance = 2,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -4978,16 +3593,11 @@ const struct Item gItems[] =
         .name = _("EON TICKET"),
         .itemId = ITEM_EON_TICKET,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gEonTicketItemDescription,
+        .description = sEonTicketDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 1,
     },
 
@@ -4996,16 +3606,11 @@ const struct Item gItems[] =
         .name = _("RED ORB"),
         .itemId = ITEM_RED_ORB,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRedOrbItemDescription,
+        .description = sRedOrbDesc,
         .importance = 2,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5014,16 +3619,11 @@ const struct Item gItems[] =
         .name = _("BLUE ORB"),
         .itemId = ITEM_BLUE_ORB,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBlueOrbItemDescription,
+        .description = sBlueOrbDesc,
         .importance = 2,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5032,16 +3632,11 @@ const struct Item gItems[] =
         .name = _("SCANNER"),
         .itemId = ITEM_SCANNER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gScannerItemDescription,
+        .description = sScannerDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5050,16 +3645,11 @@ const struct Item gItems[] =
         .name = _("GO-GOGGLES"),
         .itemId = ITEM_GO_GOGGLES,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGoGogglesItemDescription,
+        .description = sGoGogglesDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5068,16 +3658,11 @@ const struct Item gItems[] =
         .name = _("METEORITE"),
         .itemId = ITEM_METEORITE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMeteoriteItemDescription,
+        .description = sMeteoriteDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5086,16 +3671,11 @@ const struct Item gItems[] =
         .name = _("RM. 1 KEY"),
         .itemId = ITEM_ROOM_1_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRoom1KeyItemDescription,
+        .description = sRoom1KeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5104,16 +3684,11 @@ const struct Item gItems[] =
         .name = _("RM. 2 KEY"),
         .itemId = ITEM_ROOM_2_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRoom2KeyItemDescription,
+        .description = sRoom2KeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5122,16 +3697,11 @@ const struct Item gItems[] =
         .name = _("RM. 4 KEY"),
         .itemId = ITEM_ROOM_4_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRoom4KeyItemDescription,
+        .description = sRoom4KeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5140,16 +3710,11 @@ const struct Item gItems[] =
         .name = _("RM. 6 KEY"),
         .itemId = ITEM_ROOM_6_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRoom6KeyItemDescription,
+        .description = sRoom6KeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5158,16 +3723,11 @@ const struct Item gItems[] =
         .name = _("STORAGE KEY"),
         .itemId = ITEM_STORAGE_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gStorageKeyItemDescription,
+        .description = sStorageKeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5176,16 +3736,11 @@ const struct Item gItems[] =
         .name = _("ROOT FOSSIL"),
         .itemId = ITEM_ROOT_FOSSIL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRootFossilItemDescription,
+        .description = sRootFossilDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5194,16 +3749,11 @@ const struct Item gItems[] =
         .name = _("CLAW FOSSIL"),
         .itemId = ITEM_CLAW_FOSSIL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gClawFossilItemDescription,
+        .description = sClawFossilDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5212,16 +3762,11 @@ const struct Item gItems[] =
         .name = _("DEVON SCOPE"),
         .itemId = ITEM_DEVON_SCOPE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDevonScopeItemDescription,
+        .description = sDevonScopeDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5232,16 +3777,10 @@ const struct Item gItems[] =
         .name = _("TM01"),
         .itemId = ITEM_TM01_FOCUS_PUNCH,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM01ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM01Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5250,16 +3789,10 @@ const struct Item gItems[] =
         .name = _("TM02"),
         .itemId = ITEM_TM02_DRAGON_CLAW,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM02ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM02Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5268,16 +3801,10 @@ const struct Item gItems[] =
         .name = _("TM03"),
         .itemId = ITEM_TM03_WATER_PULSE,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM03ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM03Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5286,16 +3813,10 @@ const struct Item gItems[] =
         .name = _("TM04"),
         .itemId = ITEM_TM04_CALM_MIND,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM04ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM04Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5304,16 +3825,10 @@ const struct Item gItems[] =
         .name = _("TM05"),
         .itemId = ITEM_TM05_ROAR,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM05ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM05Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5322,16 +3837,10 @@ const struct Item gItems[] =
         .name = _("TM06"),
         .itemId = ITEM_TM06_TOXIC,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM06ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM06Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5340,16 +3849,10 @@ const struct Item gItems[] =
         .name = _("TM07"),
         .itemId = ITEM_TM07_HAIL,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM07ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM07Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5358,16 +3861,10 @@ const struct Item gItems[] =
         .name = _("TM08"),
         .itemId = ITEM_TM08_BULK_UP,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM08ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM08Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5376,16 +3873,10 @@ const struct Item gItems[] =
         .name = _("TM09"),
         .itemId = ITEM_TM09_BULLET_SEED,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM09ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM09Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5394,16 +3885,10 @@ const struct Item gItems[] =
         .name = _("TM10"),
         .itemId = ITEM_TM10_HIDDEN_POWER,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM10ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM10Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5412,16 +3897,10 @@ const struct Item gItems[] =
         .name = _("TM11"),
         .itemId = ITEM_TM11_SUNNY_DAY,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM11ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM11Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5430,16 +3909,10 @@ const struct Item gItems[] =
         .name = _("TM12"),
         .itemId = ITEM_TM12_TAUNT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM12ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM12Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5448,16 +3921,10 @@ const struct Item gItems[] =
         .name = _("TM13"),
         .itemId = ITEM_TM13_ICE_BEAM,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM13ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM13Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5466,16 +3933,10 @@ const struct Item gItems[] =
         .name = _("TM14"),
         .itemId = ITEM_TM14_BLIZZARD,
         .price = 5500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM14ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM14Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5484,16 +3945,10 @@ const struct Item gItems[] =
         .name = _("TM15"),
         .itemId = ITEM_TM15_HYPER_BEAM,
         .price = 7500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM15ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM15Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5502,16 +3957,10 @@ const struct Item gItems[] =
         .name = _("TM16"),
         .itemId = ITEM_TM16_LIGHT_SCREEN,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM16ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM16Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5520,16 +3969,10 @@ const struct Item gItems[] =
         .name = _("TM17"),
         .itemId = ITEM_TM17_PROTECT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM17ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM17Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5538,16 +3981,10 @@ const struct Item gItems[] =
         .name = _("TM18"),
         .itemId = ITEM_TM18_RAIN_DANCE,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM18ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM18Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5556,16 +3993,10 @@ const struct Item gItems[] =
         .name = _("TM19"),
         .itemId = ITEM_TM19_GIGA_DRAIN,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM19ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM19Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5574,16 +4005,10 @@ const struct Item gItems[] =
         .name = _("TM20"),
         .itemId = ITEM_TM20_SAFEGUARD,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM20ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM20Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5592,16 +4017,10 @@ const struct Item gItems[] =
         .name = _("TM21"),
         .itemId = ITEM_TM21_FRUSTRATION,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM21ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM21Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5610,16 +4029,10 @@ const struct Item gItems[] =
         .name = _("TM22"),
         .itemId = ITEM_TM22_SOLARBEAM,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM22ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM22Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5628,16 +4041,10 @@ const struct Item gItems[] =
         .name = _("TM23"),
         .itemId = ITEM_TM23_IRON_TAIL,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM23ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM23Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5646,16 +4053,10 @@ const struct Item gItems[] =
         .name = _("TM24"),
         .itemId = ITEM_TM24_THUNDERBOLT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM24ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM24Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5664,16 +4065,10 @@ const struct Item gItems[] =
         .name = _("TM25"),
         .itemId = ITEM_TM25_THUNDER,
         .price = 5500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM25ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM25Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5682,16 +4077,10 @@ const struct Item gItems[] =
         .name = _("TM26"),
         .itemId = ITEM_TM26_EARTHQUAKE,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM26ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM26Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5700,16 +4089,10 @@ const struct Item gItems[] =
         .name = _("TM27"),
         .itemId = ITEM_TM27_RETURN,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM27ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM27Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5718,16 +4101,10 @@ const struct Item gItems[] =
         .name = _("TM28"),
         .itemId = ITEM_TM28_DIG,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM28ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM28Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5736,16 +4113,10 @@ const struct Item gItems[] =
         .name = _("TM29"),
         .itemId = ITEM_TM29_PSYCHIC,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM29ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM29Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5754,16 +4125,10 @@ const struct Item gItems[] =
         .name = _("TM30"),
         .itemId = ITEM_TM30_SHADOW_BALL,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM30ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM30Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5772,16 +4137,10 @@ const struct Item gItems[] =
         .name = _("TM31"),
         .itemId = ITEM_TM31_BRICK_BREAK,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM31ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM31Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5790,16 +4149,10 @@ const struct Item gItems[] =
         .name = _("TM32"),
         .itemId = ITEM_TM32_DOUBLE_TEAM,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM32ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM32Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5808,16 +4161,10 @@ const struct Item gItems[] =
         .name = _("TM33"),
         .itemId = ITEM_TM33_REFLECT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM33ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM33Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5826,16 +4173,10 @@ const struct Item gItems[] =
         .name = _("TM34"),
         .itemId = ITEM_TM34_SHOCK_WAVE,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM34ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM34Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5844,16 +4185,10 @@ const struct Item gItems[] =
         .name = _("TM35"),
         .itemId = ITEM_TM35_FLAMETHROWER,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM35ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM35Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5862,16 +4197,10 @@ const struct Item gItems[] =
         .name = _("TM36"),
         .itemId = ITEM_TM36_SLUDGE_BOMB,
         .price = 1000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM36ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM36Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5880,16 +4209,10 @@ const struct Item gItems[] =
         .name = _("TM37"),
         .itemId = ITEM_TM37_SANDSTORM,
         .price = 2000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM37ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM37Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5898,16 +4221,10 @@ const struct Item gItems[] =
         .name = _("TM38"),
         .itemId = ITEM_TM38_FIRE_BLAST,
         .price = 5500,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM38ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM38Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5916,16 +4233,10 @@ const struct Item gItems[] =
         .name = _("TM39"),
         .itemId = ITEM_TM39_ROCK_TOMB,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM39ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM39Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5934,16 +4245,10 @@ const struct Item gItems[] =
         .name = _("TM40"),
         .itemId = ITEM_TM40_AERIAL_ACE,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM40ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM40Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5952,16 +4257,10 @@ const struct Item gItems[] =
         .name = _("TM41"),
         .itemId = ITEM_TM41_TORMENT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM41ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM41Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5970,16 +4269,10 @@ const struct Item gItems[] =
         .name = _("TM42"),
         .itemId = ITEM_TM42_FACADE,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM42ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM42Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -5988,16 +4281,10 @@ const struct Item gItems[] =
         .name = _("TM43"),
         .itemId = ITEM_TM43_SECRET_POWER,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM43ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM43Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6006,16 +4293,10 @@ const struct Item gItems[] =
         .name = _("TM44"),
         .itemId = ITEM_TM44_REST,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM44ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM44Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6024,16 +4305,10 @@ const struct Item gItems[] =
         .name = _("TM45"),
         .itemId = ITEM_TM45_ATTRACT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM45ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM45Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6042,16 +4317,10 @@ const struct Item gItems[] =
         .name = _("TM46"),
         .itemId = ITEM_TM46_THIEF,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM46ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM46Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6060,16 +4329,10 @@ const struct Item gItems[] =
         .name = _("TM47"),
         .itemId = ITEM_TM47_STEEL_WING,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM47ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM47Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6078,16 +4341,10 @@ const struct Item gItems[] =
         .name = _("TM48"),
         .itemId = ITEM_TM48_SKILL_SWAP,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM48ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM48Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6096,16 +4353,10 @@ const struct Item gItems[] =
         .name = _("TM49"),
         .itemId = ITEM_TM49_SNATCH,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM49ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM49Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6114,16 +4365,10 @@ const struct Item gItems[] =
         .name = _("TM50"),
         .itemId = ITEM_TM50_OVERHEAT,
         .price = 3000,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTM50ItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sTM50Desc,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6132,16 +4377,11 @@ const struct Item gItems[] =
         .name = _("HM01"),
         .itemId = ITEM_HM01_CUT,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM01ItemDescription,
+        .description = sHM01Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6150,16 +4390,11 @@ const struct Item gItems[] =
         .name = _("HM02"),
         .itemId = ITEM_HM02_FLY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM02ItemDescription,
+        .description = sHM02Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6168,16 +4403,11 @@ const struct Item gItems[] =
         .name = _("HM03"),
         .itemId = ITEM_HM03_SURF,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM03ItemDescription,
+        .description = sHM03Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6186,16 +4416,11 @@ const struct Item gItems[] =
         .name = _("HM04"),
         .itemId = ITEM_HM04_STRENGTH,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM04ItemDescription,
+        .description = sHM04Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6204,16 +4429,11 @@ const struct Item gItems[] =
         .name = _("HM05"),
         .itemId = ITEM_HM05_FLASH,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM05ItemDescription,
+        .description = sHM05Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6222,16 +4442,11 @@ const struct Item gItems[] =
         .name = _("HM06"),
         .itemId = ITEM_HM06_ROCK_SMASH,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM06ItemDescription,
+        .description = sHM06Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6240,16 +4455,11 @@ const struct Item gItems[] =
         .name = _("HM07"),
         .itemId = ITEM_HM07_WATERFALL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM07ItemDescription,
+        .description = sHM07Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6258,16 +4468,11 @@ const struct Item gItems[] =
         .name = _("HM08"),
         .itemId = ITEM_HM08_DIVE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHM08ItemDescription,
+        .description = sHM08Desc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_TM_HM,
         .type = 1,
         .fieldUseFunc = ItemUseOutOfBattle_TMHM,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6276,16 +4481,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6294,16 +4493,10 @@ const struct Item gItems[] =
         .name = _("????????"),
         .itemId = ITEM_NONE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDummyItemDescription,
-        .importance = 0,
-        .unk19 = 0,
+        .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6314,16 +4507,11 @@ const struct Item gItems[] =
         .name = _("OAK'S PARCEL"),
         .itemId = ITEM_OAKS_PARCEL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gOaksParcelItemDescription,
+        .description = sOaksParcelDesc,
         .importance = 2,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6332,16 +4520,11 @@ const struct Item gItems[] =
         .name = _("POKé FLUTE"),
         .itemId = ITEM_POKE_FLUTE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPokeFluteItemDescription,
+        .description = sPokeFluteDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6350,16 +4533,11 @@ const struct Item gItems[] =
         .name = _("SECRET KEY"),
         .itemId = ITEM_SECRET_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSecretKeyItemDescription,
+        .description = sSecretKeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6368,16 +4546,11 @@ const struct Item gItems[] =
         .name = _("BIKE VOUCHER"),
         .itemId = ITEM_BIKE_VOUCHER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBikeVoucherItemDescription,
+        .description = sBikeVoucherDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6386,16 +4559,11 @@ const struct Item gItems[] =
         .name = _("GOLD TEETH"),
         .itemId = ITEM_GOLD_TEETH,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gGoldTeethItemDescription,
+        .description = sGoldTeethDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6404,16 +4572,11 @@ const struct Item gItems[] =
         .name = _("OLD AMBER"),
         .itemId = ITEM_OLD_AMBER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gOldAmberItemDescription,
+        .description = sOldAmberDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6422,16 +4585,11 @@ const struct Item gItems[] =
         .name = _("CARD KEY"),
         .itemId = ITEM_CARD_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gCardKeyItemDescription,
+        .description = sCardKeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6440,16 +4598,11 @@ const struct Item gItems[] =
         .name = _("LIFT KEY"),
         .itemId = ITEM_LIFT_KEY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gLiftKeyItemDescription,
+        .description = sLiftKeyDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6458,16 +4611,11 @@ const struct Item gItems[] =
         .name = _("HELIX FOSSIL"),
         .itemId = ITEM_HELIX_FOSSIL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gHelixFossilItemDescription,
+        .description = sHelixFossilDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6476,16 +4624,11 @@ const struct Item gItems[] =
         .name = _("DOME FOSSIL"),
         .itemId = ITEM_DOME_FOSSIL,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gDomeFossilItemDescription,
+        .description = sDomeFossilDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6494,16 +4637,11 @@ const struct Item gItems[] =
         .name = _("SILPH SCOPE"),
         .itemId = ITEM_SILPH_SCOPE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSilphScopeItemDescription,
+        .description = sSilphScopeDesc,
         .importance = 1,
-        .unk19 = 0,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6512,16 +4650,12 @@ const struct Item gItems[] =
         .name = _("BICYCLE"),
         .itemId = ITEM_BICYCLE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBicycleItemDescription,
+        .description = sBicycleDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6530,16 +4664,12 @@ const struct Item gItems[] =
         .name = _("TOWN MAP"),
         .itemId = ITEM_TOWN_MAP,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTownMapItemDescription,
+        .description = sTownMapDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6548,16 +4678,12 @@ const struct Item gItems[] =
         .name = _("VS SEEKER"),
         .itemId = ITEM_VS_SEEKER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gVSSeekerItemDescription,
+        .description = sVSSeekerDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6566,16 +4692,12 @@ const struct Item gItems[] =
         .name = _("FAME CHECKER"),
         .itemId = ITEM_FAME_CHECKER,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gFameCheckerItemDescription,
+        .description = sFameCheckerDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6584,16 +4706,12 @@ const struct Item gItems[] =
         .name = _("TM CASE"),
         .itemId = ITEM_TM_CASE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTMCaseItemDescription,
+        .description = sTMCaseDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6602,16 +4720,12 @@ const struct Item gItems[] =
         .name = _("BERRY POUCH"),
         .itemId = ITEM_BERRY_POUCH,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gBerryPouchItemDescription,
+        .description = sBerryPouchDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6620,16 +4734,12 @@ const struct Item gItems[] =
         .name = _("TEACHY TV"),
         .itemId = ITEM_TEACHY_TV,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTeachyTVItemDescription,
+        .description = sTeachyTVDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 2,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6638,16 +4748,12 @@ const struct Item gItems[] =
         .name = _("TRI-PASS"),
         .itemId = ITEM_TRI_PASS,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTriPassItemDescription,
+        .description = sTriPassDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6656,16 +4762,12 @@ const struct Item gItems[] =
         .name = _("RAINBOW PASS"),
         .itemId = ITEM_RAINBOW_PASS,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRainbowPassItemDescription,
+        .description = sRainbowPassDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6674,16 +4776,12 @@ const struct Item gItems[] =
         .name = _("TEA"),
         .itemId = ITEM_TEA,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gTeaItemDescription,
+        .description = sTeaDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6692,16 +4790,12 @@ const struct Item gItems[] =
         .name = _("MYSTICTICKET"),
         .itemId = ITEM_MYSTIC_TICKET,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMysticTicketItemDescription,
+        .description = sMysticTicketDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6710,16 +4804,12 @@ const struct Item gItems[] =
         .name = _("AURORATICKET"),
         .itemId = ITEM_AURORA_TICKET,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gAuroraTicketItemDescription,
+        .description = sAuroraTicketDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6728,16 +4818,12 @@ const struct Item gItems[] =
         .name = _("POWDER JAR"),
         .itemId = ITEM_POWDER_JAR,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gPowderJarItemDescription,
+        .description = sPowderJarDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_PowderJar,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6746,16 +4832,12 @@ const struct Item gItems[] =
         .name = _("RUBY"),
         .itemId = ITEM_RUBY,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gRubyItemDescription,
+        .description = sRubyDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6764,16 +4846,12 @@ const struct Item gItems[] =
         .name = _("SAPPHIRE"),
         .itemId = ITEM_SAPPHIRE,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gSapphireItemDescription,
+        .description = sSapphireDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6784,16 +4862,12 @@ const struct Item gItems[] =
         .name = _("MAGMA EMBLEM"),
         .itemId = ITEM_MAGMA_EMBLEM,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gMagmaEmblemItemDescription,
+        .description = sMagmaEmblemDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 
@@ -6802,16 +4876,12 @@ const struct Item gItems[] =
         .name = _("OLD SEA MAP"),
         .itemId = ITEM_OLD_SEA_MAP,
         .price = 0,
-        .holdEffect = HOLD_EFFECT_NONE,
-        .holdEffectParam = 0,
-        .description = gOldSeaMapItemDescription,
+        .description = sOldSeaMapDesc,
         .importance = 1,
         .unk19 = 1,
         .pocket = POCKET_KEY_ITEMS,
         .type = 4,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .battleUsage = 0,
-        .battleUseFunc = NULL,
         .secondaryId = 0,
     },
 };
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index 9f5720a66..1697a1e7e 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -1,236 +1,476 @@
-const u8 gItemEffect_Potion[]       = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20};
-const u8 gItemEffect_Antidote[]     = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00};
-const u8 gItemEffect_BurnHeal[]     = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00};
-const u8 gItemEffect_IceHeal[]      = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
-const u8 gItemEffect_Awakening[]    = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
-const u8 gItemEffect_ParalyzeHeal[] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00};
-const u8 gItemEffect_FullRestore[]  = {0x00, 0x00, 0x00, 0x3f, 0x04, 0x00, 0xff};
-const u8 gItemEffect_MaxPotion[]    = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xff};
-const u8 gItemEffect_HyperPotion[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 200};
-const u8 gItemEffect_SuperPotion[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50};
-const u8 gItemEffect_FullHeal[]     = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
-const u8 gItemEffect_Revive[]       = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xfe};
-const u8 gItemEffect_MaxRevive[]    = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff};
-const u8 gItemEffect_FreshWater[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50};
-const u8 gItemEffect_SodaPop[]      = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 60};
-const u8 gItemEffect_Lemonade[]     = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 80};
-const u8 gItemEffect_MoomooMilk[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 100};
-const u8 gItemEffect_EnergyPowder[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 50, 0xfb, 0xfb, 0xf6};
-const u8 gItemEffect_EnergyRoot[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 200, 0xf6, 0xf6, 0xf1};
-const u8 gItemEffect_HealPowder[]   = {0x00, 0x00, 0x00, 0x3f, 0x00, 0xe0, 0xfb, 0xfb, 0xf6};
-const u8 gItemEffect_RevivalHerb[]  = {0x00, 0x00, 0x00, 0x00, 0x44, 0xe0, 0xff, 0xf1, 0xf1, 0xec};
-const u8 gItemEffect_Ether[]        = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a};
-const u8 gItemEffect_MaxEther[]     = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7f};
-const u8 gItemEffect_Elixir[]       = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a};
-const u8 gItemEffect_MaxElixir[]    = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x7f};
-const u8 gItemEffect_LavaCookie[]   = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
-const u8 gItemEffect_BlueFlute[]    = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
-const u8 gItemEffect_YellowFlute[]  = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-const u8 gItemEffect_RedFlute[]     = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00};
-const u8 gItemEffect_BerryJuice[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20};
-const u8 gItemEffect_SacredAsh[]    = {0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff};
-const u8 gItemEffect_HPUp[]         = {0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Protein[]      = {0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Iron[]         = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Carbos[]       = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Calcium[]      = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_RareCandy[]    = {0x00, 0x00, 0x00, 0x40, 0x44, 0xe0,  253, 0x05, 0x03, 0x02};
-const u8 gItemEffect_PPUp[]         = {0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0x05, 0x03, 0x02};
-const u8 gItemEffect_Zinc[]         = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x0a, 0x05, 0x03, 0x02};
-const u8 gItemEffect_PPMax[]        = {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x05, 0x03, 0x02};
-const u8 gItemEffect_GuardSpec[]    = {0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_DireHit[]      = {0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XAttack[]      = {0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XDefend[]      = {0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XSpeed[]       = {0x00, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XAccuracy[]    = {0x00, 0x00, 0x10, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_XSpecial[]     = {0x00, 0x00, 0x01, 0x00, 0x00, 0x60, 0x01, 0x01};
-const u8 gItemEffect_SunStone[]     = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_MoonStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_FireStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_ThunderStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_WaterStone[]   = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_LeafStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
-const u8 gItemEffect_CheriBerry[]   = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00};
-const u8 gItemEffect_ChestoBerry[]  = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
-const u8 gItemEffect_PechaBerry[]   = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00};
-const u8 gItemEffect_RawstBerry[]   = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00};
-const u8 gItemEffect_AspearBerry[]  = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
-const u8 gItemEffect_LeppaBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a};
-const u8 gItemEffect_OranBerry[]    = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 10};
-const u8 gItemEffect_PersimBerry[]  = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
-const u8 gItemEffect_LumBerry[]     = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
-const u8 gItemEffect_SitrusBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 30};
-const u8 gItemEffect_PomegBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_KelpsyBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_QualotBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_HondrewBerry[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_GrepaBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0xf6, 0x0a, 0x05, 0x02};
-const u8 gItemEffect_TamatoBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0xf6, 0x0a, 0x05, 0x02};
+const u8 gItemEffect_Potion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 20,
+};
+
+const u8 gItemEffect_Antidote[6] = {
+    [3] = ITEM3_POISON,
+};
+
+const u8 gItemEffect_BurnHeal[6] = {
+    [3] = ITEM3_BURN,
+};
+
+const u8 gItemEffect_IceHeal[6] = {
+    [3] = ITEM3_FREEZE,
+};
+
+const u8 gItemEffect_Awakening[6] = {
+    [3] = ITEM3_SLEEP,
+};
+
+const u8 gItemEffect_ParalyzeHeal[6] = {
+    [3] = ITEM3_PARALYSIS,
+};
+
+const u8 gItemEffect_FullRestore[7] = {
+    [3] = ITEM3_STATUS_ALL,
+    [4] = ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_MaxPotion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_HyperPotion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 200,
+};
+
+const u8 gItemEffect_SuperPotion[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 50,
+};
+
+const u8 gItemEffect_FullHeal[6] = {
+    [3] = ITEM3_STATUS_ALL,
+};
+
+const u8 gItemEffect_Revive[7] = {
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [6] = -2,
+};
+
+const u8 gItemEffect_MaxRevive[7] = {
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_FreshWater[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 50,
+};
+
+const u8 gItemEffect_SodaPop[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 60,
+};
+
+const u8 gItemEffect_Lemonade[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 80,
+};
+
+const u8 gItemEffect_MoomooMilk[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 100,
+};
+
+const u8 gItemEffect_EnergyPowder[10] = {
+    [4] = ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 50,
+    [7] = -5,
+    [8] = -5,
+    [9] = -10,
+};
+
+const u8 gItemEffect_EnergyRoot[10] = {
+    [4] = ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 200,
+    [7] = -10,
+    [8] = -10,
+    [9] = -15,
+};
+
+const u8 gItemEffect_HealPowder[9] = {
+    [3] = ITEM3_STATUS_ALL,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -5,
+    [7] = -5,
+    [8] = -10,
+};
+
+const u8 gItemEffect_RevivalHerb[10] = {
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -1,
+    [7] = -15,
+    [8] = -15,
+    [9] = -20,
+};
+
+const u8 gItemEffect_Ether[7] = {
+    [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+    [6] = 10,
+};
+
+const u8 gItemEffect_MaxEther[7] = {
+    [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+    [6] = 0x7F,
+};
+
+const u8 gItemEffect_Elixir[7] = {
+    [4] = ITEM4_HEAL_PP_ALL,
+    [6] = 10,
+};
+
+const u8 gItemEffect_MaxElixir[7] = {
+    [4] = ITEM4_HEAL_PP_ALL,
+    [6] = 0x7F,
+};
+
+const u8 gItemEffect_LavaCookie[6] = {
+    [3] = ITEM3_STATUS_ALL,
+};
+
+const u8 gItemEffect_BlueFlute[6] = {
+    [3] = ITEM3_SLEEP,
+};
+
+const u8 gItemEffect_YellowFlute[6] = {
+    [3] = ITEM3_CONFUSION,
+};
+
+const u8 gItemEffect_RedFlute[6] = {
+    [0] = ITEM0_INFATUATION,
+};
+
+const u8 gItemEffect_BerryJuice[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 20,
+};
+
+const u8 gItemEffect_SacredAsh[7] = {
+    [0] = ITEM0_SACRED_ASH,
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [6] = -1,
+};
+
+const u8 gItemEffect_HPUp[10] = {
+    [4] = ITEM4_EV_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Protein[10] = {
+    [4] = ITEM4_EV_ATK,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Iron[10] = {
+    [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Carbos[10] = {
+    [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_Calcium[10] = {
+    [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_RareCandy[10] = {
+    [3] = ITEM3_LEVEL_UP,
+    [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 0xFD,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_PPUp[9] = {
+    [4] = ITEM4_PP_UP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = 5,
+    [7] = 3,
+    [8] = 2,
+};
+
+const u8 gItemEffect_Zinc[10] = {
+    [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = 10,
+    [7] = 5,
+    [8] = 3,
+    [9] = 2,
+};
+
+const u8 gItemEffect_PPMax[9] = {
+    [5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL,
+    [6] = 5,
+    [7] = 3,
+    [8] = 2,
+};
+
+const u8 gItemEffect_GuardSpec[8] = {
+    [3] = ITEM3_MIST,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_DireHit[8] = {
+    [0] = 2 << 4,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XAttack[8] = {
+    [0] = 1,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XDefend[8] = {
+    [1] = 1 << 4,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XSpeed[8] = {
+    [1] = 1,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XAccuracy[8] = {
+    [2] = 1 << 4,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_XSpecial[8] = {
+    [2] = 1,
+    [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
+    [6] = 1,
+    [7] = 1,
+};
+
+const u8 gItemEffect_SunStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_MoonStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_FireStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_ThunderStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_WaterStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_LeafStone[6] = {
+    [4] = ITEM4_EVO_STONE,
+};
+
+const u8 gItemEffect_CheriBerry[6] = {
+    [3] = ITEM3_PARALYSIS,
+};
+
+const u8 gItemEffect_ChestoBerry[6] = {
+    [3] = ITEM3_SLEEP,
+};
+
+const u8 gItemEffect_PechaBerry[6] = {
+    [3] = ITEM3_POISON,
+};
+
+const u8 gItemEffect_RawstBerry[6] = {
+    [3] = ITEM3_BURN,
+};
+
+const u8 gItemEffect_AspearBerry[6] = {
+    [3] = ITEM3_FREEZE,
+};
+
+const u8 gItemEffect_LeppaBerry[7] = {
+    [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+    [6] = 10,
+};
+
+const u8 gItemEffect_OranBerry[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 10,
+};
+
+const u8 gItemEffect_PersimBerry[6] = {
+    [3] = ITEM3_CONFUSION,
+};
+
+const u8 gItemEffect_LumBerry[6] = {
+    [3] = ITEM3_STATUS_ALL,
+};
+
+const u8 gItemEffect_SitrusBerry[7] = {
+    [4] = ITEM4_HEAL_HP,
+    [6] = 30,
+};
+
+const u8 gItemEffect_PomegBerry[10] = {
+    [4] = ITEM4_EV_HP,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_KelpsyBerry[10] = {
+    [4] = ITEM4_EV_ATK,
+    [5] = ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_QualotBerry[10] = {
+    [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_HondrewBerry[10] = {
+    [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_GrepaBerry[10] = {
+    [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
+
+const u8 gItemEffect_TamatoBerry[10] = {
+    [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
+    [6] = -10,
+    [7] = 10,
+    [8] = 5,
+    [9] = 2,
+};
 
 const u8 *const gItemEffectTable[] =
 {
-    gItemEffect_Potion,
-    gItemEffect_Antidote,
-    gItemEffect_BurnHeal,
-    gItemEffect_IceHeal,
-    gItemEffect_Awakening,
-    gItemEffect_ParalyzeHeal,
-    gItemEffect_FullRestore,
-    gItemEffect_MaxPotion,
-    gItemEffect_HyperPotion,
-    gItemEffect_SuperPotion,
-    gItemEffect_FullHeal,
-    gItemEffect_Revive,
-    gItemEffect_MaxRevive,
-    gItemEffect_FreshWater,
-    gItemEffect_SodaPop,
-    gItemEffect_Lemonade,
-    gItemEffect_MoomooMilk,
-    gItemEffect_EnergyPowder,
-    gItemEffect_EnergyRoot,
-    gItemEffect_HealPowder,
-    gItemEffect_RevivalHerb,
-    gItemEffect_Ether,
-    gItemEffect_MaxEther,
-    gItemEffect_Elixir,
-    gItemEffect_MaxElixir,
-    gItemEffect_LavaCookie,
-    gItemEffect_BlueFlute,
-    gItemEffect_YellowFlute,
-    gItemEffect_RedFlute,
-    NULL,
-    NULL,
-    gItemEffect_BerryJuice,
-    gItemEffect_SacredAsh,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_HPUp,
-    gItemEffect_Protein,
-    gItemEffect_Iron,
-    gItemEffect_Carbos,
-    gItemEffect_Calcium,
-    gItemEffect_RareCandy,
-    gItemEffect_PPUp,
-    gItemEffect_Zinc,
-    gItemEffect_PPMax,
-    NULL,
-    gItemEffect_GuardSpec,
-    gItemEffect_DireHit,
-    gItemEffect_XAttack,
-    gItemEffect_XDefend,
-    gItemEffect_XSpeed,
-    gItemEffect_XAccuracy,
-    gItemEffect_XSpecial,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_SunStone,
-    gItemEffect_MoonStone,
-    gItemEffect_FireStone,
-    gItemEffect_ThunderStone,
-    gItemEffect_WaterStone,
-    gItemEffect_LeafStone,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_CheriBerry,
-    gItemEffect_ChestoBerry,
-    gItemEffect_PechaBerry,
-    gItemEffect_RawstBerry,
-    gItemEffect_AspearBerry,
-    gItemEffect_LeppaBerry,
-    gItemEffect_OranBerry,
-    gItemEffect_PersimBerry,
-    gItemEffect_LumBerry,
-    gItemEffect_SitrusBerry,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    gItemEffect_PomegBerry,
-    gItemEffect_KelpsyBerry,
-    gItemEffect_QualotBerry,
-    gItemEffect_HondrewBerry,
-    gItemEffect_GrepaBerry,
-    gItemEffect_TamatoBerry,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion,
+    [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote,
+    [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal,
+    [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal,
+    [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening,
+    [ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal,
+    [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore,
+    [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion,
+    [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion,
+    [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion,
+    [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal,
+    [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive,
+    [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive,
+    [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater,
+    [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop,
+    [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade,
+    [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk,
+    [ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder,
+    [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot,
+    [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder,
+    [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb,
+    [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether,
+    [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther,
+    [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir,
+    [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir,
+    [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie,
+    [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute,
+    [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute,
+    [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute,
+    [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
+    [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
+    [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
+    [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
+    [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron,
+    [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos,
+    [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium,
+    [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy,
+    [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp,
+    [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc,
+    [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax,
+    [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec,
+    [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit,
+    [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack,
+    [ITEM_X_DEFEND - ITEM_POTION] = gItemEffect_XDefend,
+    [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
+    [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
+    [ITEM_X_SPECIAL - ITEM_POTION] = gItemEffect_XSpecial,
+    [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_SunStone,
+    [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_MoonStone,
+    [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_FireStone,
+    [ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_ThunderStone,
+    [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_WaterStone,
+    [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_LeafStone,
+    [ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry,
+    [ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry,
+    [ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry,
+    [ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry,
+    [ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry,
+    [ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry,
+    [ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry,
+    [ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry,
+    [ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry,
+    [ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry,
+    [ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry,
+    [ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry,
+    [ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry,
+    [ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondrewBerry,
+    [ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry,
+    [ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry,
+    [LAST_BERRY_INDEX - ITEM_POTION] = NULL
 };
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/text/item_descriptions.h b/src/data/text/item_descriptions.h
index 1f048e440..5f79efc57 100644
--- a/src/data/text/item_descriptions.h
+++ b/src/data/text/item_descriptions.h
@@ -1,326 +1,1551 @@
-const u8 gDummyItemDescription[] = _("?????");
+static const u8 sDummyDesc[] = _(
+    "?????");
+
 // Pokeballs
-const u8 gMasterBallItemDescription[] = _("The best BALL that\ncatches a POKéMON\nwithout fail.");
-const u8 gUltraBallItemDescription[] = _("A better BALL with\na higher catch rate\nthan a GREAT BALL.");
-const u8 gGreatBallItemDescription[] = _("A good BALL with a\nhigher catch rate\nthan a POKé BALL.");
-const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMON.");
-const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE.");
-const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON.");
-const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor.");
-const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON.");
-const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before.");
-const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns.");
-const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly.");
-const u8 gPremierBallItemDescription[] = _("A rare BALL made\nin commemoration\nof some event.");
+static const u8 sMasterBallDesc[] = _(
+    "The best BALL that\n"
+    "catches a POKéMON\n"
+    "without fail.");
+
+static const u8 sUltraBallDesc[] = _(
+    "A better BALL with\n"
+    "a higher catch rate\n"
+    "than a GREAT BALL.");
+
+static const u8 sGreatBallDesc[] = _(
+    "A good BALL with a\n"
+    "higher catch rate\n"
+    "than a POKé BALL.");
+
+static const u8 sPokeBallDesc[] = _(
+    "A tool used for\n"
+    "catching wild\n"
+    "POKéMON.");
+
+static const u8 sSafariBallDesc[] = _(
+    "A special BALL that\n"
+    "is used only in the\n"
+    "SAFARI ZONE.");
+
+static const u8 sNetBallDesc[] = _(
+    "A BALL that works\n"
+    "well on WATER- and\n"
+    "BUG-type POKéMON.");
+
+static const u8 sDiveBallDesc[] = _(
+    "A BALL that works\n"
+    "better on POKéMON\n"
+    "on the ocean floor.");
+
+static const u8 sNestBallDesc[] = _(
+    "A BALL that works\n"
+    "better on weaker\n"
+    "POKéMON.");
+
+static const u8 sRepeatBallDesc[] = _(
+    "A BALL that works\n"
+    "better on POKéMON\n"
+    "caught before.");
+
+static const u8 sTimerBallDesc[] = _(
+    "A BALL that gains\n"
+    "power in battles\n"
+    "taking many turns.");
+
+static const u8 sLuxuryBallDesc[] = _(
+    "A cozy BALL that\n"
+    "makes POKéMON\n"
+    "more friendly.");
+
+static const u8 sPremierBallDesc[] = _(
+    "A rare BALL made\n"
+    "in commemoration\n"
+    "of some event.");
+
 // Medicine
-const u8 gPotionItemDescription[] = _("Restores the HP of\na POKéMON by\n20 points.");
-const u8 gAntidoteItemDescription[] = _("Heals a poisoned\nPOKéMON.");
-const u8 gBurnHealItemDescription[] = _("Heals POKéMON\nof a burn.");
-const u8 gIceHealItemDescription[] = _("Defrosts a frozen\nPOKéMON.");
-const u8 gAwakeningItemDescription[] = _("Awakens a sleeping\nPOKéMON.");
-const u8 gParalyzeHealItemDescription[] = _("Heals a paralyzed\nPOKéMON.");
-const u8 gFullRestoreItemDescription[] = _("Fully restores the\nHP and status of a\nPOKéMON.");
-const u8 gMaxPotionItemDescription[] = _("Fully restores the\nHP of a POKéMON.");
-const u8 gHyperPotionItemDescription[] = _("Restores the HP of\na POKéMON by\n200 points.");
-const u8 gSuperPotionItemDescription[] = _("Restores the HP of\na POKéMON by\n50 points.");
-const u8 gFullHealItemDescription[] = _("Heals all the\nstatus problems of\none POKéMON.");
-const u8 gReviveItemDescription[] = _("Revives a fainted\nPOKéMON with half\nits HP.");
-const u8 gMaxReviveItemDescription[] = _("Revives a fainted\nPOKéMON with all\nits HP.");
-const u8 gFreshWaterItemDescription[] = _("A mineral water\nthat restores HP\nby 50 points.");
-const u8 gSodaPopItemDescription[] = _("A fizzy soda drink\nthat restores HP\nby 60 points.");
-const u8 gLemonadeItemDescription[] = _("A very sweet drink\nthat restores HP\nby 80 points.");
-const u8 gMoomooMilkItemDescription[] = _("A nutritious milk\nthat restores HP\nby 100 points.");
-const u8 gEnergyPowderItemDescription[] = _("A bitter powder\nthat restores HP\nby 50 points.");
-const u8 gEnergyRootItemDescription[] = _("A bitter root\nthat restores HP\nby 200 points.");
-const u8 gHealPowderItemDescription[] = _("A bitter powder\nthat heals all\nstatus problems.");
-const u8 gRevivalHerbItemDescription[] = _("A very bitter herb\nthat revives a\nfainted POKéMON.");
-const u8 gEtherItemDescription[] = _("Restores the PP\nof a selected move\nby 10.");
-const u8 gMaxEtherItemDescription[] = _("Fully restores the\nPP of a selected\nmove.");
-const u8 gElixirItemDescription[] = _("Restores the PP\nof all moves by 10.");
-const u8 gMaxElixirItemDescription[] = _("Fully restores the\nPP of a POKéMON's\nmoves.");
-const u8 gLavaCookieItemDescription[] = _("A local specialty\nthat heals all\nstatus problems.");
-const u8 gBlueFluteItemDescription[] = _("A glass flute that\nawakens sleeping\nPOKéMON.");
-const u8 gYellowFluteItemDescription[] = _("A glass flute that\nsnaps POKéMON\nout of confusion.");
-const u8 gRedFluteItemDescription[] = _("A glass flute that\nsnaps POKéMON\nout of attraction.");
-const u8 gBlackFluteItemDescription[] = _("A glass flute that\nkeeps away wild\nPOKéMON.");
-const u8 gWhiteFluteItemDescription[] = _("A glass flute that\nlures wild POKéMON.");
-const u8 gBerryJuiceItemDescription[] = _("A 100% pure juice\nthat restores HP\nby 20 points.");
-const u8 gSacredAshItemDescription[] = _("Fully revives and\nrestores all\nfainted POKéMON.");
+static const u8 sPotionDesc[] = _(
+    "Restores the HP of\n"
+    "a POKéMON by\n"
+    "20 points.");
+
+static const u8 sAntidoteDesc[] = _(
+    "Heals a poisoned\n"
+    "POKéMON.");
+
+static const u8 sBurnHealDesc[] = _(
+    "Heals POKéMON\n"
+    "of a burn.");
+
+static const u8 sIceHealDesc[] = _(
+    "Defrosts a frozen\n"
+    "POKéMON.");
+
+static const u8 sAwakeningDesc[] = _(
+    "Awakens a sleeping\n"
+    "POKéMON.");
+
+static const u8 sParalyzeHealDesc[] = _(
+    "Heals a paralyzed\n"
+    "POKéMON.");
+
+static const u8 sFullRestoreDesc[] = _(
+    "Fully restores the\n"
+    "HP and status of a\n"
+    "POKéMON.");
+
+static const u8 sMaxPotionDesc[] = _(
+    "Fully restores the\n"
+    "HP of a POKéMON.");
+
+static const u8 sHyperPotionDesc[] = _(
+    "Restores the HP of\n"
+    "a POKéMON by\n"
+    "200 points.");
+
+static const u8 sSuperPotionDesc[] = _(
+    "Restores the HP of\n"
+    "a POKéMON by\n"
+    "50 points.");
+
+static const u8 sFullHealDesc[] = _(
+    "Heals all the\n"
+    "status problems of\n"
+    "one POKéMON.");
+
+static const u8 sReviveDesc[] = _(
+    "Revives a fainted\n"
+    "POKéMON with half\n"
+    "its HP.");
+
+static const u8 sMaxReviveDesc[] = _(
+    "Revives a fainted\n"
+    "POKéMON with all\n"
+    "its HP.");
+
+static const u8 sFreshWaterDesc[] = _(
+    "A mineral water\n"
+    "that restores HP\n"
+    "by 50 points.");
+
+static const u8 sSodaPopDesc[] = _(
+    "A fizzy soda drink\n"
+    "that restores HP\n"
+    "by 60 points.");
+
+static const u8 sLemonadeDesc[] = _(
+    "A very sweet drink\n"
+    "that restores HP\n"
+    "by 80 points.");
+
+static const u8 sMoomooMilkDesc[] = _(
+    "A nutritious milk\n"
+    "that restores HP\n"
+    "by 100 points.");
+
+static const u8 sEnergyPowderDesc[] = _(
+    "A bitter powder\n"
+    "that restores HP\n"
+    "by 50 points.");
+
+static const u8 sEnergyRootDesc[] = _(
+    "A bitter root\n"
+    "that restores HP\n"
+    "by 200 points.");
+
+static const u8 sHealPowderDesc[] = _(
+    "A bitter powder\n"
+    "that heals all\n"
+    "status problems.");
+
+static const u8 sRevivalHerbDesc[] = _(
+    "A very bitter herb\n"
+    "that revives a\n"
+    "fainted POKéMON.");
+
+static const u8 sEtherDesc[] = _(
+    "Restores the PP\n"
+    "of a selected move\n"
+    "by 10.");
+
+static const u8 sMaxEtherDesc[] = _(
+    "Fully restores the\n"
+    "PP of a selected\n"
+    "move.");
+
+static const u8 sElixirDesc[] = _(
+    "Restores the PP\n"
+    "of all moves by 10.");
+
+static const u8 sMaxElixirDesc[] = _(
+    "Fully restores the\n"
+    "PP of a POKéMON's\n"
+    "moves.");
+
+static const u8 sLavaCookieDesc[] = _(
+    "A local specialty\n"
+    "that heals all\n"
+    "status problems.");
+
+static const u8 sBlueFluteDesc[] = _(
+    "A glass flute that\n"
+    "awakens sleeping\n"
+    "POKéMON.");
+
+static const u8 sYellowFluteDesc[] = _(
+    "A glass flute that\n"
+    "snaps POKéMON\n"
+    "out of confusion.");
+
+static const u8 sRedFluteDesc[] = _(
+    "A glass flute that\n"
+    "snaps POKéMON\n"
+    "out of attraction.");
+
+static const u8 sBlackFluteDesc[] = _(
+    "A glass flute that\n"
+    "keeps away wild\n"
+    "POKéMON.");
+
+static const u8 sWhiteFluteDesc[] = _(
+    "A glass flute that\n"
+    "lures wild POKéMON.");
+
+static const u8 sBerryJuiceDesc[] = _(
+    "A 100% pure juice\n"
+    "that restores HP\n"
+    "by 20 points.");
+
+static const u8 sSacredAshDesc[] = _(
+    "Fully revives and\n"
+    "restores all\n"
+    "fainted POKéMON.");
+
 // Collectibles
-const u8 gShoalSaltItemDescription[] = _("Salt obtained from\ndeep inside the\nSHOAL CAVE.");
-const u8 gShoalShellItemDescription[] = _("A seashell found\ndeep inside the\nSHOAL CAVE.");
-const u8 gRedShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply.");
-const u8 gBlueShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply.");
-const u8 gYellowShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply.");
-const u8 gGreenShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply.");
+static const u8 sShoalSaltDesc[] = _(
+    "Salt obtained from\n"
+    "deep inside the\n"
+    "SHOAL CAVE.");
+
+static const u8 sShoalShellDesc[] = _(
+    "A seashell found\n"
+    "deep inside the\n"
+    "SHOAL CAVE.");
+
+static const u8 sRedShardDesc[] = _(
+    "A shard from an\n"
+    "ancient item. Can\n"
+    "be sold cheaply.");
+
+static const u8 sBlueShardDesc[] = _(
+    "A shard from an\n"
+    "ancient item. Can\n"
+    "be sold cheaply.");
+
+static const u8 sYellowShardDesc[] = _(
+    "A shard from an\n"
+    "ancient item. Can\n"
+    "be sold cheaply.");
+
+static const u8 sGreenShardDesc[] = _(
+    "A shard from an\n"
+    "ancient item. Can\n"
+    "be sold cheaply.");
+
 // Vitamins
-const u8 gHPUpItemDescription[] = _("Raises the base HP\nof one POKéMON.");
-const u8 gProteinItemDescription[] = _("Raises the base\nATTACK stat of one\nPOKéMON.");
-const u8 gIronItemDescription[] = _("Raises the base\nDEFENSE stat of\none POKéMON.");
-const u8 gCarbosItemDescription[] = _("Raises the base\nSPEED stat of one\nPOKéMON.");
-const u8 gCalciumItemDescription[] = _("Raises the base\nSP. ATK stat of one\nPOKéMON.");
-const u8 gRareCandyItemDescription[] = _("Raises the level\nof a POKéMON by\none.");
-const u8 gPPUpItemDescription[] = _("Raises the maximum\nPP of a selected\nmove.");
-const u8 gZincItemDescription[] = _("Raises the base\nSP. DEF stat of one\nPOKéMON.");
-const u8 gPPMaxItemDescription[] = _("Raises the PP of a\nmove to its maximum\npoints.");
+static const u8 sHPUpDesc[] = _(
+    "Raises the base HP\n"
+    "of one POKéMON.");
+
+static const u8 sProteinDesc[] = _(
+    "Raises the base\n"
+    "ATTACK stat of one\n"
+    "POKéMON.");
+
+static const u8 sIronDesc[] = _(
+    "Raises the base\n"
+    "DEFENSE stat of\n"
+    "one POKéMON.");
+
+static const u8 sCarbosDesc[] = _(
+    "Raises the base\n"
+    "SPEED stat of one\n"
+    "POKéMON.");
+
+static const u8 sCalciumDesc[] = _(
+    "Raises the base\n"
+    "SP. ATK stat of one\n"
+    "POKéMON.");
+
+static const u8 sRareCandyDesc[] = _(
+    "Raises the level\n"
+    "of a POKéMON by\n"
+    "one.");
+
+static const u8 sPPUpDesc[] = _(
+    "Raises the maximum\n"
+    "PP of a selected\n"
+    "move.");
+
+static const u8 sZincDesc[] = _(
+    "Raises the base\n"
+    "SP. DEF stat of one\n"
+    "POKéMON.");
+
+static const u8 sPPMaxDesc[] = _(
+    "Raises the PP of a\n"
+    "move to its maximum\n"
+    "points.");
+
 // Battle items
-const u8 gGuardSpecItemDescription[] = _("Prevents stat\nreduction when\nused in battle.");
-const u8 gDireHitItemDescription[] = _("Raises the\ncritical-hit ratio\nduring one battle.");
-const u8 gXAttackItemDescription[] = _("Raises the stat\nATTACK during one\nbattle.");
-const u8 gXDefendItemDescription[] = _("Raises the stat\nDEFENSE during one\nbattle.");
-const u8 gXSpeedItemDescription[] = _("Raises the stat\nSPEED during one\nbattle.");
-const u8 gXAccuracyItemDescription[] = _("Raises accuracy\nof attack moves\nduring one battle.");
-const u8 gXSpecialItemDescription[] = _("Raises the stat\nSP. ATK during one\nbattle.");
-const u8 gPokeDollItemDescription[] = _("Use to flee from\nany battle with\na wild POKéMON.");
-const u8 gFluffyTailItemDescription[] = _("Use to flee from\nany battle with\na wild POKéMON.");
+static const u8 sGuardSpecDesc[] = _(
+    "Prevents stat\n"
+    "reduction when\n"
+    "used in battle.");
+
+static const u8 sDireHitDesc[] = _(
+    "Raises the\n"
+    "critical-hit ratio\n"
+    "during one battle.");
+
+static const u8 sXAttackDesc[] = _(
+    "Raises the stat\n"
+    "ATTACK during one\n"
+    "battle.");
+
+static const u8 sXDefendDesc[] = _(
+    "Raises the stat\n"
+    "DEFENSE during one\n"
+    "battle.");
+
+static const u8 sXSpeedDesc[] = _(
+    "Raises the stat\n"
+    "SPEED during one\n"
+    "battle.");
+
+static const u8 sXAccuracyDesc[] = _(
+    "Raises accuracy\n"
+    "of attack moves\n"
+    "during one battle.");
+
+static const u8 sXSpecialDesc[] = _(
+    "Raises the stat\n"
+    "SP. ATK during one\n"
+    "battle.");
+
+static const u8 sPokeDollDesc[] = _(
+    "Use to flee from\n"
+    "any battle with\n"
+    "a wild POKéMON.");
+
+static const u8 sFluffyTailDesc[] = _(
+    "Use to flee from\n"
+    "any battle with\n"
+    "a wild POKéMON.");
+
 // Field items
-const u8 gSuperRepelItemDescription[] = _("Repels weak wild\nPOKéMON for 200\nsteps.");
-const u8 gMaxRepelItemDescription[] = _("Repels weak wild\nPOKéMON for 250\nsteps.");
-const u8 gEscapeRopeItemDescription[] = _("Use to escape\ninstantly from a\ncave or a dungeon.");
-const u8 gRepelItemDescription[] = _("Repels weak wild\nPOKéMON for 100\nsteps.");
+static const u8 sSuperRepelDesc[] = _(
+    "Repels weak wild\n"
+    "POKéMON for 200\n"
+    "steps.");
+
+static const u8 sMaxRepelDesc[] = _(
+    "Repels weak wild\n"
+    "POKéMON for 250\n"
+    "steps.");
+
+static const u8 sEscapeRopeDesc[] = _(
+    "Use to escape\n"
+    "instantly from a\n"
+    "cave or a dungeon.");
+
+static const u8 sRepelDesc[] = _(
+    "Repels weak wild\n"
+    "POKéMON for 100\n"
+    "steps.");
+
 // Evolution stones
-const u8 gSunStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve.");
-const u8 gMoonStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve.");
-const u8 gFireStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve.");
-const u8 gThunderStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve.");
-const u8 gWaterStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve.");
-const u8 gLeafStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve.");
+static const u8 sSunStoneDesc[] = _(
+    "Makes certain\n"
+    "species of POKéMON\n"
+    "evolve.");
+
+static const u8 sMoonStoneDesc[] = _(
+    "Makes certain\n"
+    "species of POKéMON\n"
+    "evolve.");
+
+static const u8 sFireStoneDesc[] = _(
+    "Makes certain\n"
+    "species of POKéMON\n"
+    "evolve.");
+
+static const u8 sThunderStoneDesc[] = _(
+    "Makes certain\n"
+    "species of POKéMON\n"
+    "evolve.");
+
+static const u8 sWaterStoneDesc[] = _(
+    "Makes certain\n"
+    "species of POKéMON\n"
+    "evolve.");
+
+static const u8 sLeafStoneDesc[] = _(
+    "Makes certain\n"
+    "species of POKéMON\n"
+    "evolve.");
+
 // Valuable items
-const u8 gTinyMushroomItemDescription[] = _("A plain mushroom\nthat would sell\nat a cheap price.");
-const u8 gBigMushroomItemDescription[] = _("A rare mushroom\nthat would sell at a\nhigh price.");
-const u8 gPearlItemDescription[] = _("A pretty pearl\nthat would sell at a\ncheap price.");
-const u8 gBigPearlItemDescription[] = _("A lovely large pearl\nthat would sell at a\nhigh price.");
-const u8 gStardustItemDescription[] = _("Beautiful red sand.\nCan be sold at a\nhigh price.");
-const u8 gStarPieceItemDescription[] = _("A red gem shard.\nIt would sell for a\nvery high price.");
-const u8 gNuggetItemDescription[] = _("A nugget of pure\ngold. Can be sold at\na high price.");
-const u8 gHeartScaleItemDescription[] = _("A lovely scale.\nIt is coveted by\ncollectors.");
+static const u8 sTinyMushroomDesc[] = _(
+    "A plain mushroom\n"
+    "that would sell\n"
+    "at a cheap price.");
+
+static const u8 sBigMushroomDesc[] = _(
+    "A rare mushroom\n"
+    "that would sell at a\n"
+    "high price.");
+
+static const u8 sPearlDesc[] = _(
+    "A pretty pearl\n"
+    "that would sell at a\n"
+    "cheap price.");
+
+static const u8 sBigPearlDesc[] = _(
+    "A lovely large pearl\n"
+    "that would sell at a\n"
+    "high price.");
+
+static const u8 sStardustDesc[] = _(
+    "Beautiful red sand.\n"
+    "Can be sold at a\n"
+    "high price.");
+
+static const u8 sStarPieceDesc[] = _(
+    "A red gem shard.\n"
+    "It would sell for a\n"
+    "very high price.");
+
+static const u8 sNuggetDesc[] = _(
+    "A nugget of pure\n"
+    "gold. Can be sold at\n"
+    "a high price.");
+
+static const u8 sHeartScaleDesc[] = _(
+    "A lovely scale.\n"
+    "It is coveted by\n"
+    "collectors.");
+
 // Mail
-const u8 gOrangeMailItemDescription[] = _("A ZIGZAGOON-print\nMAIL to be held by\na POKéMON.");
-const u8 gHarborMailItemDescription[] = _("A WINGULL-print\nMAIL to be held by\na POKéMON.");
-const u8 gGlitterMailItemDescription[] = _("A PIKACHU-print\nMAIL to be held by\na POKéMON.");
-const u8 gMechMailItemDescription[] = _("A MAGNEMITE-print\nMAIL to be held by\na POKéMON.");
-const u8 gWoodMailItemDescription[] = _("A SLAKOTH-print\nMAIL to be held by\na POKéMON.");
-const u8 gWaveMailItemDescription[] = _("A WAILMER-print\nMAIL to be held by\na POKéMON.");
-const u8 gBeadMailItemDescription[] = _("MAIL featuring a\nsketch of the\nholding POKéMON.");
-const u8 gShadowMailItemDescription[] = _("A DUSKULL-print\nMAIL to be held by\na POKéMON.");
-const u8 gTropicMailItemDescription[] = _("A BELLOSSOM-print\nMAIL to be held by\na POKéMON.");
-const u8 gDreamMailItemDescription[] = _("MAIL featuring a\nsketch of the\nholding POKéMON.");
-const u8 gFabMailItemDescription[] = _("A gorgeous-print\nMAIL to be held\nby a POKéMON.");
-const u8 gRetroMailItemDescription[] = _("MAIL featuring the\ndrawings of three\nPOKéMON.");
+static const u8 sOrangeMailDesc[] = _(
+    "A ZIGZAGOON-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sHarborMailDesc[] = _(
+    "A WINGULL-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sGlitterMailDesc[] = _(
+    "A PIKACHU-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sMechMailDesc[] = _(
+    "A MAGNEMITE-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sWoodMailDesc[] = _(
+    "A SLAKOTH-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sWaveMailDesc[] = _(
+    "A WAILMER-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sBeadMailDesc[] = _(
+    "MAIL featuring a\n"
+    "sketch of the\n"
+    "holding POKéMON.");
+
+static const u8 sShadowMailDesc[] = _(
+    "A DUSKULL-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sTropicMailDesc[] = _(
+    "A BELLOSSOM-print\n"
+    "MAIL to be held by\n"
+    "a POKéMON.");
+
+static const u8 sDreamMailDesc[] = _(
+    "MAIL featuring a\n"
+    "sketch of the\n"
+    "holding POKéMON.");
+
+static const u8 sFabMailDesc[] = _(
+    "A gorgeous-print\n"
+    "MAIL to be held\n"
+    "by a POKéMON.");
+
+static const u8 sRetroMailDesc[] = _(
+    "MAIL featuring the\n"
+    "drawings of three\n"
+    "POKéMON.");
+
 // Berries
-const u8 gCheriBerryItemDescription[] = _("A hold item that\nheals paralysis\nin battle.");
-const u8 gChestoBerryItemDescription[] = _("A hold item that\nawakens POKéMON\nin battle.");
-const u8 gPechaBerryItemDescription[] = _("A hold item that\nheals poisoning\nin battle.");
-const u8 gRawstBerryItemDescription[] = _("A hold item that\nheals a burn in\nbattle.");
-const u8 gAspearBerryItemDescription[] = _("A hold item that\ndefrosts POKéMON\nin battle.");
-const u8 gLeppaBerryItemDescription[] = _("A hold item that\nrestores 10 PP in\nbattle.");
-const u8 gOranBerryItemDescription[] = _("A hold item that\nrestores 10 HP in\nbattle.");
-const u8 gPersimBerryItemDescription[] = _("A hold item that\nheals confusion\nin battle.");
-const u8 gLumBerryItemDescription[] = _("A hold item that\nheals any status\nproblem in battle.");
-const u8 gSitrusBerryItemDescription[] = _("A hold item that\nrestores 30 HP in\nbattle.");
-const u8 gFigyBerryItemDescription[] = _("A hold item that\nrestores HP but\nmay confuse.");
-const u8 gWikiBerryItemDescription[] = _("A hold item that\nrestores HP but\nmay confuse.");
-const u8 gMagoBerryItemDescription[] = _("A hold item that\nrestores HP but\nmay confuse.");
-const u8 gAguavBerryItemDescription[] = _("A hold item that\nrestores HP but\nmay confuse.");
-const u8 gIapapaBerryItemDescription[] = _("A hold item that\nrestores HP but\nmay confuse.");
-const u8 gRazzBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow RAZZ.");
-const u8 gBlukBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow BLUK.");
-const u8 gNanabBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow NANAB.");
-const u8 gWepearBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow WEPEAR.");
-const u8 gPinapBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow PINAP.");
-const u8 gPomegBerryItemDescription[] = _("Makes a POKéMON\nfriendly but lowers\nbase HP.");
-const u8 gKelpsyBerryItemDescription[] = _("Makes a POKéMON\nfriendly but lowers\nbase ATTACK.");
-const u8 gQualotBerryItemDescription[] = _("Makes a POKéMON\nfriendly but lowers\nbase DEFENSE.");
-const u8 gHondewBerryItemDescription[] = _("Makes a POKéMON\nfriendly but lowers\nbase SP. ATK.");
-const u8 gGrepaBerryItemDescription[] = _("Makes a POKéMON\nfriendly but lowers\nbase SP. DEF.");
-const u8 gTamatoBerryItemDescription[] = _("Makes a POKéMON\nfriendly but lowers\nbase SPEED.");
-const u8 gCornnBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow CORNN.");
-const u8 gMagostBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow MAGOST.");
-const u8 gRabutaBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow RABUTA.");
-const u8 gNomelBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow NOMEL.");
-const u8 gSpelonBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow SPELON.");
-const u8 gPamtreBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow PAMTRE.");
-const u8 gWatmelBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow WATMEL.");
-const u8 gDurinBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow DURIN.");
-const u8 gBelueBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow BELUE.");
-const u8 gLiechiBerryItemDescription[] = _("A hold item that\nraises ATTACK in\na pinch.");
-const u8 gGanlonBerryItemDescription[] = _("A hold item that\nraises DEFENSE in\na pinch.");
-const u8 gSalacBerryItemDescription[] = _("A hold item that\nraises SPEED in\na pinch.");
-const u8 gPetayaBerryItemDescription[] = _("A hold item that\nraises SP. ATK in\na pinch.");
-const u8 gApicotBerryItemDescription[] = _("A hold item that\nraises SP. DEF in\na pinch.");
-const u8 gLansatBerryItemDescription[] = _("A hold item that\nups the critical-\nhit rate in a pinch.");
-const u8 gStarfBerryItemDescription[] = _("A hold item that\nsharply boosts a\nstat in a pinch.");
-const u8 gEnigmaBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow a mystery.");
+static const u8 sCheriBerryDesc[] = _(
+    "A hold item that\n"
+    "heals paralysis\n"
+    "in battle.");
+
+static const u8 sChestoBerryDesc[] = _(
+    "A hold item that\n"
+    "awakens POKéMON\n"
+    "in battle.");
+
+static const u8 sPechaBerryDesc[] = _(
+    "A hold item that\n"
+    "heals poisoning\n"
+    "in battle.");
+
+static const u8 sRawstBerryDesc[] = _(
+    "A hold item that\n"
+    "heals a burn in\n"
+    "battle.");
+
+static const u8 sAspearBerryDesc[] = _(
+    "A hold item that\n"
+    "defrosts POKéMON\n"
+    "in battle.");
+
+static const u8 sLeppaBerryDesc[] = _(
+    "A hold item that\n"
+    "restores 10 PP in\n"
+    "battle.");
+
+static const u8 sOranBerryDesc[] = _(
+    "A hold item that\n"
+    "restores 10 HP in\n"
+    "battle.");
+
+static const u8 sPersimBerryDesc[] = _(
+    "A hold item that\n"
+    "heals confusion\n"
+    "in battle.");
+
+static const u8 sLumBerryDesc[] = _(
+    "A hold item that\n"
+    "heals any status\n"
+    "problem in battle.");
+
+static const u8 sSitrusBerryDesc[] = _(
+    "A hold item that\n"
+    "restores 30 HP in\n"
+    "battle.");
+
+static const u8 sFigyBerryDesc[] = _(
+    "A hold item that\n"
+    "restores HP but\n"
+    "may confuse.");
+
+static const u8 sWikiBerryDesc[] = _(
+    "A hold item that\n"
+    "restores HP but\n"
+    "may confuse.");
+
+static const u8 sMagoBerryDesc[] = _(
+    "A hold item that\n"
+    "restores HP but\n"
+    "may confuse.");
+
+static const u8 sAguavBerryDesc[] = _(
+    "A hold item that\n"
+    "restores HP but\n"
+    "may confuse.");
+
+static const u8 sIapapaBerryDesc[] = _(
+    "A hold item that\n"
+    "restores HP but\n"
+    "may confuse.");
+
+static const u8 sRazzBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow RAZZ.");
+
+static const u8 sBlukBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow BLUK.");
+
+static const u8 sNanabBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow NANAB.");
+
+static const u8 sWepearBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow WEPEAR.");
+
+static const u8 sPinapBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow PINAP.");
+
+static const u8 sPomegBerryDesc[] = _(
+    "Makes a POKéMON\n"
+    "friendly but lowers\n"
+    "base HP.");
+
+static const u8 sKelpsyBerryDesc[] = _(
+    "Makes a POKéMON\n"
+    "friendly but lowers\n"
+    "base ATTACK.");
+
+static const u8 sQualotBerryDesc[] = _(
+    "Makes a POKéMON\n"
+    "friendly but lowers\n"
+    "base DEFENSE.");
+
+static const u8 sHondewBerryDesc[] = _(
+    "Makes a POKéMON\n"
+    "friendly but lowers\n"
+    "base SP. ATK.");
+
+static const u8 sGrepaBerryDesc[] = _(
+    "Makes a POKéMON\n"
+    "friendly but lowers\n"
+    "base SP. DEF.");
+
+static const u8 sTamatoBerryDesc[] = _(
+    "Makes a POKéMON\n"
+    "friendly but lowers\n"
+    "base SPEED.");
+
+static const u8 sCornnBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow CORNN.");
+
+static const u8 sMagostBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow MAGOST.");
+
+static const u8 sRabutaBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow RABUTA.");
+
+static const u8 sNomelBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow NOMEL.");
+
+static const u8 sSpelonBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow SPELON.");
+
+static const u8 sPamtreBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow PAMTRE.");
+
+static const u8 sWatmelBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow WATMEL.");
+
+static const u8 sDurinBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow DURIN.");
+
+static const u8 sBelueBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow BELUE.");
+
+static const u8 sLiechiBerryDesc[] = _(
+    "A hold item that\n"
+    "raises ATTACK in\n"
+    "a pinch.");
+
+static const u8 sGanlonBerryDesc[] = _(
+    "A hold item that\n"
+    "raises DEFENSE in\n"
+    "a pinch.");
+
+static const u8 sSalacBerryDesc[] = _(
+    "A hold item that\n"
+    "raises SPEED in\n"
+    "a pinch.");
+
+static const u8 sPetayaBerryDesc[] = _(
+    "A hold item that\n"
+    "raises SP. ATK in\n"
+    "a pinch.");
+
+static const u8 sApicotBerryDesc[] = _(
+    "A hold item that\n"
+    "raises SP. DEF in\n"
+    "a pinch.");
+
+static const u8 sLansatBerryDesc[] = _(
+    "A hold item that\n"
+    "ups the critical-\n"
+    "hit rate in a pinch.");
+
+static const u8 sStarfBerryDesc[] = _(
+    "A hold item that\n"
+    "sharply boosts a\n"
+    "stat in a pinch.");
+
+static const u8 sEnigmaBerryDesc[] = _(
+    "{POKEBLOCK} ingredient.\n"
+    "Plant in loamy soil\n"
+    "to grow a mystery.");
+
 // Hold items
-const u8 gBrightPowderItemDescription[] = _("A hold item that\ncasts a glare to\nreduce accuracy.");
-const u8 gWhiteHerbItemDescription[] = _("A hold item that\nrestores any\nlowered stat.");
-const u8 gMachoBraceItemDescription[] = _("A hold item that\npromotes growth,\nbut reduces SPEED.");
-const u8 gExpShareItemDescription[] = _("A hold item that\ngets EXP. points\nfrom battles.");
-const u8 gQuickClawItemDescription[] = _("A hold item that\noccasionally allows\nthe first strike.");
-const u8 gSootheBellItemDescription[] = _("A hold item that\ncalms spirits and\nfosters friendship.");
-const u8 gMentalHerbItemDescription[] = _("A hold item that\nsnaps POKéMON out\nof infatuation.");
-const u8 gChoiceBandItemDescription[] = _("Raises a move's\npower, but permits\nonly that move.");
-const u8 gKingsRockItemDescription[] = _("A hold item that\nmay cause flinching\nwhen the foe is hit.");
-const u8 gSilverPowderItemDescription[] = _("A hold item that\nraises the power of\nBUG-type moves.");
-const u8 gAmuletCoinItemDescription[] = _("Doubles money in\nbattle if the\nholder takes part.");
-const u8 gCleanseTagItemDescription[] = _("A hold item that\nhelps repel wild\nPOKéMON.");
-const u8 gSoulDewItemDescription[] = _("Hold item: raises\nSP. ATK & SP. DEF of\nLATIOS & LATIAS.");
-const u8 gDeepSeaToothItemDescription[] = _("A hold item that\nraises the SP. ATK\nof CLAMPERL.");
-const u8 gDeepSeaScaleItemDescription[] = _("A hold item that\nraises the SP. DEF\nof CLAMPERL.");
-const u8 gSmokeBallItemDescription[] = _("A hold item that\nassures fleeing\nfrom wild POKéMON.");
-const u8 gEverstoneItemDescription[] = _("A wondrous hold\nitem that prevents\nevolution.");
-const u8 gFocusBandItemDescription[] = _("A hold item that\noccasionally\nprevents fainting.");
-const u8 gLuckyEggItemDescription[] = _("A hold item that\nboosts EXP. points\nearned in battle.");
-const u8 gScopeLensItemDescription[] = _("A hold item that\nimproves the\ncritical-hit rate.");
-const u8 gMetalCoatItemDescription[] = _("A hold item that\nraises the power of\nSTEEL-type moves.");
-const u8 gLeftoversItemDescription[] = _("A hold item that\ngradually restores\nHP in battle.");
-const u8 gDragonScaleItemDescription[] = _("A strange scale\nheld by DRAGON-\ntype POKéMON.");
-const u8 gLightBallItemDescription[] = _("A hold item that\nraises the SP. ATK\nof PIKACHU.");
-const u8 gSoftSandItemDescription[] = _("A hold item that\nraises the power of\nGROUND-type moves.");
-const u8 gHardStoneItemDescription[] = _("A hold item that\nraises the power of\nROCK-type moves.");
-const u8 gMiracleSeedItemDescription[] = _("A hold item that\nraises the power of\nGRASS-type moves.");
-const u8 gBlackGlassesItemDescription[] = _("A hold item that\nraises the power of\nDARK-type moves.");
-const u8 gBlackBeltItemDescription[] = _("A hold item that\nboosts FIGHTING-\ntype moves.");
-const u8 gMagnetItemDescription[] = _("A hold item that\nboosts ELECTRIC-\ntype moves.");
-const u8 gMysticWaterItemDescription[] = _("A hold item that\nraises the power of\nWATER-type moves.");
-const u8 gSharpBeakItemDescription[] = _("A hold item that\nraises the power of\nFLYING-type moves.");
-const u8 gPoisonBarbItemDescription[] = _("A hold item that\nraises the power of\nPOISON-type moves.");
-const u8 gNeverMeltIceItemDescription[] = _("A hold item that\nraises the power of\nICE-type moves.");
-const u8 gSpellTagItemDescription[] = _("A hold item that\nraises the power of\nGHOST-type moves.");
-const u8 gTwistedSpoonItemDescription[] = _("A hold item that\nboosts PSYCHIC-\ntype moves.");
-const u8 gCharcoalItemDescription[] = _("A hold item that\nraises the power of\nFIRE-type moves.");
-const u8 gDragonFangItemDescription[] = _("A hold item that\nraises the power of\nDRAGON-type moves.");
-const u8 gSilkScarfItemDescription[] = _("A hold item that\nraises the power of\nNORMAL-type moves.");
-const u8 gUpGradeItemDescription[] = _("A peculiar box made\nby SILPH CO.");
-const u8 gShellBellItemDescription[] = _("A hold item that\nrestores HP upon\nstriking the foe.");
-const u8 gSeaIncenseItemDescription[] = _("A hold item that\nslightly boosts\nWATER-type moves.");
-const u8 gLaxIncenseItemDescription[] = _("A hold item that\nslightly lowers the\nfoe's accuracy.");
-const u8 gLuckyPunchItemDescription[] = _("A hold item that\nraises CHANSEY's\ncritical-hit rate.");
-const u8 gMetalPowderItemDescription[] = _("A hold item that\nraises DITTO's\nDEFENSE.");
-const u8 gThickClubItemDescription[] = _("A hold item that \nraises CUBONE or\nMAROWAK's ATTACK.");
-const u8 gStickItemDescription[] = _("A hold item that\nraises FARFETCH'D's\ncritical-hit ratio.");
-const u8 gRedScarfItemDescription[] = _("A hold item that\nraises COOL in\nCONTESTS.");
-const u8 gBlueScarfItemDescription[] = _("A hold item that\nraises BEAUTY in\nCONTESTS.");
-const u8 gPinkScarfItemDescription[] = _("A hold item that\nraises CUTE in\nCONTESTS.");
-const u8 gGreenScarfItemDescription[] = _("A hold item that\nraises SMART in\nCONTESTS.");
-const u8 gYellowScarfItemDescription[] = _("A hold item that\nraises TOUGH in\nCONTESTS.");
+static const u8 sBrightPowderDesc[] = _(
+    "A hold item that\n"
+    "casts a glare to\n"
+    "reduce accuracy.");
+
+static const u8 sWhiteHerbDesc[] = _(
+    "A hold item that\n"
+    "restores any\n"
+    "lowered stat.");
+
+static const u8 sMachoBraceDesc[] = _(
+    "A hold item that\n"
+    "promotes growth,\n"
+    "but reduces SPEED.");
+
+static const u8 sExpShareDesc[] = _(
+    "A hold item that\n"
+    "gets EXP. points\n"
+    "from battles.");
+
+static const u8 sQuickClawDesc[] = _(
+    "A hold item that\n"
+    "occasionally allows\n"
+    "the first strike.");
+
+static const u8 sSootheBellDesc[] = _(
+    "A hold item that\n"
+    "calms spirits and\n"
+    "fosters friendship.");
+
+static const u8 sMentalHerbDesc[] = _(
+    "A hold item that\n"
+    "snaps POKéMON out\n"
+    "of infatuation.");
+
+static const u8 sChoiceBandDesc[] = _(
+    "Raises a move's\n"
+    "power, but permits\n"
+    "only that move.");
+
+static const u8 sKingsRockDesc[] = _(
+    "A hold item that\n"
+    "may cause flinching\n"
+    "when the foe is hit.");
+
+static const u8 sSilverPowderDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "BUG-type moves.");
+
+static const u8 sAmuletCoinDesc[] = _(
+    "Doubles money in\n"
+    "battle if the\n"
+    "holder takes part.");
+
+static const u8 sCleanseTagDesc[] = _(
+    "A hold item that\n"
+    "helps repel wild\n"
+    "POKéMON.");
+
+static const u8 sSoulDewDesc[] = _(
+    "Hold item: raises\n"
+    "SP. ATK & SP. DEF of\n"
+    "LATIOS & LATIAS.");
+
+static const u8 sDeepSeaToothDesc[] = _(
+    "A hold item that\n"
+    "raises the SP. ATK\n"
+    "of CLAMPERL.");
+
+static const u8 sDeepSeaScaleDesc[] = _(
+    "A hold item that\n"
+    "raises the SP. DEF\n"
+    "of CLAMPERL.");
+
+static const u8 sSmokeBallDesc[] = _(
+    "A hold item that\n"
+    "assures fleeing\n"
+    "from wild POKéMON.");
+
+static const u8 sEverstoneDesc[] = _(
+    "A wondrous hold\n"
+    "item that prevents\n"
+    "evolution.");
+
+static const u8 sFocusBandDesc[] = _(
+    "A hold item that\n"
+    "occasionally\n"
+    "prevents fainting.");
+
+static const u8 sLuckyEggDesc[] = _(
+    "A hold item that\n"
+    "boosts EXP. points\n"
+    "earned in battle.");
+
+static const u8 sScopeLensDesc[] = _(
+    "A hold item that\n"
+    "improves the\n"
+    "critical-hit rate.");
+
+static const u8 sMetalCoatDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "STEEL-type moves.");
+
+static const u8 sLeftoversDesc[] = _(
+    "A hold item that\n"
+    "gradually restores\n"
+    "HP in battle.");
+
+static const u8 sDragonScaleDesc[] = _(
+    "A strange scale\n"
+    "held by DRAGON-\n"
+    "type POKéMON.");
+
+static const u8 sLightBallDesc[] = _(
+    "A hold item that\n"
+    "raises the SP. ATK\n"
+    "of PIKACHU.");
+
+static const u8 sSoftSandDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "GROUND-type moves.");
+
+static const u8 sHardStoneDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "ROCK-type moves.");
+
+static const u8 sMiracleSeedDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "GRASS-type moves.");
+
+static const u8 sBlackGlassesDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "DARK-type moves.");
+
+static const u8 sBlackBeltDesc[] = _(
+    "A hold item that\n"
+    "boosts FIGHTING-\n"
+    "type moves.");
+
+static const u8 sMagnetDesc[] = _(
+    "A hold item that\n"
+    "boosts ELECTRIC-\n"
+    "type moves.");
+
+static const u8 sMysticWaterDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "WATER-type moves.");
+
+static const u8 sSharpBeakDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "FLYING-type moves.");
+
+static const u8 sPoisonBarbDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "POISON-type moves.");
+
+static const u8 sNeverMeltIceDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "ICE-type moves.");
+
+static const u8 sSpellTagDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "GHOST-type moves.");
+
+static const u8 sTwistedSpoonDesc[] = _(
+    "A hold item that\n"
+    "boosts PSYCHIC-\n"
+    "type moves.");
+
+static const u8 sCharcoalDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "FIRE-type moves.");
+
+static const u8 sDragonFangDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "DRAGON-type moves.");
+
+static const u8 sSilkScarfDesc[] = _(
+    "A hold item that\n"
+    "raises the power of\n"
+    "NORMAL-type moves.");
+
+static const u8 sUpGradeDesc[] = _(
+    "A peculiar box made\n"
+    "by SILPH CO.");
+
+static const u8 sShellBellDesc[] = _(
+    "A hold item that\n"
+    "restores HP upon\n"
+    "striking the foe.");
+
+static const u8 sSeaIncenseDesc[] = _(
+    "A hold item that\n"
+    "slightly boosts\n"
+    "WATER-type moves.");
+
+static const u8 sLaxIncenseDesc[] = _(
+    "A hold item that\n"
+    "slightly lowers the\n"
+    "foe's accuracy.");
+
+static const u8 sLuckyPunchDesc[] = _(
+    "A hold item that\n"
+    "raises CHANSEY's\n"
+    "critical-hit rate.");
+
+static const u8 sMetalPowderDesc[] = _(
+    "A hold item that\n"
+    "raises DITTO's\n"
+    "DEFENSE.");
+
+static const u8 sThickClubDesc[] = _(
+    "A hold item that \n"
+    "raises CUBONE or\n"
+    "MAROWAK's ATTACK.");
+
+static const u8 sStickDesc[] = _(
+    "A hold item that\n"
+    "raises FARFETCH'D's\n"
+    "critical-hit ratio.");
+
+static const u8 sRedScarfDesc[] = _(
+    "A hold item that\n"
+    "raises COOL in\n"
+    "CONTESTS.");
+
+static const u8 sBlueScarfDesc[] = _(
+    "A hold item that\n"
+    "raises BEAUTY in\n"
+    "CONTESTS.");
+
+static const u8 sPinkScarfDesc[] = _(
+    "A hold item that\n"
+    "raises CUTE in\n"
+    "CONTESTS.");
+
+static const u8 sGreenScarfDesc[] = _(
+    "A hold item that\n"
+    "raises SMART in\n"
+    "CONTESTS.");
+
+static const u8 sYellowScarfDesc[] = _(
+    "A hold item that\n"
+    "raises TOUGH in\n"
+    "CONTESTS.");
+
 // Key items
-const u8 gMachBikeItemDescription[] = _("A folding bicycle\nthat doubles your\nspeed or better.");
-const u8 gCoinCaseItemDescription[] = _("A case that holds\nup to 9,999 COINS.");
-const u8 gItemfinderItemDescription[] = _("A device that\nsignals an invisible\nitem by sound.");
-const u8 gOldRodItemDescription[] = _("Use by any body of\nwater to fish for\nwild POKéMON.");
-const u8 gGoodRodItemDescription[] = _("A decent fishing\nrod for catching\nwild POKéMON.");
-const u8 gSuperRodItemDescription[] = _("The best fishing\nrod for catching\nwild POKéMON.");
-const u8 gSSTicketItemDescription[] = _("The ticket required\nfor sailing on a\nferry.");
-const u8 gContestPassItemDescription[] = _("The pass required\nfor entering\nPOKéMON CONTESTS.");
-const u8 gWailmerPailItemDescription[] = _("A tool used for\nwatering BERRIES\nand plants.");
-const u8 gDevonGoodsItemDescription[] = _("A package that\ncontains DEVON's\nmachine parts.");
-const u8 gSootSackItemDescription[] = _("A sack used to\ngather and hold\nvolcanic ash.");
-const u8 gBasementKeyItemDescription[] = _("The key for NEW\nMAUVILLE beneath\nMAUVILLE CITY.");
-const u8 gAcroBikeItemDescription[] = _("A folding bicycle\ncapable of jumps\nand wheelies.");
-const u8 gPokeblockCaseItemDescription[] = _("A case for holding\n{POKEBLOCK}S made with\na BERRY BLENDER.");
-const u8 gLetterItemDescription[] = _("A letter to STEVEN\nfrom the PRESIDENT\nof the DEVON CORP.");
-const u8 gEonTicketItemDescription[] = _("The ticket for a\nferry to a distant\nsouthern island.");
-const u8 gRedOrbItemDescription[] = _("A red, glowing orb\nsaid to contain an\nancient power.");
-const u8 gBlueOrbItemDescription[] = _("A blue, glowing orb\nsaid to contain an\nancient power.");
-const u8 gScannerItemDescription[] = _("A device found\ninside the\nABANDONED SHIP.");
-const u8 gGoGogglesItemDescription[] = _("Nifty goggles that\nprotect eyes from\ndesert sandstorms.");
-const u8 gMeteoriteItemDescription[] = _("A meteorite found\nat METEOR FALLS.");
-const u8 gRoom1KeyItemDescription[] = _("A key that opens a\ndoor inside the\nABANDONED SHIP.");
-const u8 gRoom2KeyItemDescription[] = _("A key that opens a\ndoor inside the\nABANDONED SHIP.");
-const u8 gRoom4KeyItemDescription[] = _("A key that opens a\ndoor inside the\nABANDONED SHIP.");
-const u8 gRoom6KeyItemDescription[] = _("A key that opens a\ndoor inside the\nABANDONED SHIP.");
-const u8 gStorageKeyItemDescription[] = _("The key to the\nstorage inside the\nABANDONED SHIP.");
-const u8 gRootFossilItemDescription[] = _("A fossil of an\nancient, seafloor-\ndwelling POKéMON.");
-const u8 gClawFossilItemDescription[] = _("A fossil of an\nancient, seafloor-\ndwelling POKéMON.");
-const u8 gDevonScopeItemDescription[] = _("A device by DEVON\nthat signals any\nunseeable POKéMON.");
+static const u8 sMachBikeDesc[] = _(
+    "A folding bicycle\n"
+    "that doubles your\n"
+    "speed or better.");
+
+static const u8 sCoinCaseDesc[] = _(
+    "A case that holds\n"
+    "up to 9,999 COINS.");
+
+static const u8 sItemfinderDesc[] = _(
+    "A device that\n"
+    "signals an invisible\n"
+    "item by sound.");
+
+static const u8 sOldRodDesc[] = _(
+    "Use by any body of\n"
+    "water to fish for\n"
+    "wild POKéMON.");
+
+static const u8 sGoodRodDesc[] = _(
+    "A decent fishing\n"
+    "rod for catching\n"
+    "wild POKéMON.");
+
+static const u8 sSuperRodDesc[] = _(
+    "The best fishing\n"
+    "rod for catching\n"
+    "wild POKéMON.");
+
+static const u8 sSSTicketDesc[] = _(
+    "The ticket required\n"
+    "for sailing on a\n"
+    "ferry.");
+
+static const u8 sContestPassDesc[] = _(
+    "The pass required\n"
+    "for entering\n"
+    "POKéMON CONTESTS.");
+
+static const u8 sWailmerPailDesc[] = _(
+    "A tool used for\n"
+    "watering BERRIES\n"
+    "and plants.");
+
+static const u8 sDevonGoodsDesc[] = _(
+    "A package that\n"
+    "contains DEVON's\n"
+    "machine parts.");
+
+static const u8 sSootSackDesc[] = _(
+    "A sack used to\n"
+    "gather and hold\n"
+    "volcanic ash.");
+
+static const u8 sBasementKeyDesc[] = _(
+    "The key for NEW\n"
+    "MAUVILLE beneath\n"
+    "MAUVILLE CITY.");
+
+static const u8 sAcroBikeDesc[] = _(
+    "A folding bicycle\n"
+    "capable of jumps\n"
+    "and wheelies.");
+
+static const u8 sPokeblockCaseDesc[] = _(
+    "A case for holding\n"
+    "{POKEBLOCK}S made with\n"
+    "a BERRY BLENDER.");
+
+static const u8 sLetterDesc[] = _(
+    "A letter to STEVEN\n"
+    "from the PRESIDENT\n"
+    "of the DEVON CORP.");
+
+static const u8 sEonTicketDesc[] = _(
+    "The ticket for a\n"
+    "ferry to a distant\n"
+    "southern island.");
+
+static const u8 sRedOrbDesc[] = _(
+    "A red, glowing orb\n"
+    "said to contain an\n"
+    "ancient power.");
+
+static const u8 sBlueOrbDesc[] = _(
+    "A blue, glowing orb\n"
+    "said to contain an\n"
+    "ancient power.");
+
+static const u8 sScannerDesc[] = _(
+    "A device found\n"
+    "inside the\n"
+    "ABANDONED SHIP.");
+
+static const u8 sGoGogglesDesc[] = _(
+    "Nifty goggles that\n"
+    "protect eyes from\n"
+    "desert sandstorms.");
+
+static const u8 sMeteoriteDesc[] = _(
+    "A meteorite found\n"
+    "at METEOR FALLS.");
+
+static const u8 sRoom1KeyDesc[] = _(
+    "A key that opens a\n"
+    "door inside the\n"
+    "ABANDONED SHIP.");
+
+static const u8 sRoom2KeyDesc[] = _(
+    "A key that opens a\n"
+    "door inside the\n"
+    "ABANDONED SHIP.");
+
+static const u8 sRoom4KeyDesc[] = _(
+    "A key that opens a\n"
+    "door inside the\n"
+    "ABANDONED SHIP.");
+
+static const u8 sRoom6KeyDesc[] = _(
+    "A key that opens a\n"
+    "door inside the\n"
+    "ABANDONED SHIP.");
+
+static const u8 sStorageKeyDesc[] = _(
+    "The key to the\n"
+    "storage inside the\n"
+    "ABANDONED SHIP.");
+
+static const u8 sRootFossilDesc[] = _(
+    "A fossil of an\n"
+    "ancient, seafloor-\n"
+    "dwelling POKéMON.");
+
+static const u8 sClawFossilDesc[] = _(
+    "A fossil of an\n"
+    "ancient, seafloor-\n"
+    "dwelling POKéMON.");
+
+static const u8 sDevonScopeDesc[] = _(
+    "A device by DEVON\n"
+    "that signals any\n"
+    "unseeable POKéMON.");
+
 // TMs/HMs
-const u8 gTM01ItemDescription[] = _("Powerful, but makes\nthe user flinch if\nhit by the foe.");
-const u8 gTM02ItemDescription[] = _("Hooks and slashes\nthe foe with long,\nsharp claws.");
-const u8 gTM03ItemDescription[] = _("Generates an\nultrasonic wave\nthat may confuse.");
-const u8 gTM04ItemDescription[] = _("Raises SP. ATK and\nSP. DEF by focusing\nthe mind.");
-const u8 gTM05ItemDescription[] = _("A savage roar that\nmakes the foe flee \nto end the battle.");
-const u8 gTM06ItemDescription[] = _("Poisons the foe\nwith a toxin that\ngradually worsens.");
-const u8 gTM07ItemDescription[] = _("Creates a hailstorm\nthat damages all\ntypes except ICE.");
-const u8 gTM08ItemDescription[] = _("Bulks up the body\nto boost both\nATTACK & DEFENSE.");
-const u8 gTM09ItemDescription[] = _("Shoots 2 to 5 seeds\nin a row to strike\nthe foe.");
-const u8 gTM10ItemDescription[] = _("The attack power\nvaries among\ndifferent POKéMON.");
-const u8 gTM11ItemDescription[] = _("Raises the power of\nFIRE-type moves\nfor 5 turns.");
-const u8 gTM12ItemDescription[] = _("Enrages the foe so\nit can only use\nattack moves.");
-const u8 gTM13ItemDescription[] = _("Fires an icy cold\nbeam that may\nfreeze the foe.");
-const u8 gTM14ItemDescription[] = _("A brutal snow-and-\nwind attack that\nmay freeze the foe.");
-const u8 gTM15ItemDescription[] = _("Powerful, but needs\nrecharging the\nnext turn.");
-const u8 gTM16ItemDescription[] = _("Creates a wall of\nlight that lowers\nSP. ATK damage.");
-const u8 gTM17ItemDescription[] = _("Negates all damage,\nbut may fail if used\nin succession.");
-const u8 gTM18ItemDescription[] = _("Raises the power of\nWATER-type moves\nfor 5 turns.");
-const u8 gTM19ItemDescription[] = _("Recovers half the\nHP of the damage \nthis move inflicts.");
-const u8 gTM20ItemDescription[] = _("Prevents status\nabnormality with a\nmystical power.");
-const u8 gTM21ItemDescription[] = _("The less the user\nlikes you, the more\npowerful this move.");
-const u8 gTM22ItemDescription[] = _("Absorbs sunlight in\nthe 1st turn, then\nattacks next turn.");
-const u8 gTM23ItemDescription[] = _("Slams the foe with\na hard tail. It may\nlower DEFENSE.");
-const u8 gTM24ItemDescription[] = _("A powerful electric\nattack that may\ncause paralysis.");
-const u8 gTM25ItemDescription[] = _("Strikes the foe\nwith a thunderbolt.\nIt may paralyze.");
-const u8 gTM26ItemDescription[] = _("Causes a quake\nthat has no effect\non flying foes.");
-const u8 gTM27ItemDescription[] = _("The more the user\nlikes you, the more\npowerful this move.");
-const u8 gTM28ItemDescription[] = _("Digs underground\nthe 1st turn, then\nstrikes next turn.");
-const u8 gTM29ItemDescription[] = _("A powerful psychic\nattack that may\nlower SP. DEF.");
-const u8 gTM30ItemDescription[] = _("Hurls a dark lump\nat the foe. It may\nlower SP. DEF.");
-const u8 gTM31ItemDescription[] = _("Destroys barriers\nlike LIGHT SCREEN\nand causes damage.");
-const u8 gTM32ItemDescription[] = _("Creates illusory\ncopies to enhance\nelusiveness.");
-const u8 gTM33ItemDescription[] = _("Creates a wall of\nlight that weakens\nphysical attacks.");
-const u8 gTM34ItemDescription[] = _("Zaps the foe with a\njolt of electricity\nthat never misses.");
-const u8 gTM35ItemDescription[] = _("Looses a stream of\nfire that may burn\nthe foe.");
-const u8 gTM36ItemDescription[] = _("Hurls sludge at the\nfoe. It may poison\nthe foe.");
-const u8 gTM37ItemDescription[] = _("Causes a sandstorm\nthat hits the foe\nover several turns.");
-const u8 gTM38ItemDescription[] = _("A powerful fire\nattack that may\nburn the foe.");
-const u8 gTM39ItemDescription[] = _("Stops the foe from\nmoving with rocks.\nMay lower SPEED.");
-const u8 gTM40ItemDescription[] = _("An extremely fast\nattack that can't\nbe avoided.");
-const u8 gTM41ItemDescription[] = _("Prevents the foe\nfrom using the same\nmove in a row.");
-const u8 gTM42ItemDescription[] = _("Raises ATTACK when\npoisoned, burned,\nor paralyzed.");
-const u8 gTM43ItemDescription[] = _("Adds an effect to\nattack depending\non the location.");
-const u8 gTM44ItemDescription[] = _("The user sleeps for\n2 turns to restore\nhealth and status.");
-const u8 gTM45ItemDescription[] = _("Makes it tough to\nattack a foe of the\nopposite gender.");
-const u8 gTM46ItemDescription[] = _("While attacking,\nit may steal the\nfoe's held item.");
-const u8 gTM47ItemDescription[] = _("Spreads hard-\nedged wings and\nslams into the foe.");
-const u8 gTM48ItemDescription[] = _("Switches abilities\nwith the foe on the\nturn this is used.");
-const u8 gTM49ItemDescription[] = _("Steals the effects\nof the move the foe\nis trying to use.");
-const u8 gTM50ItemDescription[] = _("Enables full-power\nattack, but sharply\nlowers SP. ATK.");
-
-const u8 gHM01ItemDescription[] = _("Attacks the foe\nwith sharp blades\nor claws.");
-const u8 gHM02ItemDescription[] = _("Flies up on the\nfirst turn, then\nattacks next turn.");
-const u8 gHM03ItemDescription[] = _("Creates a huge\nwave, then crashes\nit down on the foe.");
-const u8 gHM04ItemDescription[] = _("Builds enormous\npower, then slams\nthe foe.");
-const u8 gHM05ItemDescription[] = _("Looses a powerful\nblast of light that\nreduces accuracy.");
-const u8 gHM06ItemDescription[] = _("A rock-crushingly\ntough attack that\nmay lower DEFENSE.");
-const u8 gHM07ItemDescription[] = _("Attacks the foe\nwith enough power\nto climb waterfalls.");
-const u8 gHM08ItemDescription[] = _("Dives underwater\nthe 1st turn, then\nattacks next turn.");
+static const u8 sTM01Desc[] = _(
+    "Powerful, but makes\n"
+    "the user flinch if\n"
+    "hit by the foe.");
+
+static const u8 sTM02Desc[] = _(
+    "Hooks and slashes\n"
+    "the foe with long,\n"
+    "sharp claws.");
+
+static const u8 sTM03Desc[] = _(
+    "Generates an\n"
+    "ultrasonic wave\n"
+    "that may confuse.");
+
+static const u8 sTM04Desc[] = _(
+    "Raises SP. ATK and\n"
+    "SP. DEF by focusing\n"
+    "the mind.");
+
+static const u8 sTM05Desc[] = _(
+    "A savage roar that\n"
+    "makes the foe flee \n"
+    "to end the battle.");
+
+static const u8 sTM06Desc[] = _(
+    "Poisons the foe\n"
+    "with a toxin that\n"
+    "gradually worsens.");
+
+static const u8 sTM07Desc[] = _(
+    "Creates a hailstorm\n"
+    "that damages all\n"
+    "types except ICE.");
+
+static const u8 sTM08Desc[] = _(
+    "Bulks up the body\n"
+    "to boost both\n"
+    "ATTACK & DEFENSE.");
+
+static const u8 sTM09Desc[] = _(
+    "Shoots 2 to 5 seeds\n"
+    "in a row to strike\n"
+    "the foe.");
+
+static const u8 sTM10Desc[] = _(
+    "The attack power\n"
+    "varies among\n"
+    "different POKéMON.");
+
+static const u8 sTM11Desc[] = _(
+    "Raises the power of\n"
+    "FIRE-type moves\n"
+    "for 5 turns.");
+
+static const u8 sTM12Desc[] = _(
+    "Enrages the foe so\n"
+    "it can only use\n"
+    "attack moves.");
+
+static const u8 sTM13Desc[] = _(
+    "Fires an icy cold\n"
+    "beam that may\n"
+    "freeze the foe.");
+
+static const u8 sTM14Desc[] = _(
+    "A brutal snow-and-\n"
+    "wind attack that\n"
+    "may freeze the foe.");
+
+static const u8 sTM15Desc[] = _(
+    "Powerful, but needs\n"
+    "recharging the\n"
+    "next turn.");
+
+static const u8 sTM16Desc[] = _(
+    "Creates a wall of\n"
+    "light that lowers\n"
+    "SP. ATK damage.");
+
+static const u8 sTM17Desc[] = _(
+    "Negates all damage,\n"
+    "but may fail if used\n"
+    "in succession.");
+
+static const u8 sTM18Desc[] = _(
+    "Raises the power of\n"
+    "WATER-type moves\n"
+    "for 5 turns.");
+
+static const u8 sTM19Desc[] = _(
+    "Recovers half the\n"
+    "HP of the damage \n"
+    "this move inflicts.");
+
+static const u8 sTM20Desc[] = _(
+    "Prevents status\n"
+    "abnormality with a\n"
+    "mystical power.");
+
+static const u8 sTM21Desc[] = _(
+    "The less the user\n"
+    "likes you, the more\n"
+    "powerful this move.");
+
+static const u8 sTM22Desc[] = _(
+    "Absorbs sunlight in\n"
+    "the 1st turn, then\n"
+    "attacks next turn.");
+
+static const u8 sTM23Desc[] = _(
+    "Slams the foe with\n"
+    "a hard tail. It may\n"
+    "lower DEFENSE.");
+
+static const u8 sTM24Desc[] = _(
+    "A powerful electric\n"
+    "attack that may\n"
+    "cause paralysis.");
+
+static const u8 sTM25Desc[] = _(
+    "Strikes the foe\n"
+    "with a thunderbolt.\n"
+    "It may paralyze.");
+
+static const u8 sTM26Desc[] = _(
+    "Causes a quake\n"
+    "that has no effect\n"
+    "on flying foes.");
+
+static const u8 sTM27Desc[] = _(
+    "The more the user\n"
+    "likes you, the more\n"
+    "powerful this move.");
+
+static const u8 sTM28Desc[] = _(
+    "Digs underground\n"
+    "the 1st turn, then\n"
+    "strikes next turn.");
+
+static const u8 sTM29Desc[] = _(
+    "A powerful psychic\n"
+    "attack that may\n"
+    "lower SP. DEF.");
+
+static const u8 sTM30Desc[] = _(
+    "Hurls a dark lump\n"
+    "at the foe. It may\n"
+    "lower SP. DEF.");
+
+static const u8 sTM31Desc[] = _(
+    "Destroys barriers\n"
+    "like LIGHT SCREEN\n"
+    "and causes damage.");
+
+static const u8 sTM32Desc[] = _(
+    "Creates illusory\n"
+    "copies to enhance\n"
+    "elusiveness.");
+
+static const u8 sTM33Desc[] = _(
+    "Creates a wall of\n"
+    "light that weakens\n"
+    "physical attacks.");
+
+static const u8 sTM34Desc[] = _(
+    "Zaps the foe with a\n"
+    "jolt of electricity\n"
+    "that never misses.");
+
+static const u8 sTM35Desc[] = _(
+    "Looses a stream of\n"
+    "fire that may burn\n"
+    "the foe.");
+
+static const u8 sTM36Desc[] = _(
+    "Hurls sludge at the\n"
+    "foe. It may poison\n"
+    "the foe.");
+
+static const u8 sTM37Desc[] = _(
+    "Causes a sandstorm\n"
+    "that hits the foe\n"
+    "over several turns.");
+
+static const u8 sTM38Desc[] = _(
+    "A powerful fire\n"
+    "attack that may\n"
+    "burn the foe.");
+
+static const u8 sTM39Desc[] = _(
+    "Stops the foe from\n"
+    "moving with rocks.\n"
+    "May lower SPEED.");
+
+static const u8 sTM40Desc[] = _(
+    "An extremely fast\n"
+    "attack that can't\n"
+    "be avoided.");
+
+static const u8 sTM41Desc[] = _(
+    "Prevents the foe\n"
+    "from using the same\n"
+    "move in a row.");
+
+static const u8 sTM42Desc[] = _(
+    "Raises ATTACK when\n"
+    "poisoned, burned,\n"
+    "or paralyzed.");
+
+static const u8 sTM43Desc[] = _(
+    "Adds an effect to\n"
+    "attack depending\n"
+    "on the location.");
+
+static const u8 sTM44Desc[] = _(
+    "The user sleeps for\n"
+    "2 turns to restore\n"
+    "health and status.");
+
+static const u8 sTM45Desc[] = _(
+    "Makes it tough to\n"
+    "attack a foe of the\n"
+    "opposite gender.");
+
+static const u8 sTM46Desc[] = _(
+    "While attacking,\n"
+    "it may steal the\n"
+    "foe's held item.");
+
+static const u8 sTM47Desc[] = _(
+    "Spreads hard-\n"
+    "edged wings and\n"
+    "slams into the foe.");
+
+static const u8 sTM48Desc[] = _(
+    "Switches abilities\n"
+    "with the foe on the\n"
+    "turn this is used.");
+
+static const u8 sTM49Desc[] = _(
+    "Steals the effects\n"
+    "of the move the foe\n"
+    "is trying to use.");
+
+static const u8 sTM50Desc[] = _(
+    "Enables full-power\n"
+    "attack, but sharply\n"
+    "lowers SP. ATK.");
+
+
+static const u8 sHM01Desc[] = _(
+    "Attacks the foe\n"
+    "with sharp blades\n"
+    "or claws.");
+
+static const u8 sHM02Desc[] = _(
+    "Flies up on the\n"
+    "first turn, then\n"
+    "attacks next turn.");
+
+static const u8 sHM03Desc[] = _(
+    "Creates a huge\n"
+    "wave, then crashes\n"
+    "it down on the foe.");
+
+static const u8 sHM04Desc[] = _(
+    "Builds enormous\n"
+    "power, then slams\n"
+    "the foe.");
+
+static const u8 sHM05Desc[] = _(
+    "Looses a powerful\n"
+    "blast of light that\n"
+    "reduces accuracy.");
+
+static const u8 sHM06Desc[] = _(
+    "A rock-crushingly\n"
+    "tough attack that\n"
+    "may lower DEFENSE.");
+
+static const u8 sHM07Desc[] = _(
+    "Attacks the foe\n"
+    "with enough power\n"
+    "to climb waterfalls.");
+
+static const u8 sHM08Desc[] = _(
+    "Dives underwater\n"
+    "the 1st turn, then\n"
+    "attacks next turn.");
+
 // FireRed/LeafGreen key items
-const u8 gOaksParcelItemDescription[] = _("A parcel for PROF.\nOAK from a POKéMON\nMART's clerk.");
-const u8 gPokeFluteItemDescription[] = _("A sweet-sounding\nflute that awakens\nPOKéMON.");
-const u8 gSecretKeyItemDescription[] = _("The key to the\nCINNABAR ISLAND\nGYM's entrance.");
-const u8 gBikeVoucherItemDescription[] = _("A voucher for\nobtaining a bicycle\nfrom the BIKE SHOP.");
-const u8 gGoldTeethItemDescription[] = _("Gold dentures lost\nby the SAFARI\nZONE's WARDEN.");
-const u8 gOldAmberItemDescription[] = _("A stone containing\nthe genes of an\nancient POKéMON.");
-const u8 gCardKeyItemDescription[] = _("A card-type door\nkey used in SILPH\nCO's office.");
-const u8 gLiftKeyItemDescription[] = _("An elevator key\nused in TEAM\nROCKET's HIDEOUT.");
-const u8 gHelixFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON's seashell.");
-const u8 gDomeFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON's shell.");
-const u8 gSilphScopeItemDescription[] = _("SILPH CO's scope\nmakes unseeable\nPOKéMON visible.");
-const u8 gBicycleItemDescription[] = _("A folding bicycle\nthat is faster than\nthe RUNNING SHOES.");
-const u8 gTownMapItemDescription[] = _("Can be viewed\nanytime. Shows your\npresent location.");
-const u8 gVSSeekerItemDescription[] = _("A rechargeable unit\nthat flags battle-\nready TRAINERS.");
-const u8 gFameCheckerItemDescription[] = _("Stores information\non famous people\nfor instant recall.");
-const u8 gTMCaseItemDescription[] = _("A convenient case \nthat holds TMs and\nHMs.");
-const u8 gBerryPouchItemDescription[] = _("A convenient\ncontainer that\nholds BERRIES.");
-const u8 gTeachyTVItemDescription[] = _("A TV set tuned to\nan advice program\nfor TRAINERS.");
-const u8 gTriPassItemDescription[] = _("A pass for ferries\nbetween ONE, TWO,\nand THREE ISLAND.");
-const u8 gRainbowPassItemDescription[] = _("For ferries serving\nVERMILION and the\nSEVII ISLANDS.");
-const u8 gTeaItemDescription[] = _("A thirst-quenching\ntea prepared by an\nold lady.");
-const u8 gMysticTicketItemDescription[] = _("A ticket required\nto board the ship\nto NAVEL ROCK.");
-const u8 gAuroraTicketItemDescription[] = _("A ticket required\nto board the ship\nto BIRTH ISLAND.");
-const u8 gPowderJarItemDescription[] = _("Stores BERRY\nPOWDER made using\na BERRY CRUSHER.");
-const u8 gRubyItemDescription[] = _("An exquisite, red-\nglowing gem that\nsymbolizes passion.");
-const u8 gSapphireItemDescription[] = _("A brilliant blue gem\nthat symbolizes\nhonesty.");
+static const u8 sOaksParcelDesc[] = _(
+    "A parcel for PROF.\n"
+    "OAK from a POKéMON\n"
+    "MART's clerk.");
+
+static const u8 sPokeFluteDesc[] = _(
+    "A sweet-sounding\n"
+    "flute that awakens\n"
+    "POKéMON.");
+
+static const u8 sSecretKeyDesc[] = _(
+    "The key to the\n"
+    "CINNABAR ISLAND\n"
+    "GYM's entrance.");
+
+static const u8 sBikeVoucherDesc[] = _(
+    "A voucher for\n"
+    "obtaining a bicycle\n"
+    "from the BIKE SHOP.");
+
+static const u8 sGoldTeethDesc[] = _(
+    "Gold dentures lost\n"
+    "by the SAFARI\n"
+    "ZONE's WARDEN.");
+
+static const u8 sOldAmberDesc[] = _(
+    "A stone containing\n"
+    "the genes of an\n"
+    "ancient POKéMON.");
+
+static const u8 sCardKeyDesc[] = _(
+    "A card-type door\n"
+    "key used in SILPH\n"
+    "CO's office.");
+
+static const u8 sLiftKeyDesc[] = _(
+    "An elevator key\n"
+    "used in TEAM\n"
+    "ROCKET's HIDEOUT.");
+
+static const u8 sHelixFossilDesc[] = _(
+    "A piece of an\n"
+    "ancient marine\n"
+    "POKéMON's seashell.");
+
+static const u8 sDomeFossilDesc[] = _(
+    "A piece of an\n"
+    "ancient marine\n"
+    "POKéMON's shell.");
+
+static const u8 sSilphScopeDesc[] = _(
+    "SILPH CO's scope\n"
+    "makes unseeable\n"
+    "POKéMON visible.");
+
+static const u8 sBicycleDesc[] = _(
+    "A folding bicycle\n"
+    "that is faster than\n"
+    "the RUNNING SHOES.");
+
+static const u8 sTownMapDesc[] = _(
+    "Can be viewed\n"
+    "anytime. Shows your\n"
+    "present location.");
+
+static const u8 sVSSeekerDesc[] = _(
+    "A rechargeable unit\n"
+    "that flags battle-\n"
+    "ready TRAINERS.");
+
+static const u8 sFameCheckerDesc[] = _(
+    "Stores information\n"
+    "on famous people\n"
+    "for instant recall.");
+
+static const u8 sTMCaseDesc[] = _(
+    "A convenient case \n"
+    "that holds TMs and\n"
+    "HMs.");
+
+static const u8 sBerryPouchDesc[] = _(
+    "A convenient\n"
+    "container that\n"
+    "holds BERRIES.");
+
+static const u8 sTeachyTVDesc[] = _(
+    "A TV set tuned to\n"
+    "an advice program\n"
+    "for TRAINERS.");
+
+static const u8 sTriPassDesc[] = _(
+    "A pass for ferries\n"
+    "between ONE, TWO,\n"
+    "and THREE ISLAND.");
+
+static const u8 sRainbowPassDesc[] = _(
+    "For ferries serving\n"
+    "VERMILION and the\n"
+    "SEVII ISLANDS.");
+
+static const u8 sTeaDesc[] = _(
+    "A thirst-quenching\n"
+    "tea prepared by an\n"
+    "old lady.");
+
+static const u8 sMysticTicketDesc[] = _(
+    "A ticket required\n"
+    "to board the ship\n"
+    "to NAVEL ROCK.");
+
+static const u8 sAuroraTicketDesc[] = _(
+    "A ticket required\n"
+    "to board the ship\n"
+    "to BIRTH ISLAND.");
+
+static const u8 sPowderJarDesc[] = _(
+    "Stores BERRY\n"
+    "POWDER made using\n"
+    "a BERRY CRUSHER.");
+
+static const u8 sRubyDesc[] = _(
+    "An exquisite, red-\n"
+    "glowing gem that\n"
+    "symbolizes passion.");
+
+static const u8 sSapphireDesc[] = _(
+    "A brilliant blue gem\n"
+    "that symbolizes\n"
+    "honesty.");
+
 // Emerald-specific key items
-const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA's mark.");
-const u8 gOldSeaMapItemDescription[] = _("A faded sea chart\nthat shows the way\nto a certain island.");
+static const u8 sMagmaEmblemDesc[] = _(
+    "A medal-like item in\n"
+    "the same shape as\n"
+    "TEAM MAGMA's mark.");
+
+static const u8 sOldSeaMapDesc[] = _(
+    "A faded sea chart\n"
+    "that shows the way\n"
+    "to a certain island.");
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/data/wild_encounters.h b/src/data/wild_encounters.h
deleted file mode 100644
index d1f2eb616..000000000
--- a/src/data/wild_encounters.h
+++ /dev/null
@@ -1,4573 +0,0 @@
-// const rom data
-
-/*This file consists of several parts.
- *First, the actual tables that define the available Pokemon and their level ranges.
- *Second, the headers for each area that links the tables to the actual maps.
- *Third, Battle Pyramid-specific tables and headers.
- *Fourth, Battle Pike-specific tables and headers.
- *And then finally, Feebas-related data.
- *You can search for // to jump between the sections.
- */
- 
- //Start of regular Pokemon tables.
-
-const struct WildPokemon gRoute101_LandMons[] =
-{
-    {2, 2, SPECIES_WURMPLE},
-    {2, 2, SPECIES_POOCHYENA},
-    {2, 2, SPECIES_WURMPLE},
-    {3, 3, SPECIES_WURMPLE},
-    {3, 3, SPECIES_POOCHYENA},
-    {3, 3, SPECIES_POOCHYENA},
-    {3, 3, SPECIES_WURMPLE},
-    {3, 3, SPECIES_POOCHYENA},
-    {2, 2, SPECIES_ZIGZAGOON},
-    {2, 2, SPECIES_ZIGZAGOON},
-    {3, 3, SPECIES_ZIGZAGOON},
-    {3, 3, SPECIES_ZIGZAGOON},
-};
-
-const struct WildPokemonInfo gRoute101_LandMonsInfo = {20, gRoute101_LandMons};
-
-const struct WildPokemon gRoute102_LandMons[] =
-{
-    {3, 3, SPECIES_POOCHYENA},
-    {3, 3, SPECIES_WURMPLE},
-    {4, 4, SPECIES_POOCHYENA},
-    {4, 4, SPECIES_WURMPLE},
-    {3, 3, SPECIES_LOTAD},
-    {4, 4, SPECIES_LOTAD},
-    {3, 3, SPECIES_ZIGZAGOON},
-    {3, 3, SPECIES_ZIGZAGOON},
-    {4, 4, SPECIES_ZIGZAGOON},
-    {4, 4, SPECIES_RALTS},
-    {4, 4, SPECIES_ZIGZAGOON},
-    {3, 3, SPECIES_SEEDOT},
-};
-
-const struct WildPokemonInfo gRoute102_LandMonsInfo = {20, gRoute102_LandMons};
-
-const struct WildPokemon gRoute102_WaterMons[] =
-{
-    {20, 30, SPECIES_MARILL},
-    {10, 20, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-    {20, 30, SPECIES_GOLDEEN},
-};
-
-const struct WildPokemonInfo gRoute102_WaterMonsInfo = {4, gRoute102_WaterMons};
-
-const struct WildPokemon gRoute102_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_CORPHISH},
-    {25, 30, SPECIES_CORPHISH},
-    {30, 35, SPECIES_CORPHISH},
-    {20, 25, SPECIES_CORPHISH},
-    {35, 40, SPECIES_CORPHISH},
-    {40, 45, SPECIES_CORPHISH},
-};
-
-const struct WildPokemonInfo gRoute102_FishingMonsInfo = {30, gRoute102_FishingMons};
-
-const struct WildPokemon gRoute103_LandMons[] =
-{
-    {2, 2, SPECIES_POOCHYENA},
-    {3, 3, SPECIES_POOCHYENA},
-    {3, 3, SPECIES_POOCHYENA},
-    {4, 4, SPECIES_POOCHYENA},
-    {2, 2, SPECIES_WINGULL},
-    {3, 3, SPECIES_ZIGZAGOON},
-    {3, 3, SPECIES_ZIGZAGOON},
-    {4, 4, SPECIES_ZIGZAGOON},
-    {3, 3, SPECIES_WINGULL},
-    {3, 3, SPECIES_WINGULL},
-    {2, 2, SPECIES_WINGULL},
-    {4, 4, SPECIES_WINGULL},
-};
-
-const struct WildPokemonInfo gRoute103_LandMonsInfo = {20, gRoute103_LandMons};
-
-const struct WildPokemon gRoute103_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute103_WaterMonsInfo = {4, gRoute103_WaterMons};
-
-const struct WildPokemon gRoute103_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute103_FishingMonsInfo = {30, gRoute103_FishingMons};
-
-const struct WildPokemon gRoute104_LandMons[] =
-{
-    {4, 4, SPECIES_POOCHYENA},
-    {4, 4, SPECIES_WURMPLE},
-    {5, 5, SPECIES_POOCHYENA},
-    {5, 5, SPECIES_MARILL},
-    {4, 4, SPECIES_MARILL},
-    {5, 5, SPECIES_POOCHYENA},
-    {4, 4, SPECIES_TAILLOW},
-    {5, 5, SPECIES_TAILLOW},
-    {4, 4, SPECIES_WINGULL},
-    {4, 4, SPECIES_WINGULL},
-    {3, 3, SPECIES_WINGULL},
-    {5, 5, SPECIES_WINGULL},
-};
-
-const struct WildPokemonInfo gRoute104_LandMonsInfo = {20, gRoute104_LandMons};
-
-const struct WildPokemon gRoute104_WaterMons[] =
-{
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute104_WaterMonsInfo = {4, gRoute104_WaterMons};
-
-const struct WildPokemon gRoute104_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_MAGIKARP},
-    {25, 30, SPECIES_MAGIKARP},
-    {30, 35, SPECIES_MAGIKARP},
-    {20, 25, SPECIES_MAGIKARP},
-    {35, 40, SPECIES_MAGIKARP},
-    {40, 45, SPECIES_MAGIKARP},
-};
-
-const struct WildPokemonInfo gRoute104_FishingMonsInfo = {30, gRoute104_FishingMons};
-
-const struct WildPokemon gRoute105_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute105_WaterMonsInfo = {4, gRoute105_WaterMons};
-
-const struct WildPokemon gRoute105_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute105_FishingMonsInfo = {30, gRoute105_FishingMons};
-
-const struct WildPokemon gRoute110_LandMons[] =
-{
-    {12, 12, SPECIES_POOCHYENA},
-    {12, 12, SPECIES_ELECTRIKE},
-    {12, 12, SPECIES_GULPIN},
-    {13, 13, SPECIES_ELECTRIKE},
-    {13, 13, SPECIES_MINUN},
-    {13, 13, SPECIES_ODDISH},
-    {13, 13, SPECIES_MINUN},
-    {13, 13, SPECIES_GULPIN},
-    {12, 12, SPECIES_WINGULL},
-    {12, 12, SPECIES_WINGULL},
-    {12, 12, SPECIES_PLUSLE},
-    {13, 13, SPECIES_PLUSLE},
-};
-
-const struct WildPokemonInfo gRoute110_LandMonsInfo = {20, gRoute110_LandMons};
-
-const struct WildPokemon gRoute110_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute110_WaterMonsInfo = {4, gRoute110_WaterMons};
-
-const struct WildPokemon gRoute110_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute110_FishingMonsInfo = {30, gRoute110_FishingMons};
-
-const struct WildPokemon gRoute111_LandMons[] =
-{
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {21, 21, SPECIES_SANDSHREW},
-    {21, 21, SPECIES_TRAPINCH},
-    {19, 19, SPECIES_BALTOY},
-    {21, 21, SPECIES_BALTOY},
-    {19, 19, SPECIES_SANDSHREW},
-    {19, 19, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_BALTOY},
-    {20, 20, SPECIES_CACNEA},
-    {22, 22, SPECIES_CACNEA},
-    {22, 22, SPECIES_CACNEA},
-};
-
-const struct WildPokemonInfo gRoute111_LandMonsInfo = {10, gRoute111_LandMons};
-
-const struct WildPokemon gRoute111_WaterMons[] =
-{
-    {20, 30, SPECIES_MARILL},
-    {10, 20, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-    {20, 30, SPECIES_GOLDEEN},
-};
-
-const struct WildPokemonInfo gRoute111_WaterMonsInfo = {4, gRoute111_WaterMons};
-
-const struct WildPokemon gRoute111_RockSmashMons[] =
-{
-    {10, 15, SPECIES_GEODUDE},
-    {5, 10, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-};
-
-const struct WildPokemonInfo gRoute111_RockSmashMonsInfo = {20, gRoute111_RockSmashMons};
-
-const struct WildPokemon gRoute111_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {20, 25, SPECIES_BARBOACH},
-    {35, 40, SPECIES_BARBOACH},
-    {40, 45, SPECIES_BARBOACH},
-};
-
-const struct WildPokemonInfo gRoute111_FishingMonsInfo = {30, gRoute111_FishingMons};
-
-const struct WildPokemon gRoute112_LandMons[] =
-{
-    {15, 15, SPECIES_NUMEL},
-    {15, 15, SPECIES_NUMEL},
-    {15, 15, SPECIES_MARILL},
-    {14, 14, SPECIES_NUMEL},
-    {14, 14, SPECIES_NUMEL},
-    {14, 14, SPECIES_MARILL},
-    {16, 16, SPECIES_NUMEL},
-    {16, 16, SPECIES_MARILL},
-    {16, 16, SPECIES_NUMEL},
-    {16, 16, SPECIES_NUMEL},
-    {16, 16, SPECIES_NUMEL},
-    {16, 16, SPECIES_NUMEL},
-};
-
-const struct WildPokemonInfo gRoute112_LandMonsInfo = {20, gRoute112_LandMons};
-
-const struct WildPokemon gRoute113_LandMons[] =
-{
-    {15, 15, SPECIES_SPINDA},
-    {15, 15, SPECIES_SPINDA},
-    {15, 15, SPECIES_SLUGMA},
-    {14, 14, SPECIES_SPINDA},
-    {14, 14, SPECIES_SPINDA},
-    {14, 14, SPECIES_SLUGMA},
-    {16, 16, SPECIES_SPINDA},
-    {16, 16, SPECIES_SLUGMA},
-    {16, 16, SPECIES_SPINDA},
-    {16, 16, SPECIES_SKARMORY},
-    {16, 16, SPECIES_SPINDA},
-    {16, 16, SPECIES_SKARMORY},
-};
-
-const struct WildPokemonInfo gRoute113_LandMonsInfo = {20, gRoute113_LandMons};
-
-const struct WildPokemon gRoute114_LandMons[] =
-{
-    {16, 16, SPECIES_SWABLU},
-    {16, 16, SPECIES_LOTAD},
-    {17, 17, SPECIES_SWABLU},
-    {15, 15, SPECIES_SWABLU},
-    {15, 15, SPECIES_LOTAD},
-    {16, 16, SPECIES_LOMBRE},
-    {16, 16, SPECIES_LOMBRE},
-    {18, 18, SPECIES_LOMBRE},
-    {17, 17, SPECIES_SEVIPER},
-    {15, 15, SPECIES_SEVIPER},
-    {17, 17, SPECIES_SEVIPER},
-    {15, 15, SPECIES_NUZLEAF},
-};
-
-const struct WildPokemonInfo gRoute114_LandMonsInfo = {20, gRoute114_LandMons};
-
-const struct WildPokemon gRoute114_WaterMons[] =
-{
-    {20, 30, SPECIES_MARILL},
-    {10, 20, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-    {20, 30, SPECIES_GOLDEEN},
-};
-
-const struct WildPokemonInfo gRoute114_WaterMonsInfo = {4, gRoute114_WaterMons};
-
-const struct WildPokemon gRoute114_RockSmashMons[] =
-{
-    {10, 15, SPECIES_GEODUDE},
-    {5, 10, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-};
-
-const struct WildPokemonInfo gRoute114_RockSmashMonsInfo = {20, gRoute114_RockSmashMons};
-
-const struct WildPokemon gRoute114_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {20, 25, SPECIES_BARBOACH},
-    {35, 40, SPECIES_BARBOACH},
-    {40, 45, SPECIES_BARBOACH},
-};
-
-const struct WildPokemonInfo gRoute114_FishingMonsInfo = {30, gRoute114_FishingMons};
-
-const struct WildPokemon gRoute116_LandMons[] =
-{
-    {6, 6, SPECIES_POOCHYENA},
-    {6, 6, SPECIES_WHISMUR},
-    {6, 6, SPECIES_NINCADA},
-    {7, 7, SPECIES_ABRA},
-    {7, 7, SPECIES_NINCADA},
-    {6, 6, SPECIES_TAILLOW},
-    {7, 7, SPECIES_TAILLOW},
-    {8, 8, SPECIES_TAILLOW},
-    {7, 7, SPECIES_POOCHYENA},
-    {8, 8, SPECIES_POOCHYENA},
-    {7, 7, SPECIES_SKITTY},
-    {8, 8, SPECIES_SKITTY},
-};
-
-const struct WildPokemonInfo gRoute116_LandMonsInfo = {20, gRoute116_LandMons};
-
-const struct WildPokemon gRoute117_LandMons[] =
-{
-    {13, 13, SPECIES_POOCHYENA},
-    {13, 13, SPECIES_ODDISH},
-    {14, 14, SPECIES_POOCHYENA},
-    {14, 14, SPECIES_ODDISH},
-    {13, 13, SPECIES_MARILL},
-    {13, 13, SPECIES_ODDISH},
-    {13, 13, SPECIES_ILLUMISE},
-    {13, 13, SPECIES_ILLUMISE},
-    {14, 14, SPECIES_ILLUMISE},
-    {14, 14, SPECIES_ILLUMISE},
-    {13, 13, SPECIES_VOLBEAT},
-    {13, 13, SPECIES_SEEDOT},
-};
-
-const struct WildPokemonInfo gRoute117_LandMonsInfo = {20, gRoute117_LandMons};
-
-const struct WildPokemon gRoute117_WaterMons[] =
-{
-    {20, 30, SPECIES_MARILL},
-    {10, 20, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-    {20, 30, SPECIES_GOLDEEN},
-};
-
-const struct WildPokemonInfo gRoute117_WaterMonsInfo = {4, gRoute117_WaterMons};
-
-const struct WildPokemon gRoute117_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_CORPHISH},
-    {25, 30, SPECIES_CORPHISH},
-    {30, 35, SPECIES_CORPHISH},
-    {20, 25, SPECIES_CORPHISH},
-    {35, 40, SPECIES_CORPHISH},
-    {40, 45, SPECIES_CORPHISH},
-};
-
-const struct WildPokemonInfo gRoute117_FishingMonsInfo = {30, gRoute117_FishingMons};
-
-const struct WildPokemon gRoute118_LandMons[] =
-{
-    {24, 24, SPECIES_ZIGZAGOON},
-    {24, 24, SPECIES_ELECTRIKE},
-    {26, 26, SPECIES_ZIGZAGOON},
-    {26, 26, SPECIES_ELECTRIKE},
-    {26, 26, SPECIES_LINOONE},
-    {26, 26, SPECIES_MANECTRIC},
-    {25, 25, SPECIES_WINGULL},
-    {25, 25, SPECIES_WINGULL},
-    {26, 26, SPECIES_WINGULL},
-    {26, 26, SPECIES_WINGULL},
-    {27, 27, SPECIES_WINGULL},
-    {25, 25, SPECIES_KECLEON},
-};
-
-const struct WildPokemonInfo gRoute118_LandMonsInfo = {20, gRoute118_LandMons};
-
-const struct WildPokemon gRoute118_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute118_WaterMonsInfo = {4, gRoute118_WaterMons};
-
-const struct WildPokemon gRoute118_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_CARVANHA},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_CARVANHA},
-    {20, 25, SPECIES_CARVANHA},
-    {35, 40, SPECIES_CARVANHA},
-    {40, 45, SPECIES_CARVANHA},
-};
-
-const struct WildPokemonInfo gRoute118_FishingMonsInfo = {30, gRoute118_FishingMons};
-
-const struct WildPokemon gRoute124_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute124_WaterMonsInfo = {4, gRoute124_WaterMons};
-
-const struct WildPokemon gRoute124_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute124_FishingMonsInfo = {30, gRoute124_FishingMons};
-
-const struct WildPokemon gPetalburgWoods_LandMons[] =
-{
-    {5, 5, SPECIES_POOCHYENA},
-    {5, 5, SPECIES_WURMPLE},
-    {5, 5, SPECIES_SHROOMISH},
-    {6, 6, SPECIES_POOCHYENA},
-    {5, 5, SPECIES_SILCOON},
-    {5, 5, SPECIES_CASCOON},
-    {6, 6, SPECIES_WURMPLE},
-    {6, 6, SPECIES_SHROOMISH},
-    {5, 5, SPECIES_TAILLOW},
-    {5, 5, SPECIES_SLAKOTH},
-    {6, 6, SPECIES_TAILLOW},
-    {6, 6, SPECIES_SLAKOTH},
-};
-
-const struct WildPokemonInfo gPetalburgWoods_LandMonsInfo = {20, gPetalburgWoods_LandMons};
-
-const struct WildPokemon gRusturfTunnel_LandMons[] =
-{
-    {6, 6, SPECIES_WHISMUR},
-    {7, 7, SPECIES_WHISMUR},
-    {6, 6, SPECIES_WHISMUR},
-    {6, 6, SPECIES_WHISMUR},
-    {7, 7, SPECIES_WHISMUR},
-    {7, 7, SPECIES_WHISMUR},
-    {5, 5, SPECIES_WHISMUR},
-    {8, 8, SPECIES_WHISMUR},
-    {5, 5, SPECIES_WHISMUR},
-    {8, 8, SPECIES_WHISMUR},
-    {5, 5, SPECIES_WHISMUR},
-    {8, 8, SPECIES_WHISMUR},
-};
-
-const struct WildPokemonInfo gRusturfTunnel_LandMonsInfo = {10, gRusturfTunnel_LandMons};
-
-const struct WildPokemon gGraniteCave_1F_LandMons[] =
-{
-    {7, 7, SPECIES_ZUBAT},
-    {8, 8, SPECIES_MAKUHITA},
-    {7, 7, SPECIES_MAKUHITA},
-    {8, 8, SPECIES_ZUBAT},
-    {9, 9, SPECIES_MAKUHITA},
-    {8, 8, SPECIES_ABRA},
-    {10, 10, SPECIES_MAKUHITA},
-    {6, 6, SPECIES_MAKUHITA},
-    {7, 7, SPECIES_GEODUDE},
-    {8, 8, SPECIES_GEODUDE},
-    {6, 6, SPECIES_GEODUDE},
-    {9, 9, SPECIES_GEODUDE},
-};
-
-const struct WildPokemonInfo gGraniteCave_1F_LandMonsInfo = {10, gGraniteCave_1F_LandMons};
-
-const struct WildPokemon gGraniteCave_B1F_LandMons[] =
-{
-    {9, 9, SPECIES_ZUBAT},
-    {10, 10, SPECIES_ARON},
-    {9, 9, SPECIES_ARON},
-    {11, 11, SPECIES_ARON},
-    {10, 10, SPECIES_ZUBAT},
-    {9, 9, SPECIES_ABRA},
-    {10, 10, SPECIES_MAKUHITA},
-    {11, 11, SPECIES_MAKUHITA},
-    {10, 10, SPECIES_SABLEYE},
-    {10, 10, SPECIES_SABLEYE},
-    {9, 9, SPECIES_SABLEYE},
-    {11, 11, SPECIES_SABLEYE},
-};
-
-const struct WildPokemonInfo gGraniteCave_B1F_LandMonsInfo = {10, gGraniteCave_B1F_LandMons};
-
-const struct WildPokemon gMtPyre_1F_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {23, 23, SPECIES_SHUPPET},
-    {22, 22, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-};
-
-const struct WildPokemonInfo gMtPyre_1F_LandMonsInfo = {10, gMtPyre_1F_LandMons};
-
-const struct WildPokemon gVictoryRoad_1F_LandMons[] =
-{
-    {40, 40, SPECIES_GOLBAT},
-    {40, 40, SPECIES_HARIYAMA},
-    {40, 40, SPECIES_LAIRON},
-    {40, 40, SPECIES_LOUDRED},
-    {36, 36, SPECIES_ZUBAT},
-    {36, 36, SPECIES_MAKUHITA},
-    {38, 38, SPECIES_GOLBAT},
-    {38, 38, SPECIES_HARIYAMA},
-    {36, 36, SPECIES_ARON},
-    {36, 36, SPECIES_WHISMUR},
-    {36, 36, SPECIES_ARON},
-    {36, 36, SPECIES_WHISMUR},
-};
-
-const struct WildPokemonInfo gVictoryRoad_1F_LandMonsInfo = {10, gVictoryRoad_1F_LandMons};
-
-const struct WildPokemon gSafariZone_South_LandMons[] =
-{
-    {25, 25, SPECIES_ODDISH},
-    {27, 27, SPECIES_ODDISH},
-    {25, 25, SPECIES_GIRAFARIG},
-    {27, 27, SPECIES_GIRAFARIG},
-    {25, 25, SPECIES_NATU},
-    {25, 25, SPECIES_DODUO},
-    {25, 25, SPECIES_GLOOM},
-    {27, 27, SPECIES_WOBBUFFET},
-    {25, 25, SPECIES_PIKACHU},
-    {27, 27, SPECIES_WOBBUFFET},
-    {27, 27, SPECIES_PIKACHU},
-    {29, 29, SPECIES_WOBBUFFET},
-};
-
-const struct WildPokemonInfo gSafariZone_South_LandMonsInfo = {25, gSafariZone_South_LandMons};
-
-const struct WildPokemon gUnderwater2_WaterMons[] =
-{
-    {20, 30, SPECIES_CLAMPERL},
-    {20, 30, SPECIES_CHINCHOU},
-    {30, 35, SPECIES_CLAMPERL},
-    {30, 35, SPECIES_RELICANTH},
-    {30, 35, SPECIES_RELICANTH},
-};
-
-const struct WildPokemonInfo gUnderwater2_WaterMonsInfo = {4, gUnderwater2_WaterMons};
-
-const struct WildPokemon gAbandonedShip_Rooms_B1F_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_TENTACOOL},
-    {30, 35, SPECIES_TENTACRUEL},
-};
-
-const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_WaterMonsInfo = {4, gAbandonedShip_Rooms_B1F_WaterMons};
-
-const struct WildPokemon gAbandonedShip_Rooms_B1F_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_TENTACOOL},
-    {25, 30, SPECIES_TENTACOOL},
-    {30, 35, SPECIES_TENTACOOL},
-    {30, 35, SPECIES_TENTACRUEL},
-    {25, 30, SPECIES_TENTACRUEL},
-    {20, 25, SPECIES_TENTACRUEL},
-};
-
-const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_FishingMonsInfo = {20, gAbandonedShip_Rooms_B1F_FishingMons};
-
-const struct WildPokemon gGraniteCave_B2F_LandMons[] =
-{
-    {10, 10, SPECIES_ZUBAT},
-    {11, 11, SPECIES_ARON},
-    {10, 10, SPECIES_ARON},
-    {11, 11, SPECIES_ZUBAT},
-    {12, 12, SPECIES_ARON},
-    {10, 10, SPECIES_ABRA},
-    {10, 10, SPECIES_SABLEYE},
-    {11, 11, SPECIES_SABLEYE},
-    {12, 12, SPECIES_SABLEYE},
-    {10, 10, SPECIES_SABLEYE},
-    {12, 12, SPECIES_SABLEYE},
-    {10, 10, SPECIES_SABLEYE},
-};
-
-const struct WildPokemonInfo gGraniteCave_B2F_LandMonsInfo = {10, gGraniteCave_B2F_LandMons};
-
-const struct WildPokemon gGraniteCave_B2F_RockSmashMons[] =
-{
-    {10, 15, SPECIES_GEODUDE},
-    {10, 20, SPECIES_NOSEPASS},
-    {5, 10, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-};
-
-const struct WildPokemonInfo gGraniteCave_B2F_RockSmashMonsInfo = {20, gGraniteCave_B2F_RockSmashMons};
-
-const struct WildPokemon gFieryPath_LandMons[] =
-{
-    {15, 15, SPECIES_NUMEL},
-    {15, 15, SPECIES_KOFFING},
-    {16, 16, SPECIES_NUMEL},
-    {15, 15, SPECIES_MACHOP},
-    {15, 15, SPECIES_TORKOAL},
-    {15, 15, SPECIES_SLUGMA},
-    {16, 16, SPECIES_KOFFING},
-    {16, 16, SPECIES_MACHOP},
-    {14, 14, SPECIES_TORKOAL},
-    {16, 16, SPECIES_TORKOAL},
-    {14, 14, SPECIES_GRIMER},
-    {14, 14, SPECIES_GRIMER},
-};
-
-const struct WildPokemonInfo gFieryPath_LandMonsInfo = {10, gFieryPath_LandMons};
-
-const struct WildPokemon gMeteorFalls_B1F_2R_LandMons[] =
-{
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {30, 30, SPECIES_BAGON},
-    {35, 35, SPECIES_SOLROCK},
-    {35, 35, SPECIES_BAGON},
-    {37, 37, SPECIES_SOLROCK},
-    {25, 25, SPECIES_BAGON},
-    {39, 39, SPECIES_SOLROCK},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gMeteorFalls_B1F_2R_LandMonsInfo = {10, gMeteorFalls_B1F_2R_LandMons};
-
-const struct WildPokemon gMeteorFalls_B1F_2R_WaterMons[] =
-{
-    {30, 35, SPECIES_GOLBAT},
-    {30, 35, SPECIES_GOLBAT},
-    {25, 35, SPECIES_SOLROCK},
-    {15, 25, SPECIES_SOLROCK},
-    {5, 15, SPECIES_SOLROCK},
-};
-
-const struct WildPokemonInfo gMeteorFalls_B1F_2R_WaterMonsInfo = {4, gMeteorFalls_B1F_2R_WaterMons};
-
-const struct WildPokemon gMeteorFalls_B1F_2R_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {30, 35, SPECIES_WHISCASH},
-    {35, 40, SPECIES_WHISCASH},
-    {40, 45, SPECIES_WHISCASH},
-};
-
-const struct WildPokemonInfo gMeteorFalls_B1F_2R_FishingMonsInfo = {30, gMeteorFalls_B1F_2R_FishingMons};
-
-const struct WildPokemon gJaggedPass_LandMons[] =
-{
-    {21, 21, SPECIES_NUMEL},
-    {21, 21, SPECIES_NUMEL},
-    {21, 21, SPECIES_MACHOP},
-    {20, 20, SPECIES_NUMEL},
-    {20, 20, SPECIES_SPOINK},
-    {20, 20, SPECIES_MACHOP},
-    {21, 21, SPECIES_SPOINK},
-    {22, 22, SPECIES_MACHOP},
-    {22, 22, SPECIES_NUMEL},
-    {22, 22, SPECIES_SPOINK},
-    {22, 22, SPECIES_NUMEL},
-    {22, 22, SPECIES_SPOINK},
-};
-
-const struct WildPokemonInfo gJaggedPass_LandMonsInfo = {20, gJaggedPass_LandMons};
-
-const struct WildPokemon gRoute106_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute106_WaterMonsInfo = {4, gRoute106_WaterMons};
-
-const struct WildPokemon gRoute106_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute106_FishingMonsInfo = {30, gRoute106_FishingMons};
-
-const struct WildPokemon gRoute107_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute107_WaterMonsInfo = {4, gRoute107_WaterMons};
-
-const struct WildPokemon gRoute107_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute107_FishingMonsInfo = {30, gRoute107_FishingMons};
-
-const struct WildPokemon gRoute108_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute108_WaterMonsInfo = {4, gRoute108_WaterMons};
-
-const struct WildPokemon gRoute108_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute108_FishingMonsInfo = {30, gRoute108_FishingMons};
-
-const struct WildPokemon gRoute109_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute109_WaterMonsInfo = {4, gRoute109_WaterMons};
-
-const struct WildPokemon gRoute109_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute109_FishingMonsInfo = {30, gRoute109_FishingMons};
-
-const struct WildPokemon gRoute115_LandMons[] =
-{
-    {23, 23, SPECIES_SWABLU},
-    {23, 23, SPECIES_TAILLOW},
-    {25, 25, SPECIES_SWABLU},
-    {24, 24, SPECIES_TAILLOW},
-    {25, 25, SPECIES_TAILLOW},
-    {25, 25, SPECIES_SWELLOW},
-    {24, 24, SPECIES_JIGGLYPUFF},
-    {25, 25, SPECIES_JIGGLYPUFF},
-    {24, 24, SPECIES_WINGULL},
-    {24, 24, SPECIES_WINGULL},
-    {26, 26, SPECIES_WINGULL},
-    {25, 25, SPECIES_WINGULL},
-};
-
-const struct WildPokemonInfo gRoute115_LandMonsInfo = {20, gRoute115_LandMons};
-
-const struct WildPokemon gRoute115_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute115_WaterMonsInfo = {4, gRoute115_WaterMons};
-
-const struct WildPokemon gRoute115_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute115_FishingMonsInfo = {30, gRoute115_FishingMons};
-
-const struct WildPokemon gNewMauville_Inside_LandMons[] =
-{
-    {24, 24, SPECIES_VOLTORB},
-    {24, 24, SPECIES_MAGNEMITE},
-    {25, 25, SPECIES_VOLTORB},
-    {25, 25, SPECIES_MAGNEMITE},
-    {23, 23, SPECIES_VOLTORB},
-    {23, 23, SPECIES_MAGNEMITE},
-    {26, 26, SPECIES_VOLTORB},
-    {26, 26, SPECIES_MAGNEMITE},
-    {22, 22, SPECIES_VOLTORB},
-    {22, 22, SPECIES_MAGNEMITE},
-    {26, 26, SPECIES_ELECTRODE},
-    {26, 26, SPECIES_MAGNETON},
-};
-
-const struct WildPokemonInfo gNewMauville_Inside_LandMonsInfo = {10, gNewMauville_Inside_LandMons};
-
-const struct WildPokemon gRoute119_LandMons[] =
-{
-    {25, 25, SPECIES_ZIGZAGOON},
-    {25, 25, SPECIES_LINOONE},
-    {27, 27, SPECIES_ZIGZAGOON},
-    {25, 25, SPECIES_ODDISH},
-    {27, 27, SPECIES_LINOONE},
-    {26, 26, SPECIES_ODDISH},
-    {27, 27, SPECIES_ODDISH},
-    {24, 24, SPECIES_ODDISH},
-    {25, 25, SPECIES_TROPIUS},
-    {26, 26, SPECIES_TROPIUS},
-    {27, 27, SPECIES_TROPIUS},
-    {25, 25, SPECIES_KECLEON},
-};
-
-const struct WildPokemonInfo gRoute119_LandMonsInfo = {15, gRoute119_LandMons};
-
-const struct WildPokemon gRoute119_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute119_WaterMonsInfo = {4, gRoute119_WaterMons};
-
-const struct WildPokemon gRoute119_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_CARVANHA},
-    {25, 30, SPECIES_CARVANHA},
-    {30, 35, SPECIES_CARVANHA},
-    {20, 25, SPECIES_CARVANHA},
-    {35, 40, SPECIES_CARVANHA},
-    {40, 45, SPECIES_CARVANHA},
-};
-
-const struct WildPokemonInfo gRoute119_FishingMonsInfo = {30, gRoute119_FishingMons};
-
-const struct WildPokemon gRoute120_LandMons[] =
-{
-    {25, 25, SPECIES_POOCHYENA},
-    {25, 25, SPECIES_MIGHTYENA},
-    {27, 27, SPECIES_MIGHTYENA},
-    {25, 25, SPECIES_ODDISH},
-    {25, 25, SPECIES_MARILL},
-    {26, 26, SPECIES_ODDISH},
-    {27, 27, SPECIES_ODDISH},
-    {27, 27, SPECIES_MARILL},
-    {25, 25, SPECIES_ABSOL},
-    {27, 27, SPECIES_ABSOL},
-    {25, 25, SPECIES_KECLEON},
-    {25, 25, SPECIES_SEEDOT},
-};
-
-const struct WildPokemonInfo gRoute120_LandMonsInfo = {20, gRoute120_LandMons};
-
-const struct WildPokemon gRoute120_WaterMons[] =
-{
-    {20, 30, SPECIES_MARILL},
-    {10, 20, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-    {20, 30, SPECIES_GOLDEEN},
-};
-
-const struct WildPokemonInfo gRoute120_WaterMonsInfo = {4, gRoute120_WaterMons};
-
-const struct WildPokemon gRoute120_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {20, 25, SPECIES_BARBOACH},
-    {35, 40, SPECIES_BARBOACH},
-    {40, 45, SPECIES_BARBOACH},
-};
-
-const struct WildPokemonInfo gRoute120_FishingMonsInfo = {30, gRoute120_FishingMons};
-
-const struct WildPokemon gRoute121_LandMons[] =
-{
-    {26, 26, SPECIES_POOCHYENA},
-    {26, 26, SPECIES_SHUPPET},
-    {26, 26, SPECIES_MIGHTYENA},
-    {28, 28, SPECIES_SHUPPET},
-    {28, 28, SPECIES_MIGHTYENA},
-    {26, 26, SPECIES_ODDISH},
-    {28, 28, SPECIES_ODDISH},
-    {28, 28, SPECIES_GLOOM},
-    {26, 26, SPECIES_WINGULL},
-    {27, 27, SPECIES_WINGULL},
-    {28, 28, SPECIES_WINGULL},
-    {25, 25, SPECIES_KECLEON},
-};
-
-const struct WildPokemonInfo gRoute121_LandMonsInfo = {20, gRoute121_LandMons};
-
-const struct WildPokemon gRoute121_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute121_WaterMonsInfo = {4, gRoute121_WaterMons};
-
-const struct WildPokemon gRoute121_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute121_FishingMonsInfo = {30, gRoute121_FishingMons};
-
-const struct WildPokemon gRoute122_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute122_WaterMonsInfo = {4, gRoute122_WaterMons};
-
-const struct WildPokemon gRoute122_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute122_FishingMonsInfo = {30, gRoute122_FishingMons};
-
-const struct WildPokemon gRoute123_LandMons[] =
-{
-    {26, 26, SPECIES_POOCHYENA},
-    {26, 26, SPECIES_SHUPPET},
-    {26, 26, SPECIES_MIGHTYENA},
-    {28, 28, SPECIES_SHUPPET},
-    {28, 28, SPECIES_MIGHTYENA},
-    {26, 26, SPECIES_ODDISH},
-    {28, 28, SPECIES_ODDISH},
-    {28, 28, SPECIES_GLOOM},
-    {26, 26, SPECIES_WINGULL},
-    {27, 27, SPECIES_WINGULL},
-    {28, 28, SPECIES_WINGULL},
-    {25, 25, SPECIES_KECLEON},
-};
-
-const struct WildPokemonInfo gRoute123_LandMonsInfo = {20, gRoute123_LandMons};
-
-const struct WildPokemon gRoute123_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute123_WaterMonsInfo = {4, gRoute123_WaterMons};
-
-const struct WildPokemon gRoute123_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute123_FishingMonsInfo = {30, gRoute123_FishingMons};
-
-const struct WildPokemon gMtPyre_2F_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {23, 23, SPECIES_SHUPPET},
-    {22, 22, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-};
-
-const struct WildPokemonInfo gMtPyre_2F_LandMonsInfo = {10, gMtPyre_2F_LandMons};
-
-const struct WildPokemon gMtPyre_3F_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {23, 23, SPECIES_SHUPPET},
-    {22, 22, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-};
-
-const struct WildPokemonInfo gMtPyre_3F_LandMonsInfo = {10, gMtPyre_3F_LandMons};
-
-const struct WildPokemon gMtPyre_4F_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {23, 23, SPECIES_SHUPPET},
-    {22, 22, SPECIES_SHUPPET},
-    {27, 27, SPECIES_DUSKULL},
-    {27, 27, SPECIES_DUSKULL},
-    {25, 25, SPECIES_DUSKULL},
-    {29, 29, SPECIES_DUSKULL},
-};
-
-const struct WildPokemonInfo gMtPyre_4F_LandMonsInfo = {10, gMtPyre_4F_LandMons};
-
-const struct WildPokemon gMtPyre_5F_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {23, 23, SPECIES_SHUPPET},
-    {22, 22, SPECIES_SHUPPET},
-    {27, 27, SPECIES_DUSKULL},
-    {27, 27, SPECIES_DUSKULL},
-    {25, 25, SPECIES_DUSKULL},
-    {29, 29, SPECIES_DUSKULL},
-};
-
-const struct WildPokemonInfo gMtPyre_5F_LandMonsInfo = {10, gMtPyre_5F_LandMons};
-
-const struct WildPokemon gMtPyre_6F_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {23, 23, SPECIES_SHUPPET},
-    {22, 22, SPECIES_SHUPPET},
-    {27, 27, SPECIES_DUSKULL},
-    {27, 27, SPECIES_DUSKULL},
-    {25, 25, SPECIES_DUSKULL},
-    {29, 29, SPECIES_DUSKULL},
-};
-
-const struct WildPokemonInfo gMtPyre_6F_LandMonsInfo = {10, gMtPyre_6F_LandMons};
-
-const struct WildPokemon gMtPyre_Exterior_LandMons[] =
-{
-    {27, 27, SPECIES_SHUPPET},
-    {27, 27, SPECIES_SHUPPET},
-    {28, 28, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {29, 29, SPECIES_VULPIX},
-    {27, 27, SPECIES_VULPIX},
-    {29, 29, SPECIES_VULPIX},
-    {25, 25, SPECIES_VULPIX},
-    {27, 27, SPECIES_WINGULL},
-    {27, 27, SPECIES_WINGULL},
-    {26, 26, SPECIES_WINGULL},
-    {28, 28, SPECIES_WINGULL},
-};
-
-const struct WildPokemonInfo gMtPyre_Exterior_LandMonsInfo = {10, gMtPyre_Exterior_LandMons};
-
-const struct WildPokemon gMtPyre_Summit_LandMons[] =
-{
-    {28, 28, SPECIES_SHUPPET},
-    {29, 29, SPECIES_SHUPPET},
-    {27, 27, SPECIES_SHUPPET},
-    {26, 26, SPECIES_SHUPPET},
-    {30, 30, SPECIES_SHUPPET},
-    {25, 25, SPECIES_SHUPPET},
-    {24, 24, SPECIES_SHUPPET},
-    {28, 28, SPECIES_DUSKULL},
-    {26, 26, SPECIES_DUSKULL},
-    {30, 30, SPECIES_DUSKULL},
-    {28, 28, SPECIES_CHIMECHO},
-    {28, 28, SPECIES_CHIMECHO},
-};
-
-const struct WildPokemonInfo gMtPyre_Summit_LandMonsInfo = {10, gMtPyre_Summit_LandMons};
-
-const struct WildPokemon gGraniteCave_StevensRoom_LandMons[] =
-{
-    {7, 7, SPECIES_ZUBAT},
-    {8, 8, SPECIES_MAKUHITA},
-    {7, 7, SPECIES_MAKUHITA},
-    {8, 8, SPECIES_ZUBAT},
-    {9, 9, SPECIES_MAKUHITA},
-    {8, 8, SPECIES_ABRA},
-    {10, 10, SPECIES_MAKUHITA},
-    {6, 6, SPECIES_MAKUHITA},
-    {7, 7, SPECIES_ARON},
-    {8, 8, SPECIES_ARON},
-    {7, 7, SPECIES_ARON},
-    {8, 8, SPECIES_ARON},
-};
-
-const struct WildPokemonInfo gGraniteCave_StevensRoom_LandMonsInfo = {10, gGraniteCave_StevensRoom_LandMons};
-
-const struct WildPokemon gRoute125_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute125_WaterMonsInfo = {4, gRoute125_WaterMons};
-
-const struct WildPokemon gRoute125_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute125_FishingMonsInfo = {30, gRoute125_FishingMons};
-
-const struct WildPokemon gRoute126_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute126_WaterMonsInfo = {4, gRoute126_WaterMons};
-
-const struct WildPokemon gRoute126_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute126_FishingMonsInfo = {30, gRoute126_FishingMons};
-
-const struct WildPokemon gRoute127_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute127_WaterMonsInfo = {4, gRoute127_WaterMons};
-
-const struct WildPokemon gRoute127_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute127_FishingMonsInfo = {30, gRoute127_FishingMons};
-
-const struct WildPokemon gRoute128_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute128_WaterMonsInfo = {4, gRoute128_WaterMons};
-
-const struct WildPokemon gRoute128_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_LUVDISC},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_LUVDISC},
-    {30, 35, SPECIES_WAILMER},
-    {30, 35, SPECIES_CORSOLA},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute128_FishingMonsInfo = {30, gRoute128_FishingMons};
-
-const struct WildPokemon gRoute129_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_WAILORD},
-};
-
-const struct WildPokemonInfo gRoute129_WaterMonsInfo = {4, gRoute129_WaterMons};
-
-const struct WildPokemon gRoute129_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute129_FishingMonsInfo = {30, gRoute129_FishingMons};
-
-const struct WildPokemon gRoute130_LandMons[] =
-{
-    {30, 30, SPECIES_WYNAUT},
-    {35, 35, SPECIES_WYNAUT},
-    {25, 25, SPECIES_WYNAUT},
-    {40, 40, SPECIES_WYNAUT},
-    {20, 20, SPECIES_WYNAUT},
-    {45, 45, SPECIES_WYNAUT},
-    {15, 15, SPECIES_WYNAUT},
-    {50, 50, SPECIES_WYNAUT},
-    {10, 10, SPECIES_WYNAUT},
-    {5, 5, SPECIES_WYNAUT},
-    {10, 10, SPECIES_WYNAUT},
-    {5, 5, SPECIES_WYNAUT},
-};
-
-const struct WildPokemonInfo gRoute130_LandMonsInfo = {20, gRoute130_LandMons};
-
-const struct WildPokemon gRoute130_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute130_WaterMonsInfo = {4, gRoute130_WaterMons};
-
-const struct WildPokemon gRoute130_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute130_FishingMonsInfo = {30, gRoute130_FishingMons};
-
-const struct WildPokemon gRoute131_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute131_WaterMonsInfo = {4, gRoute131_WaterMons};
-
-const struct WildPokemon gRoute131_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute131_FishingMonsInfo = {30, gRoute131_FishingMons};
-
-const struct WildPokemon gRoute132_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute132_WaterMonsInfo = {4, gRoute132_WaterMons};
-
-const struct WildPokemon gRoute132_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_HORSEA},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute132_FishingMonsInfo = {30, gRoute132_FishingMons};
-
-const struct WildPokemon gRoute133_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute133_WaterMonsInfo = {4, gRoute133_WaterMons};
-
-const struct WildPokemon gRoute133_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_HORSEA},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute133_FishingMonsInfo = {30, gRoute133_FishingMons};
-
-const struct WildPokemon gRoute134_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gRoute134_WaterMonsInfo = {4, gRoute134_WaterMons};
-
-const struct WildPokemon gRoute134_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_HORSEA},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gRoute134_FishingMonsInfo = {30, gRoute134_FishingMons};
-
-const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_TENTACOOL},
-    {30, 35, SPECIES_TENTACRUEL},
-};
-
-const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo = {4, gAbandonedShip_HiddenFloorCorridors_WaterMons};
-
-const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_TENTACOOL},
-    {25, 30, SPECIES_TENTACOOL},
-    {30, 35, SPECIES_TENTACOOL},
-    {30, 35, SPECIES_TENTACRUEL},
-    {25, 30, SPECIES_TENTACRUEL},
-    {20, 25, SPECIES_TENTACRUEL},
-};
-
-const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo = {20, gAbandonedShip_HiddenFloorCorridors_FishingMons};
-
-const struct WildPokemon gSeafloorCavern_Room1_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room1_LandMonsInfo = {4, gSeafloorCavern_Room1_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room2_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room2_LandMonsInfo = {4, gSeafloorCavern_Room2_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room3_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room3_LandMonsInfo = {4, gSeafloorCavern_Room3_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room4_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room4_LandMonsInfo = {4, gSeafloorCavern_Room4_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room5_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room5_LandMonsInfo = {4, gSeafloorCavern_Room5_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room6_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room6_LandMonsInfo = {4, gSeafloorCavern_Room6_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room6_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_GOLBAT},
-    {30, 35, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room6_WaterMonsInfo = {4, gSeafloorCavern_Room6_WaterMons};
-
-const struct WildPokemon gSeafloorCavern_Room6_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room6_FishingMonsInfo = {10, gSeafloorCavern_Room6_FishingMons};
-
-const struct WildPokemon gSeafloorCavern_Room7_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room7_LandMonsInfo = {4, gSeafloorCavern_Room7_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Room7_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_GOLBAT},
-    {30, 35, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room7_WaterMonsInfo = {4, gSeafloorCavern_Room7_WaterMons};
-
-const struct WildPokemon gSeafloorCavern_Room7_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room7_FishingMonsInfo = {10, gSeafloorCavern_Room7_FishingMons};
-
-const struct WildPokemon gSeafloorCavern_Room8_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Room8_LandMonsInfo = {4, gSeafloorCavern_Room8_LandMons};
-
-const struct WildPokemon gSeafloorCavern_Entrance_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_GOLBAT},
-    {30, 35, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Entrance_WaterMonsInfo = {4, gSeafloorCavern_Entrance_WaterMons};
-
-const struct WildPokemon gSeafloorCavern_Entrance_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gSeafloorCavern_Entrance_FishingMonsInfo = {10, gSeafloorCavern_Entrance_FishingMons};
-
-const struct WildPokemon gCaveOfOrigin_Entrance_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {33, 33, SPECIES_ZUBAT},
-    {28, 28, SPECIES_ZUBAT},
-    {29, 29, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {35, 35, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gCaveOfOrigin_Entrance_LandMonsInfo = {4, gCaveOfOrigin_Entrance_LandMons};
-
-const struct WildPokemon gCaveOfOrigin_1F_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SABLEYE},
-    {32, 32, SPECIES_SABLEYE},
-    {34, 34, SPECIES_SABLEYE},
-    {33, 33, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gCaveOfOrigin_1F_LandMonsInfo = {4, gCaveOfOrigin_1F_LandMons};
-
-const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap1_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SABLEYE},
-    {32, 32, SPECIES_SABLEYE},
-    {34, 34, SPECIES_SABLEYE},
-    {33, 33, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap1_LandMons};
-
-const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap2_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SABLEYE},
-    {32, 32, SPECIES_SABLEYE},
-    {34, 34, SPECIES_SABLEYE},
-    {33, 33, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap2_LandMons};
-
-const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap3_LandMons[] =
-{
-    {30, 30, SPECIES_ZUBAT},
-    {31, 31, SPECIES_ZUBAT},
-    {32, 32, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SABLEYE},
-    {32, 32, SPECIES_SABLEYE},
-    {34, 34, SPECIES_SABLEYE},
-    {33, 33, SPECIES_ZUBAT},
-    {34, 34, SPECIES_ZUBAT},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {36, 36, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap3_LandMons};
-
-const struct WildPokemon gNewMauville_Entrance_LandMons[] =
-{
-    {24, 24, SPECIES_VOLTORB},
-    {24, 24, SPECIES_MAGNEMITE},
-    {25, 25, SPECIES_VOLTORB},
-    {25, 25, SPECIES_MAGNEMITE},
-    {23, 23, SPECIES_VOLTORB},
-    {23, 23, SPECIES_MAGNEMITE},
-    {26, 26, SPECIES_VOLTORB},
-    {26, 26, SPECIES_MAGNEMITE},
-    {22, 22, SPECIES_VOLTORB},
-    {22, 22, SPECIES_MAGNEMITE},
-    {22, 22, SPECIES_VOLTORB},
-    {22, 22, SPECIES_MAGNEMITE},
-};
-
-const struct WildPokemonInfo gNewMauville_Entrance_LandMonsInfo = {10, gNewMauville_Entrance_LandMons};
-
-const struct WildPokemon gSafariZone_Southwest_LandMons[] =
-{
-    {25, 25, SPECIES_ODDISH},
-    {27, 27, SPECIES_ODDISH},
-    {25, 25, SPECIES_GIRAFARIG},
-    {27, 27, SPECIES_GIRAFARIG},
-    {25, 25, SPECIES_NATU},
-    {27, 27, SPECIES_DODUO},
-    {25, 25, SPECIES_GLOOM},
-    {27, 27, SPECIES_WOBBUFFET},
-    {25, 25, SPECIES_PIKACHU},
-    {27, 27, SPECIES_WOBBUFFET},
-    {27, 27, SPECIES_PIKACHU},
-    {29, 29, SPECIES_WOBBUFFET},
-};
-
-const struct WildPokemonInfo gSafariZone_Southwest_LandMonsInfo = {25, gSafariZone_Southwest_LandMons};
-
-const struct WildPokemon gSafariZone_Southwest_WaterMons[] =
-{
-    {20, 30, SPECIES_PSYDUCK},
-    {20, 30, SPECIES_PSYDUCK},
-    {30, 35, SPECIES_PSYDUCK},
-    {30, 35, SPECIES_PSYDUCK},
-    {30, 35, SPECIES_PSYDUCK},
-};
-
-const struct WildPokemonInfo gSafariZone_Southwest_WaterMonsInfo = {9, gSafariZone_Southwest_WaterMons};
-
-const struct WildPokemon gSafariZone_Southwest_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 25, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_GOLDEEN},
-    {25, 30, SPECIES_GOLDEEN},
-    {30, 35, SPECIES_GOLDEEN},
-    {30, 35, SPECIES_SEAKING},
-    {35, 40, SPECIES_SEAKING},
-    {25, 30, SPECIES_SEAKING},
-};
-
-const struct WildPokemonInfo gSafariZone_Southwest_FishingMonsInfo = {35, gSafariZone_Southwest_FishingMons};
-
-const struct WildPokemon gSafariZone_North_LandMons[] =
-{
-    {27, 27, SPECIES_PHANPY},
-    {27, 27, SPECIES_ODDISH},
-    {29, 29, SPECIES_PHANPY},
-    {29, 29, SPECIES_ODDISH},
-    {27, 27, SPECIES_NATU},
-    {29, 29, SPECIES_GLOOM},
-    {31, 31, SPECIES_GLOOM},
-    {29, 29, SPECIES_NATU},
-    {29, 29, SPECIES_XATU},
-    {27, 27, SPECIES_HERACROSS},
-    {31, 31, SPECIES_XATU},
-    {29, 29, SPECIES_HERACROSS},
-};
-
-const struct WildPokemonInfo gSafariZone_North_LandMonsInfo = {25, gSafariZone_North_LandMons};
-
-const struct WildPokemon gSafariZone_North_RockSmashMons[] =
-{
-    {10, 15, SPECIES_GEODUDE},
-    {5, 10, SPECIES_GEODUDE},
-    {15, 20, SPECIES_GEODUDE},
-    {20, 25, SPECIES_GEODUDE},
-    {25, 30, SPECIES_GEODUDE},
-};
-
-const struct WildPokemonInfo gSafariZone_North_RockSmashMonsInfo = {25, gSafariZone_North_RockSmashMons};
-
-const struct WildPokemon gSafariZone_Northwest_LandMons[] =
-{
-    {27, 27, SPECIES_RHYHORN},
-    {27, 27, SPECIES_ODDISH},
-    {29, 29, SPECIES_RHYHORN},
-    {29, 29, SPECIES_ODDISH},
-    {27, 27, SPECIES_DODUO},
-    {29, 29, SPECIES_GLOOM},
-    {31, 31, SPECIES_GLOOM},
-    {29, 29, SPECIES_DODUO},
-    {29, 29, SPECIES_DODRIO},
-    {27, 27, SPECIES_PINSIR},
-    {31, 31, SPECIES_DODRIO},
-    {29, 29, SPECIES_PINSIR},
-};
-
-const struct WildPokemonInfo gSafariZone_Northwest_LandMonsInfo = {25, gSafariZone_Northwest_LandMons};
-
-const struct WildPokemon gSafariZone_Northwest_WaterMons[] =
-{
-    {20, 30, SPECIES_PSYDUCK},
-    {20, 30, SPECIES_PSYDUCK},
-    {30, 35, SPECIES_PSYDUCK},
-    {30, 35, SPECIES_GOLDUCK},
-    {25, 40, SPECIES_GOLDUCK},
-};
-
-const struct WildPokemonInfo gSafariZone_Northwest_WaterMonsInfo = {9, gSafariZone_Northwest_WaterMons};
-
-const struct WildPokemon gSafariZone_Northwest_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 25, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_GOLDEEN},
-    {25, 30, SPECIES_GOLDEEN},
-    {30, 35, SPECIES_GOLDEEN},
-    {30, 35, SPECIES_SEAKING},
-    {35, 40, SPECIES_SEAKING},
-    {25, 30, SPECIES_SEAKING},
-};
-
-const struct WildPokemonInfo gSafariZone_Northwest_FishingMonsInfo = {35, gSafariZone_Northwest_FishingMons};
-
-const struct WildPokemon gVictoryRoad_B1F_LandMons[] =
-{
-    {40, 40, SPECIES_GOLBAT},
-    {40, 40, SPECIES_HARIYAMA},
-    {40, 40, SPECIES_LAIRON},
-    {40, 40, SPECIES_LAIRON},
-    {38, 38, SPECIES_GOLBAT},
-    {38, 38, SPECIES_HARIYAMA},
-    {42, 42, SPECIES_GOLBAT},
-    {42, 42, SPECIES_HARIYAMA},
-    {42, 42, SPECIES_LAIRON},
-    {38, 38, SPECIES_MAWILE},
-    {42, 42, SPECIES_LAIRON},
-    {38, 38, SPECIES_MAWILE},
-};
-
-const struct WildPokemonInfo gVictoryRoad_B1F_LandMonsInfo = {10, gVictoryRoad_B1F_LandMons};
-
-const struct WildPokemon gVictoryRoad_B1F_RockSmashMons[] =
-{
-    {30, 40, SPECIES_GRAVELER},
-    {30, 40, SPECIES_GEODUDE},
-    {35, 40, SPECIES_GRAVELER},
-    {35, 40, SPECIES_GRAVELER},
-    {35, 40, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gVictoryRoad_B1F_RockSmashMonsInfo = {20, gVictoryRoad_B1F_RockSmashMons};
-
-const struct WildPokemon gVictoryRoad_B2F_LandMons[] =
-{
-    {40, 40, SPECIES_GOLBAT},
-    {40, 40, SPECIES_SABLEYE},
-    {40, 40, SPECIES_LAIRON},
-    {40, 40, SPECIES_LAIRON},
-    {42, 42, SPECIES_GOLBAT},
-    {42, 42, SPECIES_SABLEYE},
-    {44, 44, SPECIES_GOLBAT},
-    {44, 44, SPECIES_SABLEYE},
-    {42, 42, SPECIES_LAIRON},
-    {42, 42, SPECIES_MAWILE},
-    {44, 44, SPECIES_LAIRON},
-    {44, 44, SPECIES_MAWILE},
-};
-
-const struct WildPokemonInfo gVictoryRoad_B2F_LandMonsInfo = {10, gVictoryRoad_B2F_LandMons};
-
-const struct WildPokemon gVictoryRoad_B2F_WaterMons[] =
-{
-    {30, 35, SPECIES_GOLBAT},
-    {25, 30, SPECIES_GOLBAT},
-    {35, 40, SPECIES_GOLBAT},
-    {35, 40, SPECIES_GOLBAT},
-    {35, 40, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gVictoryRoad_B2F_WaterMonsInfo = {4, gVictoryRoad_B2F_WaterMons};
-
-const struct WildPokemon gVictoryRoad_B2F_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {30, 35, SPECIES_WHISCASH},
-    {35, 40, SPECIES_WHISCASH},
-    {40, 45, SPECIES_WHISCASH},
-};
-
-const struct WildPokemonInfo gVictoryRoad_B2F_FishingMonsInfo = {30, gVictoryRoad_B2F_FishingMons};
-
-const struct WildPokemon gMeteorFalls_1F_1R_LandMons[] =
-{
-    {16, 16, SPECIES_ZUBAT},
-    {17, 17, SPECIES_ZUBAT},
-    {18, 18, SPECIES_ZUBAT},
-    {15, 15, SPECIES_ZUBAT},
-    {14, 14, SPECIES_ZUBAT},
-    {16, 16, SPECIES_SOLROCK},
-    {18, 18, SPECIES_SOLROCK},
-    {14, 14, SPECIES_SOLROCK},
-    {19, 19, SPECIES_ZUBAT},
-    {20, 20, SPECIES_ZUBAT},
-    {19, 19, SPECIES_ZUBAT},
-    {20, 20, SPECIES_ZUBAT},
-};
-
-const struct WildPokemonInfo gMeteorFalls_1F_1R_LandMonsInfo = {10, gMeteorFalls_1F_1R_LandMons};
-
-const struct WildPokemon gMeteorFalls_1F_1R_WaterMons[] =
-{
-    {5, 35, SPECIES_ZUBAT},
-    {30, 35, SPECIES_ZUBAT},
-    {25, 35, SPECIES_SOLROCK},
-    {15, 25, SPECIES_SOLROCK},
-    {5, 15, SPECIES_SOLROCK},
-};
-
-const struct WildPokemonInfo gMeteorFalls_1F_1R_WaterMonsInfo = {4, gMeteorFalls_1F_1R_WaterMons};
-
-const struct WildPokemon gMeteorFalls_1F_1R_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {20, 25, SPECIES_BARBOACH},
-    {35, 40, SPECIES_BARBOACH},
-    {40, 45, SPECIES_BARBOACH},
-};
-
-const struct WildPokemonInfo gMeteorFalls_1F_1R_FishingMonsInfo = {30, gMeteorFalls_1F_1R_FishingMons};
-
-const struct WildPokemon gMeteorFalls_1F_2R_LandMons[] =
-{
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_SOLROCK},
-    {33, 33, SPECIES_SOLROCK},
-    {37, 37, SPECIES_SOLROCK},
-    {35, 35, SPECIES_GOLBAT},
-    {39, 39, SPECIES_SOLROCK},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gMeteorFalls_1F_2R_LandMonsInfo = {10, gMeteorFalls_1F_2R_LandMons};
-
-const struct WildPokemon gMeteorFalls_1F_2R_WaterMons[] =
-{
-    {30, 35, SPECIES_GOLBAT},
-    {30, 35, SPECIES_GOLBAT},
-    {25, 35, SPECIES_SOLROCK},
-    {15, 25, SPECIES_SOLROCK},
-    {5, 15, SPECIES_SOLROCK},
-};
-
-const struct WildPokemonInfo gMeteorFalls_1F_2R_WaterMonsInfo = {4, gMeteorFalls_1F_2R_WaterMons};
-
-const struct WildPokemon gMeteorFalls_1F_2R_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {30, 35, SPECIES_WHISCASH},
-    {35, 40, SPECIES_WHISCASH},
-    {40, 45, SPECIES_WHISCASH},
-};
-
-const struct WildPokemonInfo gMeteorFalls_1F_2R_FishingMonsInfo = {30, gMeteorFalls_1F_2R_FishingMons};
-
-const struct WildPokemon gMeteorFalls_B1F_1R_LandMons[] =
-{
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_SOLROCK},
-    {33, 33, SPECIES_SOLROCK},
-    {37, 37, SPECIES_SOLROCK},
-    {35, 35, SPECIES_GOLBAT},
-    {39, 39, SPECIES_SOLROCK},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gMeteorFalls_B1F_1R_LandMonsInfo = {10, gMeteorFalls_B1F_1R_LandMons};
-
-const struct WildPokemon gMeteorFalls_B1F_1R_WaterMons[] =
-{
-    {30, 35, SPECIES_GOLBAT},
-    {30, 35, SPECIES_GOLBAT},
-    {25, 35, SPECIES_SOLROCK},
-    {15, 25, SPECIES_SOLROCK},
-    {5, 15, SPECIES_SOLROCK},
-};
-
-const struct WildPokemonInfo gMeteorFalls_B1F_1R_WaterMonsInfo = {4, gMeteorFalls_B1F_1R_WaterMons};
-
-const struct WildPokemon gMeteorFalls_B1F_1R_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_BARBOACH},
-    {25, 30, SPECIES_BARBOACH},
-    {30, 35, SPECIES_BARBOACH},
-    {30, 35, SPECIES_WHISCASH},
-    {35, 40, SPECIES_WHISCASH},
-    {40, 45, SPECIES_WHISCASH},
-};
-
-const struct WildPokemonInfo gMeteorFalls_B1F_1R_FishingMonsInfo = {30, gMeteorFalls_B1F_1R_FishingMons};
-
-const struct WildPokemon gShoalCave_LowTideStairsRoom_LandMons[] =
-{
-    {26, 26, SPECIES_ZUBAT},
-    {26, 26, SPECIES_SPHEAL},
-    {28, 28, SPECIES_ZUBAT},
-    {28, 28, SPECIES_SPHEAL},
-    {30, 30, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SPHEAL},
-    {32, 32, SPECIES_ZUBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideStairsRoom_LandMonsInfo = {10, gShoalCave_LowTideStairsRoom_LandMons};
-
-const struct WildPokemon gShoalCave_LowTideLowerRoom_LandMons[] =
-{
-    {26, 26, SPECIES_ZUBAT},
-    {26, 26, SPECIES_SPHEAL},
-    {28, 28, SPECIES_ZUBAT},
-    {28, 28, SPECIES_SPHEAL},
-    {30, 30, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SPHEAL},
-    {32, 32, SPECIES_ZUBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideLowerRoom_LandMonsInfo = {10, gShoalCave_LowTideLowerRoom_LandMons};
-
-const struct WildPokemon gShoalCave_LowTideInnerRoom_LandMons[] =
-{
-    {26, 26, SPECIES_ZUBAT},
-    {26, 26, SPECIES_SPHEAL},
-    {28, 28, SPECIES_ZUBAT},
-    {28, 28, SPECIES_SPHEAL},
-    {30, 30, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SPHEAL},
-    {32, 32, SPECIES_ZUBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_LandMonsInfo = {10, gShoalCave_LowTideInnerRoom_LandMons};
-
-const struct WildPokemon gShoalCave_LowTideInnerRoom_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_ZUBAT},
-    {25, 30, SPECIES_SPHEAL},
-    {25, 30, SPECIES_SPHEAL},
-    {25, 35, SPECIES_SPHEAL},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_WaterMonsInfo = {4, gShoalCave_LowTideInnerRoom_WaterMons};
-
-const struct WildPokemon gShoalCave_LowTideInnerRoom_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_FishingMonsInfo = {10, gShoalCave_LowTideInnerRoom_FishingMons};
-
-const struct WildPokemon gShoalCave_LowTideEntranceRoom_LandMons[] =
-{
-    {26, 26, SPECIES_ZUBAT},
-    {26, 26, SPECIES_SPHEAL},
-    {28, 28, SPECIES_ZUBAT},
-    {28, 28, SPECIES_SPHEAL},
-    {30, 30, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SPHEAL},
-    {32, 32, SPECIES_ZUBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-    {32, 32, SPECIES_GOLBAT},
-    {32, 32, SPECIES_SPHEAL},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_LandMonsInfo = {10, gShoalCave_LowTideEntranceRoom_LandMons};
-
-const struct WildPokemon gShoalCave_LowTideEntranceRoom_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {5, 35, SPECIES_ZUBAT},
-    {25, 30, SPECIES_SPHEAL},
-    {25, 30, SPECIES_SPHEAL},
-    {25, 35, SPECIES_SPHEAL},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_WaterMonsInfo = {4, gShoalCave_LowTideEntranceRoom_WaterMons};
-
-const struct WildPokemon gShoalCave_LowTideEntranceRoom_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_FishingMonsInfo = {10, gShoalCave_LowTideEntranceRoom_FishingMons};
-
-const struct WildPokemon gLilycoveCity_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gLilycoveCity_WaterMonsInfo = {4, gLilycoveCity_WaterMons};
-
-const struct WildPokemon gLilycoveCity_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_STARYU},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gLilycoveCity_FishingMonsInfo = {10, gLilycoveCity_FishingMons};
-
-const struct WildPokemon gDewfordTown_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gDewfordTown_WaterMonsInfo = {4, gDewfordTown_WaterMons};
-
-const struct WildPokemon gDewfordTown_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gDewfordTown_FishingMonsInfo = {10, gDewfordTown_FishingMons};
-
-const struct WildPokemon gSlateportCity_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gSlateportCity_WaterMonsInfo = {4, gSlateportCity_WaterMons};
-
-const struct WildPokemon gSlateportCity_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_WAILMER},
-    {20, 25, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gSlateportCity_FishingMonsInfo = {10, gSlateportCity_FishingMons};
-
-const struct WildPokemon gMossdeepCity_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gMossdeepCity_WaterMonsInfo = {4, gMossdeepCity_WaterMons};
-
-const struct WildPokemon gMossdeepCity_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gMossdeepCity_FishingMonsInfo = {10, gMossdeepCity_FishingMons};
-
-const struct WildPokemon gPacifidlogTown_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gPacifidlogTown_WaterMonsInfo = {4, gPacifidlogTown_WaterMons};
-
-const struct WildPokemon gPacifidlogTown_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_SHARPEDO},
-    {30, 35, SPECIES_WAILMER},
-    {25, 30, SPECIES_WAILMER},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gPacifidlogTown_FishingMonsInfo = {10, gPacifidlogTown_FishingMons};
-
-const struct WildPokemon gEverGrandeCity_WaterMons[] =
-{
-    {5, 35, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_WINGULL},
-    {15, 25, SPECIES_WINGULL},
-    {25, 30, SPECIES_PELIPPER},
-    {25, 30, SPECIES_PELIPPER},
-};
-
-const struct WildPokemonInfo gEverGrandeCity_WaterMonsInfo = {4, gEverGrandeCity_WaterMons};
-
-const struct WildPokemon gEverGrandeCity_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_LUVDISC},
-    {10, 30, SPECIES_WAILMER},
-    {30, 35, SPECIES_LUVDISC},
-    {30, 35, SPECIES_WAILMER},
-    {30, 35, SPECIES_CORSOLA},
-    {35, 40, SPECIES_WAILMER},
-    {40, 45, SPECIES_WAILMER},
-};
-
-const struct WildPokemonInfo gEverGrandeCity_FishingMonsInfo = {10, gEverGrandeCity_FishingMons};
-
-const struct WildPokemon gPetalburgCity_WaterMons[] =
-{
-    {20, 30, SPECIES_MARILL},
-    {10, 20, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-    {5, 10, SPECIES_MARILL},
-};
-
-const struct WildPokemonInfo gPetalburgCity_WaterMonsInfo = {1, gPetalburgCity_WaterMons};
-
-const struct WildPokemon gPetalburgCity_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_GOLDEEN},
-    {10, 30, SPECIES_CORPHISH},
-    {25, 30, SPECIES_CORPHISH},
-    {30, 35, SPECIES_CORPHISH},
-    {20, 25, SPECIES_CORPHISH},
-    {35, 40, SPECIES_CORPHISH},
-    {40, 45, SPECIES_CORPHISH},
-};
-
-const struct WildPokemonInfo gPetalburgCity_FishingMonsInfo = {10, gPetalburgCity_FishingMons};
-
-const struct WildPokemon gUnderwater1_WaterMons[] =
-{
-    {20, 30, SPECIES_CLAMPERL},
-    {20, 30, SPECIES_CHINCHOU},
-    {30, 35, SPECIES_CLAMPERL},
-    {30, 35, SPECIES_RELICANTH},
-    {30, 35, SPECIES_RELICANTH},
-};
-
-const struct WildPokemonInfo gUnderwater1_WaterMonsInfo = {4, gUnderwater1_WaterMons};
-
-const struct WildPokemon gShoalCave_LowTideIceRoom_LandMons[] =
-{
-    {26, 26, SPECIES_ZUBAT},
-    {26, 26, SPECIES_SPHEAL},
-    {28, 28, SPECIES_ZUBAT},
-    {28, 28, SPECIES_SPHEAL},
-    {30, 30, SPECIES_ZUBAT},
-    {30, 30, SPECIES_SPHEAL},
-    {26, 26, SPECIES_SNORUNT},
-    {32, 32, SPECIES_SPHEAL},
-    {30, 30, SPECIES_GOLBAT},
-    {28, 28, SPECIES_SNORUNT},
-    {32, 32, SPECIES_GOLBAT},
-    {30, 30, SPECIES_SNORUNT},
-};
-
-const struct WildPokemonInfo gShoalCave_LowTideIceRoom_LandMonsInfo = {10, gShoalCave_LowTideIceRoom_LandMons};
-
-const struct WildPokemon gSkyPillar_1F_LandMons[] =
-{
-    {33, 33, SPECIES_SABLEYE},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {34, 34, SPECIES_SABLEYE},
-    {36, 36, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_BANETTE},
-    {38, 38, SPECIES_BANETTE},
-    {36, 36, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_CLAYDOL},
-    {38, 38, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_CLAYDOL},
-    {38, 38, SPECIES_CLAYDOL},
-};
-
-const struct WildPokemonInfo gSkyPillar_1F_LandMonsInfo = {10, gSkyPillar_1F_LandMons};
-
-const struct WildPokemon gSootopolisCity_WaterMons[] =
-{
-    {5, 35, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_MAGIKARP},
-    {15, 25, SPECIES_MAGIKARP},
-    {25, 30, SPECIES_MAGIKARP},
-    {25, 30, SPECIES_MAGIKARP},
-};
-
-const struct WildPokemonInfo gSootopolisCity_WaterMonsInfo = {1, gSootopolisCity_WaterMons};
-
-const struct WildPokemon gSootopolisCity_FishingMons[] =
-{
-    {5, 10, SPECIES_MAGIKARP},
-    {5, 10, SPECIES_TENTACOOL},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_MAGIKARP},
-    {10, 30, SPECIES_MAGIKARP},
-    {30, 35, SPECIES_MAGIKARP},
-    {30, 35, SPECIES_MAGIKARP},
-    {35, 40, SPECIES_GYARADOS},
-    {35, 45, SPECIES_GYARADOS},
-    {5, 45, SPECIES_GYARADOS},
-};
-
-const struct WildPokemonInfo gSootopolisCity_FishingMonsInfo = {10, gSootopolisCity_FishingMons};
-
-const struct WildPokemon gSkyPillar_3F_LandMons[] =
-{
-    {33, 33, SPECIES_SABLEYE},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {34, 34, SPECIES_SABLEYE},
-    {36, 36, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_BANETTE},
-    {38, 38, SPECIES_BANETTE},
-    {36, 36, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_CLAYDOL},
-    {38, 38, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_CLAYDOL},
-    {38, 38, SPECIES_CLAYDOL},
-};
-
-const struct WildPokemonInfo gSkyPillar_3F_LandMonsInfo = {10, gSkyPillar_3F_LandMons};
-
-const struct WildPokemon gSkyPillar_5F_LandMons[] =
-{
-    {33, 33, SPECIES_SABLEYE},
-    {34, 34, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {34, 34, SPECIES_SABLEYE},
-    {36, 36, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_BANETTE},
-    {38, 38, SPECIES_BANETTE},
-    {36, 36, SPECIES_CLAYDOL},
-    {37, 37, SPECIES_CLAYDOL},
-    {38, 38, SPECIES_ALTARIA},
-    {39, 39, SPECIES_ALTARIA},
-    {39, 39, SPECIES_ALTARIA},
-};
-
-const struct WildPokemonInfo gSkyPillar_5F_LandMonsInfo = {10, gSkyPillar_5F_LandMons};
-
-const struct WildPokemon gSafariZone_Southeast_LandMons[] =
-{
-    {33, 33, SPECIES_SUNKERN},
-    {34, 34, SPECIES_MAREEP},
-    {35, 35, SPECIES_SUNKERN},
-    {36, 36, SPECIES_MAREEP},
-    {34, 34, SPECIES_AIPOM},
-    {33, 33, SPECIES_SPINARAK},
-    {35, 35, SPECIES_HOOTHOOT},
-    {34, 34, SPECIES_SNUBBULL},
-    {36, 36, SPECIES_STANTLER},
-    {37, 37, SPECIES_GLIGAR},
-    {39, 39, SPECIES_STANTLER},
-    {40, 40, SPECIES_GLIGAR},
-};
-
-const struct WildPokemonInfo gSafariZone_Southeast_LandMonsInfo = {25, gSafariZone_Southeast_LandMons};
-
-const struct WildPokemon gSafariZone_Southeast_WaterMons[] =
-{
-    {25, 30, SPECIES_WOOPER},
-    {25, 30, SPECIES_MARILL},
-    {25, 30, SPECIES_MARILL},
-    {30, 35, SPECIES_MARILL},
-    {35, 40, SPECIES_QUAGSIRE},
-};
-
-const struct WildPokemonInfo gSafariZone_Southeast_WaterMonsInfo = {9, gSafariZone_Southeast_WaterMons};
-
-const struct WildPokemon gSafariZone_Southeast_FishingMons[] =
-{
-    {25, 30, SPECIES_MAGIKARP},
-    {25, 30, SPECIES_GOLDEEN},
-    {25, 30, SPECIES_MAGIKARP},
-    {25, 30, SPECIES_GOLDEEN},
-    {30, 35, SPECIES_REMORAID},
-    {25, 30, SPECIES_GOLDEEN},
-    {25, 30, SPECIES_REMORAID},
-    {30, 35, SPECIES_REMORAID},
-    {30, 35, SPECIES_REMORAID},
-    {35, 40, SPECIES_OCTILLERY},
-};
-
-const struct WildPokemonInfo gSafariZone_Southeast_FishingMonsInfo = {35, gSafariZone_Southeast_FishingMons};
-
-const struct WildPokemon gSafariZone_Northeast_LandMons[] =
-{
-    {33, 33, SPECIES_AIPOM},
-    {34, 34, SPECIES_TEDDIURSA},
-    {35, 35, SPECIES_AIPOM},
-    {36, 36, SPECIES_TEDDIURSA},
-    {34, 34, SPECIES_SUNKERN},
-    {33, 33, SPECIES_LEDYBA},
-    {35, 35, SPECIES_HOOTHOOT},
-    {34, 34, SPECIES_PINECO},
-    {36, 36, SPECIES_HOUNDOUR},
-    {37, 37, SPECIES_MILTANK},
-    {39, 39, SPECIES_HOUNDOUR},
-    {40, 40, SPECIES_MILTANK},
-};
-
-const struct WildPokemonInfo gSafariZone_Northeast_LandMonsInfo = {25, gSafariZone_Northeast_LandMons};
-
-const struct WildPokemon gSafariZone_Northeast_RockSmashMons[] =
-{
-    {25, 30, SPECIES_SHUCKLE},
-    {20, 25, SPECIES_SHUCKLE},
-    {30, 35, SPECIES_SHUCKLE},
-    {30, 35, SPECIES_SHUCKLE},
-    {35, 40, SPECIES_SHUCKLE},
-};
-
-const struct WildPokemonInfo gSafariZone_Northeast_RockSmashMonsInfo = {25, gSafariZone_Northeast_RockSmashMons};
-
-const struct WildPokemon gMagmaHideout_1F_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_1F_LandMonsInfo = {10, gMagmaHideout_1F_LandMons};
-
-const struct WildPokemon gMagmaHideout_2F_1R_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_2F_1R_LandMonsInfo = {10, gMagmaHideout_2F_1R_LandMons};
-
-const struct WildPokemon gMagmaHideout_2F_2R_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_2F_2R_LandMonsInfo = {10, gMagmaHideout_2F_2R_LandMons};
-
-const struct WildPokemon gMagmaHideout_3F_1R_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_3F_1R_LandMonsInfo = {10, gMagmaHideout_3F_1R_LandMons};
-
-const struct WildPokemon gMagmaHideout_3F_2R_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_3F_2R_LandMonsInfo = {10, gMagmaHideout_3F_2R_LandMons};
-
-const struct WildPokemon gMagmaHideout_4F_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_4F_LandMonsInfo = {10, gMagmaHideout_4F_LandMons};
-
-const struct WildPokemon gMagmaHideout_3F_3R_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_3F_3R_LandMonsInfo = {10, gMagmaHideout_3F_3R_LandMons};
-
-const struct WildPokemon gMagmaHideout_2F_3R_LandMons[] =
-{
-    {27, 27, SPECIES_GEODUDE},
-    {28, 28, SPECIES_TORKOAL},
-    {28, 28, SPECIES_GEODUDE},
-    {30, 30, SPECIES_TORKOAL},
-    {29, 29, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GEODUDE},
-    {30, 30, SPECIES_GRAVELER},
-    {30, 30, SPECIES_GRAVELER},
-    {31, 31, SPECIES_GRAVELER},
-    {32, 32, SPECIES_GRAVELER},
-    {33, 33, SPECIES_GRAVELER},
-};
-
-const struct WildPokemonInfo gMagmaHideout_2F_3R_LandMonsInfo = {10, gMagmaHideout_2F_3R_LandMons};
-
-const struct WildPokemon gMirageTower_1F_LandMons[] =
-{
-    {21, 21, SPECIES_SANDSHREW},
-    {21, 21, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {22, 22, SPECIES_SANDSHREW},
-    {22, 22, SPECIES_TRAPINCH},
-    {23, 23, SPECIES_SANDSHREW},
-    {23, 23, SPECIES_TRAPINCH},
-    {24, 24, SPECIES_SANDSHREW},
-    {24, 24, SPECIES_TRAPINCH},
-};
-
-const struct WildPokemonInfo gMirageTower_1F_LandMonsInfo = {10, gMirageTower_1F_LandMons};
-
-const struct WildPokemon gMirageTower_2F_LandMons[] =
-{
-    {21, 21, SPECIES_SANDSHREW},
-    {21, 21, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {22, 22, SPECIES_SANDSHREW},
-    {22, 22, SPECIES_TRAPINCH},
-    {23, 23, SPECIES_SANDSHREW},
-    {23, 23, SPECIES_TRAPINCH},
-    {24, 24, SPECIES_SANDSHREW},
-    {24, 24, SPECIES_TRAPINCH},
-};
-
-const struct WildPokemonInfo gMirageTower_2F_LandMonsInfo = {10, gMirageTower_2F_LandMons};
-
-const struct WildPokemon gMirageTower_3F_LandMons[] =
-{
-    {21, 21, SPECIES_SANDSHREW},
-    {21, 21, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {22, 22, SPECIES_SANDSHREW},
-    {22, 22, SPECIES_TRAPINCH},
-    {23, 23, SPECIES_SANDSHREW},
-    {23, 23, SPECIES_TRAPINCH},
-    {24, 24, SPECIES_SANDSHREW},
-    {24, 24, SPECIES_TRAPINCH},
-};
-
-const struct WildPokemonInfo gMirageTower_3F_LandMonsInfo = {10, gMirageTower_3F_LandMons};
-
-const struct WildPokemon gMirageTower_4F_LandMons[] =
-{
-    {21, 21, SPECIES_SANDSHREW},
-    {21, 21, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {20, 20, SPECIES_SANDSHREW},
-    {20, 20, SPECIES_TRAPINCH},
-    {22, 22, SPECIES_SANDSHREW},
-    {22, 22, SPECIES_TRAPINCH},
-    {23, 23, SPECIES_SANDSHREW},
-    {23, 23, SPECIES_TRAPINCH},
-    {24, 24, SPECIES_SANDSHREW},
-    {24, 24, SPECIES_TRAPINCH},
-};
-
-const struct WildPokemonInfo gMirageTower_4F_LandMonsInfo = {10, gMirageTower_4F_LandMons};
-
-const struct WildPokemon gDesertUnderpass_LandMons[] =
-{
-    {38, 38, SPECIES_DITTO},
-    {35, 35, SPECIES_WHISMUR},
-    {40, 40, SPECIES_DITTO},
-    {40, 40, SPECIES_LOUDRED},
-    {41, 41, SPECIES_DITTO},
-    {36, 36, SPECIES_WHISMUR},
-    {38, 38, SPECIES_LOUDRED},
-    {42, 42, SPECIES_DITTO},
-    {38, 38, SPECIES_WHISMUR},
-    {43, 43, SPECIES_DITTO},
-    {44, 44, SPECIES_LOUDRED},
-    {45, 45, SPECIES_DITTO},
-};
-
-const struct WildPokemonInfo gDesertUnderpass_LandMonsInfo = {10, gDesertUnderpass_LandMons};
-
-const struct WildPokemon gArtisanCave_B1F_LandMons[] =
-{
-    {40, 40, SPECIES_SMEARGLE},
-    {41, 41, SPECIES_SMEARGLE},
-    {42, 42, SPECIES_SMEARGLE},
-    {43, 43, SPECIES_SMEARGLE},
-    {44, 44, SPECIES_SMEARGLE},
-    {45, 45, SPECIES_SMEARGLE},
-    {46, 46, SPECIES_SMEARGLE},
-    {47, 47, SPECIES_SMEARGLE},
-    {48, 48, SPECIES_SMEARGLE},
-    {49, 49, SPECIES_SMEARGLE},
-    {50, 50, SPECIES_SMEARGLE},
-    {50, 50, SPECIES_SMEARGLE},
-};
-
-const struct WildPokemonInfo gArtisanCave_B1F_LandMonsInfo = {10, gArtisanCave_B1F_LandMons};
-
-const struct WildPokemon gArtisanCave_1F_LandMons[] =
-{
-    {40, 40, SPECIES_SMEARGLE},
-    {41, 41, SPECIES_SMEARGLE},
-    {42, 42, SPECIES_SMEARGLE},
-    {43, 43, SPECIES_SMEARGLE},
-    {44, 44, SPECIES_SMEARGLE},
-    {45, 45, SPECIES_SMEARGLE},
-    {46, 46, SPECIES_SMEARGLE},
-    {47, 47, SPECIES_SMEARGLE},
-    {48, 48, SPECIES_SMEARGLE},
-    {49, 49, SPECIES_SMEARGLE},
-    {50, 50, SPECIES_SMEARGLE},
-    {50, 50, SPECIES_SMEARGLE},
-};
-
-const struct WildPokemonInfo gArtisanCave_1F_LandMonsInfo = {10, gArtisanCave_1F_LandMons};
-
-const struct WildPokemon gAlteringCave1_LandMons[] =
-{
-    {10, 10, SPECIES_ZUBAT},
-    {12, 12, SPECIES_ZUBAT},
-    {8, 8, SPECIES_ZUBAT},
-    {14, 14, SPECIES_ZUBAT},
-    {10, 10, SPECIES_ZUBAT},
-    {12, 12, SPECIES_ZUBAT},
-    {16, 16, SPECIES_ZUBAT},
-    {6, 6, SPECIES_ZUBAT},
-    {8, 8, SPECIES_ZUBAT},
-    {14, 14, SPECIES_ZUBAT},
-    {8, 8, SPECIES_ZUBAT},
-    {14, 14, SPECIES_ZUBAT},
-};
-
-const struct WildPokemonInfo gAlteringCave1_LandMonsInfo = {7, gAlteringCave1_LandMons};
-
-const struct WildPokemon gAlteringCave2_LandMons[] =
-{
-    {7, 7, SPECIES_MAREEP},
-    {9, 9, SPECIES_MAREEP},
-    {5, 5, SPECIES_MAREEP},
-    {11, 11, SPECIES_MAREEP},
-    {7, 7, SPECIES_MAREEP},
-    {9, 9, SPECIES_MAREEP},
-    {13, 13, SPECIES_MAREEP},
-    {3, 3, SPECIES_MAREEP},
-    {5, 5, SPECIES_MAREEP},
-    {11, 11, SPECIES_MAREEP},
-    {5, 5, SPECIES_MAREEP},
-    {11, 11, SPECIES_MAREEP},
-};
-
-const struct WildPokemonInfo gAlteringCave2_LandMonsInfo = {7, gAlteringCave2_LandMons};
-
-const struct WildPokemon gAlteringCave3_LandMons[] =
-{
-    {23, 23, SPECIES_PINECO},
-    {25, 25, SPECIES_PINECO},
-    {22, 22, SPECIES_PINECO},
-    {27, 27, SPECIES_PINECO},
-    {23, 23, SPECIES_PINECO},
-    {25, 25, SPECIES_PINECO},
-    {29, 29, SPECIES_PINECO},
-    {19, 19, SPECIES_PINECO},
-    {21, 21, SPECIES_PINECO},
-    {27, 27, SPECIES_PINECO},
-    {21, 21, SPECIES_PINECO},
-    {27, 27, SPECIES_PINECO},
-};
-
-const struct WildPokemonInfo gAlteringCave3_LandMonsInfo = {7, gAlteringCave3_LandMons};
-
-const struct WildPokemon gAlteringCave4_LandMons[] =
-{
-    {16, 16, SPECIES_HOUNDOUR},
-    {18, 18, SPECIES_HOUNDOUR},
-    {14, 14, SPECIES_HOUNDOUR},
-    {20, 20, SPECIES_HOUNDOUR},
-    {16, 16, SPECIES_HOUNDOUR},
-    {18, 18, SPECIES_HOUNDOUR},
-    {22, 22, SPECIES_HOUNDOUR},
-    {12, 12, SPECIES_HOUNDOUR},
-    {14, 14, SPECIES_HOUNDOUR},
-    {20, 20, SPECIES_HOUNDOUR},
-    {14, 14, SPECIES_HOUNDOUR},
-    {20, 20, SPECIES_HOUNDOUR},
-};
-
-const struct WildPokemonInfo gAlteringCave4_LandMonsInfo = {7, gAlteringCave4_LandMons};
-
-const struct WildPokemon gAlteringCave5_LandMons[] =
-{
-    {10, 10, SPECIES_TEDDIURSA},
-    {12, 12, SPECIES_TEDDIURSA},
-    {8, 8, SPECIES_TEDDIURSA},
-    {14, 14, SPECIES_TEDDIURSA},
-    {10, 10, SPECIES_TEDDIURSA},
-    {12, 12, SPECIES_TEDDIURSA},
-    {16, 16, SPECIES_TEDDIURSA},
-    {6, 6, SPECIES_TEDDIURSA},
-    {8, 8, SPECIES_TEDDIURSA},
-    {14, 14, SPECIES_TEDDIURSA},
-    {8, 8, SPECIES_TEDDIURSA},
-    {14, 14, SPECIES_TEDDIURSA},
-};
-
-const struct WildPokemonInfo gAlteringCave5_LandMonsInfo = {7, gAlteringCave5_LandMons};
-
-const struct WildPokemon gAlteringCave6_LandMons[] =
-{
-    {22, 22, SPECIES_AIPOM},
-    {24, 24, SPECIES_AIPOM},
-    {20, 20, SPECIES_AIPOM},
-    {26, 26, SPECIES_AIPOM},
-    {22, 22, SPECIES_AIPOM},
-    {24, 24, SPECIES_AIPOM},
-    {28, 28, SPECIES_AIPOM},
-    {18, 18, SPECIES_AIPOM},
-    {20, 20, SPECIES_AIPOM},
-    {26, 26, SPECIES_AIPOM},
-    {20, 20, SPECIES_AIPOM},
-    {26, 26, SPECIES_AIPOM},
-};
-
-const struct WildPokemonInfo gAlteringCave6_LandMonsInfo = {7, gAlteringCave6_LandMons};
-
-const struct WildPokemon gAlteringCave7_LandMons[] =
-{
-    {22, 22, SPECIES_SHUCKLE},
-    {24, 24, SPECIES_SHUCKLE},
-    {20, 20, SPECIES_SHUCKLE},
-    {26, 26, SPECIES_SHUCKLE},
-    {22, 22, SPECIES_SHUCKLE},
-    {24, 24, SPECIES_SHUCKLE},
-    {28, 28, SPECIES_SHUCKLE},
-    {18, 18, SPECIES_SHUCKLE},
-    {20, 20, SPECIES_SHUCKLE},
-    {26, 26, SPECIES_SHUCKLE},
-    {20, 20, SPECIES_SHUCKLE},
-    {26, 26, SPECIES_SHUCKLE},
-};
-
-const struct WildPokemonInfo gAlteringCave7_LandMonsInfo = {7, gAlteringCave7_LandMons};
-
-const struct WildPokemon gAlteringCave8_LandMons[] =
-{
-    {22, 22, SPECIES_STANTLER},
-    {24, 24, SPECIES_STANTLER},
-    {20, 20, SPECIES_STANTLER},
-    {26, 26, SPECIES_STANTLER},
-    {22, 22, SPECIES_STANTLER},
-    {24, 24, SPECIES_STANTLER},
-    {28, 28, SPECIES_STANTLER},
-    {18, 18, SPECIES_STANTLER},
-    {20, 20, SPECIES_STANTLER},
-    {26, 26, SPECIES_STANTLER},
-    {20, 20, SPECIES_STANTLER},
-    {26, 26, SPECIES_STANTLER},
-};
-
-const struct WildPokemonInfo gAlteringCave8_LandMonsInfo = {7, gAlteringCave8_LandMons};
-
-const struct WildPokemon gAlteringCave9_LandMons[] =
-{
-    {22, 22, SPECIES_SMEARGLE},
-    {24, 24, SPECIES_SMEARGLE},
-    {20, 20, SPECIES_SMEARGLE},
-    {26, 26, SPECIES_SMEARGLE},
-    {22, 22, SPECIES_SMEARGLE},
-    {24, 24, SPECIES_SMEARGLE},
-    {28, 28, SPECIES_SMEARGLE},
-    {18, 18, SPECIES_SMEARGLE},
-    {20, 20, SPECIES_SMEARGLE},
-    {26, 26, SPECIES_SMEARGLE},
-    {20, 20, SPECIES_SMEARGLE},
-    {26, 26, SPECIES_SMEARGLE},
-};
-
-const struct WildPokemonInfo gAlteringCave9_LandMonsInfo = {7, gAlteringCave9_LandMons};
-
-const struct WildPokemon gMeteorFalls_StevensCave_LandMons[] =
-{
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_GOLBAT},
-    {33, 33, SPECIES_GOLBAT},
-    {35, 35, SPECIES_SOLROCK},
-    {33, 33, SPECIES_SOLROCK},
-    {37, 37, SPECIES_SOLROCK},
-    {35, 35, SPECIES_GOLBAT},
-    {39, 39, SPECIES_SOLROCK},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-    {38, 38, SPECIES_GOLBAT},
-    {40, 40, SPECIES_GOLBAT},
-};
-
-const struct WildPokemonInfo gMeteorFalls_StevensCave_LandMonsInfo = {10, gMeteorFalls_StevensCave_LandMons};
-
-//The actual headers that link the encounter tables to particular maps start here.
-
-const struct WildPokemonHeader gWildMonHeaders[] =
-{
-    {
-        .mapGroup = MAP_GROUP(ROUTE101),
-        .mapNum = MAP_NUM(ROUTE101),
-        .landMonsInfo = &gRoute101_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE102),
-        .mapNum = MAP_NUM(ROUTE102),
-        .landMonsInfo = &gRoute102_LandMonsInfo,
-        .waterMonsInfo = &gRoute102_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute102_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE103),
-        .mapNum = MAP_NUM(ROUTE103),
-        .landMonsInfo = &gRoute103_LandMonsInfo,
-        .waterMonsInfo = &gRoute103_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute103_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE104),
-        .mapNum = MAP_NUM(ROUTE104),
-        .landMonsInfo = &gRoute104_LandMonsInfo,
-        .waterMonsInfo = &gRoute104_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute104_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE105),
-        .mapNum = MAP_NUM(ROUTE105),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute105_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute105_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE110),
-        .mapNum = MAP_NUM(ROUTE110),
-        .landMonsInfo = &gRoute110_LandMonsInfo,
-        .waterMonsInfo = &gRoute110_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute110_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE111),
-        .mapNum = MAP_NUM(ROUTE111),
-        .landMonsInfo = &gRoute111_LandMonsInfo,
-        .waterMonsInfo = &gRoute111_WaterMonsInfo,
-        .rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo,
-        .fishingMonsInfo = &gRoute111_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE112),
-        .mapNum = MAP_NUM(ROUTE112),
-        .landMonsInfo = &gRoute112_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE113),
-        .mapNum = MAP_NUM(ROUTE113),
-        .landMonsInfo = &gRoute113_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE114),
-        .mapNum = MAP_NUM(ROUTE114),
-        .landMonsInfo = &gRoute114_LandMonsInfo,
-        .waterMonsInfo = &gRoute114_WaterMonsInfo,
-        .rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo,
-        .fishingMonsInfo = &gRoute114_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE116),
-        .mapNum = MAP_NUM(ROUTE116),
-        .landMonsInfo = &gRoute116_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE117),
-        .mapNum = MAP_NUM(ROUTE117),
-        .landMonsInfo = &gRoute117_LandMonsInfo,
-        .waterMonsInfo = &gRoute117_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute117_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE118),
-        .mapNum = MAP_NUM(ROUTE118),
-        .landMonsInfo = &gRoute118_LandMonsInfo,
-        .waterMonsInfo = &gRoute118_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute118_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE124),
-        .mapNum = MAP_NUM(ROUTE124),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute124_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute124_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(PETALBURG_WOODS),
-        .mapNum = MAP_NUM(PETALBURG_WOODS),
-        .landMonsInfo = &gPetalburgWoods_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(RUSTURF_TUNNEL),
-        .mapNum = MAP_NUM(RUSTURF_TUNNEL),
-        .landMonsInfo = &gRusturfTunnel_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(GRANITE_CAVE_1F),
-        .mapNum = MAP_NUM(GRANITE_CAVE_1F),
-        .landMonsInfo = &gGraniteCave_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F),
-        .mapNum = MAP_NUM(GRANITE_CAVE_B1F),
-        .landMonsInfo = &gGraniteCave_B1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_1F),
-        .mapNum = MAP_NUM(MT_PYRE_1F),
-        .landMonsInfo = &gMtPyre_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(VICTORY_ROAD_1F),
-        .mapNum = MAP_NUM(VICTORY_ROAD_1F),
-        .landMonsInfo = &gVictoryRoad_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH),
-        .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH),
-        .landMonsInfo = &gSafariZone_South_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(UNDERWATER2),
-        .mapNum = MAP_NUM(UNDERWATER2),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gUnderwater2_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F),
-        .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F),
-        .mapNum = MAP_NUM(GRANITE_CAVE_B2F),
-        .landMonsInfo = &gGraniteCave_B2F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(FIERY_PATH),
-        .mapNum = MAP_NUM(FIERY_PATH),
-        .landMonsInfo = &gFieryPath_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R),
-        .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R),
-        .landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo,
-        .waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(JAGGED_PASS),
-        .mapNum = MAP_NUM(JAGGED_PASS),
-        .landMonsInfo = &gJaggedPass_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE106),
-        .mapNum = MAP_NUM(ROUTE106),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute106_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute106_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE107),
-        .mapNum = MAP_NUM(ROUTE107),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute107_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute107_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE108),
-        .mapNum = MAP_NUM(ROUTE108),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute108_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute108_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE109),
-        .mapNum = MAP_NUM(ROUTE109),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute109_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute109_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE115),
-        .mapNum = MAP_NUM(ROUTE115),
-        .landMonsInfo = &gRoute115_LandMonsInfo,
-        .waterMonsInfo = &gRoute115_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute115_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE),
-        .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE),
-        .landMonsInfo = &gNewMauville_Inside_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE119),
-        .mapNum = MAP_NUM(ROUTE119),
-        .landMonsInfo = &gRoute119_LandMonsInfo,
-        .waterMonsInfo = &gRoute119_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute119_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE120),
-        .mapNum = MAP_NUM(ROUTE120),
-        .landMonsInfo = &gRoute120_LandMonsInfo,
-        .waterMonsInfo = &gRoute120_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute120_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE121),
-        .mapNum = MAP_NUM(ROUTE121),
-        .landMonsInfo = &gRoute121_LandMonsInfo,
-        .waterMonsInfo = &gRoute121_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute121_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE122),
-        .mapNum = MAP_NUM(ROUTE122),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute122_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute122_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE123),
-        .mapNum = MAP_NUM(ROUTE123),
-        .landMonsInfo = &gRoute123_LandMonsInfo,
-        .waterMonsInfo = &gRoute123_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute123_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_2F),
-        .mapNum = MAP_NUM(MT_PYRE_2F),
-        .landMonsInfo = &gMtPyre_2F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_3F),
-        .mapNum = MAP_NUM(MT_PYRE_3F),
-        .landMonsInfo = &gMtPyre_3F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_4F),
-        .mapNum = MAP_NUM(MT_PYRE_4F),
-        .landMonsInfo = &gMtPyre_4F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_5F),
-        .mapNum = MAP_NUM(MT_PYRE_5F),
-        .landMonsInfo = &gMtPyre_5F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_6F),
-        .mapNum = MAP_NUM(MT_PYRE_6F),
-        .landMonsInfo = &gMtPyre_6F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR),
-        .mapNum = MAP_NUM(MT_PYRE_EXTERIOR),
-        .landMonsInfo = &gMtPyre_Exterior_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT),
-        .mapNum = MAP_NUM(MT_PYRE_SUMMIT),
-        .landMonsInfo = &gMtPyre_Summit_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM),
-        .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM),
-        .landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE125),
-        .mapNum = MAP_NUM(ROUTE125),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute125_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute125_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE126),
-        .mapNum = MAP_NUM(ROUTE126),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute126_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute126_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE127),
-        .mapNum = MAP_NUM(ROUTE127),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute127_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute127_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE128),
-        .mapNum = MAP_NUM(ROUTE128),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute128_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute128_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE129),
-        .mapNum = MAP_NUM(ROUTE129),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute129_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute129_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE130),
-        .mapNum = MAP_NUM(ROUTE130),
-        .landMonsInfo = &gRoute130_LandMonsInfo,
-        .waterMonsInfo = &gRoute130_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute130_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE131),
-        .mapNum = MAP_NUM(ROUTE131),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute131_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute131_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE132),
-        .mapNum = MAP_NUM(ROUTE132),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute132_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute132_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE133),
-        .mapNum = MAP_NUM(ROUTE133),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute133_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute133_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ROUTE134),
-        .mapNum = MAP_NUM(ROUTE134),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gRoute134_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gRoute134_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
-        .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1),
-        .landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2),
-        .landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3),
-        .landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4),
-        .landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5),
-        .landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6),
-        .landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo,
-        .waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7),
-        .landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo,
-        .waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8),
-        .landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE),
-        .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE),
-        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE),
-        .landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F),
-        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F),
-        .landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
-        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
-        .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
-        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
-        .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
-        .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
-        .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE),
-        .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE),
-        .landMonsInfo = &gNewMauville_Entrance_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST),
-        .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST),
-        .landMonsInfo = &gSafariZone_Southwest_LandMonsInfo,
-        .waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH),
-        .mapNum = MAP_NUM(SAFARI_ZONE_NORTH),
-        .landMonsInfo = &gSafariZone_North_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST),
-        .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST),
-        .landMonsInfo = &gSafariZone_Northwest_LandMonsInfo,
-        .waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F),
-        .mapNum = MAP_NUM(VICTORY_ROAD_B1F),
-        .landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F),
-        .mapNum = MAP_NUM(VICTORY_ROAD_B2F),
-        .landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo,
-        .waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R),
-        .mapNum = MAP_NUM(METEOR_FALLS_1F_1R),
-        .landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo,
-        .waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R),
-        .mapNum = MAP_NUM(METEOR_FALLS_1F_2R),
-        .landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo,
-        .waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R),
-        .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R),
-        .landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo,
-        .waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
-        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
-        .landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
-        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
-        .landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
-        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
-        .landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo,
-        .waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
-        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
-        .landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo,
-        .waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(LILYCOVE_CITY),
-        .mapNum = MAP_NUM(LILYCOVE_CITY),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gLilycoveCity_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gLilycoveCity_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(DEWFORD_TOWN),
-        .mapNum = MAP_NUM(DEWFORD_TOWN),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gDewfordTown_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gDewfordTown_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SLATEPORT_CITY),
-        .mapNum = MAP_NUM(SLATEPORT_CITY),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gSlateportCity_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSlateportCity_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(MOSSDEEP_CITY),
-        .mapNum = MAP_NUM(MOSSDEEP_CITY),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gMossdeepCity_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gMossdeepCity_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN),
-        .mapNum = MAP_NUM(PACIFIDLOG_TOWN),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gPacifidlogTown_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(EVER_GRANDE_CITY),
-        .mapNum = MAP_NUM(EVER_GRANDE_CITY),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gEverGrandeCity_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(PETALBURG_CITY),
-        .mapNum = MAP_NUM(PETALBURG_CITY),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gPetalburgCity_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gPetalburgCity_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(UNDERWATER1),
-        .mapNum = MAP_NUM(UNDERWATER1),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gUnderwater1_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
-        .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
-        .landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SKY_PILLAR_1F),
-        .mapNum = MAP_NUM(SKY_PILLAR_1F),
-        .landMonsInfo = &gSkyPillar_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY),
-        .mapNum = MAP_NUM(SOOTOPOLIS_CITY),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = &gSootopolisCity_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSootopolisCity_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SKY_PILLAR_3F),
-        .mapNum = MAP_NUM(SKY_PILLAR_3F),
-        .landMonsInfo = &gSkyPillar_3F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SKY_PILLAR_5F),
-        .mapNum = MAP_NUM(SKY_PILLAR_5F),
-        .landMonsInfo = &gSkyPillar_5F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST),
-        .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST),
-        .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo,
-        .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo,
-    },
-    {
-        .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST),
-        .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST),
-        .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_1F),
-        .landMonsInfo = &gMagmaHideout_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R),
-        .landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R),
-        .landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R),
-        .landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R),
-        .landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_4F),
-        .landMonsInfo = &gMagmaHideout_4F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R),
-        .landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R),
-        .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R),
-        .landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MIRAGE_TOWER_1F),
-        .mapNum = MAP_NUM(MIRAGE_TOWER_1F),
-        .landMonsInfo = &gMirageTower_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MIRAGE_TOWER_2F),
-        .mapNum = MAP_NUM(MIRAGE_TOWER_2F),
-        .landMonsInfo = &gMirageTower_2F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MIRAGE_TOWER_3F),
-        .mapNum = MAP_NUM(MIRAGE_TOWER_3F),
-        .landMonsInfo = &gMirageTower_3F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(MIRAGE_TOWER_4F),
-        .mapNum = MAP_NUM(MIRAGE_TOWER_4F),
-        .landMonsInfo = &gMirageTower_4F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(DESERT_UNDERPASS),
-        .mapNum = MAP_NUM(DESERT_UNDERPASS),
-        .landMonsInfo = &gDesertUnderpass_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F),
-        .mapNum = MAP_NUM(ARTISAN_CAVE_B1F),
-        .landMonsInfo = &gArtisanCave_B1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ARTISAN_CAVE_1F),
-        .mapNum = MAP_NUM(ARTISAN_CAVE_1F),
-        .landMonsInfo = &gArtisanCave_1F_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave1_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave2_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave3_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave4_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave5_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave6_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave7_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave8_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(ALTERING_CAVE),
-        .mapNum = MAP_NUM(ALTERING_CAVE),
-        .landMonsInfo = &gAlteringCave9_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE),
-        .mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE),
-        .landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = MAP_GROUP(UNDEFINED),
-        .mapNum = MAP_NUM(UNDEFINED),
-        .landMonsInfo = NULL,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-};
-
-//Battle Pyramid-specific tables and headers start here.
-
-const struct WildPokemon gBattlePyramidPlaceholders_1[] =
-{
-    {5, 5, SPECIES_BULBASAUR},
-    {5, 5, SPECIES_BULBASAUR},
-    {5, 5, SPECIES_BULBASAUR},
-    {5, 5, SPECIES_BULBASAUR},
-    {5, 5, SPECIES_IVYSAUR},
-    {5, 5, SPECIES_IVYSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_CHARMANDER},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_1Info = {4, gBattlePyramidPlaceholders_1};
-
-const struct WildPokemon gBattlePyramidPlaceholders_2[] =
-{
-    {5, 5, SPECIES_IVYSAUR},
-    {5, 5, SPECIES_IVYSAUR},
-    {5, 5, SPECIES_IVYSAUR},
-    {5, 5, SPECIES_IVYSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMANDER},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_2Info = {4, gBattlePyramidPlaceholders_2};
-
-const struct WildPokemon gBattlePyramidPlaceholders_3[] =
-{
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_VENUSAUR},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARIZARD},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_3Info = {4, gBattlePyramidPlaceholders_3};
-
-const struct WildPokemon gBattlePyramidPlaceholders_4[] =
-{
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMANDER},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_SQUIRTLE},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_4Info = {4, gBattlePyramidPlaceholders_4};
-
-const struct WildPokemon gBattlePyramidPlaceholders_5[] =
-{
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_WARTORTLE},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_5Info = {4, gBattlePyramidPlaceholders_5};
-
-const struct WildPokemon gBattlePyramidPlaceholders_6[] =
-{
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_WARTORTLE},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_6Info = {4, gBattlePyramidPlaceholders_6};
-
-const struct WildPokemon gBattlePyramidPlaceholders_7[] =
-{
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_WARTORTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_SQUIRTLE},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARIZARD},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-    {5, 5, SPECIES_CHARMELEON},
-};
-
-const struct WildPokemonInfo gBattlePyramidPlaceholders_7Info = {8, gBattlePyramidPlaceholders_7};
-
-const struct WildPokemonHeader gBattlePyramidWildMonHeaders[] =
-{
-    {
-        .mapGroup = 0,
-        .mapNum = 1,
-        .landMonsInfo = &gBattlePyramidPlaceholders_1Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 2,
-        .landMonsInfo = &gBattlePyramidPlaceholders_2Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 3,
-        .landMonsInfo = &gBattlePyramidPlaceholders_3Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 4,
-        .landMonsInfo = &gBattlePyramidPlaceholders_4Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 5,
-        .landMonsInfo = &gBattlePyramidPlaceholders_5Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 6,
-        .landMonsInfo = &gBattlePyramidPlaceholders_6Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 7,
-        .landMonsInfo = &gBattlePyramidPlaceholders_7Info,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 255,
-        .mapNum = 255,
-        .landMonsInfo = NULL,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-};
-
-//Battle Pike-specific tables and headers start here.
-
-const struct WildPokemon gBattlePikeMons_1[] =
-{
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_DUSCLOPS},
-    {5, 5, SPECIES_DUSCLOPS},
-    {5, 5, SPECIES_DUSCLOPS},
-    {5, 5, SPECIES_DUSCLOPS},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_DUSCLOPS},
-    {5, 5, SPECIES_DUSCLOPS},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-};
-
-const struct WildPokemonInfo gBattlePikeMonsInfo_1 = {10, gBattlePikeMons_1};
-
-const struct WildPokemon gBattlePikeMons_2[] =
-{
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_ELECTRODE},
-    {5, 5, SPECIES_ELECTRODE},
-    {5, 5, SPECIES_ELECTRODE},
-    {5, 5, SPECIES_ELECTRODE},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_ELECTRODE},
-    {5, 5, SPECIES_ELECTRODE},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-};
-
-const struct WildPokemonInfo gBattlePikeMonsInfo_2 = {10, gBattlePikeMons_2};
-
-const struct WildPokemon gBattlePikeMons_3[] =
-{
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_BRELOOM},
-    {5, 5, SPECIES_BRELOOM},
-    {5, 5, SPECIES_BRELOOM},
-    {5, 5, SPECIES_BRELOOM},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_BRELOOM},
-    {5, 5, SPECIES_BRELOOM},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-};
-
-const struct WildPokemonInfo gBattlePikeMonsInfo_3 = {10, gBattlePikeMons_3};
-
-const struct WildPokemon gBattlePikeMons_4[] =
-{
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_WOBBUFFET},
-    {5, 5, SPECIES_WOBBUFFET},
-    {5, 5, SPECIES_WOBBUFFET},
-    {5, 5, SPECIES_WOBBUFFET},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-    {5, 5, SPECIES_WOBBUFFET},
-    {5, 5, SPECIES_WOBBUFFET},
-    {5, 5, SPECIES_SEVIPER},
-    {5, 5, SPECIES_MILOTIC},
-};
-
-const struct WildPokemonInfo gBattlePikeMonsInfo_4 = {10, gBattlePikeMons_4};
-
-const struct WildPokemonHeader gBattlePikeWildMonHeaders[] =
-{
-    {
-        .mapGroup = 0,
-        .mapNum = 1,
-        .landMonsInfo = &gBattlePikeMonsInfo_1,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 2,
-        .landMonsInfo = &gBattlePikeMonsInfo_2,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 3,
-        .landMonsInfo = &gBattlePikeMonsInfo_3,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 0,
-        .mapNum = 4,
-        .landMonsInfo = &gBattlePikeMonsInfo_4,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-    {
-        .mapGroup = 255,
-        .mapNum = 255,
-        .landMonsInfo = NULL,
-        .waterMonsInfo = NULL,
-        .rockSmashMonsInfo = NULL,
-        .fishingMonsInfo = NULL,
-    },
-};
-
-//Special Feebas-related data.
-
-const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS};
-
-const u16 gRoute119WaterTileData[] =
-{
-    0, 0x2D, 0,
-    0x2E, 0x5B, 0x83,
-    0x5C, 0x8B, 0x12A,
-};
-
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
new file mode 100755
index 000000000..6dd24bfed
--- /dev/null
+++ b/src/data/wild_encounters.json
@@ -0,0 +1,12186 @@
+{
+  "wild_encounter_groups": [
+    {
+      "label": "gWildMonHeaders",
+      "for_maps": true,
+      "encounters": [
+        {
+          "map": "MAP_ROUTE101",
+          "base_label": "gRoute101",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE102",
+          "base_label": "gRoute102",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_LOTAD"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_LOTAD"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_RALTS"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_SEEDOT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_CORPHISH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE103",
+          "base_label": "gRoute103",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 2,
+                "max_level": 2,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_WINGULL"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE104",
+          "base_label": "gRoute104",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 4,
+                "max_level": 4,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WINGULL"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_MAGIKARP"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE105",
+          "base_label": "gRoute105",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE110",
+          "base_label": "gRoute110",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_ELECTRIKE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_GULPIN"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_ELECTRIKE"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_MINUN"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_MINUN"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_GULPIN"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_PLUSLE"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_PLUSLE"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE111",
+          "base_label": "gRoute111",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 19,
+                "max_level": 19,
+                "species": "SPECIES_BALTOY"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_BALTOY"
+              },
+              {
+                "min_level": 19,
+                "max_level": 19,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 19,
+                "max_level": 19,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_BALTOY"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_CACNEA"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_CACNEA"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_CACNEA"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 15,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_BARBOACH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE112",
+          "base_label": "gRoute112",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_NUMEL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE113",
+          "base_label": "gRoute113",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_SLUGMA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_SLUGMA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SLUGMA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SKARMORY"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SPINDA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SKARMORY"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE114",
+          "base_label": "gRoute114",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SWABLU"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_LOTAD"
+              },
+              {
+                "min_level": 17,
+                "max_level": 17,
+                "species": "SPECIES_SWABLU"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_SWABLU"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_LOTAD"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_LOMBRE"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_LOMBRE"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_LOMBRE"
+              },
+              {
+                "min_level": 17,
+                "max_level": 17,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 17,
+                "max_level": 17,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_NUZLEAF"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 15,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_BARBOACH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE116",
+          "base_label": "gRoute116",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_NINCADA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_NINCADA"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_SKITTY"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_SKITTY"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE117",
+          "base_label": "gRoute117",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_ILLUMISE"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_ILLUMISE"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ILLUMISE"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ILLUMISE"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_VOLBEAT"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_SEEDOT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_CORPHISH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE118",
+          "base_label": "gRoute118",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_ELECTRIKE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ELECTRIKE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_LINOONE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_MANECTRIC"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_KECLEON"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_CARVANHA"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE124",
+          "base_label": "gRoute124",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_PETALBURG_WOODS",
+          "base_label": "gPetalburgWoods",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SHROOMISH"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SILCOON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CASCOON"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_WURMPLE"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_SHROOMISH"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SLAKOTH"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_SLAKOTH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_RUSTURF_TUNNEL",
+          "base_label": "gRusturfTunnel",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_WHISMUR"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_GRANITE_CAVE_1F",
+          "base_label": "gGraniteCave_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_GEODUDE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_GRANITE_CAVE_B1F",
+          "base_label": "gGraniteCave_B1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_SABLEYE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_1F",
+          "base_label": "gMtPyre_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_VICTORY_ROAD_1F",
+          "base_label": "gVictoryRoad_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_HARIYAMA"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LOUDRED"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_HARIYAMA"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_WHISMUR"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SAFARI_ZONE_SOUTH",
+          "base_label": "gSafariZone_South",
+          "land_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_GIRAFARIG"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GIRAFARIG"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_NATU"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_DODUO"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_PIKACHU"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PIKACHU"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_WOBBUFFET"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_UNDERWATER2",
+          "base_label": "gUnderwater2",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_CLAMPERL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_CHINCHOU"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CLAMPERL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_RELICANTH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_RELICANTH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
+          "base_label": "gAbandonedShip_Rooms_B1F",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_TENTACRUEL"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_TENTACRUEL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_TENTACRUEL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_TENTACRUEL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_GRANITE_CAVE_B2F",
+          "base_label": "gGraniteCave_B2F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_SABLEYE"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 15,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_NOSEPASS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_FIERY_PATH",
+          "base_label": "gFieryPath",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_KOFFING"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_MACHOP"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_SLUGMA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_KOFFING"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_MACHOP"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_GRIMER"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_GRIMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_METEOR_FALLS_B1F_2R",
+          "base_label": "gMeteorFalls_B1F_2R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_BAGON"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_BAGON"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_BAGON"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_SOLROCK"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WHISCASH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_JAGGED_PASS",
+          "base_label": "gJaggedPass",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_MACHOP"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SPOINK"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_MACHOP"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_SPOINK"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_MACHOP"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SPOINK"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_NUMEL"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SPOINK"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE106",
+          "base_label": "gRoute106",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE107",
+          "base_label": "gRoute107",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE108",
+          "base_label": "gRoute108",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE109",
+          "base_label": "gRoute109",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE115",
+          "base_label": "gRoute115",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SWABLU"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SWABLU"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_TAILLOW"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SWELLOW"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_JIGGLYPUFF"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_JIGGLYPUFF"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_NEW_MAUVILLE_INSIDE",
+          "base_label": "gNewMauville_Inside",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_MAGNETON"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE119",
+          "base_label": "gRoute119",
+          "land_mons": {
+            "encounter_rate": 15,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_LINOONE"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ZIGZAGOON"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_LINOONE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_TROPIUS"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_TROPIUS"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_TROPIUS"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_KECLEON"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_CARVANHA"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_CARVANHA"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE120",
+          "base_label": "gRoute120",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_MIGHTYENA"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_MIGHTYENA"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_ABSOL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ABSOL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_KECLEON"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SEEDOT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_BARBOACH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE121",
+          "base_label": "gRoute121",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_MIGHTYENA"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_MIGHTYENA"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_KECLEON"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE122",
+          "base_label": "gRoute122",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE123",
+          "base_label": "gRoute123",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_POOCHYENA"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_MIGHTYENA"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_MIGHTYENA"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_KECLEON"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_2F",
+          "base_label": "gMtPyre_2F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_3F",
+          "base_label": "gMtPyre_3F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_4F",
+          "base_label": "gMtPyre_4F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_DUSKULL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_5F",
+          "base_label": "gMtPyre_5F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_DUSKULL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_6F",
+          "base_label": "gMtPyre_6F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_DUSKULL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_EXTERIOR",
+          "base_label": "gMtPyre_Exterior",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_VULPIX"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_VULPIX"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_VULPIX"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_VULPIX"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_WINGULL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MT_PYRE_SUMMIT",
+          "base_label": "gMtPyre_Summit",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUPPET"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_DUSKULL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_CHIMECHO"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_CHIMECHO"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_GRANITE_CAVE_STEVENS_ROOM",
+          "base_label": "gGraniteCave_StevensRoom",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_MAKUHITA"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_ARON"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ARON"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE125",
+          "base_label": "gRoute125",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE126",
+          "base_label": "gRoute126",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE127",
+          "base_label": "gRoute127",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE128",
+          "base_label": "gRoute128",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_LUVDISC"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_LUVDISC"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CORSOLA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE129",
+          "base_label": "gRoute129",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILORD"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE130",
+          "base_label": "gRoute130",
+          "land_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 45,
+                "max_level": 45,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 50,
+                "max_level": 50,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_WYNAUT"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WYNAUT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE131",
+          "base_label": "gRoute131",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE132",
+          "base_label": "gRoute132",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_HORSEA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE133",
+          "base_label": "gRoute133",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_HORSEA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ROUTE134",
+          "base_label": "gRoute134",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_HORSEA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
+          "base_label": "gAbandonedShip_HiddenFloorCorridors",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_TENTACRUEL"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_TENTACRUEL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_TENTACRUEL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_TENTACRUEL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM1",
+          "base_label": "gSeafloorCavern_Room1",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM2",
+          "base_label": "gSeafloorCavern_Room2",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM3",
+          "base_label": "gSeafloorCavern_Room3",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM4",
+          "base_label": "gSeafloorCavern_Room4",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM5",
+          "base_label": "gSeafloorCavern_Room5",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM6",
+          "base_label": "gSeafloorCavern_Room6",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM7",
+          "base_label": "gSeafloorCavern_Room7",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ROOM8",
+          "base_label": "gSeafloorCavern_Room8",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
+          "base_label": "gSeafloorCavern_Entrance",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+          "base_label": "gCaveOfOrigin_Entrance",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_CAVE_OF_ORIGIN_1F",
+          "base_label": "gCaveOfOrigin_1F",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
+          "base_label": "gCaveOfOrigin_UnusedRubySapphireMap1",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
+          "base_label": "gCaveOfOrigin_UnusedRubySapphireMap2",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
+          "base_label": "gCaveOfOrigin_UnusedRubySapphireMap3",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_NEW_MAUVILLE_ENTRANCE",
+          "base_label": "gNewMauville_Entrance",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_MAGNEMITE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_VOLTORB"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_MAGNEMITE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SAFARI_ZONE_SOUTHWEST",
+          "base_label": "gSafariZone_Southwest",
+          "land_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_GIRAFARIG"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GIRAFARIG"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_NATU"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DODUO"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_PIKACHU"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PIKACHU"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_WOBBUFFET"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 9,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_PSYDUCK"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 35,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 25,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SEAKING"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_SEAKING"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SEAKING"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SAFARI_ZONE_NORTH",
+          "base_label": "gSafariZone_North",
+          "land_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PHANPY"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_PHANPY"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_NATU"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_NATU"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_XATU"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_HERACROSS"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_XATU"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_HERACROSS"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 15,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 15,
+                "max_level": 20,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SAFARI_ZONE_NORTHWEST",
+          "base_label": "gSafariZone_Northwest",
+          "land_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_RHYHORN"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_RHYHORN"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_ODDISH"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_DODUO"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GLOOM"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_DODUO"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_DODRIO"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PINSIR"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_DODRIO"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_PINSIR"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 9,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_PSYDUCK"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLDUCK"
+              },
+              {
+                "min_level": 25,
+                "max_level": 40,
+                "species": "SPECIES_GOLDUCK"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 35,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 25,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SEAKING"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_SEAKING"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SEAKING"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_VICTORY_ROAD_B1F",
+          "base_label": "gVictoryRoad_B1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_HARIYAMA"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_HARIYAMA"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_HARIYAMA"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_MAWILE"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_MAWILE"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 20,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 40,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 40,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_VICTORY_ROAD_B2F",
+          "base_label": "gVictoryRoad_B2F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_MAWILE"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_LAIRON"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_MAWILE"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WHISCASH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_METEOR_FALLS_1F_1R",
+          "base_label": "gMeteorFalls_1F_1R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 17,
+                "max_level": 17,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 15,
+                "max_level": 15,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 19,
+                "max_level": 19,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 19,
+                "max_level": 19,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_ZUBAT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_SOLROCK"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_BARBOACH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_METEOR_FALLS_1F_2R",
+          "base_label": "gMeteorFalls_1F_2R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_SOLROCK"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WHISCASH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_METEOR_FALLS_B1F_1R",
+          "base_label": "gMeteorFalls_B1F_1R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 5,
+                "max_level": 15,
+                "species": "SPECIES_SOLROCK"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 30,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_BARBOACH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WHISCASH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WHISCASH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
+          "base_label": "gShoalCave_LowTideStairsRoom",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
+          "base_label": "gShoalCave_LowTideLowerRoom",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
+          "base_label": "gShoalCave_LowTideInnerRoom",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 35,
+                "species": "SPECIES_SPHEAL"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
+          "base_label": "gShoalCave_LowTideEntranceRoom",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 35,
+                "species": "SPECIES_SPHEAL"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_LILYCOVE_CITY",
+          "base_label": "gLilycoveCity",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_STARYU"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_DEWFORD_TOWN",
+          "base_label": "gDewfordTown",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SLATEPORT_CITY",
+          "base_label": "gSlateportCity",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MOSSDEEP_CITY",
+          "base_label": "gMossdeepCity",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_PACIFIDLOG_TOWN",
+          "base_label": "gPacifidlogTown",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHARPEDO"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_EVER_GRANDE_CITY",
+          "base_label": "gEverGrandeCity",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_PELIPPER"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_LUVDISC"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_LUVDISC"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CORSOLA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_WAILMER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_WAILMER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_PETALBURG_CITY",
+          "base_label": "gPetalburgCity",
+          "water_mons": {
+            "encounter_rate": 1,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 20,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MARILL"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_CORPHISH"
+              },
+              {
+                "min_level": 40,
+                "max_level": 45,
+                "species": "SPECIES_CORPHISH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_UNDERWATER1",
+          "base_label": "gUnderwater1",
+          "water_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_CLAMPERL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 30,
+                "species": "SPECIES_CHINCHOU"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_CLAMPERL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_RELICANTH"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_RELICANTH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
+          "base_label": "gShoalCave_LowTideIceRoom",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SNORUNT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_SPHEAL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SNORUNT"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_SNORUNT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SKY_PILLAR_1F",
+          "base_label": "gSkyPillar_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_BANETTE"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_BANETTE"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_CLAYDOL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SOOTOPOLIS_CITY",
+          "base_label": "gSootopolisCity",
+          "water_mons": {
+            "encounter_rate": 1,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 35,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 15,
+                "max_level": 25,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 10,
+                "species": "SPECIES_TENTACOOL"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 10,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_GYARADOS"
+              },
+              {
+                "min_level": 35,
+                "max_level": 45,
+                "species": "SPECIES_GYARADOS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 45,
+                "species": "SPECIES_GYARADOS"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SKY_PILLAR_3F",
+          "base_label": "gSkyPillar_3F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_BANETTE"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_BANETTE"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_CLAYDOL"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SKY_PILLAR_5F",
+          "base_label": "gSkyPillar_5F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SABLEYE"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_BANETTE"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_BANETTE"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_CLAYDOL"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_ALTARIA"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_ALTARIA"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_ALTARIA"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SAFARI_ZONE_SOUTHEAST",
+          "base_label": "gSafariZone_Southeast",
+          "land_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SUNKERN"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_SUNKERN"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SPINARAK"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_HOOTHOOT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SNUBBULL"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_GLIGAR"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GLIGAR"
+              }
+            ]
+          },
+          "water_mons": {
+            "encounter_rate": 9,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_WOOPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_MARILL"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_QUAGSIRE"
+              }
+            ]
+          },
+          "fishing_mons": {
+            "encounter_rate": 35,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_MAGIKARP"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_REMORAID"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_GOLDEEN"
+              },
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_REMORAID"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_REMORAID"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_REMORAID"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_OCTILLERY"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_SAFARI_ZONE_NORTHEAST",
+          "base_label": "gSafariZone_Northeast",
+          "land_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_SUNKERN"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_LEDYBA"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_HOOTHOOT"
+              },
+              {
+                "min_level": 34,
+                "max_level": 34,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_MILTANK"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_MILTANK"
+              }
+            ]
+          },
+          "rock_smash_mons": {
+            "encounter_rate": 25,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 30,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 35,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 35,
+                "max_level": 40,
+                "species": "SPECIES_SHUCKLE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_1F",
+          "base_label": "gMagmaHideout_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_2F_1R",
+          "base_label": "gMagmaHideout_2F_1R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_2F_2R",
+          "base_label": "gMagmaHideout_2F_2R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_3F_1R",
+          "base_label": "gMagmaHideout_3F_1R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_3F_2R",
+          "base_label": "gMagmaHideout_3F_2R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_4F",
+          "base_label": "gMagmaHideout_4F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_3F_3R",
+          "base_label": "gMagmaHideout_3F_3R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MAGMA_HIDEOUT_2F_3R",
+          "base_label": "gMagmaHideout_2F_3R",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_TORKOAL"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 30,
+                "max_level": 30,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 32,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GRAVELER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MIRAGE_TOWER_1F",
+          "base_label": "gMirageTower_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_TRAPINCH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MIRAGE_TOWER_2F",
+          "base_label": "gMirageTower_2F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_TRAPINCH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MIRAGE_TOWER_3F",
+          "base_label": "gMirageTower_3F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_TRAPINCH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_MIRAGE_TOWER_4F",
+          "base_label": "gMirageTower_4F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_TRAPINCH"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_TRAPINCH"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_DESERT_UNDERPASS",
+          "base_label": "gDesertUnderpass",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_DITTO"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_DITTO"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_LOUDRED"
+              },
+              {
+                "min_level": 41,
+                "max_level": 41,
+                "species": "SPECIES_DITTO"
+              },
+              {
+                "min_level": 36,
+                "max_level": 36,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_LOUDRED"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_DITTO"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_WHISMUR"
+              },
+              {
+                "min_level": 43,
+                "max_level": 43,
+                "species": "SPECIES_DITTO"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_LOUDRED"
+              },
+              {
+                "min_level": 45,
+                "max_level": 45,
+                "species": "SPECIES_DITTO"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ARTISAN_CAVE_B1F",
+          "base_label": "gArtisanCave_B1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 41,
+                "max_level": 41,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 43,
+                "max_level": 43,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 45,
+                "max_level": 45,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 46,
+                "max_level": 46,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 47,
+                "max_level": 47,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 48,
+                "max_level": 48,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 49,
+                "max_level": 49,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 50,
+                "max_level": 50,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 50,
+                "max_level": 50,
+                "species": "SPECIES_SMEARGLE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ARTISAN_CAVE_1F",
+          "base_label": "gArtisanCave_1F",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 41,
+                "max_level": 41,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 42,
+                "max_level": 42,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 43,
+                "max_level": 43,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 44,
+                "max_level": 44,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 45,
+                "max_level": 45,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 46,
+                "max_level": 46,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 47,
+                "max_level": 47,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 48,
+                "max_level": 48,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 49,
+                "max_level": 49,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 50,
+                "max_level": 50,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 50,
+                "max_level": 50,
+                "species": "SPECIES_SMEARGLE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave1",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_ZUBAT"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave2",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 7,
+                "max_level": 7,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 9,
+                "max_level": 9,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 13,
+                "max_level": 13,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 3,
+                "max_level": 3,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MAREEP"
+              },
+              {
+                "min_level": 11,
+                "max_level": 11,
+                "species": "SPECIES_MAREEP"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave3",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 23,
+                "max_level": 23,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 29,
+                "max_level": 29,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 19,
+                "max_level": 19,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 21,
+                "max_level": 21,
+                "species": "SPECIES_PINECO"
+              },
+              {
+                "min_level": 27,
+                "max_level": 27,
+                "species": "SPECIES_PINECO"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave4",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_HOUNDOUR"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_HOUNDOUR"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave5",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 12,
+                "max_level": 12,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 16,
+                "max_level": 16,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 6,
+                "max_level": 6,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 8,
+                "max_level": 8,
+                "species": "SPECIES_TEDDIURSA"
+              },
+              {
+                "min_level": 14,
+                "max_level": 14,
+                "species": "SPECIES_TEDDIURSA"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave6",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_AIPOM"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_AIPOM"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave7",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SHUCKLE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SHUCKLE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave8",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_STANTLER"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_STANTLER"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_ALTERING_CAVE",
+          "base_label": "gAlteringCave9",
+          "land_mons": {
+            "encounter_rate": 7,
+            "mons": [
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 22,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 24,
+                "max_level": 24,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 28,
+                "max_level": 28,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 18,
+                "max_level": 18,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 20,
+                "species": "SPECIES_SMEARGLE"
+              },
+              {
+                "min_level": 26,
+                "max_level": 26,
+                "species": "SPECIES_SMEARGLE"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_METEOR_FALLS_STEVENS_CAVE",
+          "base_label": "gMeteorFalls_StevensCave",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 33,
+                "max_level": 33,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 37,
+                "max_level": 37,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 35,
+                "max_level": 35,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 39,
+                "max_level": 39,
+                "species": "SPECIES_SOLROCK"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 38,
+                "max_level": 38,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 40,
+                "max_level": 40,
+                "species": "SPECIES_GOLBAT"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "label": "gBattlePyramidWildMonHeaders",
+      "for_maps": false,
+      "encounters": [
+        {
+          "base_label": "gBattlePyramid_1",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BULBASAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BULBASAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BULBASAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BULBASAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_IVYSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_IVYSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePyramid_2",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_IVYSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_IVYSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_IVYSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_IVYSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePyramid_3",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_VENUSAUR"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePyramid_4",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMANDER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePyramid_5",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePyramid_6",
+          "land_mons": {
+            "encounter_rate": 4,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePyramid_7",
+          "land_mons": {
+            "encounter_rate": 8,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WARTORTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SQUIRTLE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARIZARD"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_CHARMELEON"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "label": "gBattlePikeWildMonHeaders",
+      "for_maps": false,
+      "encounters": [
+        {
+          "base_label": "gBattlePike_1",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_DUSCLOPS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_DUSCLOPS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_DUSCLOPS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_DUSCLOPS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_DUSCLOPS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_DUSCLOPS"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePike_2",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ELECTRODE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePike_3",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BRELOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BRELOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BRELOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BRELOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BRELOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_BRELOOM"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              }
+            ]
+          }
+        },
+        {
+          "base_label": "gBattlePike_4",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_WOBBUFFET"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_SEVIPER"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MILOTIC"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt
new file mode 100755
index 000000000..8f88cc587
--- /dev/null
+++ b/src/data/wild_encounters.json.txt
@@ -0,0 +1,67 @@
+{{ doNotModifyHeader }}
+## for wild_encounter_group in wild_encounter_groups
+## for encounter in wild_encounter_group.encounters
+{% if existsIn(encounter, "land_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_LandMons[] =
+{
+## for wild_mon in encounter.land_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_LandMonsInfo = { {{encounter.land_mons.encounter_rate}}, {{ encounter.base_label }}_LandMons };
+{% endif %}
+{% if existsIn(encounter, "water_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_WaterMons[] =
+{
+## for wild_mon in encounter.water_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_WaterMonsInfo = { {{encounter.water_mons.encounter_rate}}, {{ encounter.base_label }}_WaterMons };
+{% endif %}
+{% if existsIn(encounter, "rock_smash_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_RockSmashMons[] =
+{
+## for wild_mon in encounter.rock_smash_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_RockSmashMonsInfo = { {{encounter.rock_smash_mons.encounter_rate}}, {{ encounter.base_label }}_RockSmashMons };
+{% endif %}
+{% if existsIn(encounter, "fishing_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_FishingMons[] =
+{
+## for wild_mon in encounter.fishing_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
+## endfor
+};
+
+const struct WildPokemonInfo {{ encounter.base_label }}_FishingMonsInfo = { {{encounter.fishing_mons.encounter_rate}}, {{ encounter.base_label }}_FishingMons };
+{% endif %}
+## endfor
+
+const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
+{
+## for encounter in wild_encounter_group.encounters
+    {
+        .mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ removePrefix(encounter.map, "MAP_") }}){% else %}0{% endif %},
+        .mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ removePrefix(encounter.map, "MAP_") }}){% else %}{{ loop.index1 }}{% endif %},
+        .landMonsInfo = {% if existsIn(encounter, "land_mons") %}&{{ encounter.base_label }}_LandMonsInfo{% else %}NULL{% endif %},
+        .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %},
+        .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %},
+        .fishingMonsInfo = {% if existsIn(encounter, "fishing_mons") %}&{{ encounter.base_label }}_FishingMonsInfo{% else %}NULL{% endif %},
+    },
+## endfor
+    {
+        .mapGroup = MAP_GROUP(UNDEFINED),
+        .mapNum = MAP_NUM(UNDEFINED),
+        .landMonsInfo = NULL,
+        .waterMonsInfo = NULL,
+        .rockSmashMonsInfo = NULL,
+        .fishingMonsInfo = NULL,
+    },
+};
+## endfor